Changeset 7470

Timestamp:

2004-05-27T14:16:05+12:00 (20 years ago)

Author:

cs025

Message:

Added AbstractClassifier; started to improve loading of classifiers, etc.

Location:

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

Files:

• AZListClassifier.java (modified) (3 diffs)
• AbstractClassifier.java (added)
• AbstractHierarchyNode.java (modified) (3 diffs)
• ClassifierInterface.java (modified) (1 diff)
• ClassifierManager.java (modified) (2 diffs)
• GS2HierarchyClassifier.java (modified) (2 diffs)
• HierarchyClassifier.java (modified) (1 diff)

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

@@ -27 +27 @@
 import org.greenstone.gsdl3.util.GSXML;
 
-public class AZListClassifier implements ClassifierInterface
+public class AZListClassifier extends AbstractClassifier
 {
   GS3SQLConnection database;
   MultiMap         alphaMap;
   List             fields;
-    String name;
+  String           name;
+
   class AZDocumentItem
   { public DocumentID documentId;
@@ -84 +85 @@
 
   public AZListClassifier(String name, List fields)
-    { this.name = name;
-      this.fields = fields;
+  { this.fields   = fields;
     this.alphaMap = new MultiMap();
+    this.name     = name;
     //  System.out.println("AZList :"+fields.size());
   }
@@ -256 +257 @@
     this.name = prefix;
     }
+
     int leafCount = 0;
     keys = this.alphaMap.keySet().iterator();

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

@@ -108 +108 @@
 
   public void addDocument(DocumentID document, String sortKey)
-  { this.childDocs.add(new AbstractHierarchyDocument(document, sortKey));
-
+  { if (sortKey == null && false) {
+    System.err.println("attempt to classify by an unset key");
+      return;
+    }
+    this.childDocs.add(new AbstractHierarchyDocument(document, sortKey));
+
+    System.out.println("Adding " + document.toString() + " to " + this.name + " " + this.childDocs.size());
     if (sortKey != null) {
       int first = 0;
@@ -117 +122 @@
     int at = (first + last) / 2;
     
-    if (this.childDocs.get(at) == null) {
+    System.out.println(this.name + " " + at + " " + this.childDocs.size() + " " + this.childDocs.get(at) + " " + sortKey);
+    if (this.childDocs.get(at) == null ||
+        this.childDocs.get(at).toString() == null) {
       last = at;
+      System.out.println("COntinuing");
       continue;
     }
@@ -138 +146 @@
       this.childDocs.set(first, newItem);
     }
+
+    //  System.out.println("Added " + document.toString() + " to " + this.name + " " + this.childDocs.size());
+    //    for (int a = 0; a < this.childDocs.size(); a ++) {
+    //System.out.println(this.childDocs.get(a));
+    //}
   }
 

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

@@ -17 +17 @@
    */
   public void configure(List parameters);
+  public void configure(java.net.URL baseURL, org.w3c.dom.Node node);
 
   public void setDatabase(org.greenstone.gsdl3.gs3build.util.GS3SQLConnection connection);

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

@@ -106 +106 @@
   }
 
-  public static ClassifierInterface loadClassifier(String classifierName, List params)
-  {
+  public static ClassifierInterface loadClassifier(String classifierName)
+  { System.out.println("Loading classifier " + classifierName);
     try {
       ClassifierInterface classifier = 
-    (ClassifierInterface) Class.forName("org.greenstone.gsdl3.gs3build.classifier."+classifierName).newInstance();
-      if (classifier != null) {
-    classifier.configure(params);
-      }
+    (ClassifierInterface) Class.forName("org.greenstone.gsdl3.gs3build.classifier."+classifierName+"Classifier").newInstance();
       return classifier;
     }
@@ -127 +124 @@
     return null;
   }
+    
+  public static ClassifierInterface loadClassifier(String classifierName, List params)
+  { ClassifierInterface classifier = loadClassifier(classifierName);
+    if (classifier != null) {
+      classifier.configure(params);
+    }
+    return classifier;
+  }
 
-    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;
+  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

@@ -2 +2 @@
 
 import java.io.*;
+
+import java.net.URL;
 
 import java.util.List;
@@ -168 +170 @@
   }
 
+  public void configure(URL url, org.w3c.dom.Node node)
+  {
+  }
+
   public void configure(List parameters)
   {

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

@@ -24 +24 @@
 
 
-public class HierarchyClassifier implements ClassifierInterface
+public class HierarchyClassifier extends AbstractClassifier
 { 
   class HierarchyClassifierObserver implements ClassifierObserverInterface