Changeset 614

Timestamp:

04/22/14 18:01:10 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Bundle up several statements in getRecList() and getRecCount() inside an
if() block, since $args{filter} may or may not be defined, and when it's
not, it messes in the error log. See #25.

Also remove some stale, commented surrounding if/else fragments while we're
cleaning this up.

File:

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

trunk/DNSDB.pm

@@ -3763 +3763 @@
   $sql .= "WHERE "._recparent($args{defrec},$args{revrec})." = ?";
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
-#    if ($self->{showrev_arpa} eq 'zone' || $self->{showrev_arpa} eq 'all') {
-      # Just In Case the UI is using formal .arpa notation, and someone enters something reversed,
-      # we want to match both the formal and natural zone name
-      $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)" if $args{filter};
-      my $tmp = join('.',reverse(split(/\./,$args{filter})));
-      push @bindvars, ($tmp, $tmp) if $args{filter};
-#    } else {
-#      $sql .= " AND (r.host ~* ? OR r.val ~* ?)" if $args{filter};
-#    }
+  if ($args{filter}) {
+    $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
+    my $tmp = join('.',reverse(split(/\./,$args{filter})));
+    push @bindvars, ($tmp, $tmp);
+  }
   $sql .= " ORDER BY $newsort $args{sortorder}";
   # ensure consistent ordering by sorting on record_id too
@@ -3818 +3814 @@
         " WHERE "._recparent($defrec,$revrec)."=? ".
         "AND NOT type=$reverse_typemap{SOA}";
-#    if ($self->{showrev_arpa} eq 'zone' || $self->{showrev_arpa} eq 'all') {
-      # Just In Case the UI is using formal .arpa notation, and someone enters something reversed,
-      # we want to match both the formal and natural zone name
-      $sql .= " AND (host ~* ? OR val ~* ? OR host ~* ? OR val ~* ?)" if $filter;
-      my $tmp = join('.',reverse(split(/\./,$filter)));
-      push @bindvars, ($tmp, $tmp) if $filter;
-#    } else {
-#      $sql .= " AND (host ~* ? OR val ~* ?)" if $filter;
-#    }
+  if ($args{filter}) {
+    $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
+    my $tmp = join('.',reverse(split(/\./,$args{filter})));
+    push @bindvars, ($tmp, $tmp);
+  }
+  $sql .= " AND (host ~* ? OR val ~* ? OR host ~* ? OR val ~* ?)" if $filter;
+  my $tmp = join('.',reverse(split(/\./,$filter)));
+  push @bindvars, ($tmp, $tmp) if $filter;
 
   my ($count) = $dbh->selectrow_array($sql, undef, (@bindvars) );