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

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

@@ -9 +9 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.xml.sax.XMLReader;
@@ -189 +190 @@
     select.setWhere(where);
 
-    connection.execute(select.toString());
 
     try {
-      ResultSet results = connection.getResultSet();
-      if (results != null && results.first()) {
+      Statement statement = connection.createStatement();
+      ResultSet results = statement.executeQuery(select.toString());
+      if (results.first()) {
     GS3SQLUpdate update = new GS3SQLUpdate("classifiers");
     update.setWhere(where);
@@ -206 +207 @@
 
     action = insert;
+    classifyRef = -1;
       }
       action.addValue("ClassifyID", label);
@@ -213 +215 @@
       action.addValue("NumLeafDocs", Integer.toString(noOfLeafDocs), GS3SQLField.INTEGER_TYPE);
 
-      connection.execute(action.toString());
-      classifyRef = -1;
-    }
-    catch (SQLException sqlEx) {
-      System.err.println(sqlEx);
-      return -1;
-    }
-
-    // get the ClassifyRef if we don't already have it (have done a
-    // insert action above)...
-    if (classifyRef == -1) {
-      connection.execute(select.toString());
-      
-      try {
-    ResultSet results = connection.getResultSet();
-    if (results == null || !results.first()) {
+      // do the update/insert
+      statement.execute(action.toString());
+
+
+      // get the ClassifyRef if we don't already have it (have done a
+      // insert action above)...
+      if (classifyRef == -1) {
+    results = statement.executeQuery(select.toString());
+    if (!results.first()) {
       return -1;
     }
@@ -234 +229 @@
     classifyRef = results.getInt("ClassifyRef");
       }
-      catch (SQLException sqlEx) {
-    System.err.println(sqlEx);
+      
+      statement.close();
+    }  catch (SQLException sqlEx) {
+    System.err.println("AZListClassifier.writeSQLClassifyNode(): "+sqlEx);
     return -1;
-      }
-    }
+    }
+  
 
     return classifyRef;
@@ -274 +271 @@
     }
 
+    try {
+    Statement statement = connection.createStatement();
+    
     List children;
     
@@ -292 +292 @@
         Iterator iterator = childDocs.iterator();
     int childOrder = 1;
+    //St
     while (iterator.hasNext()) {
       AZDocumentItem documentItem = (AZDocumentItem) iterator.next();
@@ -301 +302 @@
       insert.addValue("DocOrder", Integer.toString(childOrder), GS3SQLField.INTEGER_TYPE);    
 
-      connection.execute(insert.toString());
+      statement.execute(insert.toString());
 
       childOrder ++;
@@ -310 +311 @@
     }
 
+   
     /*
     else {
@@ -318 +320 @@
       delete.setWhere(where);
 
-      connection.execute(delete.toString());
+      statement.execute(delete.toString());
     }
 
@@ -331 +333 @@
     }
     */
+    statement.close();
+    } catch (SQLException e) {
+    System.err.println("AZListClassifier.writeSQL(): "+e);
+    return false;
+    }
 
     return true;