Changeset 222 for trunk

Timestamp:

01/18/12 13:47:47 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix buglet in record list filter; we have to adjust the list of bind
variables depending on whether there's a filter to apply or not.

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1317 +1317 @@
   $sql .= " LIMIT $nrecs OFFSET ".($nstart*$nrecs) if $nstart ne 'all';
 
+  my @bindvars = ($id);
+  push @bindvars, $filter if $filter;
   my $sth = $dbh->prepare($sql) or warn $dbh->errstr;
-  $sth->execute($id) or warn "$sql: ".$sth->errstr;
+  $sth->execute(@bindvars) or warn "$sql: ".$sth->errstr;
 
   my @retbase;
@@ -1344 +1346 @@
   $filter =~ s/[^a-zA-Z0-9_.:-]//g;
 
+  my @bindvars = ($id);
+  push @bindvars, $filter if $filter;
   my ($count) = $dbh->selectrow_array("SELECT count(*) FROM ".
         ($defrec eq 'y' ? 'default_' : '')."records ".
         "WHERE ".($defrec eq 'y' ? 'group' : 'domain')."_id=? ".
         "AND NOT type=$reverse_typemap{SOA}".
-        ($filter ? " AND host ILIKE '%$filter%'" : ''),
-        undef, ($id) );
+        ($filter ? " AND host ~* ?" : ''),
+        undef, (@bindvars) );
 
   return $count;