Changeset 584 for trunk

Timestamp:

01/03/14 15:16:16 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend reverse-notation search matching to record list.

Note that this causes both the zone and record list searches to turn
up more entries than you might expect for a given search (n.m) as it
will match on both direct n.m and inverse m.n entries.

File:

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

trunk/DNSDB.pm

@@ -3637 +3637 @@
   my %args = @_;
 
-  my @filterargs;
-
-  push @filterargs, $args{filter} if $args{filter};
-
   # protection against bad or missing arguments
   $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
@@ -3665 +3661 @@
   $newsort =~ s/^,//;
 
+  my @bindvars = ($args{id});
+  push @bindvars, ($args{filter},$args{filter}) if $args{filter};
+
 ##fixme:  do we need a knob to twist to switch from unix epoch to postgres time string?
   my $sql = "SELECT r.record_id,r.host,r.type,r.val,r.ttl";
@@ -3675 +3674 @@
   $sql .= "WHERE "._recparent($args{defrec},$args{revrec})." = ?";
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
-  $sql .= " AND (r.host ~* ? OR r.val ~* ?)" if $args{filter};
+#    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};
+#    }
   $sql .= " ORDER BY $newsort $args{sortorder}";
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $args{sortorder}";
   $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $perpage OFFSET ".$args{offset}*$perpage);
-
-  my @bindvars = ($args{id});
-  push @bindvars, ($args{filter},$args{filter}) if $args{filter};
 
   my @working;
@@ -3717 +3721 @@
 
   my @bindvars = ($id);
-  push @bindvars, $filter if $filter;
+  push @bindvars, ($filter,$filter) if $filter;
   my $sql = "SELECT count(*) FROM ".
         _rectable($defrec,$revrec).
         " WHERE "._recparent($defrec,$revrec)."=? ".
-        "AND NOT type=$reverse_typemap{SOA}".
-        ($filter ? " AND host ~* ?" : '');
+        "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;
+#    }
+
   my ($count) = $dbh->selectrow_array($sql, undef, (@bindvars) );