Changeset 3443 for trunk

Timestamp:

2002-10-04T13:21:34+12:00 (22 years ago)

Author:

kjdon

Message:

library names are now done dynamically, not specified in the applet info at the service end. the info is added by the applet action if needed

Location:

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

Files:

• action/AppletAction.java (modified) (3 diffs)
• service/PhindService.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/AppletAction.java

@@ -5 +5 @@
 // XML classes
 import org.w3c.dom.Node; 
+import org.w3c.dom.NodeList; 
 import org.w3c.dom.Document; 
 import org.w3c.dom.Element; 
@@ -78 +79 @@
         
         page.appendChild(doc_.importNode(request, true));
+
         // add in the applet info
-        
-        //page.appendChild(doc_.importNode(GSXML.getNodeByPath(mr_response, "response/service/applet"), true));
-        page.appendChild(doc_.importNode(GSXML.getNodeByPath(mr_response, "response/service/applet"), true));
+        Element app_desc = (Element)doc_.importNode(GSXML.getNodeByPath(mr_response, "response/service/applet"), true);
+        // must look through the applet description and see if there is a param called library. if so, add the value to be the current library name
+
+        addLibraryName(app_desc, config_.library_name_);
+        page.appendChild(app_desc);
         return transformer_.transform(stylesheet, page);
     }
@@ -111 +115 @@
     }
     }
+
+    /** this method looks through the PARAMs of the applet description for 
+     * one with the name 'library'. If its found, it sets the value to be 
+     * library_name
+     */
+    protected void addLibraryName(Element description, String library_name) {
+
+    Node child = description.getFirstChild();
+    while (child != null) {
+        if (child.getNodeType() == Node.ELEMENT_NODE) {
+        String param = child.getNodeName();
+        if (param.equals("PARAM")||param.equals("param")) {
+            String name = ((Element)child).getAttribute("NAME");
+            if (name == null || name.equals("")) {
+            // somethings wrong!!
+            } else if (name.equals("library")) {
+            ((Element)child).setAttribute("VALUE", library_name);
+            break;
+            }
+            
+        }
+        }
+        child = child.getNextSibling();
+    }
+    }
+    
 }

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

@@ -72 +72 @@
     // add in the applet info for the phind applet
     // need to make this dynamic - library names etc
-    String app_info = "<applet CODEBASE='/gsdl3/lib/java' CODE='org.greenstone.applet.phind.Phind.class' ARCHIVE='phind.jar, xercesImpl.jar, gsdl3.jar, jaxp.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE='/gsdl3/library'/> <PARAM NAME='phindcgi' VALUE='/gsdl3/library?a=a&amp;sa=r&amp;sn=Phind'/>";
+    // change the applet params - have a single param with the library name
+    // this is left blank at this end, and must be filled in by applet action - if the library name is not needed, this param is left out
+    // phindcgi param now is not complete - library must be prepended to it.
+    String app_info = "<applet CODEBASE='lib/java' CODE='org.greenstone.applet.phind.Phind.class' ARCHIVE='phind.jar, xercesImpl.jar, gsdl3.jar, jaxp.jar, xml-apis.jar' WIDTH='500' HEIGHT='400'><PARAM NAME='library' VALUE=''/> <PARAM NAME='phindcgi' VALUE='?a=a&amp;sa=r&amp;sn=Phind'/>";
     app_info +="<PARAM NAME='collection'   VALUE='";
     app_info += collection_name_;
-    app_info += "'/> <PARAM NAME='classifier' VALUE='1'/>  <PARAM NAME='orientation'  VALUE='vertical'/> <PARAM NAME='depth' VALUE='2'/> <PARAM NAME='resultorder' VALUE='L,l,E,e,D,d'/> <PARAM NAME='backdrop' VALUE='/gsdl3/interfaces/default/images/phindbg1.jpg'/><PARAM NAME='fontsize' VALUE='10'/> <PARAM NAME='blocksize'    VALUE='10'/>The Phind java applet.</applet>";
+    app_info += "'/> <PARAM NAME='classifier' VALUE='1'/>  <PARAM NAME='orientation'  VALUE='vertical'/> <PARAM NAME='depth' VALUE='2'/> <PARAM NAME='resultorder' VALUE='L,l,E,e,D,d'/> <PARAM NAME='backdrop' VALUE='interfaces/default/images/phindbg1.jpg'/><PARAM NAME='fontsize' VALUE='10'/> <PARAM NAME='blocksize'    VALUE='10'/>The Phind java applet.</applet>";
     
     Document dom = converter_.getDOM(app_info);
@@ -112 +115 @@
     String phind_index = (String)params.get("pc");
     // the location of the mgpp database files
-    basepath_ = GSFile.phindBasePath(site_home_, collection_name_, phind_index);
+    basepath_ = GSFile.phindBaseDir(site_home_, collection_name_, phind_index);
 
     // the result element