Changeset 9433

Timestamp:

2005-03-15T16:18:37+13:00 (19 years ago)

Author:

kjdon

Message:

added in code to cope when we have more than one service with the same name, eg multiple TextQuery services

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java (modified) (5 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -65 +65 @@
      */
     protected HashMap service_map=null;
-
+    /** maps pseudo service names to real service names - needed if we have two services with the same name for one collection */
+    protected HashMap service_name_map=null;
+    
     /** XML converter for String to DOM and vice versa */
     protected XMLConverter converter=null;
@@ -100 +102 @@
     public ServiceCluster() {
     this.service_map = new HashMap();
+    this.service_name_map = new HashMap();
     this.converter = new XMLConverter();
     this.doc = this.converter.newDOM();
@@ -270 +273 @@
             
             for (int j=0; j<typenodes.getLength();j++) {
-            String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);        
+            String service = ((Element) typenodes.item(j)).getAttribute(GSXML.NAME_ATT);       
+            if (service_map.get(service)!=null) {
+                char extra = '0';
+                String new_service = service+extra;    
+
+                while (service_map.get(new_service)!=null) {
+                extra++;
+                new_service = service+extra;
+                }
+                this.service_name_map.put(new_service, service);
+                service=new_service;
+                ((Element) typenodes.item(j)).setAttribute(GSXML.NAME_ATT, service);
+            }
             this.service_map.put(service, s);
-            
             // also add info to the ServiceInfo XML element
             this.service_list.appendChild(this.doc.importNode(typenodes.item(j), true));
@@ -345 +359 @@
             continue;
         }
+        String real_service = service;
+        if (this.service_name_map.containsKey(service)) {
+            real_service = (String)this.service_name_map.get(service);
+            // need to change the to att in the request - give the real service name
+            to = request.getAttribute(GSXML.TO_ATT);
+            String old_to = to;
+            to = GSPath.replaceFirstLink(to, real_service);
+            request.setAttribute(GSXML.TO_ATT, to);
+        }
         // have to pass the request to the service
         Element single_message = mess_doc.createElement(GSXML.MESSAGE_ELEM);
@@ -352 +375 @@
             Element response = (Element) GSXML.getChildByTagName(response_message, GSXML.RESPONSE_ELEM);
             String from = response.getAttribute(GSXML.FROM_ATT);
+            if (!real_service.equals(service)) {
+            // replace the real service name with the pseudo service name
+            from = GSPath.replaceFirstLink(from, service);
+            // also need to do it in the service itself
+            // shoudl this be done here??
+            Element service_elem = (Element) GSXML.getChildByTagName(response, GSXML.SERVICE_ELEM);
+            if (service_elem!= null) {
+                service_elem.setAttribute(GSXML.NAME_ATT, service);
+            }
+            }
             from = GSPath.prependLink(from, this.cluster_name);
             response.setAttribute(GSXML.FROM_ATT, from);