Changeset 594 for branches/stable/cgi-bin/search.cgi

Timestamp:

05/15/13 16:17:00 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge SQL changes and other miscellaneous fixes from /trunk through r553.

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/search.cgi (modified) (5 diffs)

branches/stable/cgi-bin/search.cgi

@@ -146 +146 @@
   my $cols = "cidr,custid,type,city,description";
 
+  # hack fix for undefined variables
+  $webvar{custid} = '' if !$webvar{custid};
+  $webvar{desc}   = '' if !$webvar{desc};
+  $webvar{notes}  = '' if !$webvar{notes};
+  $webvar{custexclude}  = '' if !$webvar{custexclude};
+  $webvar{descexclude}  = '' if !$webvar{descexclude};
+  $webvar{notesexclude} = '' if !$webvar{notesexclude};
+
   # First chunk of SQL.  Filter on custid, description, and notes as necessary.
-  my $sql = "(select $cols from searchme where".
-        " $webvar{custexclude} (custid ilike '%$webvar{custid}%'".
-        " $sqlconcat (select $cols from searchme where $webvar{descexclude} description ilike '%$webvar{desc}%')".
-        " $sqlconcat (select $cols from searchme where $webvar{notesexclude} notes ilike '%$webvar{notes}%')";
+  my $sql = qq(SELECT $cols FROM searchme\n);
+  $sql .= " WHERE $webvar{custexclude} (custid ~ '$webvar{custid}')\n";
+  $sql .= " $sqlconcat (select $cols from searchme where $webvar{descexclude} description ~ '$webvar{desc}')\n";
+  $sql .= " $sqlconcat (select $cols from searchme where $webvar{notesexclude} notes ~ '$webvar{notes}')";
 
   # If we're not supposed to search for all types, search for the selected types.
+  $webvar{alltypes} = '' if !$webvar{alltypes};
+  $webvar{typeexclude} = '' if !$webvar{typeexclude};
   if ($webvar{alltypes} ne 'on') {
     $sql .= " $sqlconcat (select $cols from searchme where $webvar{typeexclude} type in (";
@@ -164 +174 @@
   # If we're not supposed to search for all cities, search for the selected cities.
   # This could be vastly improved with proper foreign keys in the database.
+  $webvar{allcities} = '' if !$webvar{allcities};
+  $webvar{cityexclude} = '' if !$webvar{cityexclude};
   if ($webvar{allcities} ne 'on') {
     $sql .= " $sqlconcat (select $cols from searchme where $webvar{cityexclude} city in (";
@@ -315 +327 @@
 # Creates appropriate SQL to run the search and display the results
 # with queryResults()
-sub viewBy($$) {
+sub viewBy {
   my ($category,$query) = @_;
 
@@ -445 +457 @@
 # Display search queries based on the passed SQL.
 # Takes SQL, page number (for multipage search results), and a total count.
-sub queryResults($$$) {
+sub queryResults {
   my ($sql, $pageNo, $rowCount) = @_;
   my $offset = 0;
@@ -529 +541 @@
 # Return count of rows to be returned in a "real" query
 # with the passed SQL statement
-sub countRows($) {
+sub countRows {
   # Note that the "as foo" is required
   my $sth = $ip_dbh->prepare("select count(*) from ($_[0]) as foo");