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

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

@@ -11 +11 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.w3c.dom.Document;
@@ -201 +202 @@
     where.add(whereItem);
     select.setWhere(where);
-    connection.execute(select.toString());
+
+    Statement statement = null;
     
     // if not, then make an insert action
     try {
-        ResultSet results = connection.getResultSet();
-        if (results == null ||
-        !results.first()){
+        statement = connection.createStatement();
+        ResultSet results = statement.executeQuery(select.toString());
+        if (!results.first()){
         GS3SQLInsert insert = new GS3SQLInsert("files");
         
@@ -223 +225 @@
     }
     catch (SQLException ex){
-        System.err.println(ex);
+        System.err.println("METSFile.writeSQL(): "+ex);
         return false;
     }
@@ -230 +232 @@
     action.addValue("MIMEType", this.MIMEType);
     
-    return connection.execute(action.toString());
+    try {
+        statement.execute(action.toString());
+        statement.close();
+        
+    } catch (SQLException e) {
+        System.err.println("METSFile.writeSQL():"+e);
+        return false;
+    }
+    return true;
     }
     
@@ -248 +258 @@
     }
     catch (SQLException ex){
-        System.out.println(ex);
+        System.out.println("METSFile.readSQL(): "+ex);
     }
     catch (java.net.MalformedURLException urlEx){
-        System.out.println(urlEx);
+        System.out.println("METSFile.readSQL(): "+urlEx);
     }
     return null;
@@ -309 +319 @@
     } catch (java.net.MalformedURLException ex) {
         // TODO: raise error
-        System.err.println(ex);
+        System.err.println("METSFile.parse_flocateXML(): "+ex);
     }
     return thisFilePos;