Changeset 7269 for trunk

Timestamp:

2004-05-04T17:06:09+12:00 (20 years ago)

Author:

cs025

Message:

Minor configuration changes for classifiers

Location:

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

Files:

• Build.java (modified) (1 diff)
• CollectionManager.java (modified) (4 diffs)

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

@@ -59 +59 @@
     }
 
-    if (site==null) {
+    if (site == null) {
     System.err.println("you must specify the site name");
     System.exit(0);

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

@@ -71 +71 @@
     List fields;
     String sort;
-
-    public CollectionClassifier(URL parentURL, String type, Node node)
+    String className;
+
+    public CollectionClassifier(URL parentURL, String type, String className, Node node)
     { this.type = type;
+      this.className = className;
       this.fields = new ArrayList();
 
@@ -113 +115 @@
 
     public ClassifierInterface getClassifier()
-    {
+    { ClassifierInterface classifier = null;
+
       if (this.type == null) {
     return null;
@@ -119 +122 @@
       System.out.println(this.type.toLowerCase());
       if (this.type.toLowerCase().equals("hierarchy")) {
-    return new HierarchyClassifier(this.file, this.fields, this.sort);
+    classifier = new HierarchyClassifier(this.className, this.file, this.fields, this.sort);
       }
       else if (this.type.toLowerCase().equals("azlist")) {
-    return new AZListClassifier(this.fields);
-      }
-
-      return null;
+    classifier = new AZListClassifier(this.fields);
+      }
+
+      return classifier;
     }
   }
@@ -216 +219 @@
 
       if (name.equals(GSXML.CLASSIFIER_ELEM))
-      { 
-    NamedNodeMap atts = children.item(c).getAttributes();
+      { NamedNodeMap atts = children.item(c).getAttributes();
+
+        // get the type attribute
     Node attribute = atts.getNamedItem(GSXML.TYPE_ATT);
     if (attribute == null) {
       continue;
     }
-
     String type = attribute.getNodeValue();
-    classifier = new CollectionClassifier(etcURL, type, children.item(c));
+
+        // get the type attribute
+    attribute = atts.getNamedItem(GSXML.NAME_ATT);
+    if (attribute == null) {
+      continue;
+    }
+    String className = attribute.getNodeValue();
+
+    classifier = new CollectionClassifier(etcURL, type, className, children.item(c));
     
     System.out.println("Found classifier " + type);