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

Timestamp:

07/21/10 16:08:10 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Remove some ViaNet-isms (reference to city names with primary POPs).
See #26.
Update alloctypes.html to reflect current preseeded alloctypes

File:

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

trunk/cgi-bin/main.cgi

@@ -685 +685 @@
   if ($webvar{alloctype} =~ /^.i$/) {
     my ($base,undef) = split //, $webvar{alloctype};    # split into individual chars
-    my ($sql,$city);
-    # Check for pools in Subury, North Bay, or Toronto if DSL or server pool.
-    # Anywhere else is invalid and shouldn't be in the db in the first place.
-    # ... aside from #^%#$%#@#^%^^!!!! legacy data.  GRRR.
-    # Note that we want to retain the requested city to relate to customer info.
-    if ($base =~ /^[ds]$/) {
-      $city = "(allocations.city='Sudbury' or allocations.city='North Bay' or ".
-        "allocations.city='Toronto')";
-    } else {
-      $city = "allocations.city='$webvar{pop}'";
-    }
 
 # Ewww.  But it works.
     $sth = $ip_dbh->prepare("SELECT (SELECT city FROM allocations WHERE cidr=poolips.pool), ".
         "poolips.pool, COUNT(*) FROM poolips,allocations WHERE poolips.available='y' AND ".
-        "poolips.pool=allocations.cidr AND $city AND poolips.type LIKE '".$base."_' ".
+        "poolips.pool=allocations.cidr AND allocations.city='$webvar{pop}' AND poolips.type LIKE '".$base."_' ".
         "GROUP BY pool");
     $sth->execute;
@@ -754 +743 @@
         # This does NOT include cable pools.
         if ($webvar{alloctype} =~ /^.[pc]$/) {
-          if (($webvar{city} !~ /^(Sudbury|North Bay|Toronto)$/) && ($webvar{alloctype} eq 'dp')) {
-            printError("You must chose Sudbury, North Bay, or Toronto for DSL pools.");
-            return;
-          }
           $city = $webvar{city};
           $failmsg = "No suitable free block found.<br>\nYou will have to route another".
-            " superblock from one of the<br>\nmaster blocks in Sudbury or chose a smaller".
+            " superblock from one of the<br>\nmaster blocks or chose a smaller".
             " block size for the pool.";
         } else {
           $city = $webvar{pop};
           $failmsg = "No suitable free block found.<br>\nYou will have to route another".
-            " superblock to $webvar{pop}<br>\nfrom one of the master blocks in Sudbury or".
+            " superblock to $webvar{pop}<br>\nfrom one of the master blocks or".
             " chose a smaller blocksize.";
         }
@@ -986 +971 @@
   } else {
     $flag = 'n';
-    if ($webvar{alloctype} =~ /[wp][cr]|[ds][pi]/) {
-      # Set this forcibly rather than messing around elsewhere.  Yes, this *is* a hack.  PTHBTT!!
-      $webvar{pop} = 'Sudbury';
-    }
+##fixme:  hook to force-set POP or city on certain alloctypes
+# if ($webvar{alloctype =~ /foo,bar,bz/ { $webvar{pop} = 'blah'; }
     if ($webvar{pop} =~ /^-$/) {
       $flag = 'to route the block from/through';