web/modules/sniglets/Sniglets/Search.pm | 279 --------------------------------
1 file changed, 279 deletions(-)
New commits:
commit 2771c96efdf48e64faecc52d73c51a266a2e2fd9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:31:46 2009 +0100
Previous removals made validate_search_string unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 34484e8..4073319 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -24,37 +24,6 @@ use RHN::Server;
use RHN::Exception;
use PXT::Utils;
-sub validate_search_string {
- my $class = shift;
- my $pxt = shift;
- my $search = shift;
- my $search_string = shift;
-
- if ($search_string =~ /[^-a-zA-Z0-9_.]/) {
- $pxt->push_message(local_alert => 'Search strings must contain only
letters, numbers, hyphens and dashes.');
- return;
- }
-
- if (length $search_string < 2) {
- $pxt->push_message(local_alert => 'Search strings must be longer than two
characters.');
- return;
- }
-
- if ($search) {
- my $result = $search->valid_search_string($search_string);
-
- # returned value is error message to display, or undef/emptystring
- # if there are no errors
-
- if ($result) {
- $pxt->push_message(local_alert => $result);
- return;
- }
- }
-
- $pxt->pnotes(searched => 1);
-}
-
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
# Utility functions
commit 213cb07f246d1ce6a9654043d4b5270ea5479488
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:29:01 2009 +0100
The rest of Package Searching can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index a1c5c26..34484e8 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -57,17 +57,6 @@ sub validate_search_string {
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
-#################################
-# Package Searching
-#################################
-
-my $package_searches = new RHN::SearchType;
-$package_searches->add_mode(simple_package_search => "Name and Summary",
'Summary');
-$package_searches->add_mode(package_search_by_name => "Name Only",
'Summary');
-$package_searches->set_name('package_search');
-
-RHN::SearchTypes->register_type('package', $package_searches);
-
# Utility functions
sub strip_rpm_extensions { #strips the extensions off of an rpm file name
commit acb4125d5046c1e82d869a6b262123562c707eb9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:27:58 2009 +0100
Removal of bar_search_cb made package_search_handler unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index d0833c6..a1c5c26 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -24,13 +24,6 @@ use RHN::Server;
use RHN::Exception;
use PXT::Utils;
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:package_search_handler' =>
\&package_search_handler);
-}
-
sub validate_search_string {
my $class = shift;
my $pxt = shift;
@@ -75,40 +68,6 @@ $package_searches->set_name('package_search');
RHN::SearchTypes->register_type('package', $package_searches);
-sub package_search_handler {
- my $pxt = shift;
-
- my $search = RHN::SearchTypes->find_type('package');
- my $selected = new RHN::DB::Set $search->set_name, $pxt->user->id;
- $selected->empty;
- $selected->commit;
-
- my $search_string = $pxt->dirty_param('search_string') || '';
- my $search_mode = $pxt->dirty_param('view_mode') ||
$search->default_search_type;
-
- my @arch_labels;
- for my $arch (qw/ia32 ia64 x86_64/) {
- push @arch_labels, "channel-$arch"
- if $pxt->dirty_param("channel_arch_$arch");
- }
-
- my $smart_search = $pxt->dirty_param('search_subscribed_channels');
-
- if (not $smart_search and not @arch_labels) {
- $pxt->push_message(local_alert => 'You must choose at least one
architecture, or to search relevant channels.');
- return;
- }
-
- if ($smart_search and @arch_labels) {
- $pxt->push_message(local_alert => 'Either do a smart search -or- an arch
search, not both.');
- return;
- }
-
- if (Sniglets::Search->validate_search_string($pxt, $search, $search_string)) {
- RHN::Search->package_search($pxt->user, $search_mode, $search_string,
\@arch_labels, $smart_search);
- }
-}
-
# Utility functions
sub strip_rpm_extensions { #strips the extensions off of an rpm file name
commit 174a61d55d7be1d4bc720600f3b30b85259a532a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:27:10 2009 +0100
The rest of Errata Searching can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 0e66174..d0833c6 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -65,19 +65,6 @@ sub validate_search_string {
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
#################################
-# Errata Searching
-#################################
-
-
-my $errata_searches = new RHN::SearchType;
-$errata_searches->add_mode(simple_errata_search => "Summary",
'Synopsis');
-$errata_searches->add_mode(errata_search_by_advisory => "Errata Advisory (ex:
RHSA-2002:130)", 'Errata Advisory');
-$errata_searches->add_mode(errata_search_by_package_name => "Package Name (ex:
apache)", 'Package Name');
-$errata_searches->set_name('errata_search');
-
-RHN::SearchTypes->register_type('errata', $errata_searches);
-
-#################################
# Package Searching
#################################
commit c53cc40c2fdda2a19a827fd498e048081d6b2e3e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:26:44 2009 +0100
Removal of bar_search_cb made errata_search_handler unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 3fde4ad..0e66174 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,7 +28,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_search_handler' =>
\&errata_search_handler);
$pxt->register_callback('rhn:package_search_handler' =>
\&package_search_handler);
}
@@ -78,21 +77,6 @@ $errata_searches->set_name('errata_search');
RHN::SearchTypes->register_type('errata', $errata_searches);
-sub errata_search_handler {
- my $pxt = shift;
-
- my $search = RHN::SearchTypes->find_type('errata');
-
- my $selected = new RHN::DB::Set $search->set_name, $pxt->user->id;
- $selected->empty;
- $selected->commit;
-
- my $search_string = $pxt->dirty_param('search_string') || '';
- my $search_mode = $pxt->dirty_param('view_mode') ||
$search->default_search_type;
-
- RHN::Search->errata_search($pxt->user, $search_mode, $search_string);
-}
-
#################################
# Package Searching
#################################
commit 9430f4ec3ccc9ae5a8b2a0d937c27e0ac92aa1cc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:26:11 2009 +0100
The rest of System Searching can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 65289a7..3fde4ad 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -63,106 +63,6 @@ sub validate_search_string {
$pxt->pnotes(searched => 1);
}
-#################################
-# System Searching
-#################################
-
-my $system_searches = new RHN::SearchType::System;
-$system_searches->set_name('system_search');
-
-$system_searches->add_category(-label => 'Details',
- -modes => [
- { -label => 'Name/Description',
- -name => 'search_simple' },
- { -label => 'ID',
- -name => 'search_id' },
- { -label => 'Custom Info',
- -name => 'search_custom_info',
- -acl => 'org_entitlement(rhn_provisioning)'},
- { -label => 'Snapshot Tag',
- -name => 'search_snapshot_tag',
- -acl => 'org_entitlement(rhn_provisioning)'},
- ] );
-
-$system_searches->add_category(-label => 'Activity',
- -modes => [
- { -label => 'Days Since Last Checkin',
- -name => 'search_checkin' },
- { -label => 'Days Since First Registered',
- -name => 'search_registered' },
- ] );
-
-$system_searches->add_category(-label => 'Hardware',
- -modes => [
- { -label => 'CPU Model',
- -name => 'search_cpu_model' },
- { -label => 'CPU MHz less than',
- -name => 'search_cpu_mhz_lt',
- -column_name => 'CPU MHz' },
- { -label => 'CPU MHz greater than',
- -name => 'search_cpu_mhz_gt',
- -column_name => 'CPU MHz' },
- { -label => 'RAM less than',
- -name => 'search_ram_lt',
- -column_name => 'RAM' },
- { -label => 'RAM greater than',
- -name => 'search_ram_gt',
- -column_name => 'RAM' },
- ] );
-
-$system_searches->add_category(-label => 'Hardware Devices',
- -modes => [
- { -label => 'Description',
- -name => 'search_hwdevice_description' },
- { -label => 'Driver',
- -name => 'search_hwdevice_driver' },
- { -label => 'Device ID',
- -name => 'search_hwdevice_device_id' },
- { -label => 'Vendor ID',
- -name => 'search_hwdevice_vendor_id' },
- ] );
-
-$system_searches->add_category(-label => 'DMI Info',
- -modes => [
- { -label => 'System',
- -name => 'search_dmi_system' },
- { -label => 'BIOS',
- -name => 'search_dmi_bios' },
- { -label => 'Asset Tag',
- -name => 'search_dmi_asset' },
- ] );
-
-$system_searches->add_category(-label => 'Network Info',
- -modes => [
- { -label => 'Hostname',
- -name => 'search_hostname' },
- { -label => 'IP address',
- -name => 'search_ip' },
- ] );
-
-$system_searches->add_category(-label => 'Packages',
- -modes => [
- { -label => 'Installed Packages',
- -name => 'search_installed_packages' },
- { -label => 'Needed Packages',
- -name => 'search_needed_packages' },
- ] );
-
-$system_searches->add_category(-label => 'Location',
- -modes => [
- { -label => 'Address',
- -name => 'search_location_address' },
- { -label => 'Building',
- -name => 'search_location_building' },
- { -label => 'Room',
- -name => 'search_location_room' },
- { -label => 'Rack',
- -name => 'search_location_rack' },
- ] );
-
-
-RHN::SearchTypes->register_type('system', $system_searches);
-
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
#################################
commit f384f0ef6ee20e7fb1cca17c8052a50c9fddace7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:20:11 2009 +0100
Removal of bar_search_cb made system_search_handler unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 32dc6dd..65289a7 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,7 +28,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:system_search_handler' =>
\&system_search_handler);
$pxt->register_callback('rhn:errata_search_handler' =>
\&errata_search_handler);
$pxt->register_callback('rhn:package_search_handler' =>
\&package_search_handler);
}
@@ -166,29 +165,6 @@ RHN::SearchTypes->register_type('system',
$system_searches);
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
-sub system_search_handler {
- my $pxt = shift;
-
- my $search_string = $pxt->dirty_param('search_string') || '';
- my $search_set = $pxt->dirty_param('search_set') || 'all';
- my $search_type = $pxt->dirty_param('view_mode') ||
'search_simple';
- my $invert = $pxt->dirty_param('invert');
-
- my $set_name = $pxt->dirty_param('set_name') ||
'search_result_list';
- my $selected = new RHN::DB::Set $set_name, $pxt->user->id;
-
- $selected->empty;
- $selected->commit;
-
- $search_string = Sniglets::Search->strip_invalid_chars($search_string,
$search_type);
-
- my $integer_search = grep { $search_type eq $_ } @integer_types;
-
- if ($integer_search or Sniglets::Search->validate_search_string($pxt, undef,
$search_string)) {
- RHN::Search->system_search($pxt->user, $search_string, $search_set,
$search_type, $invert);
- }
-}
-
#################################
# Errata Searching
#################################
commit d090b6c0a15d0f5080ca921b6bf4d1051e5c9c58
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:18:18 2009 +0100
register_tags without content can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index b816bff..32dc6dd 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -24,12 +24,6 @@ use RHN::Server;
use RHN::Exception;
use PXT::Utils;
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
-}
-
sub register_callbacks {
my $class = shift;
my $pxt = shift;
commit cc267b65e9c9eccead93b197ce3b6522fc0bed14
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 22 09:18:03 2009 +0100
rhn:bar_search_cb not used, removing, as well as bar_search_cb.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index f56cc71..b816bff 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -37,8 +37,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:system_search_handler' =>
\&system_search_handler);
$pxt->register_callback('rhn:errata_search_handler' =>
\&errata_search_handler);
$pxt->register_callback('rhn:package_search_handler' =>
\&package_search_handler);
-
- $pxt->register_callback('rhn:bar_search_cb' => \&bar_search_cb);
}
sub validate_search_string {
@@ -270,41 +268,6 @@ sub package_search_handler {
}
}
-sub bar_search_cb {
- my $pxt = shift;
-
- my $type = $pxt->dirty_param('search_type') || 'systems';
- my $string = $pxt->dirty_param('search_string') || '';
-
- $string = PXT::Utils->escapeURI($string);
- my $url;
-
- if ($type eq 'systems') {
- my $trap = PXT::Utils->escapeURI('pxt_trap=rhn:system_search_handler');
- $url =
"/rhn/systems/Search.do?view_mode=systemsearch_name_and_description&search_string=$string&whereToSearch=all&submitted=true";
-
- $url = "/rhn/systems/Search.do" if not $string;
- }
- elsif ($type eq 'errata') {
- my $trap = PXT::Utils->escapeURI('pxt_trap=rhn:errata_search_handler');
- $url =
"/rhn/errata/Search.do?view_mode=simple_errata_search&search_string=$string";
-
- $url = "/rhn/errata/Search.do" if not $string;
- }
- elsif ($type eq 'packages') {
- my $trap = PXT::Utils->escapeURI('pxt_trap=rhn:package_search_handler');
- $url =
"/rhn/channels/software/Search.do?view_mode=search_name_and_summary&search_string=$string&ia32=channel-ia32&ia64=channel-ia64&x86=channel-x86_64&$trap";
-
- $url = "/rhn/channels/software/Search.do" if not $string;
- }
- else {
- die "no search type?!";
- }
-
- $pxt->session->set('last_search_type' => $type);
- $pxt->redirect($url);
-}
-
# Utility functions
sub strip_rpm_extensions { #strips the extensions off of an rpm file name