Changeset 323 for branches/stable

Timestamp:

04/06/06 10:40:50 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Search got broken somewhere - I apparently used an old definition
for the searchme view, and there's additional hackery necessary
to search both old and new CustIDs.

Location:

branches/stable/cgi-bin

Files:

• ipdb.psql (modified) (1 diff)
• search.cgi (modified) (1 diff)

branches/stable/cgi-bin/ipdb.psql

@@ -95 +95 @@
 GRANT ALL on "allocations" to "ipdb";
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.oldcustid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.oldcustid FROM poolips;
 
 REVOKE ALL on "searchme" from PUBLIC;

branches/stable/cgi-bin/search.cgi

@@ -105 +105 @@
 
   # 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}%')".
+  my $sql = "(select $cols from searchme where".
+        " $webvar{custexclude} (custid ilike '%$webvar{custid}%'".
+        " OR $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}%')";