Changeset 19984 for greenstone3/trunk/src/java/org/greenstone/gsdl3/action/GeneralAction.java

Timestamp:

2009-07-13T10:25:21+12:00 (15 years ago)

Author:

oranfry

Message:

initial implementation of support for site-level metadata

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/action/GeneralAction.java (modified) (5 diffs)

greenstone3/trunk/src/java/org/greenstone/gsdl3/action/GeneralAction.java

@@ -23 +23 @@
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
     logger.debug(" request="+this.converter.getString(request));
+
+    String lang = request.getAttribute(GSXML.LANG_ATT);
+    String uid = request.getAttribute(GSXML.USER_ID_ATT);
+
     //A shortcut action serving the flax web page requests
     if(request.getAttribute(GSXML.SUBACTION_ATT).equals(GSXML.FLAX_PAGE_GENERATION)
@@ -33 +37 @@
             page_response.appendChild((Element)this.doc.importNode(flaxPageNode, true));
         }
-        return result;      
+        addSiteMetadata(result, lang, uid);
+        System.err.println("a");
+        return result;
     }
     
@@ -47 +53 @@
     }
     String request_type = (String) params.get(GSParams.REQUEST_TYPE);
-    String lang = request.getAttribute(GSXML.LANG_ATT);
-    String uid = request.getAttribute(GSXML.USER_ID_ATT);
     // what is carried out depends on the request_type
     // if rt=d, then a describe request is done,
@@ -89 +93 @@
         if (response_only) {
         // just send the reponse as is
+        addSiteMetadata(result_response, lang, uid);
+        System.err.println("b");
         return result_response;
         }
@@ -116 +122 @@
     }
 
+    addSiteMetadata(page_response, lang, uid);
+    System.err.println("c");
     return result;
     }