Changeset 521 for trunk/cgi-bin

Timestamp:

10/19/12 16:38:06 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Patch up search.cgi so that it at least provides results and doesn't
spew errors all over the place. See #31, #4 (sort of).

File:

• trunk/cgi-bin/search.cgi (modified) (1 diff)

trunk/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.