Changeset 24993 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

Timestamp:

2012-01-26T11:50:17+13:00 (12 years ago)

Author:

sjm84

Message:

Adding UserContext to replace the use of lang and uid

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -763 +763 @@
         //Transformation of the XML message from the receptionist to HTML with doctype
 
-        if(inlineTemplate != null)
+        if (inlineTemplate != null)
         {
             try
@@ -770 +770 @@
                 GSXSLT.mergeStylesheets(skinAndLibraryDoc, inlineTemplateDoc.getDocumentElement());
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 ex.printStackTrace();
             }
         }
-        
+
         if (skinAndLibraryDoc.getElementsByTagName("gsf:metadata").getLength() > 0)
         {
-            secondConfigFormatPass(collection, skinAndLibraryDoc, doc, request.getAttribute("lang"), request.getAttribute("uid"));
+            secondConfigFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request));
         }
 
@@ -795 +795 @@
     }
 
-    protected void secondConfigFormatPass(String collection, Document skinAndLibraryDoc, Document doc, String lang, String uid)
+    protected void secondConfigFormatPass(String collection, Document skinAndLibraryDoc, Document doc, UserContext userContext)
     {
         String to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
         Element metaMessage = this.doc.createElement(GSXML.MESSAGE_ELEM);
-        Element metaRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
+        Element metaRequest = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, userContext);
         Element paramList = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
         Element docNodeList = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);