Changeset 722 for trunk

Timestamp:

06/13/16 16:06:41 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint adding global record search. See #57.

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (1 diff)
• templates/dns.css (modified) (1 diff)
• templates/menu.tmpl (modified) (1 diff)
• templates/recsearch.tmpl (added)

trunk/DNSDB.pm

@@ -4882 +4882 @@
   return $loglist;
 } # end getLogEntries()
+
+
+## DNSDB::recSearchCount()
+# Get a total count for a global record search
+## DNSDB::recSearch()
+# Find records matching the search string
+sub recSearch {
+  my $self = shift;
+  my $dbh = $self->{dbh};
+
+  my %args = @_;
+
+my $sql = q(
+SELECT r.domain_id,d.domain,g1.group_name AS domgroup,r.rdns_id,z.revnet AS revzone,g2.group_name AS 
+revgroup,r.host,t.name AS rectype,r.val,l.description AS location
+FROM records r
+LEFT JOIN domains d ON r.domain_id = d.domain_id
+  LEFT JOIN groups g1 ON d.group_id = g1.group_id
+LEFT JOIN revzones z ON r.rdns_id = z.rdns_id
+  LEFT JOIN groups g2 on z.group_id = g2.group_id
+JOIN rectypes t ON r.type = t.val
+LEFT JOIN locations l ON r.location = l.location
+WHERE r.type <> 6 AND (r.host ~* ? OR r.val ~* ?)
+);
+
+# Limit scope based on group
+if ($args{group} != 1) {
+  my @grouplist;
+  $self->getChildren($args{group}, \@grouplist);
+  my $groupset = join(',', $args{group}, @grouplist);
+  # oh my aching HEAD.  there has to be a better way to do conditions on joined tables...
+  $sql .= "AND (
+  (g1.group_id IN ($groupset) AND g2.group_id IN ($groupset)) OR
+  (g1.group_id IN ($groupset) AND g2.group_id IS NULL) OR
+  (g1.group_id IS NULL AND g2.group_id IN ($groupset))
+  )
+";
+}
+
+my $foo = q(
+SELECT r.domain_id,d.domain,g1.group_name AS domgroup,r.rdns_id,z.revnet AS revzone,g2.group_name AS 
+revgroup,r.host,t.name AS rectype,r.val,l.description AS location
+FROM records r
+LEFT JOIN domains d on r.domain_id = d.domain_id
+  LEFT JOIN groups g1 on d.group_id = g1.group_id
+LEFT JOIN revzones z on r.rdns_id = z.rdns_id
+  LEFT JOIN groups g2 on z.group_id = g2.group_id
+JOIN rectypes t ON r.type = t.val
+LEFT JOIN locations l ON r.location = l.location
+WHERE r.type <> 6 AND (r.host ~* 'kings' OR r.val ~* 'kings');
+);
+#ORDER BY record_id
+
+#warn "$sql\n";
+# safety valve.  probably need a way to flag this back to the caller.
+if (!$args{searchfor} || $args{searchfor} =~ /^.{0,2}$/) { $sql .= "LIMIT 10"; }
+
+#$sql .= "LIMIT 20" if $sql !~ /LIMIT/;
+
+  return $dbh->selectall_arrayref($sql, { Slice => {} }, $args{searchfor}, $args{searchfor}) or warn $dbh->errstr;
+} # end recSearch()
 
 

trunk/dns.cgi

@@ -1859 +1859 @@
   DONELOG: ;
 
+} elsif ($webvar{page} eq 'recsearch') {
+
+##FIXME
+##FIXME  Limit scope of search!!
+##FIXME
+
+#  my $count = $dnsdb->recSearchCount(searchfor => $webvar{searchfor});
+
+  $page->param(searchfor => $webvar{searchfor});
+  my $recset = $dnsdb->recSearch(searchfor => $webvar{searchfor}, group => $logingroup);
+  $page->param(searchresults => $recset);
+
 } # end $webvar{page} dance
 

trunk/templates/dns.css

@@ -36 +36 @@
         background-color: #F0F0F0;
 }
+
+/* Alternating row colours, now in CSS */
+.altrows > tbody > tr {
+        background-color: #D0E0E0;
+}
+.altrows > tbody > tr:nth-child(odd) {
+        background-color: #FFFFFF;
+}
+.altrows > tbody > tr:nth-child(even) {
+        background-color: #DDDDDD;
+}
+
 .container {
         background-color: #FFFFFF;

trunk/templates/menu.tmpl

@@ -31 +31 @@
 <!-- hmm:  <TMPL_VAR NAME=groupname> -->
 <hr />
+Find records(s):
+<form action="<TMPL_VAR NAME=script_self>&amp;page=recsearch" method="POST">
+<input name="searchfor" />
+<input type="submit" value=" Search " />
+</form>
+<hr />
 <a href="<TMPL_VAR NAME=script_self>&amp;page=dnsq">DNS Query</a><br />
 <a href="<TMPL_VAR NAME=script_self>&amp;page=whoisq">WHOIS Query</a><br />