Changeset 890

Timestamp:

09/02/16 16:29:25 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Updates to RPC findAllocation() to provide more details to the caller
in one shot

File:

• trunk/cgi-bin/ipdb-rpc.cgi (modified) (1 diff)

trunk/cgi-bin/ipdb-rpc.cgi

@@ -462 +462 @@
   die "IP to search for required\n" if !$args{ip} || $args{ip} !~ /^\d+\.\d+\.\d+\.\d+$/;
 
-  my $sql = "SELECT cidr,custid,type FROM searchme WHERE cidr >>= ?";
+  my $sql = q(SELECT s.cidr,s.custid,s.type,s.description,a.dispname
+    FROM searchme s
+    JOIN alloctypes a ON s.type = a.type
+    WHERE cidr >>= ?);
   # first, check if it's even on our network
-  my $isours = $ip_dbh->selectall_arrayref($sql." AND type = 'mm'", undef, $args{ip});
+  my $isours = $ip_dbh->selectall_arrayref($sql." AND s.type = 'mm'", undef, $args{ip});
   die $ip_dbh->errstr."\n" if $ip_dbh->err;  # do we care?
   die "IP not on our network\n" if !@$isours;
 
   # now, find the specific allocation
-  my $result = $ip_dbh->selectall_arrayref($sql." AND NOT type LIKE '_m' ORDER BY cidr DESC",
+  my $result = $ip_dbh->selectall_arrayref($sql." AND NOT s.type LIKE '_m' ORDER BY cidr DESC",
     { Slice => {} }, $args{ip});
   die $ip_dbh->errstr."\n" if $ip_dbh->err;