Changeset 320 for trunk/cgi-bin/search.cgi

Timestamp:

04/04/06 18:25:28 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge all bugfixes, hacks, tweaks, and miscellaneous updates from
/branches/stable necessary to bring code into line. Aside from
CustID verification and notification bits, /trunk and
/branches/stable should now be identical.

File:

• trunk/cgi-bin/search.cgi (modified) (3 diffs)

trunk/cgi-bin/search.cgi

@@ -9 +9 @@
 # Last update by $Author$
 ###
-# Copyright 2005 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2005,2006 Kris Deugau
 
 use strict;             
@@ -106 +106 @@
   # 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 $webvar{custexclude} oldcustid 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}%')";
@@ -283 +284 @@
     # Query for a customer ID.  Note that we can't restrict to "numeric-only"
     # as we have non-numeric custIDs in the legacy data.  :/
-    $sql = "select * from searchme where custid ilike '%$query%'";
+    $sql = "select * from searchme where custid ilike '%$query%' or oldcustid ilike '%$query%'";
     my $count = countRows($sql);
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";