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

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/doctypes/DocumentList.java

@@ -13 +13 @@
 
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.ResultSet;
 
@@ -68 +69 @@
     select.setWhere(where);
 
-    this.connection.execute(select.toString());
-
-    ResultSet results = this.connection.getResultSet();
-    if (results != null) {
-      select = new GS3SQLSelect("filegroups");
-      select.addField("DocID");
-      select.setDistinct(true);
-      
-      where = new GS3SQLWhere();
-      where.setCondition(GS3SQLWhere.OR_CONDITION);
-
-      GS3SQLWhereItem whereItem = null;
-
-      try {
-    results.first();
+    try {
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(select.toString());
+    
+    select = new GS3SQLSelect("filegroups");
+    select.addField("DocID");
+    select.setDistinct(true);
+      
+    where = new GS3SQLWhere();
+    where.setCondition(GS3SQLWhere.OR_CONDITION);
+    
+    GS3SQLWhereItem whereItem = null;
+
+        results.first();
     do {
       int fileGroupRef = results.getInt("FileGroupRef");
@@ -90 +90 @@
     while (results.next());
     select.setWhere(where);
-    results.close();
-    
-    this.connection.execute(select.toString());
-    
-    results = this.connection.getResultSet();
+    
+    results = statement.executeQuery(select.toString());
+    
     results.first();
     do {
@@ -100 +98 @@
       reply.add(docId);
     } while (results.next());
-      } 
-      catch (SQLException sqlEx)
-      { System.err.println(sqlEx);
-      }
-    }
+    statement.close();
+    }
+    catch (SQLException sqlEx) {
+    System.err.println("DocumentList.getDocumentIdsWithFile(): "+sqlEx);
+    }
+    
     return reply;
   }
@@ -173 +172 @@
   }
 
-  private List findDocumentIdsUsingFileQuery(String query)
-  { this.connection.execute(query);
-
-    try {
-
-      ResultSet results = this.connection.getResultSet();
-      if (results == null ||
-      !results.first()) {
-    return null;
-      }
+    private List findDocumentIdsUsingFileQuery(String query) {
+    
+    try {
+    
+    Statement statement = connection.createStatement();
+    ResultSet results = statement.executeQuery(query);
+
+    if (!results.first()) {
+        statement.close();
+        return null;
+    }
       
       // get a list of group ids first and turn it into a query on filegroups
@@ -207 +207 @@
       // structures...recreating new filegroup queries as necessary
       while (queryBuffer.length() > 0) {
-    connection.execute(queryBuffer.toString());
-    
-    results = this.connection.getResultSet();
-    if (results == null || !results.first()) {
-      return null;
+    results = statement.executeQuery(queryBuffer.toString());
+    
+    if (!results.first()) {
+        statement.close();
+        return null;
     }
     
@@ -256 +256 @@
       
       // execute the division query
-      this.connection.execute(queryBuffer.toString());
-      
-      results = this.connection.getResultSet();
-      if (results == null ||
-      !results.first()) {
-    return null;
+      results = statement.executeQuery(queryBuffer.toString());
+      
+      if (!results.first()) {
+      statement.close();
+      return null;
       }
 
@@ -268 +267 @@
     reply.add(results.getString("DocID"));
       } while (results.next());
-
+      
+      statement.close();
       return reply;
     }
     catch (SQLException ex) {
-      System.err.println(ex);
+      System.err.println("DocumentList.findDocumentIdsUsingFileQuery()"+ ex);
     }
     return null;
@@ -454 +454 @@
     select.addField("*");
     
-    ResultSet documents;
     try {
-      connection.execute(select.toString());
-      documents = connection.getResultSet();
-
-      if (documents.first())
-      { do
-    { DocumentInterface document = AbstractDocument.readSQL(connection, documents);
-          list.addDocument(document);
-    }
-    while (documents.next());
-      }
-    }
-    catch (java.sql.SQLException ex)
-    { System.out.println(ex);
-      return null;
+    Statement statement = connection.createStatement();
+    ResultSet documents = statement.executeQuery(select.toString());
+    if (documents.first()) { 
+        do {
+        DocumentInterface document = AbstractDocument.readSQL(connection, documents);
+        list.addDocument(document);
+        }
+        while (documents.next());
+    }
+    statement.close();
+    }
+    catch (java.sql.SQLException ex) {
+    System.out.println("DocumentList.writeSQLDocuments(): "+ex);
+    return null;
     }
 
@@ -487 +486 @@
 {
   private boolean hasNext;
+  private Statement statement;
   private ResultSet resultSet;
   private GS3SQLConnection connection;
@@ -498 +498 @@
 
     try {
-      connection.execute(select.toString());
-      this.resultSet = connection.getResultSet();
+    this.statement = connection.createStatement();
+      this.resultSet = statement.executeQuery(select.toString());
       this.hasNext = this.resultSet.first();
     } catch (SQLException ex) {
+      System.err.println("DocumentListIterator(): "+ex);
       this.hasNext = false;
     }
@@ -520 +521 @@
 
       if (!this.hasNext) {
-    this.resultSet.close(); // be a good citizen & close used result sets
+      this.statement.close(); // be a good citizen & close used statement 
       }
     } catch (SQLException ex) {
+    System.err.println("DocumentList.iterator.next(): "+ex);
       this.hasNext = false;
     }