Changeset 5964

Timestamp:

2003-11-25T11:46:14+13:00 (20 years ago)

Author:

kjdon

Message:

some modifications, cant remember what for

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XMLRetrieve.java (modified) (8 diffs)

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

@@ -28 +28 @@
     protected String toc_xsl_name = "";
     protected String document_encoding = "";
+    protected String document_root_tag = "";
+    
     protected Element collection_doc_list = null;
-
+    
     protected boolean provide_content = true;
     protected boolean provide_structure = true;
@@ -37 +39 @@
     public boolean configure(Element info, Element extra_info) {
     
+    System.out.println("configuring XMLRetrieve...");
     // look for the parameters
     Element param_list = (Element)GSXML.getChildByTagName(info, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -45 +48 @@
         this.toc_xsl_name = (String)params.get("tocXSLT");
         this.document_encoding = (String)params.get("documentEncoding");
+        this.document_root_tag = (String)params.get("documentRootTag");
         services_to_provide = (String)params.get("provideServices");
     }
@@ -92 +96 @@
     collection_doc_list = (Element)GSXML.getChildByTagName(extra_info, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
 
+    this.converter.setEntityResolver(new GSEntityResolver());
     return true;
     }
@@ -131 +136 @@
         } 
 
+        
         // if we have asked for the whole doc, just append it
         if (doc_name.equals(node_id)) {
@@ -363 +369 @@
         String meta_name = (String) meta_name_list.elementAt(i);
         String actual_meta_name = meta_name;
-        if (meta_name.startsWith("root:")) {
+        if (meta_name.startsWith("root_")) {
             actual_meta_name = meta_name.substring(5);
         } else {
@@ -393 +399 @@
         if (section != null) {
             Element title_meta = extractTitleMeta(section);
-            metadata_list.appendChild(title_meta);
-            
+            if (title_meta != null) {
+            metadata_list.appendChild(title_meta);
+            }
         }
         }
@@ -426 +433 @@
     // this assumes that the scope refers to a top level node - this may be overwritten if the scope bit in the id is a shorthand of some sort
     protected String translateScope(String scope) {
+    if (this.document_root_tag != null) {
+        return GSPath.appendLink(this.document_root_tag, scope);
+    }
     return scope;
     }
     
 }
+