Changeset 8955

Timestamp:

2005-02-02T14:47:06+13:00 (19 years ago)

Author:

kjdon

Message:

now we specify a dictionary name. also some calls to getTextString, the args are in a different order

Location:

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

Files:

• GS2Construct.java (modified) (4 diffs)
• GS2MGPPRetrieve.java (modified) (1 diff)
• GS2MGRetrieve.java (modified) (1 diff)
• GS2MGSearch.java (modified) (1 diff)
• GS2Retrieve.java (modified) (1 diff)
• GS3MGSearch.java (modified) (1 diff)
• GS3Retrieve.java (modified) (2 diffs)

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

@@ -228 +228 @@
     // check that the coll is there in the first place
     if (!coll_dir.exists()) {
-        t = this.doc.createTextNode(getTextString("delete.exists_error", args, lang));
+        t = this.doc.createTextNode(getTextString("delete.exists_error", lang, args));
         status.appendChild(t);
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
@@ -236 +236 @@
     // try to delete the directory
     if (!GSFile.deleteFile(coll_dir)) {
-        t = this.doc.createTextNode(getTextString("delete.delete_error", args, lang));
+        t = this.doc.createTextNode(getTextString("delete.delete_error", lang, args));
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         status.appendChild(t);
@@ -309 +309 @@
         
     if (response == null) {
-        t = this.doc.createTextNode(getTextString(action_name+".configure_error", args , lang));
+        t = this.doc.createTextNode(getTextString(action_name+".configure_error", lang, args));
         status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
         status.appendChild(t);
@@ -316 +316 @@
         
     // if we got here, we have succeeded!
-    t = this.doc.createTextNode(getTextString(action_name+".success", args, lang));
+    t = this.doc.createTextNode(getTextString(action_name+".success", lang, args));
     status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.SUCCESS));
     status.appendChild(t);

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

@@ -56 +56 @@
     {
     this.mgpp_src = new MGPPWrapper();
+    // only the classifier service has strings at present
+    this.dictionary_name = "ClassifierBrowse";
+
     }
 

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

@@ -55 +55 @@
     {
     this.mg_src = new MGWrapper();
+    // only the classifier service has strings at present
+    this.dictionary_name = "ClassifierBrowse";
     }
 

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

@@ -53 +53 @@
     /** constructor */
     public GS2MGSearch()
-    {
+    {   
     this.mg_src = new MGWrapper();
+    this.dictionary_name = "MGSearch";
     }
 

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

@@ -279 +279 @@
         }
         String [] array = {meta_name};
-        String description = getTextString("ClassifierBrowse.classifier_help", array, lang);
+        String description = getTextString("ClassifierBrowse.classifier_help", lang, array);
         Element cl_desc = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);
         new_cl.appendChild(cl_desc);

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

@@ -54 +54 @@
     {
     this.mg_src = new MGWrapper();
+    this.dictionary_name = "MGSearch";
     }
 

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

@@ -82 +82 @@
     {
     this.database = new SQLQuery();
+    // only the classifier service has strings at present
+    this.dictionary_name = "ClassifierBrowse";
+
     }
 
@@ -227 +230 @@
         }
         String [] array = {meta_name};
-        String description = getTextString("ClassifierBrowse.classifier_help", array, lang);
+        String description = getTextString("ClassifierBrowse.classifier_help", lang, array);
         Element cl_desc = GSXML.createDisplayTextElement(this.doc, GSXML.DISPLAY_TEXT_DESCRIPTION, description);
         new_cl.appendChild(cl_desc);