Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/metadata/METSStructure.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/METSStructure.java (modified) (7 diffs)

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

@@ -10 +10 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -180 +181 @@
     { 
     int sqlRef = -1;
-    ResultSet results;
-
+    ResultSet results = null;
+    Statement statement = null;
+    
     // Prepare query to see if this structure has already been written
     GS3SQLSelect select = new GS3SQLSelect("structure");
@@ -190 +192 @@
     where.add(item);
     select.setWhere(where);
-
+    
     // attempt to execute the query & get the current structure's reference
     try {
-        connection.execute(select.toString());
-        results = connection.getResultSet();
-        if (results != null &&
-        results.first()){
+        statement = connection.createStatement();
+        results = statement.executeQuery(select.toString());
+        if (results.first()){
         sqlRef = results.getInt("structureRef");
         }
-        else { 
-        results = null;
-        }
-        
-        if (results != null) {
-        results.close();
-        }
     }
     catch (SQLException sqlEx) {
-        System.err.print(sqlEx);
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
         return false;
     }
     
     // insert a new structure if it wasn't there previously
-    if (results == null) {
+    if (sqlRef == -1) {
         GS3SQLInsert insert = new GS3SQLInsert("structure");
         insert.addValue("DocID", document.getID().toString());
@@ -220 +214 @@
         insert.addValue("Label", this.label);
         
-        if (!connection.execute(insert.toString())) {
+        try {
+        statement.execute(insert.toString());
+        
+        // get the new structure reference by re-running the original select object
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+            sqlRef = results.getInt("StructureRef");
+        } 
+        } catch (SQLException sqlEx) {
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
         return false;
         }
         
-        // get the new structure reference by re-running the original select object
-        connection.execute(select.toString());
-
-        try {
-        results = connection.getResultSet();
-        results.first();
-        sqlRef = results.getInt("StructureRef");
-        }
-        catch (SQLException sql) {
-        System.err.println(sql);
-        return false;
-        }
     }
     else {
@@ -244 +235 @@
         update.addValue("Label", this.label);
         
-        connection.execute(update.toString());
-    }
-    
+        try {
+        statement.execute(update.toString());
+        } catch (SQLException sqlEx) {
+        System.err.print("METSStructure.writeSQL(): "+sqlEx);
+        return false;
+        }
+    }
+    
+    // close the statement
+    try {
+        statement.close();
+    } catch (SQLException e) {
+        System.err.println("METSStructure.writeSQL(): "+e);
+    }
     // write out the child groups (Divisions) now...    
     Iterator groups = this.children.values().iterator();
@@ -296 +298 @@
         select.setWhere(where);
 
-        connection.execute(select.toString());
+        Statement statement = connection.createStatement();
+        ResultSet divisionSet = statement.executeQuery(select.toString());
 
         // parse through the divisions
-        ResultSet divisionSet = connection.getResultSet();
-        if (divisionSet != null && divisionSet.first()) {
+        if (divisionSet.first()) {
         do {
             METSDivision division = METSDivision.readSQL(connection, divisionSet);
@@ -309 +311 @@
         while (divisionSet.next());
         }
-
+        statement.close();
         return structure;
     }
-    catch (SQLException sqlEx)
-        { System.out.println(sqlEx + " " + select.toString());
+    catch (SQLException sqlEx) {
+        System.err.println("METSStructure.readSQL(): "+ sqlEx + " " + select.toString());
         System.exit(1);
-        }
+    }
     return null;
     }