Changeset 3363

Timestamp:

2002-08-20T10:39:06+12:00 (22 years ago)

Author:

kjdon

Message:

modified

Location:

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

Files:

• Library2.java (modified) (1 diff)
• LibraryServlet.java (modified) (3 diffs)
• action/Action.java (modified) (4 diffs)
• action/BrowseAction.java (modified) (1 diff)
• action/PageAction.java (modified) (5 diffs)
• action/QueryAction.java (modified) (3 diffs)
• action/ResourceAction.java (modified) (3 diffs)
• core/Receptionist.java (modified) (10 diffs)
• service/MGPPGDBMService.java (modified) (6 diffs)
• service/PhindService.java (modified) (1 diff)
• service/ServiceModule.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/Library2.java

@@ -27 +27 @@
 import java.io.IOException;
 /**
- * A program to take XML strings from the command line and send 
- * them to the system.
+ * A program to take XML cgi-input from the command line and return html
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
  * @version $Revision$
  */
+
 final public class Library2 {
-
+ 
     public static void main(String args[]) {
 
-    if (args.length != 2) {
-        System.out.println("Usage: Library2 <gsdl3home> <sitehome>");
+    if (args.length != 4) {
+        System.out.println("Usage: Library2 <sites home> <site name> <interfaces home> <interface name>");
         System.exit(1);
     }
-    String gsdl_home = args[0]; 
-    String transform_home = GSFile.xmlTransformDir(gsdl_home);
-    String site_home = args[1];
+
+    ConfigVars config_ = new ConfigVars();
+    config_.sites_home_ = args[0];
+    config_.site_name_ = args[1];
+    config_.interfaces_home_ = args[2];
+    config_.interface_name_ = args[3];
+
+    config_.createXML();
     
-    MessageRouter mr = new MessageRouter();
-    mr.setSiteHome(site_home);
-    mr.configure();
-    
-    // for doing xslt transforms
-    XMLTransformer transformer = new XMLTransformer();
+    // new message router - create it and pass a handle to recept.
+    // the servlet wont use this directly
+    MessageRouter message_router_ = new MessageRouter();
+    message_router_.setSiteHome(config_.sites_home_+File.separatorChar
+               +config_.site_name_);
+    message_router_.configure();
+    // new receptionist
+    Receptionist recept_ = new Receptionist();
+    recept_.setConfigVars(config_);
+    recept_.setMessageRouter(message_router_);
+    recept_.configure();
 
     BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
     String query=null;
-    String request=null;
     String result=null;
-    String collect=null;
-    String service=null;
-    String info=null;
-    String content=null;
     while (true) {
-        System.out.println("Please enter a  query type (choose from: describe, query) or 'exit' to quit");
+        System.out.println("Please enter an XML query all on one line, or 'exit' to quit");
         try {
         query = br.readLine();
-        query.trim();
-        
-        if (query.startsWith("exit")) {
-            System.exit(1);
-        }
-        if (query.equals("describe")|| query.equals("query")) {
-            System.out.println("\nPlease enter a collection name (or <enter> for no collection)");
-            collect = br.readLine();
-            collect.trim();
-            System.out.println("\nPlease enter a service name (or <enter> for no service)");
-            service = br.readLine();
-            service.trim();
-            if (query.equals("describe")) {
-            
-            System.out.println("\nPlease enter an info name (or <enter> for no info)");
-            info = br.readLine();
-            info.trim();
-            
-            } else if (query.equals("query") ) {
-            System.out.println("\nPlease enter the content to your query (in xml, all on one line - sorry about that)");
-            content=br.readLine();
-            content.trim();
-            }
-            
-            request = "<message><request type='"+query+"' to='";
-            
-            if (!collect.equals ("")) {
-            request += collect+"/";
-            }
-            if (!service.equals("")) {
-            request += service+"/";
-            }
-            request += "'";
-            if (query.equals("describe") && !info.equals("")) {
-            request += " info='"+info+"'/>";
-            }
-            else if (query.equals("query") && !content.equals("")) {
-            request +=">"+content+"</request>";
-            } else {
-            request += "/>";
-            }
+        } catch (Exception e) {
+        System.err.println("Library1 exception:"+e.getMessage());
+        }
+        if (query.startsWith("exit")) {
+        System.exit(1);
+        }
+        
+        result = recept_.process(query);
+
+        System.out.println(result);
 
 
-            request += "</message>";
-            
-            System.out.println("Sending message to MessageRouter:\n"+request);
-            result = mr.process(request);
-            
-            System.out.println("Raw Result:\n"+result+"\n");
-            
-            // transform the result
-            
-            // select a stylesheet
-            String stylesheet = null;
-            if (query.equals("describe")) {
-            if (collect.equals("")&&service.equals("")) {
-                stylesheet = transform_home+File.separatorChar+"home.xsl";
-            } else if (!collect.equals("")) {
-                stylesheet = transform_home+File.separatorChar+"collect_about.xsl";
-            } else if (!service.equals("")) {
-                stylesheet = transform_home+File.separatorChar+"service_about.xsl";
-            }
-            } else if (query.equals("query")) {
-            stylesheet = transform_home+File.separatorChar+"query_result.xsl";
-            }
-            if (stylesheet != null) {
-            File style = new File(stylesheet);
-            if (!style.exists()) {
-                System.err.println("stylesheet doesn't exist");
-            } else {
-            
-                String transformed_result = transformer.transform(stylesheet, result);
-                System.out.println("Transformed result:\n"+transformed_result);
-            }
-            } else {
-            System.out.println("no appropriate stylesheet found");
-            }
-        } else {
-            System.out.println("your request was not understood, sorry");
-        }
-        
-        }  catch (IOException e) {
-        System.err.println("Library2 IO exception:"+e.getMessage());
-        }
-        
-    } // while (true
-    }
-    
+    }
+
+    }    
 }
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -22 +22 @@
 public class LibraryServlet extends HttpServlet {
     
-    private ConfigVars config_=null; // holds all teh system set up vars
+    private ConfigVars config_=null; // holds all the system set up vars
     private Receptionist recept_=null;
-    private ModuleInterface message_router_=null;
+    private MessageRouter message_router_=null;
     /** initialise the servlet
      */
@@ -52 +52 @@
     // new message router - create it and pass a handle to recept.
     // the servlet wont use this directly
-    MessageRouter mr = new MessageRouter();
-    mr.setSiteHome(config_.sites_home_+File.separatorChar
+    message_router_ = new MessageRouter();
+    message_router_.setSiteHome(config_.sites_home_+File.separatorChar
                +config_.site_name_);
-    mr.configure();
+    message_router_.configure();
     // new receptionist
     recept_ = new Receptionist();
     recept_.setConfigVars(config_);
-    recept_.setMessageRouter(mr);
+    recept_.setMessageRouter(message_router_);
     recept_.configure();
 
@@ -68 +68 @@
     throws ServletException, IOException {
     
-    response.setContentType("text/html");
+    request.setCharacterEncoding("UTF-8");
+    response.setContentType("text/html;charset=UTF-8");
+    //response.setContentType("text/html");
     PrintWriter out = response.getWriter();
 

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

@@ -5 +5 @@
 // XML classes
 import org.w3c.dom.Node; 
+import org.w3c.dom.Element; 
 import org.w3c.dom.Document; 
 
-abstract public class Action implements ModuleInterface{
+abstract public class Action {
 
     protected ConfigVars config_=null;
@@ -15 +16 @@
     /** a converter class to parse XML and create Docs */
     protected XMLConverter converter_=null;
+    /** cgi args conveter */
+    protected CGIArgConverter cgi_=null;
     /** a transformer class to transform xml using xslt */
     protected XMLTransformer transformer_=null;
@@ -38 +41 @@
     }
 
+    public void setCGIConverter(CGIArgConverter cgi) {
+    cgi_ = cgi;
+    }
     public void configure() {
     // does nothing yet
@@ -45 +51 @@
      * and returns the page of results - may be in html/xml/other
      * depending on the output att of the request */
-    abstract public String process(String xml_in);
-
-    /*Document doc = converter_.getDOM(xml_in);
+    public String process(String xml_in) {
+       
+    Element message = converter_.getDOM(xml_in).getDocumentElement();
     
-      Node res = process(doc);
-    return converter_.getString(res); // does this work for html? */
+    return process(message);
+    }
     
-    public Node process(Node xml_in){
-    return xml_in; // for now
-    }
+    abstract public String process(Element xml_in);
+    
 
 }

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

@@ -11 +11 @@
     
 
-    public String process (String xml_in) {
+    public String process (Element message) {
 
-    Element message = converter_.getDOM(xml_in).getDocumentElement();
     Element request = (Element)message.getElementsByTagName("request").item(0);
     

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

@@ -12 +12 @@
 public class PageAction extends Action {
 
-
-    public String process (String xml_in) {
+    public String process (Element message) {
     
-    Element message = converter_.getDOM(xml_in).getDocumentElement();
     Element request = (Element)message.getElementsByTagName("request").item(0);
-
     String info = request.getAttribute("info");
     // remove the page/ bit
     info = GSPath.removeFirstLink(info);
     String page_name = GSPath.getFirstLink(info);
+
+    // create the return page tree
+    Element page = doc_.createElement("page");
+    page.setAttribute("lang", message.getAttribute("lang"));
+    // add the lang stuff from xml_in
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "translate"), true));
+    // add the system stuff from xml_in
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "config"), true));
+
     if (page_name.equals("")) {
         // for now send an error. change to always display the home page?
@@ -27 +33 @@
     }
     if (page_name.equals("home")) {
-        return homePage(request);
+        return homePage(page, request);
     } else if (page_name.equals("about")) {
-        return aboutPage(request);
+        return aboutPage(page, request);
     } else {
         return GSHTML.errorPage("page: "+page_name+" not yet implemented");
@@ -35 +41 @@
     }
 
-    protected String homePage(Element request) {
+
+    protected String homePage(Element page, Element orig_message) {
     
     // first, get the list of collections from mr
     
     Element coll_list_message = doc_.createElement("message");
+    coll_list_message.setAttribute("lang", page.getAttribute("lang"));
     Element coll_list_request = doc_.createElement("request");
     coll_list_message.appendChild(coll_list_request);
@@ -53 +61 @@
     System.out.println(converter_.getString(coll_list_response));
 
+    // second, get the metadata for each collection
     NodeList colls = coll_list_response.getElementsByTagName("collection");
     
     Element metadata_message = doc_.createElement("message");
+    metadata_message.setAttribute("lang", page.getAttribute("lang"));
     Element metadata_request = doc_.createElement("request");
     metadata_message.appendChild(metadata_request);
@@ -70 +80 @@
     }
 
-    //return GSHTML.htmlSafe(converter_.getString(coll_list_response));
-    //now the full response is in coll_list_response
-    //String stylesheet = GSFile.stylesheetPath(gsdl_home_, site_home_,
-    //                    display_home_, "home.xsl");
-    String stylesheet = GSFile.stylesheetPath(config_, "home.xsl");
-
-    Element system = doc_.createElement("system");
-    //Element sitename = doc_.createElement("sitename");
-    system.setAttribute("sitename", "localsite");
-    coll_list_response.appendChild(coll_list_response.getOwnerDocument().importNode(system, true));
-    
     System.out.println("the second xml response is");
     System.out.println(converter_.getString(coll_list_response));
 
+    //now the full response is in coll_list_response
+
+    // add it in to the page xml tree
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(coll_list_response, "response"), true));
+
+    String stylesheet = GSFile.stylesheetPath(config_, "home.xsl");
     String transformed_result = transformer_.transform(stylesheet,
-                               coll_list_response);    
+                               page);    
     return transformed_result;
              
     } // homePage
 
