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

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/AbstractHierarchyNode.java

@@ -7 +7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
@@ -273 +274 @@
     GS3SQLInsert insert;
 
+    Statement statement;
+    // can we connect to the database?
+    try {
+    statement = connection.createStatement();
+    } catch (SQLException e) {
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+    return false;
+    }
+    
     // Get own full id
     String fullId = this.id.length() > 0 ? this.prefix+"."+this.id : this.prefix;
@@ -283 +293 @@
     select.setWhere(where);
 
-    connection.execute(select.toString());
 
     // update or insert the classifier as required
     try {
-      ResultSet results = connection.getResultSet();
-      if (results != null && results.first()) {
+      ResultSet results = statement.executeQuery(select.toString());
+      if (results.first()) {
     GS3SQLUpdate update = new GS3SQLUpdate("classifiers");
     update.setWhere(where);
@@ -313 +322 @@
 
     action = insert;
+    classifyRef = -1;
       }
       action.addValue("ClassifyID", fullId);
@@ -331 +341 @@
       action.addValue("NumLeafDocs", Integer.toString(this.noOfLeafDocs()), GS3SQLField.INTEGER_TYPE);
 
-      connection.execute(action.toString());
-      classifyRef = -1;
+      statement.execute(action.toString());
     }
     catch (SQLException sqlEx) {
       if (action == null) {
-    System.err.println(sqlEx);
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx);
       }
       else {
-    System.err.println(sqlEx + " " + action.toString());
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx + " " + action.toString());
       }
       return false;
@@ -347 +356 @@
     // insert action above)...
     if (classifyRef == -1) {
-      connection.execute(select.toString());
-      
       try {
-    ResultSet results = connection.getResultSet();
-    if (results == null || !results.first()) {
-      return false;
+        ResultSet results = statement.executeQuery(select.toString());
+    if (!results.first()) {
+        statement.close();
+        return false;
     }
     
     classifyRef = results.getInt("ClassifyRef");
+    
       }
       catch (SQLException sqlEx) {
-    System.err.println(sqlEx);
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+sqlEx);
     return false;
       }
@@ -368 +377 @@
       GS3SQLDelete delete = new GS3SQLDelete("classdocuments");
       delete.setWhere(where);
-
-      connection.execute(delete.toString());
-    }
-
+      try {
+      statement.execute(delete.toString());
+      } catch (SQLException e) {
+      System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+      return false;
+      }
+    }
+    
     // post the child nodes...
     Iterator iterator = this.childNodes.iterator();
@@ -379 +392 @@
       if (!childNode.writeSQL(connection)) {
       System.out.println("Failed to write " );
-    return false;
+      return false;
       }
     }
@@ -394 +407 @@
       insert.addValue("DocID", docId.toString());
       insert.addValue("DocOrder", Integer.toString(order), GS3SQLField.INTEGER_TYPE);
-
-      connection.execute(insert.toString());
-
+      try {
+      statement.execute(insert.toString());
+      } catch (SQLException e) {
+      System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+      return false;
+      }
       order ++;
     }
+    // close the statment
+    try {
+    statement.close();
+    } catch (SQLException e) {
+    System.err.println("AbstractHierarchyNode.writeSQL(): "+e);
+    }
+
     return true;
   }