Changeset 7309

Timestamp:

2004-05-12T13:05:30+12:00 (20 years ago)

Author:

kjdon

Message:

classifiers now output info to the buildCOnfig.xml file

Location:

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

Files:

• CollectionManager.java (modified) (1 diff)
• classifier/AZListClassifier.java (modified) (4 diffs)
• classifier/ClassifierInterface.java (modified) (2 diffs)
• classifier/ClassifierManager.java (modified) (3 diffs)
• classifier/GS2HierarchyClassifier.java (modified) (3 diffs)
• classifier/HierarchyClassifier.java (modified) (3 diffs)

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

@@ -404 +404 @@
       build_config.appendChild(service_list);
 
+      // the document structure and metadata retrieval will use GS3REtrieve service, so add it in here
+      Element base_retrieve_service = doc.createElement(GSXML.SERVICE_CLASS_ELEM);
+      base_retrieve_service.setAttribute(GSXML.NAME_ATT, "GS3Retrieve");
+      service_list.appendChild(base_retrieve_service);
       // ask the indexers to add stuff into the service rack list
       this.buildManager.getIndexerManager().addServiceDescriptions(service_list);
-
+      this.buildManager.getClassifierManager().addServiceDescriptions(service_list);
       // get the String
       String build_config_string = converter.getString(build_config);

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/AZListClassifier.java

@@ -17 +17 @@
 import org.xml.sax.helpers.DefaultHandler;
 
+import org.w3c.dom.Element;
+
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentInterface;
@@ -23 +25 @@
 import org.greenstone.gsdl3.gs3build.database.*;
 import org.greenstone.gsdl3.gs3build.util.MultiMap;
+import org.greenstone.gsdl3.util.GSXML;
 
 public class AZListClassifier implements ClassifierInterface
@@ -251 +254 @@
     prefix = "CLAZ"+this.fields.get(0).toString();
     // TODO: write this name back to collectionConfig.xml
+    this.name = prefix;
     }
     int leafCount = 0;
@@ -329 +333 @@
     return true;
   }
+    public boolean addClassifierDescription(Element classifier_list) {
+    // TODO check that there are some docs in the classification
+    Element classifier = classifier_list.getOwnerDocument().createElement(GSXML.CLASSIFIER_ELEM);
+    classifier.setAttribute(GSXML.NAME_ATT, this.name);
+    classifier_list.appendChild(classifier);
+    return true;
+    }
+
 }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/ClassifierInterface.java

@@ -3 +3 @@
 import java.util.List;
 
+import org.w3c.dom.Element;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentInterface;
@@ -38 +39 @@
    */
   public void completeClassification();
+
+    public boolean addClassifierDescription(Element classifier_list);
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/ClassifierManager.java

@@ -3 +3 @@
 import java.util.List;
 import java.util.Iterator;
+import org.w3c.dom.Element;
+import org.w3c.dom.Document;
 
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
@@ -8 +10 @@
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentList;
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
+import org.greenstone.gsdl3.util.GSXML;
+
 
 public class ClassifierManager
@@ -123 +127 @@
     return null;
   }
+
+    public boolean addServiceDescriptions(Element service_class_list) {
+    if (this.used==0) {
+        // no classiifers
+        return true;
+    }
+    Element retrieve_service = GSXML.getNamedElement(service_class_list, GSXML.SERVICE_CLASS_ELEM, GSXML.NAME_ATT, "GS3Retrieve");
+    Document owner_doc = service_class_list.getOwnerDocument();
+    if (retrieve_service == null) {
+        System.err.println("didn't find a retrieve service");
+        // create it
+        retrieve_service = owner_doc.createElement(GSXML.SERVICE_CLASS_ELEM);
+        retrieve_service.setAttribute(GSXML.NAME_ATT, "GS3Retrieve");
+        service_class_list.appendChild(retrieve_service);
+    }
+    Element classifier_list = owner_doc.createElement(GSXML.CLASSIFIER_ELEM+GSXML.LIST_MODIFIER);
+    retrieve_service.appendChild(classifier_list);
+    boolean success = true;
+    for (int i = 0; i < this.used; i ++) {
+        if (!this.list[i].addClassifierDescription(classifier_list)) {
+        success = false;
+        }
+    }
+    return success;
+    }
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/GS2HierarchyClassifier.java

@@ -13 +13 @@
 import org.xml.sax.helpers.XMLReaderFactory;
 import org.xml.sax.helpers.DefaultHandler;
+import org.w3c.dom.Element;
 
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
@@ -20 +21 @@
 import org.greenstone.gsdl3.gs3build.util.GS2TextFileHandler;
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
+import org.greenstone.gsdl3.util.GSXML;
 
 public class GS2HierarchyClassifier implements ClassifierInterface
@@ -290 +292 @@
     }
   }
+    public boolean addClassifierDescription(Element classifier_list) {
+    // TODO check that there are some docs in the classification
+    Element classifier = classifier_list.getOwnerDocument().createElement(GSXML.CLASSIFIER_ELEM);
+    //classifier.setAttribute(GSXML.NAME_ATT, this.name);
+    classifier.setAttribute(GSXML.NAME_ATT, "name"); // what is teh name???
+    classifier_list.appendChild(classifier);
+    return true;
+    }
+
 }

trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/HierarchyClassifier.java

@@ -16 +16 @@
 import org.xml.sax.helpers.XMLReaderFactory;
 import org.xml.sax.helpers.DefaultHandler;
-
+import org.w3c.dom.Element;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentID;
 import org.greenstone.gsdl3.gs3build.doctypes.DocumentInterface;
 import org.greenstone.gsdl3.gs3build.util.XMLTools;
 import org.greenstone.gsdl3.gs3build.util.GS3SQLConnection;
+import org.greenstone.gsdl3.util.GSXML;
+
 
 public class HierarchyClassifier implements ClassifierInterface
@@ -213 +215 @@
       this.fields = fields;
       this.sortBy = sortBy;
-
+      this.name = name;
       System.out.println("Counting " + this.fields.size() + " fields");
     }
@@ -332 +334 @@
     }
   }
+
+    public boolean addClassifierDescription(Element classifier_list) {
+    // TODO check that there are some docs in the classification
+    Element classifier = classifier_list.getOwnerDocument().createElement(GSXML.CLASSIFIER_ELEM);
+    classifier.setAttribute(GSXML.NAME_ATT, this.name);
+    classifier_list.appendChild(classifier);
+    return true;
+    }
 }