Changeset 908 for trunk

Timestamp:

08/16/17 15:23:11 (7 years ago)

Author:

Kris Deugau

Message:

/trunk

Further refine general RPC search with variations on alloctype matching
and sort ordering

File:

• trunk/cgi-bin/search-rpc.cgi (modified) (4 diffs)

trunk/cgi-bin/search-rpc.cgi

@@ -151 +151 @@
   my @matchtypes;
 
-  my %mt = (EXACT => '=',
+  my %mt = (
+        EXACT => '=',
         EQUAL => '=',
-        NOT => '!~',
+        NOT => '!~',    # text only?
         # CIDR options
         MASK => 'MASK',
@@ -161 +162 @@
 
   if ($args{type}) {
+    my $notflag = '';
+    if ($args{type} =~ /^NOT:/) {
+      $args{type} =~ s/^NOT://;
+      $notflag = 'NOT ';
+    }
+    if ($args{type} =~ /\./) {
+      $args{type} =~ s/\./_/;
+      push @matchtypes, $notflag.'LIKE';
+    } else {
+      push @matchtypes, ($notflag ? '<>' : '=');
+    }
     push @fields, 's.type';
     push @vals, $args{type};
-    push @matchtypes, '=';
   }
 
@@ -224 +235 @@
   }
 
-  my $sql = q(SELECT s.cidr,s.custid,s.type,s.description,s.city,a.dispname FROM searchme s JOIN alloctypes a ON s.type = a.type);
+  my $cols = "s.cidr, s.custid, s.type, s.city, s.description, s.id, s.parent_id, s.available, s.vrf, a.dispname";
+  my $sql = qq(SELECT $cols FROM searchme s JOIN alloctypes a ON s.type = a.type);
   my @sqlcriteria;
   for (my $i = 0; $i <= $#fields; $i++) {
@@ -231 +243 @@
   $sql .= " WHERE ".join(' AND ', @sqlcriteria) if @sqlcriteria;
 
+  # multifield sorting!
+  if ($args{order}) {
+    my @ordfields = split /,/, $args{order};
+    # there are probably better ways to do this
+    my %omap = (cidr => 's.cidr', net => 's.cidr', network => 's.cidr', ip => 's.cidr',
+      custid => 's.custid', type => 's.type', city => 's.city',
+      desc => 's.description', description => 's.description');
+    my @ordlist;
+    # only pass sort field values from the list of acceptable field names or aliases as per %omap
+    foreach my $ord (@ordfields) {
+      push @ordlist, $omap{$ord}
+        if grep /^$ord$/, (keys %omap);
+    }
+    if (@ordlist) {
+      $sql .= " ORDER BY ". join(',', @ordlist);
+    }
+  }
+
   my $result = $ip_dbh->selectall_arrayref($sql, {Slice=>{}}, @vals);
   die $ip_dbh->errstr if !$result;