-    protected String aboutPage(Element request) {
+    protected String aboutPage(Element page, Element request) {
 
     // get the params out
-    HashMap params = GSXML.extractParams((Element)GSXML.getChildByTagName(request, "paramList"));
+    HashMap params = GSXML.extractParams((Element)GSXML.getNodeByPath(request, "paramList"));
     String coll_name = (String)params.get("c");
-    String lang = (String)params.get("l");
-    if (lang==null || lang.equals("")) {
-        lang="en"; // the default
-    }
-    System.out.println("lang="+lang);
+
     Element coll_about_message = doc_.createElement("message");
-    //coll_about_message.setAttribute("xml:lang", lang);
+    coll_about_message.setAttribute("lang", page.getAttribute("lang"));
+
     Element coll_about_request = doc_.createElement("request");
     coll_about_message.appendChild(coll_about_request);
     coll_about_request.setAttribute("type", "describe");
     coll_about_request.setAttribute("to", coll_name);
+
     Element coll_about_response = (Element)mr_.process(coll_about_message);
-    coll_about_response.setAttribute("lang", lang);
-    //return GSHTML.htmlSafe(converter_.getString(coll_about_response));
-    //String stylesheet = GSFile.stylesheetPath(gsdl_home_, site_home_,
-    //                    display_home_, "about.xsl");
+
+
+    // add the response to the page 
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(coll_about_response, "response"), true));
+
+    // process using the stylesheet
     String stylesheet = GSFile.stylesheetPath(config_, "about.xsl");
 
