Changeset 23405 for main/trunk/greenstone3/src

Timestamp:

2010-12-07T17:05:38+13:00 (13 years ago)

Author:

sjb48

Message:

FormatAction constructs message containing format string that is sent to the collection. The message knows the service, and if it is the browse service, then it also knows the classifer list number.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• action/FormatAction.java (modified) (6 diffs)
• collection/ServiceCluster.java (modified) (1 diff)
• core/Receptionist.java (modified) (1 diff)
• core/TransformingReceptionist.java (modified) (1 diff)
• util/XMLTransformer.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/FormatAction.java

@@ -3 +3 @@
 import org.greenstone.gsdl3.core.ModuleInterface;
 import org.greenstone.gsdl3.util.*;
+import org.greenstone.util.GlobalProperties;
 
 // XML classes
@@ -54 +55 @@
     
     String coll = (String)params.get(GSParams.COLLECTION); //SYSTEM_CLUSTER);
+    String service = (String)params.get(GSParams.SERVICE);
+    String classifier = (String)params.get("cl");
+
+
+    logger.error("Collection="+coll);
+    logger.error("Service="+service);
+    logger.error("Classifier="+classifier);
+
 
     String to = "";
@@ -62 +71 @@
     Element mr_request_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
     Element mr_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_FORMAT_STRING, to, lang, uid);
+
+    request.setAttribute("service", service);
+    if(classifier != null)
+        request.setAttribute("classifier", classifier);
+
     mr_request_message.appendChild(mr_request);
     
-    Element format = this.doc.createElement(GSXML.FORMAT_STRING_ELEM);
-    mr_request.appendChild(format);
+    //Element format = this.doc.createElement(GSXML.FORMAT_STRING_ELEM);
+    //mr_request.appendChild(format);
 
     String format_string = (String)params.get("data");
@@ -72 +86 @@
 
     Iterator it = params.keySet().iterator();
-    while(it.hasNext())
-    {
-        logger.error("Param: "+it.next());
-    }      
+    //while(it.hasNext())
+    //{
+    //    logger.error("Param: "+it.next());
+    //}      
 
     try {
@@ -83 +97 @@
             String input = format_string;
             InputSource is = new InputSource( new StringReader( input ) );
-            Document d = builder.parse( is );
-            Element e = d.getDocumentElement();
-            
-            page_response.appendChild(this.doc.importNode(e, true));
+            Document d = (Document) builder.parse( is );
+            //Element e = d.getDocumentElement();
+            //Node d2 = this.doc.importNode(e,true); 
+
+            //Document format_doc = this.converter.newDOM();
+            //doc.appendChild(d2);
+
+            //File interface_config_file = new File(GSFile.interfaceConfigFile(GSFile.interfaceHome(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.INTERFACE_NAME))));
+            //if (!interface_config_file.exists()) {
+            //  logger.error(" interface config file: "+interface_config_file.getPath()+" not found!");
+            //}
+            //Document config_doc = this.converter.getDOM(interface_config_file, "utf-8");
+            //if (config_doc == null) {
+            //  logger.error(" could not parse interface config file: "+interface_config_file.getPath());
+            //}
+        
+            //Element config_elem = config_doc.getDocumentElement();
+            //String base_interface = config_elem.getAttribute("baseInterface");
+
+
+            // Call XSLT to transform document to xml format string
+            XMLTransformer transformer = new XMLTransformer();
+            //String stylesheet = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String)this.config_params.get(GSConstants.SITE_NAME), coll, (String)this.config_params.get(GSConstants.INTERFACE_NAME), "oran", "FormatAction");
+            //logger.error(stylesheet);
+            Document style_doc = this.converter.getDOM(new File("/home/sam/greenstone3/web/interfaces/oran/transform/formatString.xsl"), "UTF-8");
+
+            if(style_doc == null)
+                logger.error("style_doc is null");
+
+            // not sure what to do here - some code from Transforming Receptionist
+            String transformed = transformer.transformToString(style_doc, d);
+            //Node transformed = transformer.transform(style_doc, d);
+           
+            Element format = this.doc.createElement(GSXML.FORMAT_STRING_ELEM);
+            GSXML.setNodeText(format, transformed);
+            //format.appendChild(this.doc.createTextNode(transformed));
+            //format.setNodeValue(transformed);
+            mr_request.appendChild(format); 
+            logger.error("Transformed: "+transformed);
+
+
+            //page_response.appendChild(this.doc.importNode(e, true));
     } catch( Exception ex ) {
             logger.error("There was an exception "+ex);
@@ -100 +152 @@
 
     // Call XSLT to transform document to xml format string
-    this.transformer = new XMLTransformer();
+    //XMLTransformer transformer = new XMLTransformer();
 
     // not sure what to do here - some code from Transforming Receptionist
+    //transformer.transformToString(Document stylesheet, Document source);
 
     // create a mesage to send to the collection object via the message router

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

@@ -509 +509 @@
         return response;
     }
-    
+
+    if (type.equals(GSXML.REQUEST_TYPE_FORMAT_STRING)) {
+        logger.error("Received format string request");
+        String service = request.getAttribute("service");
+        logger.error("Service is " + service);
+        String classifier = null;
+        if(service.equals("ClassifierBrowse"))
+        {
+            classifier = request.getAttribute("classifier");
+            logger.error("Classifier is " + classifier);
+        }
+        Element format_element = (Element) GSXML.getChildByTagName(request, GSXML.FORMAT_STRING_ELEM);
+        String format_string = GSXML.getNodeText(format_element);
+        logger.error("Format string: " + format_string);
+        logger.error("Config file location = " + GSFile.collectionConfigFile(this.site_home, this.cluster_name));
+    }
     if (type.equals(GSXML.REQUEST_TYPE_SYSTEM)) {
         response = processSystemRequest(request);

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

@@ -234 +234 @@
 
     logger.debug("receptionist returned response");
-    logger.error("receptionist returned response");
+    //logger.error("receptionist returned response");
     logger.debug(this.converter.getString(resulting_page));
-    logger.error(this.converter.getString(resulting_page));
+    //logger.error(this.converter.getString(resulting_page));
 //    logger.info("receptionist returned response");
 //    logger.info(this.converter.getString(resulting_page));

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -659 +659 @@
       logger.info(" cant find stylesheet for "+name);
     }
+    logger.error("stylesheet:"+stylesheet);
     return stylesheet;
   }

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XMLTransformer.java

@@ -98 +98 @@
         //this.t_factory = TransformerFactory.newInstance();
     } catch (Exception e) {
-        logger.error("exception "+e.getMessage());
+        logger.error("exception creating t_factory "+e.getMessage());
     }
     }