Changeset 3644

Timestamp:

2003-01-06T14:47:34+13:00 (21 years ago)

Author:

kjdon

Message:

tidying up

Location:

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

Files:

• MessageRouter.java (modified) (6 diffs)
• Receptionist.java (modified) (9 diffs)

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

@@ -53 +53 @@
  * @see ModuleInterface
  * @see Collection
- * @see ServicesImpl
+ * @see ServiceRack
  * @see Communicator
  *
@@ -302 +302 @@
     
     Node module_list = GSXML.getChildByTagName(config, 
-                           GSXML.SERVICE_IMPL_ELEM+GSXML.LIST_MODIFIER);
+                           GSXML.SERVICE_CLASS_ELEM+GSXML.LIST_MODIFIER);
     if (module_list == null) {
         System.out.println("... none to be loaded");
@@ -316 +316 @@
         
         for(int i=0; i<service_impls.getLength(); i++) {
-            if (service_impls.item(i).getNodeName().equals(GSXML.SERVICE_IMPL_ELEM)) {
+            if (service_impls.item(i).getNodeName().equals(GSXML.SERVICE_CLASS_ELEM)) {
             Element n = (Element)service_impls.item(i);
             String service_name = n.getAttribute(GSXML.NAME_ATT);
             System.out.println("..."+service_name);
             try {
-                ServicesImpl s = (ServicesImpl)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
+                ServiceRack s = (ServiceRack)Class.forName("org.greenstone.gsdl3.service."+service_name).newInstance();
                 s.setSiteHome(site_home_);
                 s.setMessageRouter(this);
@@ -343 +343 @@
                 }
             } catch (Exception e ) {
-                System.err.println("MessageRouter configure exception:  in ServicesImpl class specification:  "+ e.getMessage());
+                System.err.println("MessageRouter configure exception:  in ServiceRack class specification:  "+ e.getMessage());
                 
             } 
@@ -502 +502 @@
     }
 
-    protected boolean activateServicesImpl(String module_name) {
+    protected boolean activateServiceRack(String module_name) {
     return false;
     }
@@ -558 +558 @@
             if (module_type.equals(GSXML.COLLECTION_ELEM)) {
             activateCollection(module_name);
-            } else if (module_type.equals(GSXML.SERVICE_IMPL_ELEM)) {
-            activateServicesImpl(module_name);
+            } else if (module_type.equals(GSXML.SERVICE_CLASS_ELEM)) {
+            activateServiceRack(module_name);
             } else if (module_type.equals(GSXML.CLUSTER_ELEM)) {
             activateServiceCluster(module_name);

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

@@ -26 +26 @@
 
     /** the cgi args converter */
-    protected CGIArgConverter cgi_=null;
+    protected GSCGI cgi_ = null;
 
     /** container Document to create XML Nodes */
@@ -44 +44 @@
     doc_ = converter_.newDOM();
     action_map_= new HashMap();
-    cgi_ = new CGIArgConverter();
+    cgi_ = new GSCGI();
     }
  
@@ -76 +76 @@
     a.setConfigVars(config_);
     a.setMessageRouter(mr_);
-    a.setCGIConverter(cgi_);
+    a.setCGI(cgi_);
     a.configure();
     action_map_.put("p", a);
@@ -82 +82 @@
     a = new QueryAction();
     a.setConfigVars(config_);
-    a.setCGIConverter(cgi_);
+    a.setCGI(cgi_);
     a.setMessageRouter(mr_);
     a.configure();
@@ -89 +89 @@
     a = new BrowseAction();
     a.setConfigVars(config_);
-    a.setCGIConverter(cgi_);
-    a.setMessageRouter(mr_);
+    a.setCGI(cgi_);
+    a.setMessageRouter(mr_);
     a.configure();
     action_map_.put("b", a);
 
-    a = new ResourceAction();
-    a.setConfigVars(config_);
-    a.setCGIConverter(cgi_);
-    a.setMessageRouter(mr_);
-    a.configure();
-    action_map_.put("r", a);
+    a = new DocumentAction();
+    a.setConfigVars(config_);
+    a.setCGI(cgi_);
+    a.setMessageRouter(mr_);
+    a.configure();
+    action_map_.put("d", a);
 
     a = new AppletAction();
     a.setConfigVars(config_);
-    a.setCGIConverter(cgi_);
+    a.setCGI(cgi_);
     a.setMessageRouter(mr_);
     a.configure();
     action_map_.put("a", a);
+    
+    a = new ProcessAction();
+    a.setConfigVars(config_);
+    a.setCGI(cgi_);
+    a.setMessageRouter(mr_);
+    a.configure();
+    action_map_.put("pr", a);
 
 
@@ -132 +139 @@
     // check that the request type is correct
     String type = request.getAttribute(GSXML.TYPE_ATT); // returns "" if no att of this name
-    if (!type.equals(GSXML.REQUEST_TYPE_ACTION)) {
-        System.err.println("Receptionist Error: request type should be '"+GSXML.REQUEST_TYPE_ACTION+"', but it was '"+type+"'!");
+    if (!type.equals(GSXML.REQUEST_TYPE_CGI)) {
+        System.err.println("Receptionist Error: request type should be '"+GSXML.REQUEST_TYPE_CGI+"', but it was '"+type+"'!");
         return null;
     }   
@@ -145 +152 @@
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     if (param_list!=null) {
-        if (!cgi_.toLong(param_list)) {
+        if (!cgi_.paramListToLongNames(param_list)) {
         System.err.println("Receptionist Error: couldn't convert short names to long names in the param list!");
         return null;
@@ -161 +168 @@
         ac.setConfigVars(config_);
         ac.setMessageRouter(mr_);
-        ac.setCGIConverter(cgi_);
+        ac.setCGI(cgi_);
         ac.configure();
         action_map_.put(action, ac);
@@ -186 +193 @@
     /** returns an xml element containing all the text strings 
      * needed for an interface 
-     * currenlty only uses the current interface - should add in 
+     * currently only uses the current interface - should add in 
      * needed ones from the default interface if current != default */
     protected Element getDisplayElement(String lang) {