-    System.out.println("stylesheet="+stylesheet);
+    //System.out.println("response="+converter_.getString(page));
     String transformed_result = transformer_.transform(stylesheet,
-                               coll_about_response);    
+                               page);    
     return transformed_result;
     

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

@@ -10 +10 @@
 
 import java.util.HashMap;
+import java.util.Map;
+//import java.util.Map;
+import java.util.Iterator;
 
 public class QueryAction extends Action {
     
 
-    public String process (String xml_in) {
-
-    Element message = converter_.getDOM(xml_in).getDocumentElement();
+    public String process (Element message) {
+
+
+    // create the return page tree
+    Element page = doc_.createElement("page");
+    page.setAttribute("lang", message.getAttribute("lang"));
+    // add the lang stuff from message
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "translate"), true));
+    // add the system stuff from message
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "config"), true));
+
     Element request = (Element)message.getElementsByTagName("request").item(0);
-    
     String info = request.getAttribute("info");
     // remove the q/ bit
@@ -29 +39 @@
 
     if (query_type.equals("text")) {
-        return textQuery(request);
+        return textQuery(page, request);
     }
     if (query_type.equals("field")) {
-        return fieldQuery(request);
-    }
-    return unknownQuery(request);
+        return fieldQuery(page, request);
+    }
+    return unknownQuery(page, request);
 
     
     }
     
