Changeset 28965 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

Timestamp:

2014-04-10T14:38:22+12:00 (10 years ago)

Author:

kjdon

Message:

removing stored Document field - now get passed it as needed or work it out from Element owner documents

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSDocumentModel.java

@@ -102 +102 @@
 
     protected String _siteHome;
-    protected Document _mainDoc;
-    protected MessageRouter _router;
+    protected MessageRouter _router;
     protected HashMap<String, Document> _docCache = new HashMap<String, Document>();
 
-    public GSDocumentModel(String siteHome, Document mainDocument, MessageRouter router)
+    public GSDocumentModel(String siteHome, MessageRouter router)
     {
         _siteHome = siteHome;
-        _mainDoc = mainDocument;
         _router = router;
     }
@@ -1702 +1700 @@
         if (_errorMessageMap.get(_errorStatus) != null)
         {
-            GSXML.addError(elem.getOwnerDocument(), elem, methodName + ": " + _errorMessageMap.get(_errorStatus), GSXML.ERROR_TYPE_SYNTAX);
+            GSXML.addError(elem, methodName + ": " + _errorMessageMap.get(_errorStatus), GSXML.ERROR_TYPE_SYNTAX);
             return true;
         }
@@ -2009 +2007 @@
     {
         //Find out what kind of database we have
-        Element dbTypeMessage = _mainDoc.createElement(GSXML.MESSAGE_ELEM);
-        Element dbTypeRequest = GSXML.createBasicRequest(_mainDoc, GSXML.REQUEST_TYPE_DESCRIBE, collection, userContext);
+      Document doc = XMLConverter.newDOM();
+        Element dbTypeMessage = doc.createElement(GSXML.MESSAGE_ELEM);
+        Element dbTypeRequest = GSXML.createBasicRequest(doc, GSXML.REQUEST_TYPE_DESCRIBE, collection, userContext);
         dbTypeMessage.appendChild(dbTypeRequest);
         Element dbTypeResponse = (Element) _router.process(dbTypeMessage);