Changeset 9426

Timestamp:

2005-03-15T14:44:28+13:00 (19 years ago)

Author:

kjdon

Message:

changed the collection specific stuff slightly - instead of the single collection.properties file, now we need the correct class name.properties to be in collection/resources - otherwise services with the same key names will get mixed up.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -342 +342 @@
     protected String getTextString(String key, String lang, String dictionary, String[] args) {
 
+    // we want to use the collection class loader in case there are coll specific files
+    CollectionClassLoader class_loader = new CollectionClassLoader(this.site_home, this.cluster_name);
+    
     if (dictionary != null) {
         // just try the one specified dictionary
-        Dictionary dict = new Dictionary(dictionary, lang);
+        Dictionary dict = new Dictionary(dictionary, lang, class_loader);
         String result = dict.get(key, args);
         if (result == null) { // not found
@@ -352 +355 @@
     }
 
-    // If no dictionary was specified, we try collection specific one, then
-    // dictionaries based on the class names
-    
-    // first we try a collection properties file
-    Dictionary dict = new Dictionary("collection", lang, new CollectionClassLoader(this.site_home, this.cluster_name));
-    String result = dict.get(key, args);
-    if (result != null) {
-        return result;
-    }
-    
-    // then we try class names for dictionary names
+    // now we try class names for dictionary names
     String class_name = this.getClass().getName();
     class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    dict = new Dictionary(class_name, lang);
-    result = dict.get(key, args);
+    Dictionary dict = new Dictionary(class_name, lang, class_loader);
+    String result = dict.get(key, args);
     if (result != null) {
         return result;
@@ -380 +373 @@
         break;
         }
-        dict = new Dictionary(class_name, lang, new CollectionClassLoader(this.site_home, this.cluster_name));
+        dict = new Dictionary(class_name, lang, class_loader);
         result = dict.get(key, args);
         c = c.getSuperclass();