/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 1063

Added by Jing Tao over 22 years ago

Fixed some DB connection bug.

+      {
         Connection dbConn = null;
         MetaCatUtil ut = new MetaCatUtil();
         dbConn = ut.getConnection();
         // get server location for this doc
         int serverLocation=getServerLocationNumber(dbConn,accnum);
         ut.returnConnection(dbConn);
         registerDocument(docname, doctype,accnum, user, serverLocation);
         try
+        {
           dbConn = ut.openDBConnection();
           // get server location for this doc
           int serverLocation=getServerLocationNumber(dbConn,accnum);
           dbConn.close();
           registerDocument(docname, doctype,accnum, user, serverLocation);
+        }
         catch (Exception e)
+        {
           throw e;
+        }
         finally
+        {
           try
+          {
             dbConn.close();
+          }
           catch (Exception ee)
           {}
+        }
+      }
       /**
-...
           pstmt.execute();
           pstmt.close();
           dbconn.close();
         } finally {
           util.returnConnection(dbconn);
+        }
         finally
+        {
           try
+          {
             dbconn.close();
+          }
           catch (SQLException sqlE)
+          {
             util.debugMessage("Error in DocumentImpl.registerDocument:" +
                                     sqlE.getMessage(), 30);
+          }
+        }
+      }
-...
           //user specified rev should be great than 0
           if (revInDataBase==-1 && userSpecifyRev>0 )
+          {
             //ture means for replication
             ac = new AccessionNumber(dbconn, accnum, "insert");
+          }
           //rev is greater the last revsion number and revInDataBase isn't -1
-...
           pstmt.execute();
           pstmt.close();
           dbconn.close();
         } finally {
           util.returnConnection(dbconn);
+        }
         finally
+        {
           try
+          {
             dbconn.close();
+          }
           catch (SQLException sqlE)
+          {
             util.debugMessage("Error in DocumentImpl.registerDocument:" +
                                     sqlE.getMessage());
+          }
+        }
+      }
-...
        *        resides.
        */
      public static void writeDataFile(InputStream input, String filePath,
         String docname, String doctype, String accnum, String user, int serverCode)
                                       String docname, String doctype, String accnum,
                                       String user, String docHomeServer)
                          throws SQLException, AccessionNumberException, Exception
+     {
        int serverCode=-2;
         if (filePath==null||filePath.equals(""))
+        {
           throw new
-...
+        {
           throw new Exception("Please specify the stored file name");
+        }
         //get server code for the home server
         serverCode=getServerCode(docHomeServer);
         //if the server is not in the xml replication table, insert it.
         if (serverCode==-1)
+        {
           insertServerIntoReplicationTable(docHomeServer);
           //get server code again
           serverCode=getServerCode(docHomeServer);
+        }
         //make sure user have file lock grant(local metacat means have it too)
         if (getDataFileLockGrant(accnum))
+        {
-...
           bis.close();
     	    outPut.close();
     	    fos.close();
           //force replication to other server
           /*during replciation, don't need force replication again.
           MetaCatUtil util = new MetaCatUtil();
           if ((util.getOption("replicationdata")).equals("on"))
+          {
             Connection dbConn = util.getConnection();
             if (serverCode==1)
+            {
               ForceReplicationHandler frh = new ForceReplicationHandler(accnum,
                       "insert",false,ReplicationHandler.buildServerList(dbConn));
               util.returnConnection(dbConn);
+            }
             else
+            {
               if ((util.getOption("hub")).equals("super"))
+              {
                 ForceReplicationHandler frh = new ForceReplicationHandler(accnum,
                     true, ReplicationHandler.buildServerList(dbConn));
                 util.returnConnection(dbConn);
+              }
               else
+              {
                 String docId=util.getDocIdFromString(accnum);
                 ForceReplicationHandler frh = new ForceReplicationHandler(accnum,
                     true, ReplicationHandler.getHomeServer(docId));
+              }
+            }
           }*/
         }//if
+     }
-...
+      {
         Connection dbConn = null;
         MetaCatUtil ut= new MetaCatUtil();
         dbConn = ut.getConnection();
         int serverLocation=getServerLocationNumber(dbConn,accnum);
         ut.returnConnection(dbConn);
         return getDataFileLockGrant(accnum,serverLocation);
         try
+        {
           dbConn = ut.openDBConnection();
           int serverLocation=getServerLocationNumber(dbConn,accnum);
           dbConn.close();
           return getDataFileLockGrant(accnum,serverLocation);
+        }
         catch (Exception e)
+        {
           try
+          {
             dbConn.close();
+          }
           catch (Exception ee)
           {}
           throw e;
+        }
+      }
       /**
-...
       /** Save a document entry in the xml_revisions table */
       private static void archiveDocRevision(Connection conn, String docid,
                                              String user)
                                              throws SQLException {
+     {
         String sysdate = dbAdapter.getDateTimeFunction();
         // create a record in xml_revisions table
         // for that document as selected from xml_documents
         PreparedStatement pstmt = conn.prepareStatement(
        try
+       {
          PreparedStatement pstmt = conn.prepareStatement(
           "INSERT INTO xml_revisions " +
             "(docid, rootnodeid, docname, doctype, " +
             "user_owner, user_updated, date_created, date_updated, " +
-...
             "server_location, rev, public_access, catalog_id " +
           "FROM xml_documents " +
           "WHERE docid = ?");
         // Bind the values to the query and execute it
         pstmt.setString(1, docid);
         pstmt.setString(2, user);
         pstmt.setString(3, docid);
         pstmt.execute();
         pstmt.close();
           // Bind the values to the query and execute it
           pstmt.setString(1, docid);
           pstmt.setString(2, user);
           pstmt.setString(3, docid);
           pstmt.execute();
           pstmt.close();
+       }
        catch (SQLException e)
+       {
+       }
+      }
-...
         try
+        {
           //check xml_replication table
           dbConn=util.getConnection();
           dbConn=util.openDBConnection();
           pStmt = dbConn.prepareStatement
           ("SELECT serverid FROM xml_replication WHERE server='" + serverName +"'");
           pStmt.execute();
-...
+        {
           try
+          {
             util.returnConnection(dbConn);
             dbConn.close();
+          }
           catch (Exception ee)
           {}
-...
         MetaCatUtil util = new MetaCatUtil();
         try
+        {
            dbConn=util.getConnection();
            dbConn=util.openDBConnection();
            pStmt = dbConn.prepareStatement("INSERT INTO xml_replication " +
                                           "(server, last_checked, replicate) " +
                                           "VALUES ('" + server + "', to_date(" +
-...
           try
+          {
             pStmt.close();
             util.returnConnection(dbConn);
             dbConn.close();
+          }
           catch (Exception ee)
           {}

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 1063

Added by Jing Tao over 22 years ago