Changeset 751 for trunk

Timestamp:

06/18/15 17:52:32 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Finally commit last stage of user-facing "merge blocks" process. See #8.

File:

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

trunk/cgi-bin/main.cgi

@@ -183 +183 @@
 elsif($webvar{action} eq 'confmerge') {
   confMerge();
+}
+elsif($webvar{action} eq 'domerge') {
+  doMerge();
 }
 elsif($webvar{action} eq 'delete') {
@@ -1276 +1279 @@
 
 
+# Make it so
+sub doMerge {
+  if (!$webvar{newmask} || $webvar{newmask} !~ /^\d+$/) {
+    $page->param(err => 'New netmask required');
+    return;
+  }
+
+  $page->param(block => $webvar{block});
+  my $binfo = getBlockData($ip_dbh, $webvar{block});
+  my $pinfo = getBlockData($ip_dbh, $binfo->{parent_id});
+  my $block = new NetAddr::IP $binfo->{block};
+
+  # Tree navigation
+  my $crumbs = getBreadCrumbs($ip_dbh, $binfo->{parent_id});
+  my @rcrumbs = reverse (@$crumbs);
+  $utilbar->param(breadcrumb => \@rcrumbs);
+
+  $page->param(oldblock => $binfo->{block});
+  $page->param(oldtype => $disp_alloctypes{$binfo->{type}});
+  $page->param(newdisptype => $disp_alloctypes{$webvar{newtype}});
+  my $newblock = new NetAddr::IP $block->addr."/$webvar{newmask}";
+  $newblock = $newblock->network;
+  $page->param(newblock => $newblock);
+  $page->param(vis_scope => $merge_display{$webvar{scope}});
+
+  my $mlist = mergeBlocks($ip_dbh, $webvar{block}, %webvar, user => $authuser);
+
+  if ($mlist) {
+    #(newtype => $webvar{newtype}, newmask => $webvar{newmask}));
+    # Slice off first entry (the new parent - note this may be a new allocation,
+    # not the same ID that was "merged"!
+    my $parent = shift @$mlist;
+    $page->param(backpool => $webvar{newtype} =~ /.[dp]/);
+    if ($webvar{newtype} =~ /.[enr]/) {
+      $page->param(backleaf => 1);
+      $page->param(backid => $binfo->{parent_id});
+      $page->param(backblock => $pinfo->{block});
+    } else {
+      $page->param(backid => $parent->{id});
+      $page->param(backblock => $parent->{block});
+    }
+    $page->param(mergelist => $mlist);
+  } else {
+    $page->param(err => "Merge failed: $IPDB::errstr");
+  }
+} # doMerge()
+
+
 # Delete an allocation.
 sub remove {