Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/DocXMLUtil.java

    r24583 r24993  
    2424import org.greenstone.gsdl3.util.GSPath;
    2525import org.greenstone.gsdl3.util.GSXML;
     26import org.greenstone.gsdl3.util.UserContext;
    2627
    2728import org.w3c.dom.Document;
    … …  
    122123        }
    123124
    124         String lang = request.getAttribute(GSXML.LANG_ATT);
    125         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     125        UserContext userContext = new UserContext(request);
    126126
    127127        //Go through each of the document items that are requested
    … …  
    133133            String collection = currentDoc.getAttribute(GSXML.COLLECTION_ATT);
    134134
    135             _GSDM.documentXMLCreateDocXML(oid, collection, lang, uid);
     135            _GSDM.documentXMLCreateDocXML(oid, collection, userContext);
    136136            if(_GSDM.checkError(result, DOC_XML_CREATE_EMPTY_FILE))
    137137            {
    … …  
    152152        }
    153153
    154         String lang = request.getAttribute(GSXML.LANG_ATT);
    155         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     154        UserContext userContext = new UserContext(request);
    156155
    157156        //Go through each of the metadata items that are requested
    … …  
    164163            String metadataName = currentMetadata.getAttribute(GSXML.NAME_ATT);
    165164
    166             ArrayList<Element> metadataValues = _GSDM.documentXMLGetMetadata(oid, collection, metadataName, lang, uid);
     165            ArrayList<Element> metadataValues = _GSDM.documentXMLGetMetadata(oid, collection, metadataName, userContext);
    167166            if(_GSDM.checkError(result, DOC_XML_GET_METADATA))
    168167            {
    … …  
    192191        }
    193192
    194         String lang = request.getAttribute(GSXML.LANG_ATT);
    195         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     193        UserContext userContext = new UserContext(request);
    196194
    197195        //Go through each of the metadata items that are requested
    … …  
    237235                    return result;
    238236                }
    239                 _GSDM.documentXMLSetMetadata(oid, collection, metadataName, newMetadataValue, pos, op, lang, uid);
     237                _GSDM.documentXMLSetMetadata(oid, collection, metadataName, newMetadataValue, pos, op, userContext);
    240238                if(_GSDM.checkError(result, DOC_XML_SET_METADATA))
    241239                {
    … …  
    246244            else if (oldMetadataValue != null && !oldMetadataValue.equals(""))
    247245            {
    248                 _GSDM.documentXMLReplaceMetadata(oid, collection, metadataName, oldMetadataValue, newMetadataValue, lang, uid);
     246                _GSDM.documentXMLReplaceMetadata(oid, collection, metadataName, oldMetadataValue, newMetadataValue, userContext);
    249247                if(_GSDM.checkError(result, DOC_XML_SET_METADATA))
    250248                {
    … …  
    272270        }
    273271
    274         String lang = request.getAttribute(GSXML.LANG_ATT);
    275         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     272        UserContext userContext = new UserContext(request);
    276273
    277274        //Go through each of the requests
    … …  
    283280            String collection = currentSection.getAttribute(GSXML.COLLECTION_ATT);
    284281
    285             _GSDM.documentXMLCreateSection(oid, collection, lang, uid);
     282            _GSDM.documentXMLCreateSection(oid, collection, userContext);
    286283            if(_GSDM.checkError(result, DOC_XML_CREATE_SECTION))
    287284            {
    … …  
    302299        }
    303300
    304         String lang = request.getAttribute(GSXML.LANG_ATT);
    305         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     301        UserContext userContext = new UserContext(request);
    306302
    307303        //Go through each of the requests
    … …  
    313309            String collection = currentSection.getAttribute(GSXML.COLLECTION_ATT);
    314310
    315             _GSDM.documentXMLDeleteSection(oid, collection, lang, uid);
     311            _GSDM.documentXMLDeleteSection(oid, collection, userContext);
    316312            if(_GSDM.checkError(result, DOC_XML_DELETE_SECTION))
    317313            {
    … …  
    332328        }
    333329
    334         String lang = request.getAttribute(GSXML.LANG_ATT);
    335         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     330        UserContext userContext = new UserContext(request);
    336331
    337332        //Go through each of the requests
    … …  
    343338            String collection = currentSection.getAttribute(GSXML.COLLECTION_ATT);
    344339
    345             _GSDM.documentXMLGetSection(oid, collection, lang, uid);
     340            _GSDM.documentXMLGetSection(oid, collection, userContext);
    346341            if(_GSDM.checkError(result, DOC_XML_GET_SECTION))
    347342            {
    … …  
    362357        }
    363358
    364         String lang = request.getAttribute(GSXML.LANG_ATT);
    365         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     359        UserContext userContext = new UserContext(request);
    366360
    367361        //Go through each of the requests
    … …  
    388382            }
    389383           
    390             _GSDM.documentXMLSetSection(oid, collection, currentSection, op, lang, uid);
     384            _GSDM.documentXMLSetSection(oid, collection, currentSection, op, userContext);
    391385            if(_GSDM.checkError(result, DOC_XML_SET_SECTION))
    392386            {
    … …  
    408402        }
    409403
    410         String lang = request.getAttribute(GSXML.LANG_ATT);
    411         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     404        UserContext userContext = new UserContext(request);
    412405
    413406        //Go through each of the requests
    … …  
    419412            String collection = currentContent.getAttribute(GSXML.COLLECTION_ATT);
    420413
    421             String content = _GSDM.documentXMLGetText(oid, collection, lang, uid);
     414            String content = _GSDM.documentXMLGetText(oid, collection, userContext);
    422415            if(_GSDM.checkError(result, DOC_XML_GET_TEXT))
    423416            {
    … …  
    451444        }
    452445
    453         String lang = request.getAttribute(GSXML.LANG_ATT);
    454         String uid = request.getAttribute(GSXML.USER_ID_ATT);
     446        UserContext userContext = new UserContext(request);
    455447
    456448        //Go through each of the requests
    … …  
    462454            String collection = currentContent.getAttribute(GSXML.COLLECTION_ATT);
    463455
    464             _GSDM.documentXMLSetText(oid, collection, currentContent, lang, uid);
     456            _GSDM.documentXMLSetText(oid, collection, currentContent, userContext);
    465457            if(_GSDM.checkError(result, DOC_XML_SET_TEXT))
    466458            {
Note: See TracChangeset for help on using the changeset viewer.