-    protected String textQuery(Element request) {
-
-    Element query_request = doc_.createElement("message");
-    query_request.appendChild(doc_.importNode(request, true));
-
+    // we may be able to generalize this for all query types?
+    protected String textQuery(Element page, Element request) {
+
+    // chack that the stylesheet is present - cant output a page without one. we may adapt this to use unknownquery stylesheet? - or ask for one from the MR
     String stylesheet = GSFile.stylesheetPath(config_, "textquery.xsl");
-    
-    //String stylesheet = GSFile.stylesheetPath(gsdl_home_, site_home_,
-    //                    display_home_, "textquery.xsl");
     if (stylesheet==null) {
         return GSHTML.errorPage("textquery stylesheet not found!");
     }
-    
-    HashMap params = GSXML.extractParams((Element)GSXML.getChildByTagName(request, "paramList"));
+
+    // extract the params from the cgi-request, and check that we have a coll specified
+    // first convert short to long names
+    Element cgi_paramList = (Element)GSXML.getChildByTagName(request, "paramList");
+    cgi_.toLong(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList);
+
+    String collection = (String)params.get("c");
+    if (collection == null || collection.equals("")) {
+        return GSHTML.errorPage("textquery, need to specify a colleciton!");
+    }
+
+    // the first part of the data for the page is the cgi-params
+    Element cgi_request = (Element)doc_.importNode(request, true);
+    page.appendChild(cgi_request);
+
+    // get the service info from the MR - this will probably need to be cached somehow later on. and add as a description node to the cgi-request - this doesn't work. change to add the specified value as a current attribute to the param - need to do somthing different for query
+
+    Element mr_info_message = doc_.createElement("message");
+    Element mr_info_request = doc_.createElement("request");
+    mr_info_message.appendChild(mr_info_request);
+    mr_info_request.setAttribute("type", "describe");
+
+    String to = collection;
+    to = GSPath.appendLink(to, "TextQuery");
+    mr_info_request.setAttribute("to", to);
+
+    Element mr_info_response = (Element) mr_.process(mr_info_message);
+    System.err.println("describe response for service");
+    System.err.println(converter_.getString(mr_info_response));
+    Element description = doc_.createElement("description");
+    // just param list for now - may need content info too
+    Node pl = GSXML.getNodeByPath(mr_info_response, "response/service/paramList");
+    if (pl ==null) {
+        System.out.println("pl is null");
+    }
+    else {
+        System.out.println("pl name is "+pl.getNodeName());
+    }
+    Element imported_paramList = (Element)doc_.importNode(pl, true);
+    System.out.println("imported param list=");
+    System.out.println(converter_.getString(imported_paramList));
+    // convert the name to short
+    cgi_.addShortNames(imported_paramList);
+    System.out.println("converted param list=");
+    System.out.println(converter_.getString(imported_paramList));
+
+    description.appendChild(imported_paramList);
+    
+    // for each param in page_request, set the current value if present
+    //actually, prob dont need to know the default value, just which one to display - overwrite the default att?
+    
+    Element param = (Element)imported_paramList.getFirstChild();
+    while (param !=null) {
+        if (param.getNodeName().equals("param")) { // just in case
+        String name = param.getAttribute("name");
+        String current = (String)params.get(name);
+        System.out.println("name="+name+", current="+current);
+        if (current !=null && !current.equals("")) {
+            param.setAttribute("default", current);
+        }
+        }
+        param = (Element)param.getNextSibling();
+    }
+    System.out.println("adapted param list=");
+    System.out.println(converter_.getString(imported_paramList));
+    
+    cgi_request.appendChild(description);
+    
+    // check the query string
     String query = (String)params.get("q");
+
     if (query==null|| query.equals("")) {
-        // if there is no q set, just output the search box
-        String transformed_result = transformer_.transform(stylesheet,
-                                   query_request);    
-        return transformed_result;
+        // if there is no q set, just output the search form
+        System.out.println("the plain page with no query data");
+        System.out.println(converter_.getString(page));
+        return transformer_.transform(stylesheet, page);       
     }
     
     // else do the request, output search box and results
-    Element mr_message = doc_.createElement("message");
-    Element mr_request = doc_.createElement("request");
-    mr_message.appendChild(mr_request);
-
-    mr_request.setAttribute("type", "query");
-    String to = (String)params.get("c"); // collection name
-    to = GSPath.appendLink(to, "TextQuery");
-    mr_request.setAttribute("to", to);
-    
-    // ignore paramList for now
+    Element mr_query_message = doc_.createElement("message");
+    Element mr_query_request = doc_.createElement("request");
+    mr_query_message.appendChild(mr_query_request);
+
+    mr_query_request.setAttribute("type", "query");
+    mr_query_request.setAttribute("to", to);
+
+    // paramList
     Element paramList = doc_.createElement("paramList");
-    mr_request.appendChild(paramList);
+    mr_query_request.appendChild(paramList);
+
+    Iterator i = params.entrySet().iterator();
+    while (i.hasNext()) {
+        Map.Entry e = (Map.Entry)i.next();
+        String name = cgi_.toLong((String)e.getKey());
+        if (!name.equals("")) {
+        String value = (String)e.getValue();
+        // if (!name.equals("c")) {
+        Element p = doc_.createElement("param");
+        p.setAttribute("name", name);
+        p.setAttribute("value", value);
+        paramList.appendChild(p);
+        // }
+        }
+    }
 
     // content - contains the query string
-    Element content = doc_.createElement("content");
-    Text text = doc_.createTextNode(query);
-    content.appendChild(text);
-    mr_request.appendChild(content);
-    //return GSHTML.errorPage(GSHTML.htmlSafe(converter_.getString(mr_message)));
-
-    Element result1 = (Element)mr_.process(mr_message);
+    Element query_content = doc_.createElement("content");
+    Text query_text = doc_.createTextNode(query);
+    query_content.appendChild(query_text);
+    mr_query_request.appendChild(query_content);
+    
+    Element mr_query_response = (Element)mr_.process(mr_query_message);
+
     // this result is the list of docs.
     // now take that list, and get the Titles
     // for now, just create a whole new request
 
-    Element resource_list = (Element)result1.getElementsByTagName("resourceList").item(0); // should always be a resource list - but it may be empty
-
-    Element first_resource = (Element)GSXML.getChildByTagName(resource_list, "resource");
-    if (first_resource == null) { // no docs found - dont bother getting metadata
-        Element result_response = (Element)GSXML.getChildByTagName(result1, "response");
+    // check that there are some resources - for now check the list, but later should use a numdocs metadata elem
+    Element resource_list = (Element)GSXML.getNodeByPath(mr_query_response, "response/content/resourceList"); // resourceList not present if no docs found
+    if (resource_list == null) {
+
+        Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, "response");
         
-        query_request.appendChild(doc_.importNode(result_response, true));
-        
-        String transformed_result = transformer_.transform(stylesheet,
-                                   query_request);
-        
-        return transformed_result;
-    }
+        page.appendChild(doc_.importNode(result_response, true));
+        System.out.println("the page with empty response");
+        System.out.println(converter_.getString(page));     
+        return transformer_.transform(stylesheet, page);
+    }
+
+    // we have a doc list, so get the metadata - for now, get title.
+    // can we dynamically decide what metadata to get?
     // get the Title metadata
-    Element mr_message2 = doc_.createElement("message");
-    Element mr_request2 = doc_.createElement("request");
-    mr_message2.appendChild(mr_request2);
-
-    mr_request2.setAttribute("type", "query");
-    to = (String)params.get("c"); // collection name
-    to = GSPath.appendLink(to, "MetadataRetrieve");
-    mr_request2.setAttribute("to", to);
-    Element content2 = doc_.createElement("content");
-    mr_request2.appendChild(content2);
+    Element mr_metadata_message = doc_.createElement("message");
+    Element mr_metadata_request = doc_.createElement("request");
+    mr_metadata_message.appendChild(mr_metadata_request);
+
+    mr_metadata_request.setAttribute("type", "query");
+    to = GSPath.appendLink(collection, "MetadataRetrieve");
+    mr_metadata_request.setAttribute("to", to);
+    
+    Element meta_content = doc_.createElement("content");
+    mr_metadata_request.appendChild(meta_content);
 
     // the first part of the content is the doc list
-    content2.appendChild(doc_.importNode(resource_list, true));
+    meta_content.appendChild(doc_.importNode(resource_list, true));
 
     // the second part of the content is the metadata list
@@ -120 +209 @@
     title.setAttribute("name", "Title");
     metadata_list.appendChild(title);
-    content2.appendChild(metadata_list);
-
-    //return GSHTML.errorPage(GSHTML.htmlSafe(converter_.getString(mr_request2)));
-    Element result2 = (Element)mr_.process(mr_message2);
-    
-    Element result2_response = (Element)GSXML.getChildByTagName(result2, "response");
-    
-    query_request.appendChild(doc_.importNode(result2_response, true));
-    //return GSHTML.errorPage(GSHTML.htmlSafe(converter_.getString(query_request)));
-
-    String transformed_result = transformer_.transform(stylesheet,
-                           query_request);
-    
-    return transformed_result;
-    
-    }
-
-    protected String fieldQuery(Element request) {
+    meta_content.appendChild(metadata_list);
+
+    System.out.println("the metadata request to mr");
+    System.out.println(converter_.getString(mr_metadata_message));
+
+    Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);
+    
+    Element result_response = (Element)GSXML.getChildByTagName(mr_metadata_response, "response");
+    
+    page.appendChild(doc_.importNode(result_response, true));
+    
+    System.out.println("the page with full response");
+    System.out.println(converter_.getString(page));     
+
+    return transformer_.transform(stylesheet, page);
+    
+    }
+
+    protected String fieldQuery(Element page, Element request) {
     return GSHTML.errorPage("field query not implemented");
 
 
     }
