Changeset 26042 for main

Timestamp:

2012-07-31T11:47:04+12:00 (12 years ago)

Author:

kjdon

Message:

SimpleDocument renamed to BasicDocument

Location:

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

Files:

• AbstractGS2TextSearch.java (modified) (3 diffs)
• AbstractSearch.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import org.apache.log4j.Logger;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.SimpleDocumentDatabase;
+import org.greenstone.gsdl3.util.BasicDocumentDatabase;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -60 +60 @@
     protected int maxnumeric = 4;
 
-    SimpleDocumentDatabase gs_doc_db = null;
+    BasicDocumentDatabase gs_doc_db = null;
 
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.AbstractGS2TextSearch.class.getName());
@@ -109 +109 @@
 
         // replaces default AbstractSearch version with one tied to database
-        gs_doc_db = new SimpleDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem);
+        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem);
         if (!gs_doc_db.isValid())
         {

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

@@ -23 +23 @@
 
 import org.apache.log4j.Logger;
-import org.greenstone.gsdl3.util.AbstractSimpleDocument;
+import org.greenstone.gsdl3.util.AbstractBasicDocument;
+import org.greenstone.gsdl3.util.BasicDocument;
 import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.SimpleDocument;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -33 +33 @@
  * Partially implements a generic search service
  * 
- * @author Katherine Don
  */
 
@@ -54 +53 @@
     protected static final String START_PAGE_PARAM = "startPage";
 
-    protected AbstractSimpleDocument gs_doc = null;
+    protected AbstractBasicDocument gs_doc = null;
 
     /** can more than one index be searched at the same time? */
@@ -165 +164 @@
 
         // Base line for document (might be overriden by sub-classes)
-        gs_doc = new SimpleDocument(this.doc, this.default_document_type);
+        gs_doc = new BasicDocument(this.doc, this.default_document_type);
 
         return true;