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

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

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (4 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.