spacewalk/setup/bin/spacewalk-setup | 14 ------ web/modules/pxt/PXT/Trace.pm | 13 ----- web/modules/rhn/RHN/DB/Channel.pm | 67 ----------------------------- web/modules/rhn/RHN/DB/ContactGroup.pm | 19 -------- web/modules/rhn/RHN/DB/Org.pm | 19 -------- web/modules/rhn/RHN/DB/SatInstall.pm | 34 -------------- web/modules/rhn/RHN/DataSource.pm | 7 --- web/modules/rhn/RHN/SatelliteCert.pm | 6 -- web/modules/rhn/RHN/SimpleStruct.pm | 8 --- web/modules/sniglets/Sniglets/Navi/Node.pm | 2 10 files changed, 189 deletions(-)
New commits: commit 7e2ae37a84d7741cf36d91e7460788e893bd68fb Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:52:41 2010 +0200
Method unused_entitlements no longer called, removing.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm index 1e6a296..1bbd142 100644 --- a/web/modules/rhn/RHN/DB/Org.pm +++ b/web/modules/rhn/RHN/DB/Org.pm @@ -351,25 +351,6 @@ sub entitlement_data { return $ent_data; }
-#How many unused basic or enterprise slots does the org have? -sub unused_entitlements { - my $self = shift; - - my $dbh = RHN::DB->connect; - my $sth = $dbh->prepare(<<EOS); -SELECT SUM(max_members - current_members) - FROM rhnServerGroup - WHERE org_id = :org_id - AND ( group_type = (SELECT id FROM rhnServerGroupType WHERE label = 'sw_mgr_entitled') - OR group_type = (SELECT id FROM rhnServerGroupType WHERE label = 'enterprise_entitled')) -EOS - $sth->execute_h(org_id => $self->id); - my ($tot) = $sth->fetchrow; - $sth->finish; - - return $tot; -} - sub owns_server_groups { my $self = shift; my @sg_ids = @_;
commit 6fdad7a9985d888937fb759309b77821d52dfaf9 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:47:56 2010 +0200
Method set_fields does not seem to be invoked, removing.
diff --git a/web/modules/rhn/RHN/SimpleStruct.pm b/web/modules/rhn/RHN/SimpleStruct.pm index 5a1c72b..161d1f4 100644 --- a/web/modules/rhn/RHN/SimpleStruct.pm +++ b/web/modules/rhn/RHN/SimpleStruct.pm @@ -57,14 +57,6 @@ sub extract_namespace_array { return $aref; }
-sub set_fields { - my $self = shift; - - croak "attempt to set fields for SimpleStruct after already set" if exists $self->{_simple_struct_fields_}; - - $self->{_simple_struct_fields_} = { map { $_ => undef } @_ }; -} - sub AUTOLOAD { my $self = shift;
commit 571aa29792a527b3206486782e7bab6d7b879af9 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:45:38 2010 +0200
Method schema_version no longer used, removing.
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm index 4fe51a8..fc1deec 100644 --- a/web/modules/rhn/RHN/DB/SatInstall.pm +++ b/web/modules/rhn/RHN/DB/SatInstall.pm @@ -116,40 +116,6 @@ EOQ return; }
-sub schema_version { - my $class = shift; - - my $dbh = RHN::DB->connect; - my $sth = $dbh->prepare(<<EOQ); - SELECT VI.label, - VI.name_id, - VI.evr_id, - PN.name, - PE.evr.as_vre_simple() AS VRE - FROM rhnPackageName PN, - rhnPackageEVR PE, - rhnVersionInfo VI - WHERE PN.id = VI.name_id - AND PE.id = VI.evr_id -EOQ - - $sth->execute(); - - my $version; - - while (my $row = $sth->fetchrow_hashref()) { - - if ($row->{LABEL} eq 'schema') { - $version = $row->{VRE}; - last; - } - } - - $sth->finish; - - return $version; -} - sub update_monitoring_config { my $class = shift; my $mon_config = shift;
commit 6447b639bf5783c5fb8bcbe90789ab3343fea6d1 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:44:25 2010 +0200
Method relationships is no longer called, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm index 3d32635..bd14e1d 100644 --- a/web/modules/rhn/RHN/DB/Channel.pm +++ b/web/modules/rhn/RHN/DB/Channel.pm @@ -976,46 +976,6 @@ EOQ return $progenitor; }
-sub relationships { - my $self = shift; - - my $dbh = RHN::DB->connect; - - my $query = <<EOQ; -SELECT CC.original_id, 'cloned_from', 'was cloned from' - FROM rhnChannelCloned CC - WHERE CC.id = :cid -EOQ - - my $sth = $dbh->prepare($query); - - $sth->execute_h(cid => $self->id); - - my %ret; - - while (my ($id, $label, $descrip) = $sth->fetchrow) { - $ret{$self->id}->{$label}->{description} = $descrip; - push @{$ret{$self->id}->{$label}->{channels}}, $id; - } - - $query = <<EOQ; -SELECT CC.id, 'cloned_from', 'was cloned from' - FROM rhnChannelCloned CC - WHERE CC.original_id = :cid -EOQ - - $sth = $dbh->prepare($query); - - $sth->execute_h(cid => $self->id); - - while (my ($id, $label, $descrip) = $sth->fetchrow) { - $ret{$id}->{$label}->{description} = $descrip; - push @{$ret{$id}->{$label}->{channels}}, $self->id; - } - - return %ret; -} - sub remove_packages_in_set { my $self = shift; my %attr = validate_with(params => @_, spec => { set_label => 1, user_id => 1 }, strip_leading => '-');
commit 284bf263c07a1b542d6345127cd933f80a390879 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:42:59 2010 +0200
Method list_groups no longer seems to be used, removing.
diff --git a/web/modules/rhn/RHN/DB/ContactGroup.pm b/web/modules/rhn/RHN/DB/ContactGroup.pm index 24e8195..44a8155 100644 --- a/web/modules/rhn/RHN/DB/ContactGroup.pm +++ b/web/modules/rhn/RHN/DB/ContactGroup.pm @@ -330,25 +330,6 @@ EOQ }
-# fetch a list of contact groups that are available for the probe. -################# -sub list_groups { -################# - my $class = shift; - my ($user, $sid) =@_; - - #list all of the contact methods if the user is a monitoring admin - if ($user->is('monitoring_admin')) { - my $ds = new RHN::DataSource::Simple(-querybase => "contact_group_queries", - -mode => "orgs_contact_groups"); - return $ds->execute_query(-org_id => $user->org->id); - - } - else { - - } -} - ############ sub delete { ############
commit 3bdbbeb6b86f13d8134322257c9d41b4b73f0851 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:41:07 2010 +0200
Methods active_image and inactive_image do not seem to be invoked, removing.
diff --git a/web/modules/sniglets/Sniglets/Navi/Node.pm b/web/modules/sniglets/Sniglets/Navi/Node.pm index 1d422dc..75bcc8d 100644 --- a/web/modules/sniglets/Sniglets/Navi/Node.pm +++ b/web/modules/sniglets/Sniglets/Navi/Node.pm @@ -61,8 +61,6 @@ sub node_id { return $_[0]->{'node-id'} } sub formvars { return $_[0]->{formvars} } sub urls { return $_[0]->{urls} } sub directories { return $_[0]->{directories} } -sub active_image { return $_[0]->{'active-image'} } -sub inactive_image { return $_[0]->{'inactive-image'} } sub acl { return $_[0]->{acl} } sub perm_fail_redirect { return $_[0]->{perm_fail_redirect} } sub target { return $_[0]->{target} }
commit bc5e44a7459049cd462d17633c553879f74bab7b Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:39:23 2010 +0200
Since RHN::DB::Search was removed, get_query_body is unused, removing.
diff --git a/web/modules/rhn/RHN/DataSource.pm b/web/modules/rhn/RHN/DataSource.pm index f289579..dd0cf23 100644 --- a/web/modules/rhn/RHN/DataSource.pm +++ b/web/modules/rhn/RHN/DataSource.pm @@ -95,13 +95,6 @@ sub required_params { return @uniq_params; }
-sub get_query_body { - my $self = shift; - - my $mode_data = $self->lookup_mode_data; - return $mode_data->{query}->{body}; -} - sub execute_query { my $self = shift; my %params = @_;
commit d56a728129977212c4756c8e377b8d341df35a9e Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:37:51 2010 +0200
Method get_channel_families from spacewalk-setup (the bin) not used, removing.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index b876925..31f82cf 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1522,14 +1522,6 @@ sub set_channel_family { $self->push_field(name => 'channel-families', family => $label, quantity => $quantity); }
-sub get_channel_families { - my $self = shift; - - my $a = $self->get_field('channel-families'); - - return map { [ $_->{family}, $_->{quantity} ] } @$a; -} - sub version { my $self = shift;
commit bae8f67a098420e743052aa2dc14f8706f2a2ab0 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:35:59 2010 +0200
Removal of PXT::SoapRequest made deserialize unused, removing.
diff --git a/web/modules/pxt/PXT/Trace.pm b/web/modules/pxt/PXT/Trace.pm index 3eae43a..a931e4f 100644 --- a/web/modules/pxt/PXT/Trace.pm +++ b/web/modules/pxt/PXT/Trace.pm @@ -66,19 +66,6 @@ sub hits { return @{$self->{hits}}; }
-sub deserialize { - my $class = shift; - my $str = shift; - - no strict; - my $trace = eval $str; - use strict; - - die "Error parsing trace data: $@" unless $trace and ref($trace) and $trace->isa("PXT::Trace"); - - return $trace; -} - sub serialize { my $self = shift;
commit 4645e2ceef709026e57cd5a2fa5c52c27f1b4df5 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:34:12 2010 +0200
Methods clear_channel_families not called anywhere, removing as dead code.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 7cd94d7..b876925 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -1514,12 +1514,6 @@ sub _init { return; }
-sub clear_channel_families { - my $self = shift; - - $self->clear_field("channel-families"); -} - sub set_channel_family { my $self = shift; my $label = shift; diff --git a/web/modules/rhn/RHN/SatelliteCert.pm b/web/modules/rhn/RHN/SatelliteCert.pm index 449d524..3c7fb87 100644 --- a/web/modules/rhn/RHN/SatelliteCert.pm +++ b/web/modules/rhn/RHN/SatelliteCert.pm @@ -35,12 +35,6 @@ sub _init { return; }
-sub clear_channel_families { - my $self = shift; - - $self->clear_field("channel-families"); -} - sub set_channel_family { my $self = shift; my $label = shift;
commit c64e84173cb24a481e5aa42dc128df82f8ca8806 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 10 14:30:30 2010 +0200
Method available_channels_with_license not called anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm index 515f374..3d32635 100644 --- a/web/modules/rhn/RHN/DB/Channel.pm +++ b/web/modules/rhn/RHN/DB/Channel.pm @@ -344,33 +344,6 @@ sub proxy_channels_by_version { }
-sub available_channels_with_license { - my $class = shift; - my $org_id = shift; - - my $dbh = RHN::DB->connect; - - my $query = <<EOQ; -SELECT AC.channel_id, AC.channel_label, AC.channel_name - FROM rhnChannelFamilyLicense CFL, rhnChannelFamilyMembers CFM, rhnAvailableChannels AC - WHERE AC.org_id = ? - AND AC.channel_id = CFM.channel_id - AND CFM.channel_family_id = CFL.channel_family_id -ORDER BY UPPER(AC.channel_name) -EOQ - - my $sth = $dbh->prepare($query); - $sth->execute($org_id); - - my @ret; - - while (my @row = $sth->fetchrow) { - push @ret, [ @row ]; - } - - return @ret; -} - sub has_downloads { my $class = shift; my $cid = shift;
spacewalk-commits@lists.fedorahosted.org