Changeset 31867 for main

Timestamp:

2017-08-10T14:19:33+12:00 (7 years ago)

Author:

kjdon

Message:

setting classifier style attribute - can't remember why! Also, need to set teh class loader for the macro resolver AFTER the class loader is constructedsvn diff util/GSXML.java

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service

Files:

• AbstractBrowse.java (modified) (4 diffs)
• GS2Browse.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -79 +79 @@
     protected AbstractBrowse()
     {
+
     }
 
@@ -566 +567 @@
                     Node parentNode = current.getParentNode();
 
-                    if (parentNode == null)
+                    if (parentNode == null || !parentNode.getNodeName().equals(GSXML.CLASS_NODE_ELEM))
                     {
-                        continue;
+                      String this_style = getThisType(current.getAttribute(GSXML.NODE_ID_ATT));
+                      if (this_style != null) {
+                        current.setAttribute(GSXML.CLASSIFIER_STYLE_ATT, this_style);
                     }
-
+                    }
+                    else {
                     Element parent = (Element) parentNode;
                     String childType = parent.getAttribute(GSXML.CHILD_TYPE_ATT);
@@ -579 +583 @@
 
                     current.setAttribute(GSXML.CLASSIFIER_STYLE_ATT, childType);
+                    }
                 }
             } // if want structure
@@ -775 +780 @@
     /** Gets the type of list a classifier is (e.g. VList or HList) */
     abstract protected String getChildType(String node_id);
-
+  
+  /** Gets the type of list this current node is part of */ 
+  abstract protected String getThisType(String node_id);
     /**
      * returns the document type of the doc that the specified node belongs to.

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2Browse.java

@@ -51 +51 @@
     public GS2Browse()
     {
-      this.macro_resolver = new GS2MacroResolver(this.coll_db, this.class_loader);
+      this.macro_resolver = new GS2MacroResolver();
     }
 
@@ -118 +118 @@
         }
         this.gs_doc = gs_doc_db;
+        
+        // we need to set the database for our GS2 macro resolver
+        GS2MacroResolver gs2_macro_resolver = (GS2MacroResolver) this.macro_resolver;
+        gs2_macro_resolver.setDB(this.coll_db);
+        // set the class loader in case we have collection specific properties files
+        gs2_macro_resolver.setClassLoader(this.class_loader);
 
     
@@ -139 +145 @@
     }
 
-
+  /** the type of a node is the same as teh child type of its parent */
+  protected String getThisType(String node_id) {
+    String parent_id = OID.getParent(node_id);
+    if (parent_id.equals(node_id)) {
+      return null; // no parent so doesn't have a thistype
+    }
+    DBInfo info = this.coll_db.getInfo(parent_id);
+    if (info == null)
+      {
+    return null;
+      }
+    return info.getInfo("childtype");
+  }