/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1215

Added by Jing Tao over 22 years ago

Merge DBConnection branch to head.

       private static final AbstractDatabase dbAdapter = MetaCatUtil.dbAdapter;
       private Connection conn = null;
       //private Connection conn = null;
       private String sitecode = null;
       private String sep = null;
       private String docid = null;
-...
       /**
        * Construct an AccessionNumber
        */
       public AccessionNumber ()
              throws SQLException, ClassNotFoundException
+      {
       //public AccessionNumber ()
              //throws SQLException, ClassNotFoundException
       //{
         // Open a connection to the database from here
         this((new MetaCatUtil()).openDBConnection());
+      }
         //this((new MetaCatUtil()).openDBConnection());
       //}
       /**
        * Construct an AccessionNumber
+       *
        * @param conn the db connection to read from and write Accession# to
        */
       public AccessionNumber (Connection conn)
       public AccessionNumber ()
+      {
         this.sitecode = MetaCatUtil.getOption("sitecode");
         this.sep = MetaCatUtil.getOption("accNumSeparator");
         this.conn = conn;
         //this.conn = conn;
+      }
       /** NEW - WHEN CLIENT ALWAYS PROVIDE ACCESSION NUMBER INCLUDING REV IN IT
-...
        * @param conn the db connection to read Accession number from
        * @param accnum the accession number to be checked for validness
        */
       public AccessionNumber (Connection conn, String accnum, String action)
       public AccessionNumber (String accnum, String action)
                throws AccessionNumberException, SQLException, NumberFormatException
+     {
         this(conn);
         this();
         this.rev = null;
         this.docid = accnum;
-...
+      {
         String uniqueid;
         String sysdate = dbAdapter.getDateTimeFunction();
         DBConnection conn = null;
         int serialNumber = -1;
         try {
           PreparedStatement pstmt;
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getUniqueID");
           serialNumber=conn.getCheckOutSerialNumber();
           pstmt = conn.prepareStatement
                   ("INSERT INTO accession_number (site_code, date_created) " +
                    "VALUES (?, " + sysdate + ")");
-...
           pstmt.execute();
           pstmt.close();
           uniqueid = "" + dbAdapter.getUniqueID(conn, "accession_number");
           uniqueid = "" + dbAdapter.getUniqueID(conn.getConnections(),
                                                               "accession_number");
           //because we only count the connection usage one when it check in
           //but it use twice. So we need to increase one
           conn.increaseUsageCount(1);
         } catch (SQLException e) {
           throw new
           SQLException("Error on AccessionNumber.getUniqueID(): "+e.getMessage());
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
+        }
         return uniqueid;
+      }
-...
                       throws SQLException {
         boolean hasAccNumber = false;
         DBConnection conn = null;
         int serialNumber = -1;
         try {
           PreparedStatement pstmt;
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.accNumberUsed");
           serialNumber=conn.getCheckOutSerialNumber();
           pstmt = conn.prepareStatement(
                     "SELECT 'x' FROM xml_documents " +
                     "WHERE docid = ? " +
-...
         } catch (SQLException e) {
           throw new SQLException
           ("Error on AccessionNumber.accNumberUsed(accNumber): " + e.getMessage());
+        }
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
+        }
         return hasAccNumber;
+      }
-...
       private boolean accNumberIsCurrent(String accNumber) throws SQLException {
         boolean hasCurrentAccNumber = false;
         DBConnection conn = null;
         int serialNumber = -1;
         try {
           PreparedStatement pstmt;
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.accNumberIsCurre");
           serialNumber=conn.getCheckOutSerialNumber();
           pstmt = conn.prepareStatement(
                     "SELECT 'x' FROM xml_documents " +
                     "WHERE docid = ?");
-...
           throw new SQLException(
               "Error on AccessionNumber.accNumberIsCurrent(String accNumber): " +
               e.getMessage());
+        }
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
+        }
         return hasCurrentAccNumber;
+      }
-...
       private String getLastRevision(String docid) throws SQLException
+      {
         String rev = "";
         DBConnection conn = null;
         int serialNumber = -1;
         try {
           PreparedStatement pstmt;
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getLastRevision");
           serialNumber=conn.getCheckOutSerialNumber();
           pstmt = conn.prepareStatement
                   ("SELECT rev FROM xml_documents WHERE docid='" + docid + "'");
           pstmt.execute();
-...
           throw new SQLException(
           "Error on AccessionNumber.getLastRevision(): " + e.getMessage());
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn,serialNumber);
+        }
         return rev;
+      }
-...
       private int getLastRevisionNumber(String docId) throws SQLException
+      {
         int rev = 1;
         DBConnection conn =null;
         int serialNumber = -1;
         try {
           PreparedStatement pStmt;
           PreparedStatement pStmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getLastRevisionN");
           serialNumber=conn.getCheckOutSerialNumber();
           pStmt = conn.prepareStatement
                   ("SELECT rev FROM xml_documents WHERE docid='" + docId + "'");
           pStmt.execute();
-...
           throw new SQLException(
           "Error on AccessionNumber.getLastRevision(): " + e.getMessage());
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn,serialNumber);
+        }
         return rev;
+      }
-...
       private String getNextRevision(String docid) throws SQLException
+      {
         String rev = "";
         DBConnection conn = null;
         int serialNumber = -1;
         try {
           PreparedStatement pstmt;
           PreparedStatement pstmt = null;
           //check out DBConnection
           conn=DBConnectionPool.getDBConnection("AccessionNumber.getNextRevision");
           serialNumber=conn.getCheckOutSerialNumber();
           pstmt = conn.prepareStatement
                   ("SELECT rev+1 FROM xml_documents WHERE docid='" + docid + "'");
           pstmt.execute();
-...
           throw new SQLException(
           "Error on AccessionNumber.getNextRevision(): " + e.getMessage());
+        }
         finally
+        {
           DBConnectionPool.returnDBConnection(conn, serialNumber);
+        }
         return rev;
+      }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1215

Added by Jing Tao over 22 years ago