Changeset 6010

Timestamp:

2003-11-26T15:35:27+13:00 (20 years ago)

Author:

cs025

Message:

ID changes for documents, and adding DocID to the database tables

Location:

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

Files:

• DocumentFactory.java (modified) (1 diff)
• DocumentIDFactory.java (modified) (1 diff)
• DocumentList.java (modified) (2 diffs)
• DocumentSQLWriter.java (modified) (1 diff)
• IndexDocument.java (modified) (2 diffs)

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

@@ -11 +11 @@
     { return new TextDocument(id);
     }
+    else if (type.equals(IndexDocument.INDEX_DOCUMENT_TYPE))
+    { return new IndexDocument(id);
+    }
     return null;
   }

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

@@ -4 +4 @@
 
 public class DocumentIDFactory implements DocumentIDFactoryInterface
-{   private CollectionManager collection;
+{ private CollectionManager collection;
 
-    public DocumentIDFactory(CollectionManager collection)
-    { this.collection = collection;
-    }
+  public DocumentIDFactory(CollectionManager collection)
+  { this.collection = collection;
+  }
 
-    public DocumentID getNewDocumentID(DocumentInterface document)
-    {   DocumentID id;
+  public DocumentID getNewDocumentID(DocumentInterface document)
+  { DocumentID id;
 
-        String idString = this.collection.getNextDocumentID();
-        id = new DocumentID(idString);
-
-        return id;
-    }
+    String idString = this.collection.getNextDocumentID();
+    id = new DocumentID(idString);
+    
+    return id;
+  }
 }

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

@@ -14 +14 @@
 import java.sql.SQLException;
 import java.sql.ResultSet;
+
+import org.greenstone.gsdl3.gs3build.metadata.METSFileGroup;
 
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
@@ -48 +50 @@
     this.count = 0;
     this.connection = connection;
+  }
+
+  public List findDocumentIdsUsingFile(String fileRef)
+  { 
+    // Get the simple list of file objects & their file group reference
+    String query = "SELECT FileGroupRef FROM files WHERE FileLocation REGEXP \"" + fileRef +"\";";
+    
+    this.connection.execute(query);
+
+    try {
+
+      ResultSet results = this.connection.getResultSet();
+      if (results == null ||
+      !results.first()) {
+    return null;
+      }
+      
+      // get a list of group ids first and turn it into a query on filegroups
+      StringBuffer queryBuffer = new StringBuffer("SELECT * FROM filegroups WHERE ");
+      boolean first = true;
+      
+      do {
+    int groupRef = results.getInt("FileGroupRef");
+    
+    if (first) {
+      first = false;
+    }
+    else {
+      queryBuffer.append(" OR ");
+    }
+    queryBuffer.append("FileGroupRef=" + Integer.toString(groupRef));
+      } while (results.next());
+      queryBuffer.append(";");
+      
+      // make a holder for the actual file section identifiers
+      List divisions = new ArrayList();
+      
+      // expand (or, in fact, contract) through the document
+      // 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;
+    }
+    
+    queryBuffer = new StringBuffer();
+    do {
+      String type = results.getString("ParentType");
+      String parentRef = results.getString("ParentRef");
+      if (type.equals(METSFileGroup.SECTION_PARENT)) {
+        divisions.add(parentRef);
+      }
+      else {
+        if (queryBuffer.length() > 0) {
+          queryBuffer.append(" OR ");
+        }
+        queryBuffer.append("FileGroupRef=" + parentRef);
+      }
+    } while (results.next());
+    
+    if (queryBuffer.length() > 0) {
+      queryBuffer.insert(0, "SELECT * FROM filegroups WHERE ");
+      queryBuffer.append(";");
+    }
+      }
+      
+      // ok, now find all the sections in which we are interested...
+      queryBuffer.setLength(0);
+      queryBuffer.append("SELECT DISTINCT DocID FROM filesection WHERE ");
+      Iterator iterator = divisions.iterator();
+      first = true;
+      
+      while (iterator.hasNext()) {
+    String ref = iterator.next().toString();
+    
+    if (first) {
+      first = false;
+    }
+    else {
+      queryBuffer.append(" OR ");
+    }
+    
+    queryBuffer.append("FileSectionRef="+ref);
+      }
+      queryBuffer.append(";");
+      
+      // execute the division query
+      this.connection.execute(queryBuffer.toString());
+      
+      results = this.connection.getResultSet();
+      if (results == null ||
+      !results.first()) {
+    return null;
+      }
+
+      List reply = new ArrayList();
+      do {
+    reply.add(results.getString("DocID"));
+      } while (results.next());
+
+      return reply;
+    }
+    catch (SQLException ex) {
+      System.err.println(ex);
+    }
+    return null;
   }
 

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

@@ -54 +54 @@
     //     which would suggest placing it in the AbstractDocument or similar
     //     class?!
+    if (document.getDocumentMetadata() == null) {
+      System.out.println("Null metadata document");
+    }
     document.getDocumentMetadata().writeSQL(document, connection);
 

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

@@ -22 +22 @@
 {
   public static final String INDEX_DOCUMENT_TYPE = "GSINDEX";
-  
+
+  public IndexDocument(DocumentID id)
+  { super(id);
+  }
+
   public IndexDocument(URL url)
   { super(url);
@@ -38 +42 @@
   }
 
-  public METSDescriptiveSet getDocumentMetadata()
-  { return null;
+  /**
+   *  Indicate whether this document is indexed.
+   *
+   *  @see: DocumentInterface.isIndexed
+   */
+  public boolean isIndexed()
+  {
+    return true;
   }
+
 }