Changeset 6018

Timestamp:

2003-11-27T12:33:18+13:00 (20 years ago)

Author:

cs025

Message:

Extensions to the document creation calls

Location:

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

Files:

• AbstractDocument.java (modified) (1 diff)
• DocumentFactory.java (modified) (2 diffs)
• DocumentList.java (modified) (6 diffs)

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

@@ -89 +89 @@
   public void setID(DocumentID id)
   { this.id = id;
+    this.isModified = true;
   }
 

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

@@ -1 +1 @@
 package org.greenstone.gsdl3.gs3build.doctypes;
+
+import java.sql.SQLException;
+import java.sql.ResultSet;
+
+import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
 
 public class DocumentFactory
@@ -16 +21 @@
     return null;
   }
+
+  public static DocumentInterface readSQLDocument(GS3SQLConnection connection, DocumentID id)
+  {
+    String query = "SELECT * FROM document WHERE DocID="+id.toString()+";";
+    connection.execute(query);
+
+    try {
+      ResultSet results = connection.getResultSet();
+      if (results != null && results.first()) {
+    return AbstractDocument.readSQL(connection, results);
+      }
+    }
+    catch (SQLException sqlEx) {
+      System.err.println(sqlEx);
+    }
+    return null;
+  }
 }

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

@@ -50 +50 @@
     this.count = 0;
     this.connection = connection;
+  }
+
+
+  public List getDocumentIdsWithFile(URL fileLocation)
+  { List reply = new ArrayList();
+
+    GS3SQLSelect select = new GS3SQLSelect("files");
+    select.addField("*");
+    GS3SQLWhere  where  = new GS3SQLWhere(new GS3SQLWhereItem("FileLocation", "=", fileLocation.toString()));
+    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();
+    do {
+      int fileGroupRef = results.getInt("FileGroupRef");
+      whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(fileGroupRef), GS3SQLField.INTEGER_TYPE);
+      where.add(whereItem);
+    }
+    while (results.next());
+    select.setWhere(where);
+    results.close();
+    
+    this.connection.execute(select.toString());
+    
+    results = this.connection.getResultSet();
+    results.first();
+    do {
+      String docId = results.getString("DocID");
+      reply.add(docId);
+    } while (results.next());
+      } 
+      catch (SQLException sqlEx)
+      { System.err.println(sqlEx);
+      }
+    }
+    return reply;
   }
 
@@ -161 +210 @@
 
   /**
+   *  Cache a document into the cache, without writing it to the database.
+   *  Used directly by other parts of DocumentList when they know that the
+   *  document is in the database already, or they are going to write it
+   *  themselves...
+   *
+   *  @param <code>DocumentInterface</code> the document to cache
+   */
+  private void cacheDocument(DocumentInterface document)
+  { // increase cache size, etc. as necessary
+    if (this.used == this.size) {
+      if (this.size >= maxSize) {
+    for (int i = 0; i < this.size - 1; i ++) {
+      this.list[i] = this.list[i+1];
+    }
+    this.used --;
+      }
+      else {
+    this.ensureSize((this.size * 2) > maxSize ? maxSize : (this.size * 2));
+      }
+    }
+    
+    // insert the document itself
+    this.list[this.used] = document;    
+  }
+
+  /**
    *  Write the document into the document list (cache) and the database.
    *
@@ -166 +241 @@
    */
   public void addDocument(DocumentInterface document)
-  { // increase cache size, etc. as necessary
-    if (this.used == this.size) {
-      if (this.size >= maxSize) {
-    for (int i = 0; i < this.size - 1; i ++) {
-      this.list[i] = this.list[i+1];
-    }
-    this.used --;
-      }
-      else {
-    this.ensureSize((this.size * 2) > maxSize ? maxSize : (this.size * 2));
-      }
-    }
-    
-    // insert the document itself
-    this.list[this.used] = document;
+  { // first cache it...
+    this.cacheDocument(document);
 
     // set the document identifier, if not already set
@@ -188 +250 @@
     }
 
-    // add to the database as well
-    document.getSQLWriter().writeDocument(document, this.connection);
+    // add to the database as well, if it is modified...
+    if (document.isModified()) {
+      document.getSQLWriter().writeDocument(document, this.connection);
+    }
 
     // Remember that we've used one more item from the cache.
@@ -232 +296 @@
   }
 
+  public DocumentInterface getDocument(DocumentID documentId)
+  {
+    DocumentInterface document = DocumentFactory.readSQLDocument(connection, documentId);
+    if (document != null) {
+      this.cacheDocument(document);
+    }
+    return document;
+  }
+
   /**
   public DocumentID getDocumentID(int index)
@@ -358 +431 @@
   { throw new UnsupportedOperationException("DocumentList does not support iterator removal of documents");
   }
-
-  public List getDocumentIdsWithFile(URL fileLocation)
-  { List reply = new ArrayList();
-
-    GS3SQLSelect select = new GS3SQLSelect("files");
-    select.addField("*");
-    GS3SQLWhere  where  = new GS3SQLWhere(new GS3SQLWhereItem("FileLocation", "=", fileLocation.toString()));
-    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();
-    do {
-      int fileGroupRef = results.getInt("FileGroupRef");
-      whereItem = new GS3SQLWhereItem("FileGroupRef", "=", Integer.toString(fileGroupRef), GS3SQLField.INTEGER_TYPE);
-      where.add(whereItem);
-    }
-    while (results.next());
-    select.setWhere(where);
-    results.close();
-    
-    this.connection.execute(select.toString());
-    
-    results = this.connection.getResultSet();
-    results.first();
-    do {
-      String docId = results.getString("DocID");
-      reply.add(docId);
-    } while (results.next());
-      } 
-      catch (SQLException sqlEx)
-      { System.err.println(sqlEx);
-      }
-    }
-    return reply;
-  }
 }