Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDivision.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDivision.java (modified) (10 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSDivision.java

@@ -10 +10 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -475 +476 @@
     select.setWhere(where);
     
-    connection.execute(select.toString());
+    Statement statement = null;
+    ResultSet resultSet = null;
     
     // Do the actual writing
     GS3SQLAction action;
     
-    ResultSet resultSet = connection.getResultSet();
     try {
-        if (resultSet == null ||
-        !resultSet.first()) {
-        resultSet = null;
+        statement = connection.createStatement();
+        resultSet = statement.executeQuery(select.toString());
+        if (!resultSet.first()) {
         
         GS3SQLInsert insert = new GS3SQLInsert("divisions");
@@ -499 +500 @@
         GS3SQLUpdate update = new GS3SQLUpdate("divisions");
         GS3SQLWhere  updateWhere = 
-            new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), 
-                            GS3SQLField.INTEGER_TYPE));
+            new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE));
         update.setWhere(updateWhere);
         action = update;
@@ -515 +515 @@
     action.addValue("UserLabel", this.userLabel);
     
-    if (!connection.execute(action.toString())){
+    try {
+        statement.execute(action.toString());
+    } catch (SQLException e) {
+        System.err.println("METSDivision.writeSQL(): "+e);
         return false;
     }
     
     // if doing a fresh item, get the new structure reference...
-    if (resultSet == null){
+    if (sqlRef == -1){
         // get the new structure reference
-        connection.execute(select.toString());
-        
-        // get the sql reference for the division
         try {
         // read in the structure reference
-        resultSet = connection.getResultSet();
-        if (resultSet == null) {
-            return false;
+        resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+            sqlRef = resultSet.getInt("DivisionRef");
         }
-        resultSet.first();
-        sqlRef = resultSet.getInt("DivisionRef");
-        resultSet.close();
-        resultSet = null;
         }
         catch (SQLException sqlex) {
-        System.err.println("Unable to retrieve reference for Division " + sqlex);
+        System.err.println("METSDIVISION.writeSQL(): Unable to retrieve reference for Division " + sqlex);
         return false;
         }
     }
-    // close the open resultSet, as we don't need it any longer...
-    else {
-        try {
-        resultSet.close();
-        }
-        catch (SQLException sql) {
-        System.err.println(sql + " " + select.toString());
-        }
-    }
     
     // delete the old file/metadata references
-    GS3SQLWhere referenceWhere = 
-        new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), 
-                        GS3SQLField.INTEGER_TYPE));
-    
-    GS3SQLDelete delete = new GS3SQLDelete("divisionfilerefs");
-    delete.setWhere(referenceWhere);
-    connection.execute(delete.toString());
-    
-    delete = new GS3SQLDelete("divisionmetarefs");
-    delete.setWhere(referenceWhere);
-    connection.execute(delete.toString());
-    
-    // write the new file references
-    if (this.fileRefs.size() > 0){
-        Iterator iterator = this.fileRefs.iterator();
-        
-        while (iterator.hasNext()) {
-        GS3SQLInsert fileinsert = new GS3SQLInsert("divisionfilerefs");
-        fileinsert.addValue("DocID", docId.toString());
-        fileinsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
-        fileinsert.addValue("DivisionType", "Group");
-        fileinsert.addValue("FileID", iterator.next().toString());
-        connection.execute(fileinsert.toString());
-        }
-    }
-    
-    // write the metadata references
-    if (this.metadataRefs.size() > 0){
-        Iterator iterator = this.metadataRefs.iterator();
-        
-        while (iterator.hasNext()) {
-        GS3SQLInsert metainsert = new GS3SQLInsert("divisionmetarefs");
-        metainsert.addValue("DocID", docId.toString());
-        metainsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
-        metainsert.addValue("DivisionType", "Group");
-        metainsert.addValue("MetaID", iterator.next().toString());
-        connection.execute(metainsert.toString());
-        }
-    }
-    
+    try {
+        GS3SQLWhere referenceWhere = 
+        new GS3SQLWhere(new GS3SQLWhereItem("DivisionRef", "=", Integer.toString(sqlRef), 
+                            GS3SQLField.INTEGER_TYPE));
+        
+        GS3SQLDelete delete = new GS3SQLDelete("divisionfilerefs");
+        delete.setWhere(referenceWhere);
+        
+        statement.execute(delete.toString());
+        
+        delete = new GS3SQLDelete("divisionmetarefs");
+        delete.setWhere(referenceWhere);
+        statement.execute(delete.toString());
+    
+        // write the new file references
+        if (this.fileRefs.size() > 0){
+        Iterator iterator = this.fileRefs.iterator();
+        
+        while (iterator.hasNext()) {
+            GS3SQLInsert fileinsert = new GS3SQLInsert("divisionfilerefs");
+            fileinsert.addValue("DocID", docId.toString());
+            fileinsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+            fileinsert.addValue("DivisionType", "Group");
+            fileinsert.addValue("FileID", iterator.next().toString());
+            statement.execute(fileinsert.toString());
+        }
+        }
+        
+        // write the metadata references
+        if (this.metadataRefs.size() > 0){
+        Iterator iterator = this.metadataRefs.iterator();
+        
+        while (iterator.hasNext()) {
+            GS3SQLInsert metainsert = new GS3SQLInsert("divisionmetarefs");
+            metainsert.addValue("DocID", docId.toString());
+            metainsert.addValue("DivisionRef", Integer.toString(sqlRef), GS3SQLField.INTEGER_TYPE);
+            metainsert.addValue("DivisionType", "Group");
+            metainsert.addValue("MetaID", iterator.next().toString());
+            statement.execute(metainsert.toString());
+        }
+        }
+        statement.close();
+    } catch (SQLException e) {
+        System.err.println("METSDIVISION.writeSQL(): "+e);
+        return false;
+    }
     // write out any children in turn
     Iterator groups = this.children.values().iterator();
@@ -633 +626 @@
         select.setWhere(where);
 
-        connection.execute(select.toString());
+        Statement statement = connection.createStatement();
+        ResultSet childSet = statement.executeQuery(select.toString());
       
         // circulate through to obtain further children
-        ResultSet childSet = connection.getResultSet();
         if (childSet.first())
         {
@@ -645 +638 @@
             while (childSet.next());
         }
-
         select = new GS3SQLSelect("divisionfilerefs");
         select.addField("*");
@@ -652 +644 @@
         select.setWhere(where);
 
-        connection.execute(select.toString());
-
-        ResultSet fileSet = connection.getResultSet();
-        if (fileSet != null && fileSet.first()){
+        ResultSet fileSet = statement.executeQuery(select.toString());
+
+        if (fileSet.first()){
         do {
             String reference = fileSet.getString("FileID");
@@ -662 +653 @@
         while (fileSet.next());  
         }
-
+        
         select = new GS3SQLSelect("divisionmetarefs");
         select.addField("*");
@@ -669 +660 @@
         select.setWhere(where);
 
-        connection.execute(select.toString());
-
-        ResultSet metaSet = connection.getResultSet();
-        if (metaSet != null && metaSet.first()){
+        ResultSet metaSet = statement.executeQuery(select.toString());
+
+        if (metaSet.first()){
         do {
             String reference = metaSet.getString("MetaID");
@@ -680 +670 @@
         }
         
+        statement.close();
         return division;
     }