Changeset 6288 for trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/GS2HierarchyClassifier.java

Timestamp:

2003-12-17T13:15:07+13:00 (20 years ago)

Author:

cs025

Message:

Various changes

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/GS2HierarchyClassifier.java (modified) (5 diffs)

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

@@ -49 +49 @@
     }
     
-    public GS2HierarchyNode(String name, String id, String descriptor)
-    { super(name, id, descriptor);
+    public GS2HierarchyNode(String prefix, String name, String id, String descriptor)
+    { super(prefix, name, id, descriptor);
     }
     
@@ -97 +97 @@
  
       this.rootNode = new GS2HierarchyNode();
+      String prefix = "CL"+hierarchyName;
 
       while (this.hasMoreLines()) {
@@ -120 +121 @@
     
     // Initialise the tree
-    GS2HierarchyNode node = new GS2HierarchyNode(name, "CL"+hierarchyName+"."+id, description);
+    GS2HierarchyNode node = new GS2HierarchyNode(prefix, name, id, description);
 
     this.rootNode.add(node);
@@ -224 +225 @@
    */
   public boolean classifyDocument(DocumentID documentID, DocumentInterface document)
-  { // the observer records the assignment of documents to classifications
+  { if (this.hierarchy == null) {
+      return true;
+    }
+    
+    // the observer records the assignment of documents to classifications
     GS2HierarchyClassifierObserver classifyObserver = new GS2HierarchyClassifierObserver(document);
         
@@ -241 +246 @@
       }
 
+      System.out.println("Matching " + values.get(0).toString());
+
+      if (documentID == null) {
+    System.out.println("Bad documentID");
+    continue;
+      }
+
       // ...and send them to the classifier
       this.hierarchy.getClassifications(documentID, values, classifyObserver);