Changeset 186 for trunk/cgi-bin/main.cgi

Timestamp:

03/03/05 17:14:54 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

First round of changes for "clean" handling of subblock allocations.
Note that the code will likely malfunction in a number of corner
and not-so-corner cases. Fixing those will require rethinking of
the allocation types.

File:

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

trunk/cgi-bin/main.cgi

@@ -331 +331 @@
       $data[2] .= 'i';
     }
-    my @row = (qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
+    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
         $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
     # Allow listing of pool if desired/required.
@@ -598 +599 @@
 #    $data[2] =~ s/\s+//g;
 
-    my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=edit&block=$data[0]\">$data[0]</a>",
+    my @row = ( (($data[2] =~ /^l.$/) ? 'Sub ' : '').
+        qq(<a href="/ip/cgi-bin/main.cgi?action=edit&block=$data[0]">$data[0]</a>),
         $data[1], $disp_alloctypes{$data[2]}, $data[3], $data[4]);
     # If the allocation is a pool, allow listing of the IPs in the pool.
@@ -634 +636 @@
   # unrouted free blocks, but it's better to let the database do the work if we can.
   $count = 0;
-  $sth = $ip_dbh->prepare("select cidr from freeblocks where routed='y' and cidr <<= '$master' order by cidr");
+  $sth = $ip_dbh->prepare("select cidr,routed from freeblocks where cidr <<= '$master'".
+        " order by cidr");
   $sth->execute();
   while (my @data = $sth->fetchrow_array()) {
-    # cidr,maskbits,city
+    # cidr,routed
     my $cidr = new NetAddr::IP $data[0];
-    my @row = ("<a href=\"/ip/cgi-bin/main.cgi?action=assign&block=$cidr\">$cidr</a>",
+    my @row = ((($data[1] eq 'r') ? 'Sub ' : '').
+        "<a href=\"/ip/cgi-bin/main.cgi?action=assign&block=$cidr\">$cidr</a>",
         $cidr->range);
     printRow(\@row, 'color1') if ($count%2 == 0);
@@ -869 +873 @@
         if ($webvar{allocfrom} ne '-') {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and cidr <<= '$webvar{allocfrom}' and routed='y' order by cidr,maskbits desc";
+                " and cidr <<= '$webvar{allocfrom}' and routed='".
+                (($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y')."' order by cidr,maskbits desc";
         } else {
           $sql = "select cidr from freeblocks where city='$city' and maskbits<=$webvar{maskbits}".
-                " and routed='y' order by cidr,maskbits desc";
+                " and routed='".(($webvar{alloctype} =~ /^l.$/) ? 'r' : 'y').
+                "' order by cidr,maskbits desc";
         }
       }