Changeset 51

Timestamp:

11/02/04 13:15:53 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes and updates from /branches/stable r49 and r50

File:

• trunk/cgi-bin/main.cgi (modified) (4 diffs)

trunk/cgi-bin/main.cgi

@@ -253 +253 @@
     # 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 like '%$query%'";
+    $sql = "select * from searchme where custid ilike '%$query%'";
     my $count = countRows("select count(*) from ($sql) foo");
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
@@ -262 +262 @@
     print qq(<div class="heading">Searching for descriptions containing '$query'</div><br>\n);
     # Query based on description (includes "name" from old DB).
-    $sql = "select * from searchme where description like '%$query%'";
+    $sql = "select * from searchme where description ilike '%$query%'";
     my $count = countRows("select count(*) from ($sql) foo");
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";
@@ -1482 +1482 @@
 
         # Set up query for compacting free blocks.
-        $sth = $ip_dbh->prepare("select * from freeblocks where city='$webvar{city}'".
+        $sth = $ip_dbh->prepare("select * from freeblocks where cidr << ".
+                "(select cidr from routed where cidr >> '$cidr') ".
                 " and maskbits<=".$cidr->masklen." and routed='y' order by maskbits desc");
 
@@ -1528 +1529 @@
       } else {
         $sth = $ip_dbh->prepare("insert into freeblocks values ('$cidr',".$cidr->masklen.
-                ",'$webvar{city}','y')");
+                ",(select city from routed where cidr >>= '$cidr'),'y')");
       }
       $sth->execute;