Changeset 28966 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java

Timestamp:

2014-04-10T14:39:33+12:00 (10 years ago)

Author:

kjdon

Message:

Lots of changes. Mainly to do with removing this.doc from everywhere. Document is not thread safe. Now we tend to create a new Document everytime we are starting a new page/message etc. in service this.desc_doc is available as teh document to create service info stuff. But it should only be used for this and not for other messages. newDOM is now static for XMLConverter. method param changes for some GSXML methods.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2DocumentRetrieve.java (modified) (5 diffs)

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

@@ -127 +127 @@
         }
 
-        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem);
+        gs_doc_db = new BasicDocumentDatabase(database_type, this.site_home, this.cluster_name, this.index_stem);
         if (!gs_doc_db.isValid())
         {
@@ -174 +174 @@
      * name="xxx">value</metadata></metadataList>
      */
-  protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException
-    {
-        Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
+  protected Element getMetadataList(Document doc, String node_id, boolean all_metadata, ArrayList<String> metadata_names, String lang) throws GSException
+    {
+        Element metadata_list = doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
         DBInfo info = this.coll_db.getInfo(node_id);
         if (info == null)
@@ -195 +195 @@
                 for (int i = 0; i < values.size(); i++)
                 {
-                  GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
+                  GSXML.addMetadata(metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
                 }
             }
@@ -213 +213 @@
             {
               // some of these may be parent/ancestor. does resolve need a different id???
-              GSXML.addMetadata(this.doc, metadata_list, meta_name,  this.macro_resolver.resolve(values.elementAt(j), lang, MacroResolver.SCOPE_META, node_id));
+              GSXML.addMetadata(metadata_list, meta_name,  this.macro_resolver.resolve(values.elementAt(j), lang, MacroResolver.SCOPE_META, node_id));
             }
             }
@@ -295 +295 @@
      * <nodeContent>text content or other elements</nodeContent>
      */
-    abstract protected Element getNodeContent(String doc_id, String lang) throws GSException;
+  abstract protected Element getNodeContent(Document doc, String doc_id, String lang) throws GSException;