Changeset 7303 for trunk

Timestamp:

2004-05-11T14:01:08+12:00 (20 years ago)

Author:

kjdon

Message:

now AZListCLassifier has a name parameter, and I modified slightly what gets written to the database - top level node no longer has a parent and its description is 'Classifier', lower nodes use the key as their anme and description for now

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/gs3build/classifier/AZListClassifier.java (modified) (6 diffs)

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

@@ -29 +29 @@
   MultiMap         alphaMap;
   List             fields;
-
+    String name;
   class AZDocumentItem
   { public DocumentID documentId;
@@ -80 +80 @@
   }
 
-  public AZListClassifier(List fields)
-  { this.fields = fields;
+  public AZListClassifier(String name, List fields)
+    { this.name = name;
+      this.fields = fields;
     this.alphaMap = new MultiMap();
     //  System.out.println("AZList :"+fields.size());
@@ -199 +200 @@
     insert = new GS3SQLInsert("classifiers");
 
-    if (parentId.length() > 0) {
-      insert.addValue("ParentID", parentId);
-    }
-    else {
-      insert.addValue("ParentID", label);
-    }
+    insert.addValue("ParentID", parentId);
 
     action = insert;
@@ -251 +247 @@
     Iterator keys;
  
-    String prefix = "CLAZ"+this.fields.get(0).toString();
-
+    String prefix = this.name;
+    if (prefix==null || prefix.equals("")) {
+    prefix = "CLAZ"+this.fields.get(0).toString();
+    // TODO: write this name back to collectionConfig.xml
+    }
     int leafCount = 0;
     keys = this.alphaMap.keySet().iterator();
@@ -264 +263 @@
     }
 
-    int parentClassify = this.writeSQLClassifyNode(connection, "", 0, prefix, "", "", leafCount);
+    int parentClassify = this.writeSQLClassifyNode(connection, "", 0, prefix, "", "Classifier", leafCount);
 
     if (parentClassify < 0) 
@@ -283 +282 @@
     String className = prefix + "." + key.toString();
 
-    int classifyRef = this.writeSQLClassifyNode(connection, prefix, nodeOrder, className, "", "", childDocs.size());
+    int classifyRef = this.writeSQLClassifyNode(connection, prefix, nodeOrder, className, key.toString(), key.toString(), childDocs.size());
 
     // note the child documents...