Changeset 6696

Timestamp:

2004-02-02T16:06:45+13:00 (20 years ago)

Author:

cs025

Message:

Comments, modifications to BuildManager, corrections to CollectionManager
reading of collectConfigure.xml.

Location:

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

Files:

• BuildManager.java (modified) (3 diffs)
• CollectionManager.java (modified) (8 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/BuildManager.java

@@ -101 +101 @@
 
   public void run()
-  {
+  { // Initialise collection manager - note start of build
     this.collectionManager.startBuild();
+
+    // TODO: add expansion (e.g. Zip files)
 
     for (int i = 0; i < this.inputRoots.size(); i ++)
@@ -109 +111 @@
       fileCrawler.crawl();
     }
-    this.indexerManager.indexDocuments();
     this.extractorManager.extractDocuments();
     this.classifierManager.classifyDocuments();
+    this.indexerManager.indexDocuments();
+
+    // TODO: validation phase
 
     if (this.archiveDir != null) {
@@ -120 +124 @@
     this.collectionManager.setCollectionMetadata("gsdl3", "documentCount", Integer.toString(this.docList.getCount()));
 
+    // TODO: write out collection configuration file (service lists, etc.)
+    
     this.collectionManager.endBuild();
   }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/CollectionManager.java

@@ -94 +94 @@
     public ClassifierInterface getClassifier()
     {
+      if (this.type == null) {
+    return null;
+      }
       if (this.type.toLowerCase().equals("hierarchy")) {
     return new HierarchyClassifier(this.file, this.fields, this.sort);
+      }
+      else if (this.type.toLowerCase().equals("azlist")) {
+    return new AZListClassifier(this.fields);
       }
 
@@ -140 +146 @@
     { IndexerInterface indexer = null;
 
+      System.out.println("Index: " + this.type);
+
       if (!indexerMap.containsKey(this.type)) {
     if (this.type.toLowerCase().equals("mg")) {
-      indexer = new MGIndexer();
+      indexer = new MGIndexer();      
     }
     if (indexer != null) {
@@ -165 +173 @@
   
     this.database = GS3SQLConnectionFactory.createConnection(collection);
-    if (this.database != null) {
+    /*    if (this.database != null) {
       this.database.clearCollection(collection);
       this.database = null;
     }
+    */
     if (this.database == null) {
       this.database = GS3SQLConnectionFactory.createConnection("test");
@@ -201 +210 @@
 
     this.buildDocNo = 1;
+  }
+
+  private void configureBrowsers(BuildManager buildManager, Node node)
+  { CollectionClassifier classifier = null;
+
+    NodeList children = node.getChildNodes();
+    for (int c = 0; c < children.getLength(); c ++)
+    { // assume that non-element children are irrelevant
+      if (children.item(c).getNodeType() != org.w3c.dom.Node.ELEMENT_NODE)
+      { continue;
+      }
+
+      String name = children.item(c).getNodeName();
+      System.out.println(name);
+
+      if (name.equals("classifier"))
+      { 
+    NamedNodeMap atts = children.item(c).getAttributes();
+    Node attribute = atts.getNamedItem("type");
+    if (attribute == null) {
+      continue;
+    }
+
+    String type = attribute.getNodeValue();
+    classifier = new CollectionClassifier(type, children.item(c));
+    
+    System.out.println("Found classifier " + type);
+    
+    // attach the classifier
+    ClassifierInterface classify = classifier.getClassifier();
+    buildManager.getClassifierManager().addClassifier(classify);
+      }  
+    }
   }
 
@@ -213 +255 @@
       Document document = builder.parse(collectionConfig);
 
-      CollectionClassifier classifier = null;
-
       Map                  indexerMap = new HashMap();
 
@@ -228 +268 @@
       { // TODO: throw exception
       }
+
+      System.out.println("Configuring collection");
 
       NodeList children = rootElement.getChildNodes();
@@ -239 +281 @@
 
     // the name is a plugin element
-    if (name.equals("index"))
-    { NamedNodeMap atts = children.item(c).getAttributes();
-      Node attribute = atts.getNamedItem("type");
-      String type = attribute.getNodeValue();
-
-      attribute = atts.getNamedItem("name");
-      String indexName = attribute.getNodeValue();
-
-      // create the local indexer representation
-      CollectionIndexer indexer = new CollectionIndexer(type, indexName, children.item(c));
-
-      // prepare it...
-      indexer.prepareIndexer(indexerMap);
+    if (name.equals("search")) {
+      NodeList indexChildren = children.item(c).getChildNodes();
+
+      for (int i = 0; i < indexChildren.getLength(); i ++) {
+        String childName = indexChildren.item(i).getNodeName();
+
+        if (childName.equals("index"))
+        { NamedNodeMap atts = indexChildren.item(i).getAttributes();
+          Node attribute = atts.getNamedItem("type");
+          String type = attribute.getNodeValue();
+
+          attribute = atts.getNamedItem("name");
+          String indexName = attribute.getNodeValue();
+          
+          // create the local indexer representation
+          CollectionIndexer indexer = new CollectionIndexer(type, indexName, indexChildren.item(i));
+         
+          // prepare it...
+          indexer.prepareIndexer(indexerMap);
+        }
+      }
     }
     else if (name.equals("browse"))
-    {
-    }
-    else if (name.equals("classifier"))
-    { 
-      NamedNodeMap atts = children.item(c).getAttributes();
-      Node attribute = atts.getNamedItem("type");
-      String type = attribute.getNodeValue();
-      classifier = new CollectionClassifier(type, children.item(c));
-
-      // attach the classifier
-      ClassifierInterface classify = classifier.getClassifier();
-      buildManager.getClassifierManager().addClassifier(classify);
+    { this.configureBrowsers(buildManager, children.item(c));
     }
     // TODO: other elements - make a factory-method approach here...
@@ -278 +317 @@
 
     // attach the classifier
-    buildManager.getIndexerManager().addIndexer(indexer);   
+    buildManager.addIndexer(indexer);   
       }
     }