Changeset 26196 for main/trunk

Timestamp:

2012-09-18T15:17:35+12:00 (12 years ago)

Author:

kjdon

Message:

use a class loader for the dictionary to allow a colleciton to have a resource bundle in its resources folder. Need to read from the dictionary each time, without caching, otherwise may end up with the wrong language being cached. Thi scan happen when you ask for a metadata value to be resolved. the lang is new, so reload the dictionary entry. But when ask for a text to be resolved, now the lang does not look new, but the last time the text fragment was looked up in the dictionary it might have been a different language. - not all dictionary lookups are done each time, so can get out of date. So now, do a new lookup each time, but only do it if the macro is in the text

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java (modified) (5 diffs)

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

@@ -34 +34 @@
 
     protected SimpleCollectionDatabase coll_db = null;
-
+  protected ClassLoader class_loader = null;
     private static Pattern p_back_slash = Pattern.compile("\\\"");// create a pattern "\\\"", but it matches both " and \"
 
     // need to make it not add macros if they are already present
-    public GS2MacroResolver(SimpleCollectionDatabase db)
+  public GS2MacroResolver(SimpleCollectionDatabase db, ClassLoader class_loader)
     {
         super();
         coll_db = db;
+        this.class_loader = class_loader;
     }
 
@@ -53 +54 @@
         this.coll_db = db;
     }
-
-    public String resolve(String text, String lang, String scope, String doc_oid)
+  public void setClassLoader(ClassLoader class_loader) {
+    this.class_loader = class_loader;
+  }
+  
+  public String resolve(String text, String lang, String scope, String doc_oid)
     {
         if (text == null || text.equals(""))
@@ -103 +107 @@
             {
             case TYPE_DICT:
-                if (m.text == null || new_lang)
-                {
-                    Dictionary dict = new Dictionary(m.bundle, lang);
-                    m.text = dict.get(m.key, null);
-                }
+              if (text.contains(m.macro))
+
+                {
+              // if we change the lang, then do a metadata resolve, then a text resolve, the lang hasn't changed, but the text might be leftover from the last language.
+              // if (m.text == null || new_lang)
+              // {
+                  Dictionary dict = new Dictionary(m.bundle, lang, this.class_loader);
+                  m.text = dict.get(m.key, null);
+                    //  }
                 // we assume that dictionary entries will contain no macros
                 // otherwise we can't cache the answer because it might be 
                 // document specific
-                text = StringUtils.replace(text, m.macro, m.text);
+                  text = StringUtils.replace(text, m.macro, m.text);}
                 break;
             case TYPE_TEXT:
@@ -131 +139 @@
                     if (m.resolve)
                     {
-                        new_text = this.resolve(m.text, lang, scope, doc_oid);
+                      new_text = this.resolve(m.text, lang, scope, doc_oid);
                     }
                     else
@@ -191 +199 @@
                         if (m.resolve)
                         {
-                            new_text = this.resolve(new_text, lang, scope, doc_oid);
+                          new_text = this.resolve(new_text, lang, scope, doc_oid);
                         }
                         text = StringUtils.replace(text, m.macro, new_text);