Changeset 318 for branches/stable

Timestamp:

04/03/06 16:20:54 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Extra code changes required for new billing system rollout. Note that references
to oldcustid can be removed later; this field is NOT required long-term.

Location:

branches/stable

Files:

• cgi-bin/CustIDCK.pm (modified) (2 diffs)
• cgi-bin/checkcusts.pl (modified) (2 diffs)
• cgi-bin/main.cgi (modified) (4 diffs)
• cgi-bin/search.cgi (modified) (2 diffs)
• editDisplay.html (modified) (1 diff)

branches/stable/cgi-bin/CustIDCK.pm

@@ -49 +49 @@
 
     eval {
-      $dbh = DBI->connect ("DBI:Pg:host=newbilling;dbname=custids", "cidcheck", "c1dch4ck");
-      die "failed connection to newbilling!!" if !$dbh;
+      $dbh = DBI->connect ("DBI:Pg:host=billing;dbname=custids", "cidcheck", "c1dch4ck");
+      die "failed connection to billing!!" if !$dbh;
 # Not certain if this is needed here.  It doesn't seem to be.
 #      $dbh->ping;      # Gotta do this to "force" a "failure".  NRGH.
@@ -58 +58 @@
   };
   alarm 0;      # avoid race conditions.  May not be needed here.  (Hah!)
-  if ($@ && $@ !~ /failed connection to newbilling!!/) {
+  if ($@ && $@ !~ /failed connection to billing!!/) {
     $CustIDCK::Error = 1;
-    $CustIDCK::ErrMsg = "Failed connection to newbilling DB host!  Unable to verify CustIDs.";
+    $CustIDCK::ErrMsg = "Failed connection to billing DB host!  Unable to verify CustIDs.";
     return 0;
   }

branches/stable/cgi-bin/checkcusts.pl

@@ -26 +26 @@
 
 ($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
-$IDH = DBI->connect ("DBI:Pg:host=newbilling;dbname=custids", "cidcheck", "c1dch4ck");
+$IDH = DBI->connect ("DBI:Pg:host=billing;dbname=custids", "cidcheck", "c1dch4ck");
 
 $sth = $dbh->prepare("select distinct def_custid from alloctypes where listorder >=40");
@@ -35 +35 @@
 $sth = $dbh->prepare("select cidr,custid from searchme where not (custid='6750400') ".
         "and not (custid='STAFF') order by cidr");
+#$sth = $dbh->prepare("select cidr,custid from searchme order by cidr");
 $sth->execute;
 

branches/stable/cgi-bin/main.cgi

@@ -987 +987 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid,swip from allocations where cidr='$webvar{block}'"
   }
 
@@ -1036 +1036 @@
       $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
     }
+    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$CITY\$\$/<input type=text name=city value="$data[3]">/g;
     $html =~ s/\$\$CIRCID\$\$/<input type="text" name="circid" value="$data[4]" maxlength=64 size=64 class="regular">/g;
@@ -1042 +1043 @@
   } else {
     $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
+    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g;
     $html =~ s/\$\$CITY\$\$/$data[3]/g;
@@ -1055 +1057 @@
   $html =~ s/\$\$SWIP\$\$/N\/A/;
 } else {
-  my $tmp = (($data[8] eq 'n') ? '<input type=checkbox name=swip>' : 
+  my $tmp = (($data[10] eq 'n') ? '<input type=checkbox name=swip>' : 
         '<input type=checkbox name=swip checked=yes>');
   $html =~ s/\$\$SWIP\$\$/$tmp/;

branches/stable/cgi-bin/search.cgi

@@ -106 +106 @@
   # First chunk of SQL.  Filter on custid, description, and notes as necessary.
   my $sql = "(select $cols from searchme where $webvar{custexclude} custid ilike '%$webvar{custid}%')".
+        " $sqlconcat $webvar{custexclude} oldcustid ilike '%$webvar{custid}%')".
         " $sqlconcat (select $cols from searchme where $webvar{descexclude} description ilike '%$webvar{desc}%')".
         " $sqlconcat (select $cols from searchme where $webvar{notesexclude} notes ilike '%$webvar{notes}%')";
@@ -286 +287 @@
     # Query for a customer ID.  Note that we can't restrict to "numeric-only"
     # as we have non-numeric custIDs in the legacy data.  :/
-    $sql = "select * from searchme where custid ilike '%$query%'";
+    $sql = "select * from searchme where custid ilike '%$query%' or oldcustid ilike '%$query%'";
     my $count = countRows($sql);
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";

branches/stable/editDisplay.html

@@ -13 +13 @@
 
 <tr class="color2"><td class=heading>CustID:</td><td class="regular">$$CUSTID$$</td></tr>
+<tr class="color2"><td class=heading>Old CustID:</td><td class="regular">$$OLDCUSTID$$</td></tr>
 
 <tr class="color2"><td class=heading>SWIPed?:</td><td class=regular>$$SWIP$$</td></tr>