Changeset 32999 for main

Timestamp:

2019-04-09T10:50:58+12:00 (5 years ago)

Author:

kjdon

Message:

a bit of tidying and commenting

File:

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

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

@@ -58 +58 @@
     Element result = doc.createElement(GSXML.MESSAGE_ELEM);
     Element response;
-    if (page_name.equals(HOME_PAGE))
-      {
-    response = homePage(request);
-            
-      }
-    else if (page_name.equals(GLI4GS3_PAGE))
-      {
-    response = gli4gs3Page(request);
-      } else    if (collection.equals("")) {
+    if (page_name.equals(HOME_PAGE)) {
+      
+      response = homePage(request);
+      
+    }
+    else if (page_name.equals(GLI4GS3_PAGE)) {
+      
+      response = gli4gs3Page(request);
+      
+    } else if (collection.equals("")) {
       // we are not in a collection. eg could be library prefs or other page
       response = generalLibraryPage(request, page_name);
@@ -73 +74 @@
       response = collectionPage(request, page_name, collection);
     }
-        
-
+    
+    
     result.appendChild(doc.importNode(response, true));
     logger.debug("page action result: " + this.converter.getPrettyString(result));
@@ -82 +83 @@
 
   // A general library page just adds site metadata and interface options.
-  // customise: prefs: add language list
+  // page specific customisation: prefs: add language list
   protected Element generalLibraryPage(Element request, String page_name) {
 
@@ -96 +97 @@
   }
 
+  // a general collection page. Need to add collection info and info about its services
   protected Element collectionPage(Element request, String page_name, String collection) {
 
@@ -141 +143 @@
 
     if (page_name.equals(ABOUT_PAGE)) {
-      // get service descriptions. Actually only want displayItems
+      // get service descriptions. Actually only want displayItems, but get everything for now
       NodeList services = coll_about_response.getElementsByTagName(GSXML.SERVICE_ELEM);
       if (services.getLength() > 0)
@@ -149 +151 @@
 
     }
-    // old code had adding a ct param to the paramList - for about/prefs page, only used for gs2 interface. Since we don't support that anymore, am leaving it out.
+    // old code had adding a ct param to the paramList - for about/prefs page, only used for gs2 interface.
+    // Since we don't support that anymore, am leaving it out.
 
     // add the global collection format info
@@ -164 +167 @@
       }
 
+    // security info for collection if we are a 'humanverify' page
     if (page_name.equals(VERIFY_PAGE)) {
       addSecurityInfo(request, collection, response);