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

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

@@ -8 +8 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -271 +272 @@
     { 
     int sqlId = -1;
-    
     // check if this node is in the database already
     GS3SQLSelect select = new GS3SQLSelect("filegroups");
@@ -281 +281 @@
     select.setWhere(where);
     
-    connection.execute(select.toString());
-    
-    ResultSet selectResult = connection.getResultSet();
+    ResultSet results = null;
+    Statement statement = null;
     
     try {
-        if (selectResult == null ||
-        !selectResult.first()) {
+        statement = connection.createStatement();
+        results = statement.executeQuery(select.toString());
+        if (!results.first()) {
         GS3SQLInsert insert = new GS3SQLInsert("filegroups");
         
@@ -295 +295 @@
         insert.addValue("ParentType", parentIsSection ? SECTION_PARENT : GROUP_PARENT);
         
-        if (!connection.execute(insert.toString())) {
-            return false;
-        }
+        statement.execute(insert.toString());
         }
         else {
@@ -304 +302 @@
     }
     catch (SQLException ex){
-        System.err.println(ex);
+        System.err.println("METSFileGroup.writeSQL(): "+ex);
         return false;
     }
     
     // get the filegroup reference now
-    connection.execute(select.toString());
-    
     try {
-        ResultSet results = connection.getResultSet();
-        if (results == null) {
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+        sqlId = results.getInt("FileGroupRef");
+        } else {
+        statement.close();
         return false;
         }
-        results.first();
-        sqlId = results.getInt("FileGroupRef");
-    }
-    catch (SQLException sqlex) {
-        System.out.println(sqlex);
+        statement.close();
+    } catch (SQLException sqlex) {
+        System.err.println("METSFileGroup.writeSQL(): "+sqlex);
         return false;
     }
-    
     // iterate over the child groups
     Iterator childIter = childGroups.iterator();
@@ -330 +326 @@
         
         if (!fileGroup.writeSQL(document, Integer.toString(sqlId), false, connection)){
+        System.err.println("METSFileGroup.writeSQL(): Couldn't write FileGroup");
         return false;
         }
@@ -337 +334 @@
     childIter = children.iterator();
     while (childIter.hasNext()){
-        METSFile file = (METSFile) childIter.next();
-        
+        METSFile file = (METSFile) childIter.next();        
         if (!file.writeSQL(sqlId, connection)){
+        System.err.println("METSFileGroup.writeSQL(): Couldn't write File");
         return false;
         }
@@ -371 +368 @@
         select.setWhere(where);
         
-        connection.execute(select.toString());
+        Statement statement = connection.createStatement();
         
         // parse through the child groups
-        ResultSet childSet = connection.getResultSet();
+        ResultSet childSet = statement.executeQuery(select.toString());
         if (childSet.first()) {
         do {
@@ -384 +381 @@
         while (childSet.next());
         }
-        
         // now scan for file members
         select = new GS3SQLSelect("files");
         select.addField("*");
-        whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(groupRef),
-                        GS3SQLField.INTEGER_TYPE);
+        whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(groupRef), GS3SQLField.INTEGER_TYPE);
         where = new GS3SQLWhere(whereItem);
         select.setWhere(where);
-        connection.execute(select.toString());
-        
-        ResultSet childFileSet = connection.getResultSet();
-        if (childFileSet != null && childFileSet.first()) {
+        ResultSet childFileSet = statement.executeQuery(select.toString());
+        if (childFileSet.first()) {
         do {
             METSFile file = METSFile.readSQL(connection, childFileSet);
@@ -404 +397 @@
         while (childFileSet.next());
         }
-        
+        statement.close();
         return group;
     }
     catch (SQLException sqlEx){
-        System.out.println(sqlEx);
+        System.err.println("METSFileGroup.readSQL(): "+sqlEx);
         System.exit(1);
     }