Changeset 925 for trunk

Timestamp:

07/09/19 16:28:38 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend search-rpc.cgi to support searching on the parent_id; other criteria
may not narrow things down enough

File:

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

trunk/cgi-bin/search-rpc.cgi

@@ -224 +224 @@
   } # args{cidr}
 
-  foreach (qw(custid description notes city) ) {
-    if ($args{$_}) {
-      push @fields, "s.$_";
-      if ($args{$_} =~ /^(EXACT|NOT):/) {
+  foreach my $sfield (qw(custid description notes city) ) {
+    if ($args{$sfield}) {
+      push @fields, "s.$sfield";
+      if ($args{$sfield} =~ /^(EXACT|NOT):/) {
         push @matchtypes, $mt{$1};
-        $args{$_} =~ s/^$1://;
+        $args{$sfield} =~ s/^$1://;
       } else {
         push @matchtypes, '~*';
       }
-      push @vals, $args{$_};
-    }
+      push @vals, $args{$sfield};
+    }
+  }
+
+  if ($args{parent_id}) {
+    # parent_id is always exact.  default to positive match
+    if ($args{parent_id} =~ /^NOT:/) {
+      $args{parent_id} =~ s/^NOT://;
+      push @matchtypes, '<>';
+    } else {
+      push @matchtypes, '=';
+    }
+    push @fields, 's.parent_id';
+    push @vals, $args{parent_id};
   }
 
@@ -349 +361 @@
 Not all fields are exposed for search.  For most purposes these should be sufficient.
 
+Most fields support EXACT: or NOT: prefixes on the search term to restrict the matches.
+
 =over 4
 
@@ -413 +427 @@
 To search for a free block, use the main RPC API's listFree or findAllocateFrom subs.
 
+=item parent_id
+
+Restrict to allocations in the given parent.
+
 =item order