Changeset 666

Timestamp:

10/08/14 12:26:55 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Convert calling convention for getRecCount() to a hash so we can pass the
same arguments to getRecCount() and getRecList()

Location:

trunk

Files:

• DNSDB.pm (modified) (4 diffs)
• dns-rpc.cgi (modified) (1 diff)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -4004 +4004 @@
   my %args = @_;
 
+  $args{revrec} = 'n' if !$args{revrec};
+  $args{defrec} = 'n' if !$args{defrec};
+
   # protection against bad or missing arguments
   $args{sortorder} = 'ASC' if !$args{sortorder} || !grep /^$args{sortorder}$/, ('ASC','DESC');
@@ -4015 +4018 @@
   my $perpage = ($args{nrecs} ? $args{nrecs} : $self->{perpage});
 
-  # sort reverse zones on IP, correctly
-  # do other fiddling with $args{sortby} while we're at it.
-  # whee!  multisort means just passing comma-separated fields in sortby!
-  my $newsort = '';
-  foreach my $sf (split /,/, $args{sortby}) {
-    $sf = "r.$sf";
-    $sf =~ s/r\.val/inetlazy(r.val)/;
-# hmm.  do we really need to limit this?
-#       if $args{revrec} eq 'y' && $args{defrec} eq 'n';
-    $sf =~ s/r\.type/t.alphaorder/;
-    $newsort .= ",$sf";
-  }
-  $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";
+  my @bindvars;
+  my $sql = "SELECT r.record_id,";
+  # only include the parent info if we don't already know which parent we're in
+  $sql .= "r.domain_id,r.rdns_id," unless $args{id};
+  $sql .= "r.host,r.type,r.val,r.ttl";
   $sql .= ",l.description AS locname,stamp,r.stamp < now() AS ispast,r.expires,r.stampactive"
         if $args{defrec} eq 'n';
@@ -4040 +4031 @@
   $sql .= "INNER JOIN rectypes t ON r.type=t.val ";     # for sorting by type alphabetically
   $sql .= "LEFT JOIN locations l ON r.location=l.location " if $args{defrec} eq 'n';
-  $sql .= "WHERE "._recparent($args{defrec},$args{revrec})." = ?";
-  $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
+  $sql .= "WHERE NOT r.type=$reverse_typemap{SOA}";
+
+  # "normal" record list
+  if ($args{id}) {
+    $sql .= " AND "._recparent($args{defrec},$args{revrec})." = ?";
+    push @bindvars, $args{id};
+  }
+
+  # Filtering on host/val (mainly normal record list)
   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, ($args{filter},$args{filter});
     push @bindvars, ($tmp, $tmp);
   }
+
+  # Filtering on other fields
+  foreach (qw(type distance weight port ttl description)) {
+    if ($args{$_}) {
+      $sql .= " AND $_ ~* ?";
+      push @bindvars, $args{$_};
+    }
+  }
+
+  # whee!  multisort means just passing comma-separated fields in sortby!
+  my $newsort = '';
+  foreach my $sf (split /,/, $args{sortby}) {
+    $sf = "r.$sf";
+    # sort on IP, correctly
+    $sf =~ s/r\.val/inetlazy(r.val)/;
+# hmm.  do we really need to limit this?
+#       if $args{revrec} eq 'y' && $args{defrec} eq 'n';
+    $sf =~ s/r\.type/t.alphaorder/;  # subtly different from sorting on rectypes.name
+    $newsort .= ",$sf";
+  }
+  $newsort =~ s/^,//;
+##enhance: pass in ascending/descending sort per-field
   $sql .= " ORDER BY $newsort $args{sortorder}";
   # ensure consistent ordering by sorting on record_id too
   $sql .= ", record_id $args{sortorder}";
+
+  # Offset/pagination
   $sql .= ($args{offset} eq 'all' ? '' : " LIMIT $perpage OFFSET ".$args{offset}*$perpage);
 
@@ -4078 +4101 @@
   my $self = shift;
   my $dbh = $self->{dbh};
-  my $defrec = shift;
-  my $revrec = shift;
-  my $id = shift;
-  my $filter = shift || '';
-
-  # keep the nasties down, since we can't ?-sub this bit.  :/
-  # note this is chars allowed in DNS hostnames
-  $filter =~ s/[^a-zA-Z0-9_.:-]//g;
-
-  my @bindvars = ($id);
-  push @bindvars, ($filter,$filter) if $filter;
+
+  my %args = @_;
+
+  $args{defrec} = 'n' if !$args{defrec};
+  $args{revrec} = 'n' if !$args{revrec};
+
+  my @bindvars;
   my $sql = "SELECT count(*) FROM ".
-        _rectable($defrec,$revrec).
-        " WHERE "._recparent($defrec,$revrec)."=? ".
-        "AND NOT type=$reverse_typemap{SOA}";
-  if ($filter) {
+        _rectable($args{defrec},$args{revrec}).
+        " WHERE NOT type=$reverse_typemap{SOA}";
+  if ($args{id}) {
+    $sql .= " AND "._recparent($args{defrec},$args{revrec})." = ?";
+    push @bindvars, $args{id};
+  }
+
+  # Filtering on host/val (mainly normal record list)
+  if ($args{filter}) {
     $sql .= " AND (r.host ~* ? OR r.val ~* ? OR r.host ~* ? OR r.val ~* ?)";
-    my $tmp = join('.',reverse(split(/\./,$filter)));
+    my $tmp = join('.',reverse(split(/\./,$args{filter})));
+    push @bindvars, ($args{filter},$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;
+
+  # Filtering on other fields
+  foreach (qw(type distance weight port ttl description)) {
+    if ($args{$_}) {
+      $sql .= " AND $_ ~* ?";
+      push @bindvars, $args{$_};
+    }
+  }
 
   my ($count) = $dbh->selectrow_array($sql, undef, (@bindvars) );

trunk/dns-rpc.cgi

@@ -455 +455 @@
   $args{direction} = 'ASC' if !$args{direction};
 
-  my $ret = $dnsdb->getRecCount($args{defrec}, $args{revrec}, $args{id}, $args{filter});
+  my $ret = $dnsdb->getRecCount(defrec => $args{defrec}, revrec => $args{revrec},
+        id => $args{id}, filter => $args{filter});
 
   die "$dnsdb->errstr\n" if !$ret;

trunk/dns.cgi

@@ -632 +632 @@
     $page->param(curpage => $webvar{page});
 
-    my $count = $dnsdb->getRecCount($webvar{defrec}, $webvar{revrec}, $webvar{id}, $filter);
+    my $count = $dnsdb->getRecCount(defrec => $webvar{defrec}, revrec => $webvar{revrec},
+        id => $webvar{id}, filter => $filter);
 
     $sortby = 'host';