[openca-cvsdev] CVS: openca-0.9/src/modules/openca-dbi DBI.pm,1.17,1.18

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

Update of /cvsroot/openca/openca-0.9/src/modules/openca-dbi
In directory usw-pr-cvs1:/tmp/cvs-serv7692/src/modules/openca-dbi

Modified Files:
	DBI.pm 
Log Message:
some mysql related fixes


Index: DBI.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-dbi/DBI.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DBI.pm	2001/11/23 09:56:22	1.17
--- DBI.pm	2001/11/30 17:26:44	1.18
***************
*** 749,753 ****
    ## preparing now the database-strings
    ## this is very database dependent
!   print "    preparing the remote and local databases (vendor dependent)<br>\n" 
      if ($self->{DEBUG});
  
--- 749,753 ----
    ## preparing now the database-strings
    ## this is very database dependent
!   print "    preparing the database (vendor dependent)<br>\n" 
      if ($self->{DEBUG});
  
***************
*** 2045,2062 ****
    ## I hope the people only search for Certs, Requests and CRRs
    ## mmh this is impossible
!   $query = "select MIN (".$OpenCA::DBI::SQL->{VARIABLE}->{$table."_SERIAL"}[0].")".
!     " from ".$OpenCA::DBI::SQL->{TABLE}->{$table}." where (".
!     $OpenCA::DBI::SQL->{VARIABLE}->{$table."_SERIAL"}[0]." > ? ".
!     ")";
    undef @bind_values;
!   if ($status) {
!     $query .= " and (".$OpenCA::DBI::SQL->{VARIABLE}->{STATUS}[0]." like ?)";
!     $bind_values [1] = $status;
    }
!   $bind_values [0] = $serial; # date is not numeric
!   if ( $serial =~ /^$/ ) {
!     $bind_values [0] = "";
    }
-   my $rv;
  
    ## do_query
--- 2045,2068 ----
    ## I hope the people only search for Certs, Requests and CRRs
    ## mmh this is impossible
!   my $and = 0;
    undef @bind_values;
!   $query = "select MIN(".$OpenCA::DBI::SQL->{VARIABLE}->{$table."_SERIAL"}[0].")".
!     " from ".$OpenCA::DBI::SQL->{TABLE}->{$table};
!   if ($serial) {
!     $query .= " where (".
!               $OpenCA::DBI::SQL->{VARIABLE}->{$table."_SERIAL"}[0]." > ? ".
!               ")";
!     $bind_values [0] = $serial;
!     $and = 1;
    }
!   if ($status) {
!     if ($and) {
!       $query .= " and ";
!     } else {
!       $query .= " where ";
!     }
!     $query .= " (".$OpenCA::DBI::SQL->{VARIABLE}->{STATUS}[0]." like ?)";
!     $bind_values [scalar @bind_values] = $status;
    }
  
    ## do_query
***************
*** 2515,2523 ****
  
    ## set intial values
!   if ( $is_int ) {
!     $from = 0 if (not $from);
!   } else {
!     $from = "\"0\"" if (not $from);
!   }
    $dbKey = $from;
  
--- 2521,2525 ----
  
    ## set intial values
!   $from = undef if (not $from);
    $dbKey = $from;