-    protected String unknownQuery(Element request) {
+    protected String unknownQuery(Element page, Element request) {
 
     return GSHTML.errorPage("unknown query subtype - unknown query not implemented");

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

@@ -10 +10 @@
 import java.util.HashMap;
 public class ResourceAction extends Action {
-    
 
-    public String process (String xml_in) {
 
-    Element message = converter_.getDOM(xml_in).getDocumentElement();
-    Element request = (Element)message.getElementsByTagName("request").item(0);
+    // could pass in action name, and have it dynamically decide the name
+   
+    public String process (Element message) {
 
-    // could pass in aciton name, and have it dynamically decide the name
+    // find the stylesheet
     String stylesheet = GSFile.stylesheetPath(config_, "resource.xsl");
 
-    //String stylesheet = GSFile.stylesheetPath(gsdl_home_, site_home_,
-    //                    display_home_, "resource.xsl");
     if (stylesheet==null) {
         return GSHTML.errorPage("resource stylesheet not found!");
     }
-    
+
     // for now, info="r" eventually we may want to change to r/text r/assoc
     // or something
-    
-    HashMap params = GSXML.extractParams((Element)request.getElementsByTagName("paramList").item(0));
-    
+    Element request = (Element)message.getElementsByTagName("request").item(0);
+
+    Element cgi_paramList = (Element)GSXML.getChildByTagName(request, "paramList");
+    cgi_.toLong(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList);
+
     String resource_name = (String)params.get("r");
     if (resource_name == null || resource_name.equals("")) {
@@ -36 +36 @@
         return GSHTML.errorPage("no resource specified");
     }
+    
+    
+    // create the return page tree
+    Element page = doc_.createElement("page");
+    page.setAttribute("lang", message.getAttribute("lang"));
+    // add the lang stuff from message
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "translate"), true));
+    // add the config stuff from message
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(message, "config"), true));
+
+
 
     // build up the mr request
