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

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

@@ -16 +16 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -232 +233 @@
         insert.addValue("FileSecID", "test"); // TODO: remove magic string
         
-        if (!connection.execute(insert.toString())){
+        Statement statement = null;
+        try {
+        statement = connection.createStatement();
+        statement.execute(insert.toString());
+        } catch (SQLException e) {
+        System.err.println("METSFileSet.writeSQL(): "+e);
         return false;
         }
@@ -246 +252 @@
         
         try {
-        connection.execute(select.toString());
-        
-        ResultSet set = connection.getResultSet();
-        set.first();
-        int sectionRef = set.getInt("FileSectionRef");
-        
-        this.reference = Integer.toString(sectionRef);
+        ResultSet set = statement.executeQuery(select.toString());
+        if (set.first()) {
+            int sectionRef = set.getInt("FileSectionRef");
+            
+            this.reference = Integer.toString(sectionRef);
+        }
+        statement.close();
         }
         catch (SQLException ex){
-        System.out.println(ex);
+        System.out.println("METSFileSet.writeSQL(): "+ex);
         return false;
         }
     }
     
+    if (this.reference == null) {
+        return false;
+    }
     // write out the children
     while (groups.hasNext()){
@@ -281 +290 @@
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("DocID", "=", document.getID().toString());
     select.setWhere(new GS3SQLWhere(whereItem));
-    connection.execute(select.toString());
+
+    Statement statement = null;
     
     // Get the identifier for this file set, etc.
-    ResultSet sections = connection.getResultSet();
-    int fileSetRef;
+    int fileSetRef = -1;
     try {
-        sections.first();
-        fileSetRef     = sections.getInt("FileSectionRef");
-        set.reference = Integer.toString(fileSetRef);
+        statement = connection.createStatement();
+        ResultSet sections = statement.executeQuery(select.toString());
+        if (sections.first()) {
+        fileSetRef = sections.getInt("FileSectionRef");
+        set.reference = Integer.toString(fileSetRef);
+        } else {
+        statement.close();
+        return null;
+        }
+        
     }
     catch (SQLException ex){
-        System.out.println(ex);
+        System.err.println("METSFileSet.readSQL() "+ex);
         return null;
     }
-    
     // Get child file groups
     select = new GS3SQLSelect("filegroups");
@@ -307 +322 @@
     where.add(whereItem);
     select.setWhere(where);
-    connection.execute(select.toString());
-    
     // start going through the matching file groups
     try {
-        ResultSet resultSet = connection.getResultSet();
-        resultSet.first();
-        do {
-        METSFileGroup filegroup = METSFileGroup.readSQL(document, connection, resultSet);
-        if (filegroup != null) {
-            set.addGroup(filegroup);
-        }
-        } while (resultSet.next());
+        ResultSet resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        do {
+            METSFileGroup filegroup = METSFileGroup.readSQL(document, connection, resultSet);
+            if (filegroup != null) {
+            set.addGroup(filegroup);
+            }
+        } while (resultSet.next());
+        }
+        statement.close();
     }
     catch (SQLException sqlEx) {
-        System.out.println(sqlEx);
+        System.out.println("METSFileSet.readSQL(): "+sqlEx);
         System.exit(1);
     }
-    
     return set;
     }