Changeset 24993 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.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/service/DocumentMaker.java (modified) (20 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocumentMaker.java

@@ -38 +38 @@
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
+import org.greenstone.gsdl3.util.UserContext;
 
 import org.w3c.dom.Element;
@@ -123 +124 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to create
@@ -135 +135 @@
             String collection = currentDoc.getAttribute(GSXML.COLLECTION_ATT);
 
-            _GSDM.documentCreate(oid, collection, lang, uid);
+            _GSDM.documentCreate(oid, collection, userContext);
             if (_GSDM.checkError(result, DOCUMENT_CREATE))
             {
@@ -155 +155 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to delete
@@ -166 +165 @@
             String collection = currentDoc.getAttribute(GSXML.COLLECTION_ATT);
 
-            _GSDM.documentDelete(oid, collection, lang, uid);
+            _GSDM.documentDelete(oid, collection, userContext);
             if (_GSDM.checkError(result, DOCUMENT_DELETE))
             {
@@ -186 +185 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to duplicate
@@ -200 +198 @@
             String operation = currentDoc.getAttribute("operation");
 
-            _GSDM.documentMoveOrDuplicate(oid, collection, newOID, newCollection, _GSDM.operationStringToInt(operation), false, lang, uid);
+            _GSDM.documentMoveOrDuplicate(oid, collection, newOID, newCollection, _GSDM.operationStringToInt(operation), false, userContext);
             if (_GSDM.checkError(result, DOCUMENT_DUPLICATE))
             {
@@ -220 +218 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to duplicate
@@ -239 +236 @@
             }
 
-            _GSDM.documentGetInformation(oid, collection, requestedInfo, lang, uid);
+            _GSDM.documentGetInformation(oid, collection, requestedInfo, userContext);
             if (_GSDM.checkError(result, DOCUMENT_GET_INFORMATION))
             {
@@ -259 +256 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to duplicate
@@ -273 +269 @@
             String operation = currentDoc.getAttribute("operation");
 
-            _GSDM.documentMoveOrDuplicate(oid, collection, newOID, newCollection, _GSDM.operationStringToInt(operation), true, lang, uid);
+            _GSDM.documentMoveOrDuplicate(oid, collection, newOID, newCollection, _GSDM.operationStringToInt(operation), true, userContext);
             if (_GSDM.checkError(result, DOCUMENT_MOVE))
             {
@@ -292 +288 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to duplicate
@@ -304 +299 @@
             String mergeOID = currentDoc.getAttribute("merge" + GSXML.NODE_ID_ATT);
 
-            _GSDM.documentMerge(oid, collection, mergeOID, lang, uid);
+            _GSDM.documentMerge(oid, collection, mergeOID, userContext);
             if (_GSDM.checkError(result, DOCUMENT_MERGE))
             {
@@ -324 +319 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         //Get the list of documents to duplicate
@@ -347 +341 @@
             }
 
-            _GSDM.documentSplit(oid, collection, split, lang, uid);
+            _GSDM.documentSplit(oid, collection, split, userContext);
             if (_GSDM.checkError(result, DOCUMENT_SPLIT))
             {
@@ -367 +361 @@
         }
 
-        String lang = request.getAttribute(GSXML.LANG_ATT);
-        String uid = request.getAttribute(GSXML.USER_ID_ATT);
+        UserContext userContext = new UserContext(request);
 
         Element param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
@@ -401 +394 @@
                     String subOperation = (String) keyValueMap.get("subOperation");
 
-                    _GSDM.documentMoveOrDuplicate(origOID, origCollection, newOID, newCollection, _GSDM.operationStringToInt(subOperation), operation.equals("move"), lang, uid);
+                    _GSDM.documentMoveOrDuplicate(origOID, origCollection, newOID, newCollection, _GSDM.operationStringToInt(subOperation), operation.equals("move"), userContext);
 
                     if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && origCollection != null && !collectionsToBuild.contains(origCollection))
@@ -419 +412 @@
                     String subOperation = (String) keyValueMap.get("subOperation");
 
-                    //_GSDM.documentCreate(oid, collection, lang, uid); <--- Maybe go back to this
-                    _GSDM.documentXMLSetSection(oid, collection, this.doc.createElement(GSXML.DOCXML_SECTION_ELEM), _GSDM.operationStringToInt(subOperation), lang, uid);
+                    //_GSDM.documentCreate(oid, collection, userContext); <--- Maybe go back to this
+                    _GSDM.documentXMLSetSection(oid, collection, this.doc.createElement(GSXML.DOCXML_SECTION_ELEM), _GSDM.operationStringToInt(subOperation), userContext);
 
                     if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && collection != null && !collectionsToBuild.contains(collection))
@@ -432 +425 @@
                     String collection = (String) keyValueMap.get("collection");
 
-                    _GSDM.documentDelete(oid, collection, lang, uid);
+                    _GSDM.documentDelete(oid, collection, userContext);
 
                     if (_GSDM.getErrorStatus() == GSDocumentModel.NO_ERROR && collection != null && !collectionsToBuild.contains(collection))
@@ -445 +438 @@
                     String newContent = (String) keyValueMap.get("text");
                     
-                    _GSDM.documentXMLSetText(oid, collection, newContent, lang, uid);
+                    _GSDM.documentXMLSetText(oid, collection, newContent, userContext);
                     
                     System.err.println(newContent);