Changeset 30670

Timestamp:

2016-08-04T12:08:33+12:00 (7 years ago)

Author:

kjdon

Message:

can now get displayItem values from a dictionary. for collections, this enables us to more easily get the name and descriptions translated for the demo colls.

Location:

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

Files:

• Collection.java (modified) (4 diffs)
• ServiceCluster.java (modified) (4 diffs)

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

@@ -33 +33 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.core.ModuleInterface;
+import org.greenstone.gsdl3.util.CollectionClassLoader;
+import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -83 +85 @@
 
     protected XMLTransformer transformer = null;
+    /**
+     * A class loader that knows about the collection resources directory can
+     * put properties files, dtds etc in here
+     */
+    CollectionClassLoader class_loader = null;
 
     /** same as setClusterName */
@@ -113 +120 @@
             return false;
         }
+        // set up the class loader
+        this.class_loader = new CollectionClassLoader(this.getClass().getClassLoader(), this.site_home, this.cluster_name);
 
         macro_resolver.addMacro("_httpcollection_", this.site_http_address + "/collect/" + this.cluster_name);
@@ -909 +918 @@
         return response;
     }
+
+  // override this to use collection class loader
+  protected String getTextString(String key, String lang, String dictionary, String[] args)
+  {
+    Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
+    String result = dict.get(key, args);
+    if (result == null)
+      { // not found
+    //return "_" + key + "_";
+    return null;
+      }
+    return result;
+  }
+
 }

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

@@ -29 +29 @@
 import org.greenstone.gsdl3.core.ModuleInterface;
 import org.greenstone.gsdl3.service.ServiceRack;
+import org.greenstone.gsdl3.util.Dictionary;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSPath;
@@ -326 +327 @@
             {
                 Element d = (Element) displaynodes.item(k);
-                String lang = d.getAttribute(GSXML.LANG_ATT);
-                if (lang == null || lang.equals(""))
-                {
-                    //set the lang to teh default
-                    d.setAttribute(GSXML.LANG_ATT, DEFAULT_LANG);
-                }
                 String name = d.getAttribute(GSXML.NAME_ATT);
                 Element this_item = GSXML.getNamedElement(this.display_item_list, GSXML.DISPLAY_TEXT_ELEM, GSXML.NAME_ATT, name);
@@ -359 +354 @@
   }
 
-    // protected boolean addPlugins(Element plugin_list)
-    // {
-    //  if (plugin_list == null)
-    //      return false;
-    //  NodeList pluginNodes = plugin_list.getElementsByTagName(GSXML.PLUGIN_ELEM);
-    //  if (pluginNodes.getLength() > 0)
-    //  {
-    //      for (int k = 0; k < pluginNodes.getLength(); k++)
-    //      {
-    //          this.plugin_item_list.appendChild(this.doc.importNode(pluginNodes.item(k), true));
-    //      }
-    //  }
-
-    //  return true;
-    // }
     protected boolean resolveMacros(Element display_list)
     {
@@ -952 +932 @@
 
     }
-
-    protected boolean addAllDisplayInfo(Element description, String lang)
-    {
-      Document doc = description.getOwnerDocument();
-        NodeList items = this.display_item_list.getChildNodes();
-        for (int i = 0; i < items.getLength(); i++)
-        { // for each key
-            Element m = (Element) items.item(i);
-            // findthe child with the correct language
-            Element new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, lang);
-            if (new_m == null && lang != DEFAULT_LANG)
-            {
-                // use the default lang
-                new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
-            }
-            if (new_m == null)
-            {
-                // just get the first one
-                new_m = (Element) GSXML.getChildByTagName(m, GSXML.DISPLAY_TEXT_ELEM);
-            }
-            description.appendChild(doc.importNode(new_m, true));
-        }
-        return true;
-
-    }
-
-    protected Element getDisplayTextElement(String key, String lang)
-    {
-
-        Element this_item = GSXML.getNamedElement(this.display_item_list, GSXML.DISPLAY_TEXT_ELEM, GSXML.NAME_ATT, key);
-        if (this_item == null)
-        {
-            return null;
-        }
-
-        Element this_lang = GSXML.getNamedElement(this_item, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, lang);
-        if (this_lang == null && lang != DEFAULT_LANG)
-        {
-            // try the default
-            this_lang = GSXML.getNamedElement(this_item, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
-        }
-        if (this_lang == null)
-        {
-            // just return the first one
-            return GSXML.getFirstElementChild(this_item);//(Element)this_item.getFirstChild().cloneNode(true);
-        }
-        return (Element) this_lang.cloneNode(true);
-
-    }
+  // from our store of displayItems, (eg name, description etc) add one of each to response. PIck the best fit for request lang.
+
+  protected boolean addAllDisplayInfo(Element description, String lang)
+  {
+    Document doc = description.getOwnerDocument();
+    NodeList items = this.display_item_list.getChildNodes();
+    for (int i = 0; i < items.getLength(); i++)
+      { // for each key
+    Element m = (Element) items.item(i);
+    // is there one with the specified language?
+    Element new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, lang);
+    if (new_m == null) {
+      // if not, have we got one with a key?
+      new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.KEY_ATT, null);
+      if (new_m != null) {
+        // look up the dictionary
+        String value = getTextString(new_m.getAttribute(GSXML.KEY_ATT), lang, new_m.getAttribute(GSXML.DICTIONARY_ATT));
+        if (value != null) {
+          GSXML.setNodeText(new_m, value);
+        }
+        else {
+          // haven't found the key in the dictionary, ignore this display item
+          new_m = null;
+        }
+      }
+    }
+    if (new_m == null && lang != DEFAULT_LANG) {
+      // still haven't got a value. can we use the defualt lang?
+      new_m = GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, DEFAULT_LANG);
+    }
+    if (new_m == null)
+      {
+        // STILL haven't found one, lets use the first one with a lang att (so we don't just get the key one back
+        new_m = (Element) GSXML.getNamedElement(m, GSXML.DISPLAY_TEXT_ELEM, GSXML.LANG_ATT, null);
+      }
+    if (new_m != null) {
+      description.appendChild(doc.importNode(new_m, true));
+    }
+      } // for each key
+    return true;
+    
+  }
+  
+
+  protected String getTextString(String key, String lang, String dictionary) {
+    return getTextString(key, lang, dictionary, null);
+  }
+
+  protected String getTextString(String key, String lang, String dictionary, String[] args)
+  {
+    Dictionary dict = new Dictionary(dictionary, lang);
+    String result = dict.get(key, args);
+    return result;
+  }
+  
 
     public HashMap<String, ServiceRack> getServiceMap()