/src/edu/ucsb/nceas/metacat/DBUtil.java - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 5167

Added by daigle over 14 years ago

add method name to log statements

     package edu.ucsb.nceas.metacat;
     import java.sql.Connection;
     import java.sql.SQLException;
     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
-...
     import java.io.InputStream;
     import java.io.IOException;
     import java.net.URL;
     import java.net.URLConnection;
     import java.net.MalformedURLException;
     import java.util.Enumeration;
     import java.util.Vector;
     import java.util.Stack;
     import org.apache.log4j.Logger;
-...
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
      * A suite of utility classes for quering DB
      * A suite of utility classes for querying DB
      */
     public class DBUtil {
-...
          if (args.length < 1)
+         {
             System.err.println("Wrong number of arguments!!!");
             System.err.println(
             "USAGE: java DBUtil <-dt | -ds [doctype] | -dl user>");
             System.err.println("USAGE: java DBUtil <-dt | -ds [doctype] | -dl user>");
             return;
          } else {
             try {
-...
       public String readDoctypes()
             throws SQLException  {
         Vector doctypeList = new Vector();
         Vector<String> doctypeList = new Vector<String>();
         DBConnection dbConn = null;
         int serialNumber = -1;
         PreparedStatement pstmt = null;
-...
           pstmt.close();
         } catch (SQLException e) {
           throw new SQLException("DBUtil.readDoctypes(). " + e.getMessage());
           throw new SQLException("DBUtil.readDoctypes - SQL error: " + e.getMessage());
+        }
         finally
+        {
-...
             	systemID = SystemUtil.getContextURL() + systemID;
+            }
           } else {
             throw new SQLException("Non-registered doctype: " + doctype);
             throw new SQLException("DBUtil.readDTDSchema - Non-registered doctype: " + doctype);
+          }
           pstmt.close();
         } catch (SQLException e) {
           throw new SQLException("DBUtil.readDTD(). " + e.getMessage());
           throw new SQLException("DBUtil.readDTDSchema - " + e.getMessage());
+        }
         finally
+        {
-...
     	    in.close();
         } catch (MalformedURLException e) {
           throw new MalformedURLException
           ("DBUtil.readDTD(). " + e.getMessage());
         	throw new MalformedURLException("DBUtil.readDTDSchema - Malformed URL Error: " + e.getMessage());
         } catch (IOException e) {
           throw new IOException
           ("DBUtil.readDTD(). " + e.getMessage());
         	throw new IOException("DBUtil.readDTDSchema - I/O error: " + e.getMessage());
         } catch (SecurityException e) {
           throw new IOException
           ("DBUtil.readDTD(). " + e.getMessage());
         	throw new IOException("DBUtil.readDTDSchema - Security error: " + e.getMessage());
+        }
        return cbuff.toString();
+      }
       /**
        * format the DataGuide ResultSet to XML
        */
       private String formatToXML(Vector resultset) {
         String currPath = null;
         String currElement = null;
         String prevElement = null;
         StringBuffer result = new StringBuffer();
         Enumeration rs = resultset.elements();
         Stack st = new Stack();
         int i = 0;
     //  /**
     //   * format the DataGuide ResultSet to XML
     //   */
     //  private String formatToXML(Vector resultset) {
     //
     //    String currPath = null;
     //    String currElement = null;
     //    String prevElement = null;
     //    StringBuffer result = new StringBuffer();
     //    Enumeration<String> rs = resultset.elements();
     //    Stack st = new Stack();
     //    int i = 0;
     //
     //    result.append("<?xml version=\"1.0\"?>\n");
     //    result.append("<resultset>\n");
     //
     //    while (rs.hasMoreElements()) {
     //        currPath = (String)rs.nextElement();
     //        while ( !In(prevElement, currPath) ) {
     //            currElement = (String)st.pop();
     //            result.append(pad(" ",i--) + "</" + currElement + ">\n");
     //            if ( st.empty() )
     //                prevElement = null;
     //            else
     //                prevElement = (String)st.peek();
     //        }
     //        currElement = getElementFromPath(currPath);
     //        st.push(currElement);
     //        result.append(pad(" ",++i) + "<" + currElement + ">\n");
     //        prevElement = currElement;
     //    }
     //    while ( !st.empty() ) {
     //        prevElement = (String)st.pop();
     //        result.append(pad(" ",i--) + "</" + prevElement + ">\n");
     //    }
     //    result.append("</resultset>\n");
     //
     //    return result.toString();
     //  }
         result.append("<?xml version=\"1.0\"?>\n");
         result.append("<resultset>\n");
         while (rs.hasMoreElements()) {
             currPath = (String)rs.nextElement();
             while ( !In(prevElement, currPath) ) {
                 currElement = (String)st.pop();
                 result.append(pad(" ",i--) + "</" + currElement + ">\n");
                 if ( st.empty() )
                     prevElement = null;
                 else
                     prevElement = (String)st.peek();
+            }
             currElement = getElementFromPath(currPath);
             st.push(currElement);
             result.append(pad(" ",++i) + "<" + currElement + ">\n");
             prevElement = currElement;
+        }
         while ( !st.empty() ) {
             prevElement = (String)st.pop();
             result.append(pad(" ",i--) + "</" + prevElement + ">\n");
+        }
         result.append("</resultset>\n");
     //  /**
     //   * check if element is in path like /elem1/elem2/elemn3
     //   */
     //  private boolean In(String element, String path) {
     //
     //    if ( element == null ) return true;
     //    return ( path.indexOf(element) != -1 );
     //  }
     //
     //  /**
     //   * get last element from path like /elem1/elem2/elemn3
     //   */
     //  private String getElementFromPath(String path) {
     //
     //    return ( path.substring(path.lastIndexOf("/")+1) );
     //  }
     //
     //  /**
     //   * repeates the str n-times
     //   */
     //  private String pad(String str, int n) {
     //
     //    String result = "";
     //    for ( int i = 0; i < n; i++ )
     //        result = result.concat(str);
     //
     //    return result;
     //  }
         return result.toString();
+      }
       /**
        * check if element is in path like /elem1/elem2/elemn3
        */
       private boolean In(String element, String path) {
         if ( element == null ) return true;
         return ( path.indexOf(element) != -1 );
+      }
       /**
        * get last element from path like /elem1/elem2/elemn3
        */
       private String getElementFromPath(String path) {
         return ( path.substring(path.lastIndexOf("/")+1) );
+      }
       /**
        * repeates the str n-times
        */
       private String pad(String str, int n) {
         String result = "";
         for ( int i = 0; i < n; i++ )
             result = result.concat(str);
         return result;
+      }
       /**
        * format the ResultSet to XML
        */
       private String formatToXML(Vector resultset, String tag) {
       private String formatToXML(Vector<String> resultset, String tag) {
         String val = null;
         StringBuffer result = new StringBuffer();
         Enumeration rs = resultset.elements();
         Enumeration<String> rs = resultset.elements();
         result.append("<?xml version=\"1.0\"?>\n");
         result.append("<resultset>\n");
         while (rs.hasMoreElements()) {
             val = (String)rs.nextElement();
             val = rs.nextElement();
             result.append("   <" + tag + ">" + val + "</" + tag + ">\n");
+        }
         result.append("</resultset>\n");
-...
+      }
       /**
        * get the lastest Accession Number from a particular scope
        * get the latest Accession Number from a particular scope
        */
       public String getMaxDocid(String scope)
             throws SQLException  {
-...
         try {
         	PropertyService.getProperty("document.accNumSeparator");
         } catch (PropertyNotFoundException pnfe) {
         	logMetacat.error("could not get property 'accNumSeparator'.  setting to '.': "
         			+ pnfe.getMessage());
         	logMetacat.error("DBUtil.getMaxDocid - could not get property " +
         			"'accNumSeparator'.  setting to '.': " + pnfe.getMessage());
+        }
         PreparedStatement pstmt = null;
         DBConnection dbConn = null;
-...
       public boolean idExists(String docid)
         throws SQLException
+      {
         Vector v = getAllDocids(null);
         Vector<String> v = getAllDocids(null);
         for(int i=0; i<v.size(); i++)
+        {
           String id = (String)v.elementAt(i);
-...
       /**
        * return all docids with a given doctype
        */
       public Vector getAllDocidsByType(String doctype, boolean includeRevs) throws SQLException {
       public Vector<String> getAllDocidsByType(String doctype, boolean includeRevs) throws SQLException {
     		Vector<String> resultVector = new Vector<String>();
     		String accnum = null;
     		String sep = ".";
     	    try {
     	    	PropertyService.getProperty("document.accNumSeparator");
     	    } catch (PropertyNotFoundException pnfe) {
     	    	logMetacat.error("could not get property 'accNumSeparator'.  setting to '.': "
     	    			+ pnfe.getMessage());
     	    	logMetacat.error("DBUtil.getAllDocidsByType - could not get property " +
     	    			"'accNumSeparator'.  setting to '.': " + pnfe.getMessage());
+    	    }
     		PreparedStatement pstmt = null;
     		DBConnection dbConn = null;
-...
+    	}
       /**
        * get the lastest Accession Number from a particular scope
        * get the latest Accession Number from a particular scope
        */
       public Vector<String> getAllDocids(String scope)
             throws SQLException  {
         Vector<String> resultVector = new Vector<String>();
         String accnum = null;
     //    String accnum = null;
         String sep = ".";
         try {
         	PropertyService.getProperty("document.accNumSeparator");
-...
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           long max = 0;
     //      long max = 0;
           String id = null;
           String rev = null;
           while(rs.next()){
-...
           pstmt.close();
         } catch (SQLException e) {
           throw new SQLException("DBUtil.getAllDocids(). " + e.getMessage());
           throw new SQLException("DBUtil.getAllDocids - SQL error:  " + e.getMessage());
+        }
         finally
+        {
-...
+      }
       /**
        * To a given docid, found a dataset docid which conatains the the given doicd
        * To a given docid, found a dataset docid which contains the the given docid
        * This will be done by searching xml_relation table
        * If couldn't find, null will be return
        * @param givenDocId, the docid which we want to find
-...
           dbConn=DBConnectionPool.
                       getDBConnection("DBUtil.findDataSetDocIdForGivenDocument");
           serialNumber=dbConn.getCheckOutSerialNumber();
           // Sql command to chose a docid from xm_relation table
           // SQL command to chose a docid from xm_relation table
           sqlCommand = "select docid from xml_relation where object like ? or "
                                                         + "subject like ?";
           // Prepared statement
-...
           // Bind variable
           pStmt.setString(1, givenDocId);
           pStmt.setString(2, givenDocId);
           // Excute prepared statement
           // Execute prepared statement
           pStmt.execute();
           // Get result set
           resultSet = pStmt.getResultSet();
-...
         }//try
         catch ( SQLException e)
+        {
           // Print out excepition
           logMetacat.error("Error in DBUil.findDataSEtDocIdForGivenDocument"
                                     +e.getMessage());
           // Print out exception
           logMetacat.error("DBUtil.findDataSetDocIdForGivenDocument - " +
         		  "SQL error: " + e.getMessage());
           // return null
           return dataSetDocId;
-...
           }//try
           catch ( SQLException e)
+          {
             // Print out excepition
         	  logMetacat.error("Error in DBUil.findDataSetDocIdForGivenDoc"
                                     + e.getMessage());
             // Print out exception
         	  logMetacat.error("DBUtil.findDataSetDocIdForGivenDocument - " +
         			  "error closing db resources: "  + e.getMessage());
           }//catch
           finally
-...
         PreparedStatement pstmt = null;
         // String to store a docid without rev
         String docIdWithoutRevision = null;
         // SQL comand
         // SQL command
         String sqlCommand = null;
         // Resulst set
         // Result set
         ResultSet rs = null;
         // String to store the revision
         String revision = null;
-...
         // Get docid without rev
         docIdWithoutRevision = DocumentUtil.getDocIdFromString(givenDocId);
         // SQL comand is:
         // SQL command is:
         sqlCommand = "select rev, doctype from xml_documents where docid like ?";
         try
-...
           // Prepare the sql command
           pstmt = dbConn.prepareStatement(sqlCommand);
           // Bin vairable
           // Bin variable
           pstmt.setString(1, docIdWithoutRevision);
           // Excute the prepared statement
           // Execute the prepared statement
           pstmt.execute();
           // Get result set
           rs = pstmt.getResultSet();
-...
+          {
             // No record, throw a exception
             throw new
                   SQLException("There is not record for given docid:"+givenDocId);
                   SQLException("DBUtil.getCurrentRevisionAndDocTypeForGivenDocument - " +
                 		  "There is no record for given docid: " + givenDocId);
           }//else
+        }
-...
           }//try
           catch ( SQLException e)
+          {
             // Print out excepition
         	  logMetacat.error("Error in DBUil.getCurrentRevisionAndDocType"
                                     + e.getMessage());
             // Print out exception
         	  logMetacat.error("DBUtil.getCurrentRevisionAndDocTypeForGivenDocument - " +
         			  "Error closing db resources: " + e.getMessage());
           }//catch
           finally
-...
               boolean hasRow = rs.next();
               while (hasRow) {
                   rev = rs.getInt(1);
                   logMetacat.warn("rev "+ rev +" is added to list");
                   logMetacat.info("DBUtil.getRevListFromRevisionTable - rev: " + rev +
                 		  " is added to list for docid: " + docIdWithoutRev);
                   list.add(new Integer(rev));
                   hasRow = rs.next();
-...
               try {
                   pStmt.close();
               } catch (Exception ee) {
             	  logMetacat.error("Error in DocumentImpl."
                           + "getLatestRevisionNumber: " + ee.getMessage());
             	  logMetacat.error("DBUtil.getRevListFromRevisionTable - Error closing " +
             			  "prepared statement: " + ee.getMessage());
               } finally {
                   DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+              }
-...
               try {
                   pStmt.close();
               } catch (Exception ee) {
             	  logMetacat.error("Error in DBUtil."
                           + "getLatestRevisionInDocumentTable: " + ee.getMessage());
             	  logMetacat.error("DBUtil.getLatestRevisionInDocumentTable - Error closing " +
             			  " prepared statement: " + ee.getMessage());
               } finally {
                   DBConnectionPool.returnDBConnection(dbConn, serialNumber);
+              }
           }//finally
           return rev;
       }//getLatestRevisionNumber
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 5167

Added by daigle over 14 years ago