-
     Element mr_message = doc_.createElement("message");
     Element mr_request = doc_.createElement("request");
@@ -61 +71 @@
     content.appendChild(resource_list);
 
-    //return GSHTML.errorPage(GSHTML.htmlSafe(converter_.getString(mr_message)));
-    Element result = (Element)mr_.process(mr_message);
-    //return GSHTML.errorPage(GSHTML.htmlSafe(converter_.getString(mr_message)+"<p>"+converter_.getString(result)));
+    Element mr_result = (Element)mr_.process(mr_message);
 
-    // create a new Element
-    Element page = doc_.createElement("message");
+    // add the results to the page
     page.appendChild(doc_.importNode(request, true));
-    page.appendChild(doc_.importNode(GSXML.getChildByTagName(result, "response"), true));
-    //message.appendChild(doc_.importNode(GSXML.getChildByTagName(result, "response"), true));
+    page.appendChild(doc_.importNode(GSXML.getChildByTagName(mr_result, "response"), true));
+    
 
     String transformed_result = transformer_.transform(stylesheet, page);

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -18 +18 @@
     protected ConfigVars config_=null;
 
+    /** the cgi args converter */
+    protected CGIArgConverter cgi_=null;
+
     /** container Document to create XML Nodes */
     protected Document doc_=null; 
