Changeset 32549 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

Timestamp:

2018-10-30T10:30:53+13:00 (5 years ago)

Author:

kjdon

Message:

receptionist now passes languageList (from interfaceConfig) to teh actions, so an action can add it into the page response if it needs to, rather than the receptionist adding it in to every page. its only ever used in prefs page

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java (modified) (4 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/PageAction.java

@@ -58 +58 @@
         else if (page_name.equals(ABOUT_PAGE) || page_name.equals(PREFS_PAGE))
         {
-          response = aboutPage(request);
+          response = aboutOrPrefsPage(request, page_name);
             //}else if (page_name.equals(PREFS_PAGE)) {
             //response = prefsPage(request);
@@ -227 +227 @@
     } // homePage
 
-    protected Element aboutPage(Element request)
+  protected Element aboutOrPrefsPage(Element request, String page_name)
     {
       Document doc = XMLConverter.newDOM();
@@ -239 +239 @@
         if (coll_name == null || coll_name.equals(""))
         {
-            logger.error("about page requested with no collection or cluster specified!");
-            // return an empty response
+          // return a response with no collection info - must be prefs from home page
             Element response = doc.createElement(GSXML.RESPONSE_ELEM);
             addSiteMetadata(response, userContext);
             addInterfaceOptions(response);
+            if (this.language_list != null) {
+              response.appendChild(doc.importNode(this.language_list, true));
+            }
             return response;
         }
@@ -303 +305 @@
         addSiteMetadata(response, userContext);
         addInterfaceOptions(response);
+        if (page_name.equals(PREFS_PAGE) && this.language_list != null) {
+          response.appendChild(response.getOwnerDocument().importNode(this.language_list, true));
+        }
         return response;
     }