Changeset 6288

Timestamp:

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

Author:

cs025

Message:

Various changes

Location:

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

Files:

• AbstractHierarchyNode.java (modified) (8 diffs)
• GS2HierarchyClassifier.java (modified) (5 diffs)

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

@@ -15 +15 @@
 public abstract class AbstractHierarchyNode
 {
+  String prefix;        // a basic prefix used in this hierarchy
   String descriptor;    // the textual descriptor used on screen or long-hand
   String name;          // the index number, letter assignment or other item
@@ -35 +36 @@
     this.name       = null;
     this.id         = null;
+    this.prefix     = null;
     this.childNodes = new ArrayList();
     this.childDocs  = new ArrayList();
@@ -41 +43 @@
   }
     
-  public AbstractHierarchyNode(String name, String id, String descriptor)
+  public AbstractHierarchyNode(String prefix, String name, String id, String descriptor)
   { this.descriptor = descriptor;
     this.name       = name;
     this.id         = id;
+    this.prefix     = prefix;
     this.childNodes = new ArrayList();
     this.childDocs  = new ArrayList();
@@ -96 +99 @@
 
   public String getParentId()
-  { int dotAt = this.id.lastIndexOf('.');
+  { 
+    if (this.id == null) {
+      return "";
+    }
+
+    int dotAt = this.id.lastIndexOf('.');
     if (dotAt < 0) {
       return "";
@@ -188 +196 @@
     select = new GS3SQLSelect("classifiers");
     select.addField("ClassifyRef");
-    GS3SQLWhereItem whereItem = new GS3SQLWhereItem("ClassifyID", "=", this.id);
+    GS3SQLWhereItem whereItem = new GS3SQLWhereItem("ClassifyID", "=", this.prefix+"."+this.id);
     GS3SQLWhere where = new GS3SQLWhere(whereItem);
     select.setWhere(where);
@@ -206 +214 @@
       else {
     insert = new GS3SQLInsert("classifiers");
-    if (this.parent != null) {
-      insert.addValue("ParentID", this.getParentId());
+
+    String parentId = this.getParentId();
+
+    if (parentId.length() > 0) {
+      insert.addValue("ParentID", this.prefix+"."+this.getParentId());
     }
+    else {
+      insert.addValue("ParentID", this.prefix);
+    }
 
     action = insert;
       }
-      action.addValue("ClassifyID", this.id);
+      action.addValue("ClassifyID", this.prefix+"."+this.id);
       action.addValue("Name", this.name);
       action.addValue("Description", this.descriptor);
@@ -246 +260 @@
 
       // delete child documents
-      GS3SQLDelete delete = new GS3SQLDelete("classifydocuments");
+      GS3SQLDelete delete = new GS3SQLDelete("classdocuments");
       delete.setWhere(where);
 
@@ -266 +280 @@
     while (iterator.hasNext()) {
       DocumentID docId = (DocumentID) iterator.next();
-      insert = new GS3SQLInsert("classifydocuments");
+      insert = new GS3SQLInsert("classdocuments");
       insert.addValue("ClassifyRef", Integer.toString(classifyRef), GS3SQLField.INTEGER_TYPE);
       insert.addValue("DocID", docId.toString());
+
+      connection.execute(insert.toString());
     }
     return true;

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);