@@ -29 +32 @@
     protected HashMap action_map_=null;
 
+    protected Translate translation_=null;
     public Receptionist() {
     converter_ = new XMLConverter();
     doc_ = converter_.newDOM();
     action_map_= new HashMap();
+    translation_ = new Translate();
+    cgi_ = new CGIArgConverter();
     }
  
@@ -38 +44 @@
     public void setConfigVars(ConfigVars config) {
     config_ = config;
+    translation_.setConfigVars(config);
     }
     /** sets the message router  - it should already be created and 
@@ -56 +63 @@
     }
 
+    // for now, assume default is en, so load that
+    translation_.setDefaultLanguage("en");
     // for now, just statically add in the actions
     // actions may disappear if xslt is all that is needed
@@ -62 +71 @@
     a.setConfigVars(config_);
     a.setMessageRouter(mr_);
+    a.setCGIConverter(cgi_);
     a.configure();
     action_map_.put("p", a);
@@ -67 +77 @@
     a = new QueryAction();
     a.setConfigVars(config_);
+    a.setCGIConverter(cgi_);
     a.setMessageRouter(mr_);
     a.configure();
@@ -73 +84 @@
     a = new BrowseAction();
     a.setConfigVars(config_);
+    a.setCGIConverter(cgi_);
     a.setMessageRouter(mr_);
     a.configure();
@@ -79 +91 @@
     a = new ResourceAction();
     a.setConfigVars(config_);
+    a.setCGIConverter(cgi_);
     a.setMessageRouter(mr_);
     a.configure();
@@ -87 +100 @@
     public String process(String xml_in) {
 
-    Element message = converter_.getDOM(xml_in).getDocumentElement();
+    Document message_doc = converter_.getDOM(xml_in);
+    Element message = message_doc.getDocumentElement();
+    
     NodeList requests = message.getElementsByTagName("request");
     if (requests.getLength()==0) {
@@ -106 +121 @@
     // pass to appropriate action
     
-    ModuleInterface mi = (ModuleInterface)action_map_.get(action);
-    if (mi==null) {
+    Action a = (Action)action_map_.get(action);
+    if (a==null) {
         return GSHTML.errorPage("no action for "+action);
     }
+
+    // add in the translation bit - should we do it here? or give the actions access to the translation object?
+    String lang = message.getAttribute("lang");
+    Element trans = translation_.getLanguageTree(lang);
+    message.appendChild(message_doc.importNode(trans, true));
+
+    // add in the system vars bit
+    message.appendChild(message_doc.importNode(config_.config_xml_, true));
+
+    System.out.println("message at receptionist is:");
+    System.out.println(converter_.getString(message));
+    String page = a.process(message);
+    return page;
     // just pass a string for now - better to pass the doc cos already
     // parsed it, but we want a string back
-    String page = mi.process(xml_in);
+    //String page = mi.process(xml_in);
     
     // output the page
-    return page;
+    //return page;
     }
 

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

@@ -81 +81 @@
 
     System.out.println("configuring MGPPGDBMService");
-    default_index_="tt";
+    System.out.println("config info=");
+    System.out.println(converter_.getString(info));
+    // get the default index out of metadata
+    NodeList metadata = info.getElementsByTagName("metadata");
+    String name=null;
+    for(int i=0; i<metadata.getLength(); i++) {
+        Element e = (Element)metadata.item(i);
+        name = e.getAttribute("name");
+        if (name.equals("defaultIndex")) {
+        default_index_ = GSXML.getValue(e);
+        break;
+        }
+    }
+    System.out.println("default index="+default_index_);
     Element e = null;
     // these entries should reflect the build config file - some services may not be available depending on how the collection was built.
@@ -107 +120 @@
     // set up service_info_map_ - for now, just has the same elements as above
     // should have full details about each service incl params lists etc.
+    // do the text query one - for now a static list. later use buildcfg.xml values to dynamically change this
     e = doc_.createElement("service");
     e.setAttribute("type", "query");
     e.setAttribute("name", "TextQuery");
+    Element paramList = doc_.createElement("paramList");
+    // boolean params
+    Element param = GSXML.createParameter(doc_, "case", GSXML.PARAM_TYPE_BOOLEAN, "1", null);
+    paramList.appendChild(param);
+    param = GSXML.createParameter(doc_, "stem", GSXML.PARAM_TYPE_BOOLEAN, "1", null);
+    paramList.appendChild(param);
+    // enum params
+    String []vals = {"all", "some"};
+    param = GSXML.createParameter(doc_, "matchMode", GSXML.PARAM_TYPE_ENUM, "all", vals);
+    paramList.appendChild(param);
+    String [] vals1 = {"rank", "natural"};
+    param = GSXML.createParameter(doc_, "sortBy", GSXML.PARAM_TYPE_ENUM, "rank", vals1 );
+    paramList.appendChild(param);
+    String [] vals2 = {"Document", "Section"};
+    param = GSXML.createParameter(doc_, "queryLevel", GSXML.PARAM_TYPE_ENUM, "Section", vals2);
+    paramList.appendChild(param);
+    // Integer params
+    param = GSXML.createParameter(doc_, "maxDocs", GSXML.PARAM_TYPE_INTEGER, "10", null);
+    paramList.appendChild(param);
+
+
+    e.appendChild(paramList);
+    
     service_info_map_.put("TextQuery", e);
     
+
     e = doc_.createElement("service");
     e.setAttribute("type", "query");
@@ -173 +211 @@
 
     HashMap params = GSXML.extractParams(param_elem);
-    String index = (String)params.get("Index"); // we must have an index elem
+    String index = (String)params.get("Index"); 
     if (index==null) { // if its not present, use the default index
         index=default_index_;
@@ -289 +327 @@
         for (int j=0; j<ids.length; j++) {
         long real_num = gdbm_src_.oid2Docnum(ids[j]);
+        System.out.println("getting doc text, basedir="+basedir+", textdir="+textdir+", level="+level+", num="+real_num);
         String document = mgpp_src_.getDocument(basedir, textdir,  level, real_num);
         // for now, stick it in a text node - eventually should be parsed as xml??
+
+        // something funny with the doc - 
         Element new_doc = GSXML.createResourceElement(doc_, ids[j]);
         GSXML.addDocText(doc_, new_doc, document);
@@ -365 +406 @@
        
         if (name.equals("case")) {
-        boolean val = (value.equals("true")?true:false);
+        boolean val = (value.equals("1")?true:false);
         mgpp_src_.setCase(val);     
         } else if (name.equals("stem")) {
-        boolean val = (value.equals("true")?true:false);
+        boolean val = (value.equals("1")?true:false);
         mgpp_src_.setStem(val);
         } else if (name.equals("maxDocs")) {
@@ -378 +419 @@
         mgpp_src_.setReturnLevel(value);
         } else if (name.equals("matchMode")) {
-        int mode = Integer.parseInt(value);
+        int mode;
+        if (value.equals("all")) mode=1;
+        else mode=0;
         mgpp_src_.setMatchMode(mode);
-        } else if (name.equals("sortByRank")) {
-        boolean val = (value.equals("true")?true:false);
-        mgpp_src_.setSortByRank(val);
+        } else if (name.equals("sortBy")) {
+        if (value.equals("rank")) {
+            mgpp_src_.setSortByRank(true);
+        } else if (value.equals("natural")) {
+            mgpp_src_.setSortByRank(false);
+        }
         } else if (name.equals("termInfo")) {
-        boolean val = (value.equals("true")?true:false);
+        boolean val = (value.equals("1")?true:false);
         mgpp_src_.setReturnTerms(val);
         } // ignore any others

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

@@ -72 +72 @@
     f.setAttribute("type", "query");
     f.setAttribute("name", "PhindBrowse");
+
+    // add in teh applet info for the phind applet
+    String app_info = "<APPLET CODEBASE='/gsdl/bin/java' CODE='org.greenstone.gsdl3.applet.Phind.class' ARCHIVE='Phind.jar' WIDTH=500 HEIGHT=400>
+  <PARAM NAME=library      VALUE='/cgi-bin/library?e=d-000-00---0fi1998--00-0-0-0prompt-10---4---Document-dtx--0-1l--0-en-50---20-preferences-the--001-011-1-0isoZz-8859Zz-1-0'>
+  <PARAM NAME=phindcgi     VALUE='library?a=browse/phind'>
+  <PARAM NAME=collection   VALUE='fi1998'>
+  <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>";
+
     service_info_map_.put("PhindBrowse", f);
     

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

@@ -207 +207 @@
     String info = request.getAttribute("info");
     if (type.equals("describe")) { // process here, not by subclass
+        Element response = doc_.createElement("response");
+        response.setAttribute("type", "describe");
         if (to.equals("")) { // to="", look at info
         if (info.equals("serviceList")) {
-            return short_service_info_;
+            response.appendChild(short_service_info_);
+            return response;
         } 
         // else error in info field
@@ -216 +219 @@
         } else { // describe a particular service
         if (service_info_map_.containsKey(to)) {
-            return (Element)service_info_map_.get(to);
+            response.appendChild((Element)service_info_map_.get(to));
+            return response;
         }
         // else error in to field