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

Timestamp:

12/21/12 17:55:49 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Work in progress, see #5:
Update templates and calling code for allocation delete to pass
and use rdepth
Start adding support for reparented netblocks; when a reparented
block is deleted, link back not only to the parent it was living
in, but the "true" parent the free space was merged with.

File:

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

trunk/cgi-bin/main.cgi

@@ -792 +792 @@
   my $blockdata;
 
-  if ($webvar{alloctype} eq 'rm') {
+  if ($webvar{rdepth} == 0) {   # $webvar{alloctype} eq 'mm'
 
     $blockdata->{block} = $webvar{block};
-    $blockdata->{city} = getRoutedCity($ip_dbh, $webvar{block});
+    $blockdata->{city} = "N/A";
     $blockdata->{custid} = "N/A";
-    $blockdata->{type} = $webvar{alloctype};
+    $blockdata->{type} = 'mm';
     $blockdata->{circuitid} = "N/A";
     $blockdata->{description} = "N/A";
     $blockdata->{notes} = "N/A";
     $blockdata->{privdata} = "N/A";
-
-  } elsif ($webvar{alloctype} eq 'mm') {
-
-    $blockdata->{block} = $webvar{block};
-    $blockdata->{city} = "N/A";
-    $blockdata->{custid} = "N/A";
-    $blockdata->{type} = $webvar{alloctype};
-    $blockdata->{circuitid} = "N/A";
-    $blockdata->{description} = "N/A";
-    $blockdata->{notes} = "N/A";
-    $blockdata->{privdata} = "N/A";
+    $blockdata->{rdepth} = 0;
 
   } else {
 
-    $blockdata = getBlockData($ip_dbh, $webvar{block})
+    $blockdata = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
 
   } # end cases for different alloctypes
 
   $page->param(block => $blockdata->{block});
+  $page->param(rdepth => $blockdata->{rdepth});
   $page->param(disptype => $disp_alloctypes{$blockdata->{type}});
-  $page->param(type => $blockdata->{type});
+#  $page->param(type => $blockdata->{type});
   $page->param(city => $blockdata->{city});
   $page->param(custid => $blockdata->{custid});
@@ -850 +841 @@
 
   # need to retrieve block data before deleting so we can notify on that
-  my $blockinfo = getBlockData($ip_dbh, $webvar{block});
-
-  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
+  my $blockinfo = getBlockData($ip_dbh, $webvar{block}, $webvar{rdepth});
+
+  my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{rdepth}, $webvar{vrf});
 
   $page->param(block => $webvar{block});
-  if ($code eq 'OK') {
+  $page->param(delparent => $blockinfo->{parent}) if $webvar{rdepth};
+  $page->param(prdepth => $webvar{rdepth});
+  if ($code =~ /^WARN/) {
+    my ($bp,$bd) = split /,/, $msg;
+    $page->param(bparent => $bp);
+    $page->param(brdepth => $bd);
+    $page->param(mergeip => $code eq 'WARNPOOL');
+  }
+
+  if ($code eq 'OK' || $code =~ /^WARN/) {
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block} ".
         $blockinfo->{custid}.", ".$blockinfo->{city}.", desc='".$blockinfo->{description}."'";