Changeset 6345

Timestamp:

2004-01-06T11:43:53+13:00 (20 years ago)

Author:

cs025

Message:

Minor changes to build and collection managers

Location:

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

Files:

• BuildManager.java (modified) (2 diffs)
• CollectionManager.java (modified) (10 diffs)

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

@@ -68 +68 @@
     // set up the indexers
     this.indexerManager = new IndexerManager(this.docList);
-    IndexerInterface iface = new MGIndexer();
-    iface.configure(IndexerManager.outputDir, this.outputDir);
-    iface.configure(MGIndexer.MG_INDEX, "document:text");
-    iface.configure(MGIndexer.MG_INDEX, "section:text");
-    this.indexerManager.addIndexer(iface);
+
+    // configure the collection
+    this.collectionManager.configureCollection(this);
 
     // prepare a file crawler on the etc directory, and a crawl observer to respond to
@@ -88 +86 @@
   public ClassifierManager getClassifierManager()
   { return this.classifierManager;
+  }
+
+  public IndexerManager getIndexerManager()
+  { return this.indexerManager;
+  }
+
+  public void addIndexer(IndexerInterface iface)
+  { iface.configure(IndexerManager.outputDir, this.outputDir);
+    this.indexerManager.addIndexer(iface);
   }
 

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

@@ -3 +3 @@
 import java.util.Date;
 import java.util.Calendar;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.GregorianCalendar;
 
 import java.io.File;
 import java.io.IOException;
+
+import java.net.URL;
 
 import javax.xml.parsers.*;
@@ -21 +28 @@
 
 import org.greenstone.gsdl3.gs3build.collection.*;
+import org.greenstone.gsdl3.gs3build.classifier.*;
+import org.greenstone.gsdl3.gs3build.indexers.*;
 
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnectionFactory;
+import org.greenstone.gsdl3.gs3build.util.DOMUtils;
 
 /**
@@ -35 +45 @@
 public class CollectionManager
 {
-  GregorianCalendar  lastBuildDate; // pretty obvious
-  String             adminEmail;    // the email address of the administrator of the
-                                        // collection
-  int                buildDocNo;    // used to generate document identifiers
-  CollectionMetadata metadata;      // collection-level metadata
-  GS3SQLConnection   database;      // the database to store everything in
+  GregorianCalendar  lastBuildDate;  // pretty obvious
+  String             adminEmail;     // the email address of the administrator of the
+                             // collection
+  int                buildDocNo;     // used to generate document identifiers
+  CollectionMetadata metadata;       // collection-level metadata
+  GS3SQLConnection   database;       // the database to store everything in
   String             collectionHome;
+  String             collectionName;
+
+  class CollectionClassifier
+  { File file;
+    String type;
+    List fields;
+    String sort;
+
+    public CollectionClassifier(String type, Node node)
+    { this.type = type;
+      this.fields = new ArrayList();
+
+      NodeList children = node.getChildNodes();
+      for (int c = 0; c < children.getLength(); c ++) {
+    Node child = children.item(c);
+
+    if (child.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
+      String name = child.getNodeName();
+      
+      if (name.equals("file")) {
+        NamedNodeMap atts = children.item(c).getAttributes();
+        Node attribute = atts.getNamedItem("URL");
+        String urlString = attribute.getNodeValue();
+        if (urlString == null)
+          continue;
+
+        this.file = new File(urlString);
+      }
+      else if (name.equals("field")) {
+        String fieldName = DOMUtils.getNodeChildText(children.item(c));
+        this.fields.add(fieldName.toString());
+      }
+      else if (name.equals("sort")) {
+        String sortName = DOMUtils.getNodeChildText(children.item(c));
+        this.sort = sortName;
+      }
+    }
+      }
+    }
+
+    public ClassifierInterface getClassifier()
+    {
+      if (this.type.toLowerCase().equals("hierarchy")) {
+    return new HierarchyClassifier(this.file, this.fields, this.sort);
+      }
+
+      return null;
+    }
+  }
+   
+  class CollectionIndexer
+  { String level;
+    String type;
+    String name;
+    List fields;
+    String sort;
+
+    public CollectionIndexer(String type, String indexName, Node node)
+    { this.type = type.toLowerCase();
+      this.fields = new ArrayList();
+      this.name = indexName;
+      this.level = IndexerManager.DEFAULT_LEVEL;
+    
+      NodeList children = node.getChildNodes();
+      for (int c = 0; c < children.getLength(); c ++) {
+    Node child = children.item(c);
+    
+    if (child.getNodeType() == org.w3c.dom.Node.ELEMENT_NODE) {
+      String name = child.getNodeName();
+      
+      if (name.equals("level")) {
+        String levelName = DOMUtils.getNodeChildText(children.item(c));
+        this.level = levelName;
+      }
+      else if (name.equals("field")) {
+        String fieldName = DOMUtils.getNodeChildText(children.item(c));
+        this.fields.add(fieldName.toString());
+      }
+    }
+      }
+      if (this.fields.size() == 0) {
+    this.fields.add(IndexerManager.DEFAULT_FIELD);
+      }
+    }
+
+    public void prepareIndexer(Map indexerMap)
+    { IndexerInterface indexer = null;
+
+      if (!indexerMap.containsKey(this.type)) {
+    if (this.type.toLowerCase().equals("mg")) {
+      indexer = new MGIndexer();
+    }
+    if (indexer != null) {
+      indexerMap.put(this.type, indexer);
+    }
+      }
+
+      indexer = (IndexerInterface) indexerMap.get(this.type);
+      if (indexer != null) {
+    indexer.addIndex(this.level, this.fields.get(0).toString());
+      }
+    }
+  }
 
   /**
@@ -52 +165 @@
   
     this.database = GS3SQLConnectionFactory.createConnection(collection);
+    if (this.database != null) {
+      this.database.clearCollection(collection);
+      this.database = null;
+    }
     if (this.database == null) {
       this.database = GS3SQLConnectionFactory.createConnection("test");
@@ -61 +178 @@
     if (collectRoot == null)
     { System.out.println("Unable to locate GSDL3HOME");
-    //      System.exit(1);
-    return;
+      //      System.exit(1);
+      return;
     }
 
@@ -71 +188 @@
     { this.collectionHome = collectRoot + System.getProperty("file.separator") + "web/sites/localsite/collect" + System.getProperty("file.separator") + collection;
     }
+    this.collectionName = collection;
 
     File buildDirectory = new File(this.collectionHome, "building");
@@ -83 +201 @@
 
     this.buildDocNo = 1;
-    
-    File collectionConfig = new File(collectionHome, "/etc/collectionConfig.xml");
+  }
+
+  public void configureCollection(BuildManager buildManager)
+  { File collectionConfig = new File(collectionHome, "/etc/collectionConfig.xml");
     
     // get the File and read it in
@@ -93 +213 @@
       Document document = builder.parse(collectionConfig);
 
+      CollectionClassifier classifier = null;
+
+      Map                  indexerMap = new HashMap();
+
       // TODO: report an error
       if (document == null)
@@ -115 +239 @@
 
     // the name is a plugin element
-    if (name.equals("search"))
-    {
+    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);
     }
     else if (name.equals("browse"))
     {
     }
-    else if (name.equals("classify"))
+    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);
     }
     // TODO: other elements - make a factory-method approach here...
@@ -128 +271 @@
     {
     }
+      }
+
+      Iterator indexers = indexerMap.values().iterator();
+      while (indexers.hasNext()) {
+    IndexerInterface indexer = (IndexerInterface) indexers.next();
+
+    // attach the classifier
+    buildManager.getIndexerManager().addIndexer(indexer);   
       }
     }