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

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

@@ -9 +9 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -236 +237 @@
     GS3SQLWhereItem whereItem = new GS3SQLWhereItem("DocID", "=", document.getID().toString());
     select.setWhere(new GS3SQLWhere(whereItem));
-    connection.execute(select.toString());
-    
+
     // start going through the matching metadata blocks
     try {
-        ResultSet resultSet = connection.getResultSet();
-        resultSet.first();
-        do {
-        METSDescriptive descriptive = METSDescriptive.readSQL(document, connection, resultSet);
-        if (descriptive != null) {
-            set.addDescriptive(descriptive);
-        }
-        else {
-            System.out.println("Null descriptive");
-        }
-        } while (resultSet.next());
+        Statement statement = connection.createStatement();
+        ResultSet resultSet = statement.executeQuery(select.toString());
+        if (resultSet.first()) {
+        do {
+            METSDescriptive descriptive = METSDescriptive.readSQL(document, connection, resultSet);
+            if (descriptive != null) {
+            set.addDescriptive(descriptive);
+            }
+            else {
+            System.out.println("Null descriptive");
+            }
+        } while (resultSet.next());
+        }
+        statement.close();
     }
     catch (SQLException sqlEx) {
-        System.out.println(sqlEx);
+        System.err.println("METSDescriptiveSet.readSQL(): "+sqlEx);
         System.exit(1);
     }
     
+    
     return set;
     }