Changeset 101 for branches/stable

Timestamp:

12/07/04 16:06:13 (21 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Fixed allocation bug that put the wrong city on free blocks
Fixed minor display bug that indicated the customer location
instead of the POP location.

File:

• branches/stable/cgi-bin/main.cgi (modified) (2 diffs)

branches/stable/cgi-bin/main.cgi

@@ -918 +918 @@
           $city = $webvar{pop};
           $failmsg = "No suitable free block found.<br>\nYou will have to route another".
-            " superblock to $webvar{city}<br>\nfrom one of the master blocks in Sudbury or".
+            " superblock to $webvar{pop}<br>\nfrom one of the master blocks in Sudbury or".
             " chose a smaller blocksize.";
         }
@@ -1129 +1129 @@
 
           # Insert the new freeblocks entries
-          $sth = $ip_dbh->prepare("insert into freeblocks values (?, ?, ?,'y')");
+          $sth = $ip_dbh->prepare("insert into freeblocks values (?, ?, (select city from routed where cidr >> '$cidr'),'y')");
           foreach my $block (@newfreeblocks) {
-            $sth->execute("$block", $block->masklen, $webvar{city});
+            $sth->execute("$block", $block->masklen);
           }
           # Insert the allocations entry