Changeset 547 for trunk

Timestamp:

11/08/12 17:56:36 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move last-modified-change for master blocks to
IPDB.pm. See #34.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (3 diffs)
• admin.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -26 +26 @@
         %IPDBacl %aclmsg
         &initIPDBGlobals &connectDB &finish &checkDBSanity
-        &addMaster
+        &addMaster &touchMaster
         &listSummary &listMaster &listRBlock &listFree &listPool
         &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -40 +40 @@
                 %IPDBacl %aclmsg
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
-                &addMaster
+                &addMaster &touchMaster
                 &listSummary &listMaster &listRBlock &listFree &listPool
                 &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
@@ -301 +301 @@
   }
 } # end addMaster
+
+
+## IPDB::touchMaster()
+# Update last-changed timestamp on a master block.
+sub touchMaster {
+  my $dbh = shift; 
+  my $master = shift;
+
+  local $dbh->{AutoCommit} = 0;
+  local $dbh->{RaiseError} = 1;
+
+  eval {
+    $dbh->do("UPDATE masterblocks SET mtime=now() WHERE cidr = ?", undef, ($master));
+    $dbh->commit;
+  };
+
+  if ($@) {
+    my $msg = $@;
+    eval { $dbh->rollback; };
+    return ('FAIL',$msg);
+  }
+  return ('OK','OK');
+} # end touchMaster()
 
 

trunk/cgi-bin/admin.cgi

@@ -229 +229 @@
 } elsif ($webvar{action} eq 'touch') {
 
-  $page->param(master => $webvar{whichmaster});
-  $sth = $ip_dbh->prepare("update masterblocks set mtime=now() where cidr='$webvar{whichmaster}'");
-  $sth->execute;
-  if ($sth->err) {
-    $page->param(errmsg => $sth->errstr);
-  }
+  my ($code,$msg) = touchMaster($ip_dbh, $webvar{whichmaster});
+  $page->param(errmsg => $msg) if $code eq 'FAIL';
 
 } elsif ($webvar{action} eq 'listcust') {