/ - Diff - Metacat - Ecoinformatics Redmine

     package edu.ucsb.nceas;
     import junit.framework.TestCase;
     import java.io.BufferedReader;
     import java.io.File;
     import java.io.FileReader;
-...
     import java.sql.ResultSet;
     import java.sql.ResultSetMetaData;
     import java.sql.SQLException;
     import java.sql.Statement;
     import java.util.Calendar;
     import java.util.Date;
     import java.util.GregorianCalendar;
     import java.util.HashMap;
     import java.util.Hashtable;
     import java.util.SimpleTimeZone;
     import java.util.TimeZone;
     import java.util.Vector;
     import junit.framework.TestCase;
     import org.apache.http.client.HttpClient;
     import org.apache.http.impl.client.DefaultHttpClient;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     import edu.ucsb.nceas.metacat.client.InsufficientKarmaException;
     import edu.ucsb.nceas.metacat.client.Metacat;
     import edu.ucsb.nceas.metacat.client.MetacatException;
     import edu.ucsb.nceas.metacat.client.MetacatFactory;
     import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.metacat.shared.ServiceException;
     import edu.ucsb.nceas.metacat.util.DocumentUtil;
-...
     	protected static void dbQuery(String sqlStatement, String methodName)
     			throws SQLException {
     		DBConnectionPool connPool = DBConnectionPool.getInstance();
     		DBConnection dbconn = DBConnectionPool.getDBConnection(methodName);
     		int serialNumber = dbconn.getCheckOutSerialNumber();
     		Statement statement = dbconn.createStatement();
     		PreparedStatement statement = dbconn.prepareStatement(sqlStatement);
     		debug("Executing against db: " + sqlStatement);
     		statement.executeQuery(sqlStatement);
     		statement.executeQuery();
     		statement.close();
-...
     	protected static void dbUpdate(String sqlStatement, String methodName)
     			throws SQLException {
     		DBConnectionPool connPool = DBConnectionPool.getInstance();
     		DBConnection dbconn = DBConnectionPool.getDBConnection(methodName);
     		int serialNumber = dbconn.getCheckOutSerialNumber();
     		Statement statement = dbconn.createStatement();
     		PreparedStatement statement = dbconn.prepareStatement(sqlStatement);
     		debug("Executing against db: " + sqlStatement);
     		statement.executeUpdate(sqlStatement);
     		statement.executeUpdate();
     		statement.close();
     		DBConnectionPool.returnDBConnection(dbconn, serialNumber);

     package edu.ucsb.nceas.metacat.accesscontrol;
     import java.io.*;
     import java.sql.*;
     import java.io.IOException;
     import java.io.StringReader;
     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.util.Stack;
     import java.util.Vector;
     import org.apache.log4j.Logger;
     import org.xml.sax.Attributes;
     import org.xml.sax.InputSource;
     import org.xml.sax.ContentHandler;
     import org.xml.sax.EntityResolver;
     import org.xml.sax.ErrorHandler;
     import org.xml.sax.InputSource;
     import org.xml.sax.SAXException;
     import org.xml.sax.XMLReader;
     import org.xml.sax.helpers.DefaultHandler;
     import org.xml.sax.helpers.XMLReaderFactory;
     import org.xml.sax.helpers.DefaultHandler;
     import edu.ucsb.nceas.metacat.BasicNode;
     import edu.ucsb.nceas.metacat.DBEntityResolver;
     import edu.ucsb.nceas.metacat.DocumentImpl;
     import edu.ucsb.nceas.metacat.McdbException;
     import edu.ucsb.nceas.metacat.PermissionController;
     import edu.ucsb.nceas.metacat.database.DBConnection;
     import edu.ucsb.nceas.metacat.database.DBConnectionPool;
     import edu.ucsb.nceas.metacat.properties.PropertyService;
     import edu.ucsb.nceas.metacat.shared.AccessException;
     import edu.ucsb.nceas.metacat.util.MetacatUtil;
     import edu.ucsb.nceas.metacat.util.SystemUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
-...
+      {
         //DBConnection conn = null;
         //int serialNumber = -1;
         Statement stmt = null;
         PreparedStatement pstmt = null;
         try
+        {
           //check out DBConenction
           //conn=DBConnectionPool.getDBConnection("AccessControlList.deltePerm");
           //serialNumber=conn.getCheckOutSerialNumber();
         	String sql = "DELETE FROM xml_access WHERE accessfileid = ?";
           // delete all acl records for resources related to @aclid if any
           stmt = connection.createStatement();
           pstmt = connection.prepareStatement(sql);
           pstmt.setString(1, aclid);
           // Increase DBConnection usage count
           connection.increaseUsageCount(1);
           logMetacat.debug("running sql: " + stmt.toString());
           stmt.execute("DELETE FROM xml_access WHERE accessfileid = '" + aclid
                                                                           + "'");
           logMetacat.debug("running sql: " + pstmt.toString());
           pstmt.execute();
           //increase usageCount!!!!!!
           //conn.increaseUsageCount(1);
+        }
-...
+        }
         finally
+        {
           stmt.close();
           pstmt.close();
           //retrun DBConnection
           //DBConnectionPool.returnDBConnection(conn,serialNumber);
+        }

     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.sql.Statement;
     import java.sql.Timestamp;
     import java.util.Calendar;
     import java.util.Date;
-...
                                      throws SQLException
+        {
           String type = null;
           String sql = "SELECT DOCTYPE FROM xml_documents WHERE docid LIKE " + "'" +
                         docidWithoutRev +"'";
           Statement stmt = null;
           stmt = conn.createStatement();
           ResultSet result = stmt.executeQuery(sql);
           String sql = "SELECT DOCTYPE FROM xml_documents WHERE docid LIKE ?";
           PreparedStatement stmt = null;
           stmt = conn.prepareStatement(sql);
           stmt.setString(1, docidWithoutRev);
           ResultSet result = stmt.executeQuery();
           boolean hasResult = result.next();
           if (hasResult)
+          {

     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.sql.Statement;
     import java.util.Enumeration;
     import java.util.Hashtable;
-...
       /** get next node id from DB connection */
       private long generateNodeID() throws SAXException {
           long nid=0;
           Statement stmt;
           PreparedStatement pstmt;
           DBConnection dbConn = null;
           int serialNumber = -1;
           try {
             // Get DBConnection
             dbConn=DBConnectionPool.getDBConnection("DBSAXNode.generateNodeID");
             serialNumber=dbConn.getCheckOutSerialNumber();
             stmt = dbConn.createStatement();
             stmt.execute("SELECT xml_nodes_id_seq.nextval FROM dual");
             ResultSet rs = stmt.getResultSet();
             String sql = "SELECT xml_nodes_id_seq.nextval FROM dual";
             pstmt = dbConn.prepareStatement(sql);
             pstmt.execute();
             ResultSet rs = pstmt.getResultSet();
             boolean tableHasRows = rs.next();
             if (tableHasRows) {
               nid = rs.getLong(1);
+            }
             stmt.close();
             pstmt.close();
           } catch (SQLException e) {
             System.out.println("Error in DBSaxNode.generateNodeID: " +
                                 e.getMessage());

     package edu.ucsb.nceas.metacat;
     import java.sql.Statement;
     import java.sql.PreparedStatement;
     import org.apache.log4j.Logger;
-...
         	           //checkout the dbconnection
         	          dbconn = DBConnectionPool.getDBConnection("EML201DocumentCorrector.run");
         	          serialNumber = dbconn.getCheckOutSerialNumber();
         	          Statement deletingStatement = dbconn.createStatement();
         	          PreparedStatement deletingStatement = null;
         	          // delete the records in xml_index table
         	          String deletingIndex = generateXML_IndexDeletingSQL();
         	          logMetacat.debug("EML201DocumentCorrector.run - deleting the records in xml_index table with sql: " + deletingIndex);
         	          deletingStatement.execute(deletingIndex);
         	          deletingStatement = dbconn.prepareStatement(deletingIndex);
         	          deletingStatement.execute();
         	          deletingStatement.close();
         	          // delete the records in xml_nodes table
         	          String deletingNode = generateXML_NodeDeletingSQL();
         	          logMetacat.debug("EML201DocumentCorrector.run - deleting the records in xml_nodes table with sql: " + deletingNode);
         	          deletingStatement.execute(deletingNode);
         	          deletingStatement = dbconn.prepareStatement(deletingNode);
         	          deletingStatement.execute();
         	          deletingStatement.close();
         	          // delete the records in xml_nodes_revisions table
         	          String deletingNodeRevision = generateXML_Node_RevisionsDeletingSQL();
         	          logMetacat.debug("EML201DocumentCorrector.run - deleting the records in xml_nodes_revisions table with sql: " + deletingNodeRevision);
         	          deletingStatement.execute(deletingNodeRevision);
         	          deletingStatement = dbconn.prepareStatement(deletingNodeRevision);
         	          deletingStatement.execute();
         	          deletingStatement.close();
         	          //close statement and connection
         	          deletingStatement.close();
         	          //dbconn.close();
         	          success = true;
+        	      }
         	        catch (Exception ee)

       /**
        * Method to create a Statement
        * @deprecated PreparedStatements are preferred so as to encourage
        * parameter value binding
        */
       public Statement createStatement() throws SQLException
+      {

     package edu.ucsb.nceas.metacat;
     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.Statement;
     import java.util.Date;
-...
                                     .getDBConnection("DBSAXHandler.startElement");
                             serialNumber = dbConn.getCheckOutSerialNumber();
                             Statement stmt = dbConn.createStatement();
                             ResultSet rs = stmt
                                     .executeQuery("SELECT catalog_id FROM xml_catalog "
                                             + "WHERE entry_type = 'DTD' "
                                             + "AND public_id = '" + doctype + "'");
                             String sql = "SELECT catalog_id FROM xml_catalog "
                                 + "WHERE entry_type = 'DTD' "
                                 + "AND public_id = ?";
                             PreparedStatement pstmt = dbConn.prepareStatement(sql);
                             pstmt.setString(1, doctype);
                             ResultSet rs = pstmt.executeQuery();
                             boolean hasRow = rs.next();
                             if (hasRow) {
                                 catalogid = rs.getString(1);
+                            }
                             stmt.close();
                             pstmt.close();
                         }//try
                         finally {
                             // Return dbconnection
                             DBConnectionPool.returnDBConnection(dbConn,
                                     serialNumber);
                             DBConnectionPool.returnDBConnection(dbConn, serialNumber);
                         }//finally
+                    }

                      throws SAXException
+      {
         String systemid = null;
         Statement stmt = null;
         PreparedStatement pstmt = null;
         DBConnection conn = null;
         int serialNumber = -1;
         try {
-...
           conn=DBConnectionPool.getDBConnection("DBEntityResolver.getDTDSystemID");
           serialNumber=conn.getCheckOutSerialNumber();
           stmt = conn.createStatement();
           stmt.execute("SELECT system_id FROM xml_catalog " +
                        "WHERE entry_type = 'DTD' AND public_id = '" +
                        doctype + "'");
           ResultSet rs = stmt.getResultSet();
           String sql = "SELECT system_id FROM xml_catalog " +
           "WHERE entry_type = 'DTD' AND public_id = ?";
           pstmt = conn.prepareStatement(sql);
           pstmt.setString(1, doctype);
           pstmt.execute();
           ResultSet rs = pstmt.getResultSet();
           boolean tableHasRows = rs.next();
           if (tableHasRows) {
             systemid = rs.getString(1);
-...
             	systemid = SystemUtil.getContextURL() + systemid;
+            }
+          }
           stmt.close();
           pstmt.close();
         } catch (SQLException e) {
           throw new SAXException
           ("DBEntityResolver.getDTDSystemID - SQL error when getting DTD system ID: " + e.getMessage());
-...
+        {
           try
+          {
             stmt.close();
             pstmt.close();
           }//try
           catch (SQLException sqlE)
+          {

     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.sql.Statement;
     import java.util.Date;
     import java.util.EmptyStackException;
     import java.util.Enumeration;
-...
                                     .getDBConnection("DBSAXHandler.startElement");
                             serialNumber = dbConn.getCheckOutSerialNumber();
                             Statement stmt = dbConn.createStatement();
                             ResultSet rs = stmt
                                     .executeQuery("SELECT catalog_id FROM xml_catalog "
                                             + "WHERE entry_type = 'Schema' "
                                             + "AND public_id = '" + doctype + "'");
                             String sql = "SELECT catalog_id FROM xml_catalog "
                                 + "WHERE entry_type = 'Schema' "
                                 + "AND public_id = ?";
                             PreparedStatement pstmt = dbConn.prepareStatement(sql);
                             pstmt.setString(1, doctype);
                             ResultSet rs = pstmt.executeQuery();
                             boolean hasRow = rs.next();
                             if (hasRow) {
                                 catalogid = rs.getString(1);
+                            }
                             stmt.close();
                             pstmt.close();
                             //System.out.println("here!!!!!!!!!!!!!!!!!!2");
                         }//try
                         finally {
-...
         private void deletePermissionsInAccessTableForDoc(String docid)
                 throws SAXException
+        {
             Statement stmt = null;
             PreparedStatement pstmt = null;
             try {
             	String sql = "DELETE FROM xml_access WHERE docid = ?";
                 // delete all acl records for resources related to @aclid if any
                 stmt = connection.createStatement();
                 pstmt = connection.prepareStatement(sql);
                 pstmt.setString(1, docid);
                 // Increase DBConnection usage count
                 connection.increaseUsageCount(1);
                 stmt.execute("DELETE FROM xml_access WHERE docid = '"
                         + docid + "'");
                 pstmt.execute();
             } catch (SQLException e) {
                 throw new SAXException(e.getMessage());
             } finally {
                 try {
                     stmt.close();
                     pstmt.close();
                 } catch (SQLException ee) {
                     throw new SAXException(ee.getMessage());
+                }
-...
         /* Delete access rules from xml_access for a subtee id */
         private void deleteSubtreeAccessRule(String subtreeid) throws SAXException
+        {
           Statement stmt = null;
           PreparedStatement pstmt = null;
            try
+           {
                stmt = connection.createStatement();
         	   String sql =
         		   "DELETE FROM xml_access " +
         		   "WHERE accessfileid = ? " +
                    "AND subtreeid = ?";
                pstmt = connection.prepareStatement(sql);
                pstmt.setString(1, docid);
                pstmt.setString(2, subtreeid);
                // Increase DBConnection usage count
                connection.increaseUsageCount(1);
                stmt.execute("DELETE FROM xml_access WHERE accessfileid = '"
                        + docid + "' AND subtreeid ='" + subtreeid +"'");
                pstmt.execute();
+           }
            catch (SQLException e)
+           {
-...
+           {
                try
+               {
                    stmt.close();
                    pstmt.close();
+               }
                catch (SQLException ee)
+               {
-...
         private void deleteAllInlineDataAccessRules() throws SAXException
+        {
           Statement stmt = null;
           PreparedStatement pstmt = null;
            try
+           {
                stmt = connection.createStatement();
         	   String sql =
         		   "DELETE FROM xml_access " +
         		   "WHERE accessfileid = ? AND subtreeid IS NOT NULL";
                pstmt = connection.prepareStatement(sql);
                pstmt.setString(1, docid);
                // Increase DBConnection usage count
                connection.increaseUsageCount(1);
                stmt.execute("DELETE FROM xml_access WHERE accessfileid = '"
                        + docid + "' AND subtreeid IS NOT NULL");
                pstmt.execute();
+           }
            catch (SQLException e)
+           {
-...
+           {
                try
+               {
                    stmt.close();
                    pstmt.close();
+               }
                catch (SQLException ee)
+               {
-...
         /* Delete every access subtree record from xml_accesssubtree. */
         private void deleteAccessSubTreeRecord(String docId) throws SAXException
+        {
             Statement stmt = null;
             PreparedStatement pstmt = null;
             try {
             	String sql = "DELETE FROM xml_accesssubtree WHERE docid = ?";
                 // delete all acl records for resources related to @aclid if any
                 stmt = connection.createStatement();
                 pstmt = connection.prepareStatement(sql);
                 pstmt.setString(1, docId);
                 // Increase DBConnection usage count
                 connection.increaseUsageCount(1);
                 logMetacat.debug("running sql: DELETE FROM xml_accesssubtree WHERE docid = '"
                         + docId + "'");
                 stmt.execute("DELETE FROM xml_accesssubtree WHERE docid = '"
                         + docId + "'");
                 logMetacat.debug("running sql: " + sql);
                 pstmt.execute();
             } catch (SQLException e) {
                 throw new SAXException(e.getMessage());
             } finally {
                 try {
                     stmt.close();
                     pstmt.close();
                 } catch (SQLException ee) {
                     throw new SAXException(ee.getMessage());
+                }

     import java.sql.PreparedStatement;
     import java.sql.ResultSet;
     import java.sql.SQLException;
     import java.sql.Statement;
     import java.util.Date;
     import java.util.EmptyStackException;
     import java.util.Enumeration;
-...
     						dbConn = DBConnectionPool
     								.getDBConnection("DBSAXHandler.startElement");
     						serialNumber = dbConn.getCheckOutSerialNumber();
     						Statement stmt = dbConn.createStatement();
     						ResultSet rs = stmt
     								.executeQuery("SELECT catalog_id FROM xml_catalog "
     										+ "WHERE entry_type = 'Schema' "
     										+ "AND public_id = '" + doctype + "'");
     						String sql = "SELECT catalog_id FROM xml_catalog "
     							+ "WHERE entry_type = 'Schema' "
     							+ "AND public_id = ?";
     						PreparedStatement pstmt = dbConn.prepareStatement(sql);
     						pstmt.setString(1, doctype);
     						ResultSet rs = pstmt.executeQuery();
     						boolean hasRow = rs.next();
     						if (hasRow) {
     							catalogid = rs.getString(1);
+    						}
     						stmt.close();
     						pstmt.close();
     					}// try
     					finally {
     						// Return dbconnection
-...
     	/* Delete from db all permission for resources related to @aclid if any. */
     	private void deletePermissionsInAccessTable(String aclid) throws SAXException {
     		Statement stmt = null;
     		PreparedStatement pstmt = null;
     		try {
     			String sql = "DELETE FROM xml_access WHERE accessfileid = '" + aclid + "'";
     			// delete all acl records for resources related to @aclid if any
     			stmt = connection.createStatement();
     			pstmt = connection.prepareStatement(sql);
     			pstmt.setString(1, aclid);
     			// Increase DBConnection usage count
     			connection.increaseUsageCount(1);
     			logMetacat.debug("running sql: DELETE FROM xml_access WHERE accessfileid = '"
     					+ aclid + "'");
     			stmt.execute("DELETE FROM xml_access WHERE accessfileid = '" + aclid + "'");
     			logMetacat.debug("running sql: " + sql);
     			pstmt.execute();
     		} catch (SQLException e) {
     			throw new SAXException(e.getMessage());
     		} finally {
     			try {
     				stmt.close();
     				pstmt.close();
     			} catch (SQLException ee) {
     				throw new SAXException(ee.getMessage());
+    			}
-...
     	/* Delete every access subtree record from xml_accesssubtree. */
     	private void deleteAccessSubTreeRecord(String docId) throws SAXException {
     		Statement stmt = null;
     		PreparedStatement pstmt = null;
     		try {
     			String sql = "DELETE FROM xml_accesssubtree WHERE docid = ?";
     			// delete all acl records for resources related to @aclid if any
     			stmt = connection.createStatement();
     			pstmt = connection.prepareStatement(sql);
     			pstmt.setString(1, docId);
     			// Increase DBConnection usage count
     			connection.increaseUsageCount(1);
     			logMetacat.debug("running sql: DELETE FROM xml_accesssubtree WHERE docid = '"
     					+ docId + "'");
     			stmt.execute("DELETE FROM xml_accesssubtree WHERE docid = '" + docId + "'");
     			logMetacat.debug("running sql: " + sql);
     			pstmt.execute();
     		} catch (SQLException e) {
     			throw new SAXException(e.getMessage());
     		} finally {
     			try {
     				stmt.close();
     				pstmt.close();
     			} catch (SQLException ee) {
     				throw new SAXException(ee.getMessage());
+    			}

Project

General

Profile

Metacat

Revision 6606

Added by ben leinfelder about 13 years ago