[openca-cvsdev] CVS: openca-0.9/src/common/lib/bp create_csr.sub,1.4,1.5

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/common/lib/bp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1797/openca-0.9/src/common/lib/bp

Modified Files:
	create_csr.sub 
Log Message:
massive DBI update (sequences, new tables, getNewSerial)


Author of changes:  michaelbell

Index: create_csr.sub
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/common/lib/bp/create_csr.sub,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** create_csr.sub	1 Oct 2004 10:03:29 -0000	1.4
--- create_csr.sub	28 Oct 2004 10:49:03 -0000	1.5
***************
*** 101,119 ****
      my $tmp = "-----BEGIN HEADER-----\n";
      $tmp .= "TYPE = PKCS#10\n";
!     my $last_req = libDBGetLastItem ("REQUEST");
!     my $req_elements = 0;
!     $req_elements    = $last_req->getSerial("REQUEST") if ($last_req);
!     $req_elements  >>= getRequired ("ModuleShift");
!     if ((not defined $req_elements) or ($req_elements < 0)) {
!         my $msg = i18nGettext ("The database failed during counting the existing requests (__ERRNO__). __ERRVAL__",
!                                "__ERRNO__", $db->errno,
!                                "__ERRVAL__", $db->errval);
          $journal->{message} .= $msg;
          $log->addMessage (OpenCA::Log::Message->new (HASHREF => $journal));
          return [ -170, $msg ];
-     } else {
-         $req_elements++;
      }
-     my $new_serial = ($req_elements << getRequired ("ModuleShift")) | getRequired ("ModuleID");
      $tmp .= "SERIAL = ".$new_serial."\n";
      $tmp .= "NOTBEFORE = " . $tools->getDate() . "\n";
--- 101,117 ----
      my $tmp = "-----BEGIN HEADER-----\n";
      $tmp .= "TYPE = PKCS#10\n";
!     my $new_serial = $db->getNewSerial (
!                          NAME         => "REQUEST",
!                          MODULE_ID    => getRequired ("ModuleID"),
!                          MODULE_SHIFT => getRequired ("ModuleShift"));
!     if (not defined $new_serial)
!     {
!         my $msg = i18nGettext ("Cannot get new serial for CSR from database (__ERRNO__). __ERRVAL__",
!                                "__ERRNO__", $db->errno(),
!                                "__ERRVAL__", $db->errval());
          $journal->{message} .= $msg;
          $log->addMessage (OpenCA::Log::Message->new (HASHREF => $journal));
          return [ -170, $msg ];
      }
      $tmp .= "SERIAL = ".$new_serial."\n";
      $tmp .= "NOTBEFORE = " . $tools->getDate() . "\n";