Changeset 13956

Timestamp:

2007-03-01T15:15:50+13:00 (17 years ago)

Author:

shaoqun

Message:

changed code to make it work on the new collectionConfig.xml and buildConfig.xml

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (5 diffs)

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

@@ -84 +84 @@
 
     logger.info("Configuring AbstractBrowse...");
-    this.config_info = info;
-
-    if (macro_resolver != null) {
+    this.config_info = info;
+        if (macro_resolver != null) {
         macro_resolver.setSiteDetails(this.site_http_address, this.cluster_name);
         // set up the macro resolver
@@ -196 +195 @@
         Element cl = (Element)classifiers.item(i);
         Element new_cl = (Element)this.doc.importNode(cl, false); // just import this node, not the children
-        String content = cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT);
-        cl_list.appendChild(new_cl);
+            
+            //String content = cl.getAttribute(GSXML.CLASSIFIER_CONTENT_ATT);
+        
+        //get the classify title  from the database
+             String class_id =  cl.getAttribute(GSXML.NAME_ATT);
+         String content = getMetadata(class_id,"Title"); 
+
+                cl_list.appendChild(new_cl);
         String text = GSXML.getDisplayText(cl, 
                            GSXML.DISPLAY_TEXT_NAME, 
@@ -211 +216 @@
         }
         
+        
         Element cl_name = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_NAME, text);
         new_cl.appendChild(cl_name);
@@ -257 +263 @@
         Element cl = (Element)classifiers.item(i);
         String name = cl.getAttribute(GSXML.NAME_ATT);
-        Element node_extra = GSXML.getNamedElement(config_browse,
-                               GSXML.CLASSIFIER_ELEM,
-                               GSXML.NAME_ATT,
-                               name);
+
+        //Element node_extra = GSXML.getNamedElement(config_browse,
+        //                         GSXML.CLASSIFIER_ELEM,
+        //                         GSXML.NAME_ATT,
+        //                         name);
+            //now use the position to get the node - CL1 
+            int position = Integer.parseInt(name.substring(2));
+        Element node_extra = null;
+            NodeList cls = config_browse.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
+            if (position >0 && position <= cls.getLength()) {
+            node_extra  = (Element) cls.item((position -1)); 
+        }
+
         if (node_extra == null) {
         logger.error("GS2REtrieve: haven't found extra info for classifier named "+name);
@@ -698 +713 @@
                            boolean all_metadata,
                            ArrayList metadata_names);
+
+    /** get the particular metadata (identified by the metadata name) for the classifier node node_id
+     * 
+     */
+    abstract protected String getMetadata(String node_id, String metadata_name);
+
 
     /** returns the structural information asked for.