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

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

@@ -9 +9 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -281 +282 @@
     }
     
+    Statement statement = null;
+    ResultSet results = null;
     try {
+        statement = connection.createStatement();
         if (this.id == null) {
         GS3SQLSelect select = new GS3SQLSelect("namespaces");
         select.setWhere(new GS3SQLWhere(new GS3SQLWhereItem("MetadataRef", "=", Integer.toString(parentId), GS3SQLField.INTEGER_TYPE)));
         select.addField("NamespaceRef");
-        connection.execute(select.toString());
-        
-        ResultSet results = connection.getResultSet();
-        results.first();
-        sqlId = Integer.toString(results.getInt("NamespaceRef"));
+        results = statement.executeQuery(select.toString());
+        if (results.first()) {
+            sqlId = Integer.toString(results.getInt("NamespaceRef"));
+        } else {
+            statement.close();
+            return false;
+        }
         }
         else {
@@ -300 +306 @@
         GS3SQLWhere where = new GS3SQLWhere(new GS3SQLWhereItem("NamespaceRef", "=", sqlId, GS3SQLField.INTEGER_TYPE));
         delete.setWhere(where);
-        connection.execute(delete.toString());
+        statement.execute(delete.toString());
         
         // write out the metadata for this namespace
@@ -316 +322 @@
             insert.addValue("Label", thisKey);
             insert.addValue("Value", value);
-            connection.execute(insert.toString());
-        }
-        }
+            statement.execute(insert.toString());
+        }
+        }
+        statement.close();
     }
     catch (SQLException sql) {
-        System.out.println(sql);
+        System.out.println("SimpleNamespace.writeSQL(): "+sql);
     }
     return true;