Changeset 26042

Show
Ignore:
Timestamp:
31.07.2012 11:47:04 (7 years ago)
Author:
kjdon
Message:

SimpleDocument? renamed to BasicDocument?

Location:
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2TextSearch.java

    r25851 r26042  
    2323import org.apache.log4j.Logger; 
    2424import org.greenstone.gsdl3.util.GSXML; 
    25 import org.greenstone.gsdl3.util.SimpleDocumentDatabase; 
     25import org.greenstone.gsdl3.util.BasicDocumentDatabase; 
    2626import org.w3c.dom.Document; 
    2727import org.w3c.dom.Element; 
     
    6060    protected int maxnumeric = 4; 
    6161 
    62     SimpleDocumentDatabase gs_doc_db = null; 
     62    BasicDocumentDatabase gs_doc_db = null; 
    6363 
    6464    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.AbstractGS2TextSearch.class.getName()); 
     
    109109 
    110110        // replaces default AbstractSearch version with one tied to database 
    111         gs_doc_db = new SimpleDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem); 
     111        gs_doc_db = new BasicDocumentDatabase(this.doc, database_type, this.site_home, this.cluster_name, this.index_stem); 
    112112        if (!gs_doc_db.isValid()) 
    113113        { 
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java

    r25885 r26042  
    2323 
    2424import org.apache.log4j.Logger; 
    25 import org.greenstone.gsdl3.util.AbstractSimpleDocument; 
     25import org.greenstone.gsdl3.util.AbstractBasicDocument; 
     26import org.greenstone.gsdl3.util.BasicDocument; 
    2627import org.greenstone.gsdl3.util.GSPath; 
    2728import org.greenstone.gsdl3.util.GSXML; 
    28 import org.greenstone.gsdl3.util.SimpleDocument; 
    2929import org.w3c.dom.Element; 
    3030import org.w3c.dom.NodeList; 
     
    3333 * Partially implements a generic search service 
    3434 *  
    35  * @author Katherine Don 
    3635 */ 
    3736 
     
    5453    protected static final String START_PAGE_PARAM = "startPage"; 
    5554 
    56     protected AbstractSimpleDocument gs_doc = null; 
     55    protected AbstractBasicDocument gs_doc = null; 
    5756 
    5857    /** can more than one index be searched at the same time? */ 
     
    165164 
    166165        // Base line for document (might be overriden by sub-classes) 
    167         gs_doc = new SimpleDocument(this.doc, this.default_document_type); 
     166        gs_doc = new BasicDocument(this.doc, this.default_document_type); 
    168167 
    169168        return true;