Changeset 30840 for main

Timestamp:

2016-09-22T12:11:04+12:00 (8 years ago)

Author:

kjdon

Message:

adding in handling for displayItems in siteConfig file, and for requests to get these back

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (9 diffs)

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

@@ -33 +33 @@
 import org.greenstone.gsdl3.comms.SOAPCommunicator;
 import org.greenstone.gsdl3.service.ServiceRack;
+import org.greenstone.gsdl3.util.CustomClassLoader;
+import org.greenstone.gsdl3.util.DisplayItemUtil;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSPath;
@@ -95 +97 @@
     /** list of metadata for the site */
     protected Element metadata_list = null;
+  /** list of display items for all languages */
+  protected Element display_item_list = null;
+
+  /** a customised class loader so we can find resources in site resources folder*/
+  protected CustomClassLoader class_loader = null;
+  protected static final String DEFAULT_LANG = "en"; // hack for now, should be read from the coll cfg file? or site cfg file for cluster
 
     //***************************************************************
@@ -150 +158 @@
         }
         this.site_home = GSFile.siteHome(GlobalProperties.getGSDL3Home(), this.site_name);
+        // set up the class loader
+        this.class_loader = new CustomClassLoader(this.getClass().getClassLoader(), GSFile.siteResourceDir(this.site_home));
+
         String web_address = GlobalProperties.getGSDL3WebAddress();
         if (web_address.equals("")) {
@@ -251 +262 @@
         // gets removed from where it was. This changes the node list - you cant iterate over the node list in a normal manner if you are moving elements out of it
         int num_requests = requests.getLength();
+        logger.error("**** num requests = "+num_requests);
         for (int i = 0; i < num_requests; i++)
         {
@@ -331 +343 @@
         } // for each request
 
-        //  logger.debug("MR returned response");
-        //logger.debug(XMLConverter.getString(mainResult));
+            logger.debug("MR returned response");
+        logger.debug(XMLConverter.getString(mainResult));
 
         return mainResult;
@@ -480 +492 @@
         loadMetadata(metadata_list_elem);
 
+        // load up the displayItems
+        this.display_item_list = doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+        Element display_item_list_elem = (Element) GSXML.getChildByTagName(config_info, GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+        DisplayItemUtil.storeDisplayItems(this.display_item_list, display_item_list_elem);
         return true;
 
@@ -1055 +1071 @@
             Document doc = XMLConverter.newDOM();
         String type = req.getAttribute(GSXML.TYPE_ATT);
+        String lang = req.getAttribute(GSXML.LANG_ATT);
         Element response = doc.createElement(GSXML.RESPONSE_ELEM);
         response.setAttribute(GSXML.FROM_ATT, "");
@@ -1069 +1086 @@
                 response.appendChild(doc.importNode(this.service_list, true));
                 response.appendChild(doc.importNode(this.metadata_list, true));
+                Element di_list = doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+                response.appendChild(di_list);
+                DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
                 return response;
             }
@@ -1102 +1122 @@
                     {
                         response.appendChild(doc.importNode(this.metadata_list, true));
+                    }
+                    else if (info.equals(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER))
+                    {
+                      Element di_list = doc.createElement(GSXML.DISPLAY_TEXT_ELEM + GSXML.LIST_MODIFIER);
+                      response.appendChild(di_list);
+                      DisplayItemUtil.addLanguageSpecificDisplayItems(di_list, this.display_item_list, lang, DEFAULT_LANG, this.class_loader);
+                      
                     }
                 }