Changeset 15787 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java

Timestamp:

2008-05-29T13:29:54+12:00 (16 years ago)

Author:

oranfry

Message:

updating from trunk: brought in trunk changes from r15191 to r15785

File:

• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java (modified) (3 diffs)

greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java

@@ -37 +37 @@
   extends GS2MGPPSearch {
    static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.GoogleNgramMGPPSearch.class.getName());
-   protected GDBMWrapper gdbm_src = null;
   
     /** constructor */
     public GoogleNgramMGPPSearch(){
-    super();
-    gdbm_src = new GDBMWrapper();
-    
+    super();    
     }
     
@@ -52 +49 @@
     }
 
-    // Open GDBM database for querying
-    String gdbm_db_file = GSFile.GDBMDatabaseFile(this.site_home, this.cluster_name, this.index_stem);
-        if (!this.gdbm_src.openDatabase(gdbm_db_file, GDBMWrapper.READER)) {
-        logger.error("Could not open GDBM database!");
-        return false;
-    }
     this.default_max_docs = "-1";
     this.default_hits_per_page = "30";
@@ -78 +69 @@
           String num = Long.toString((((MGPPDocInfo) docs.elementAt(d)).num_));
           String doc_id = internalNum2OID(num);
-          DBInfo gdbmInfo = this.gdbm_src.getInfo(doc_id);
-          String fre = (String)gdbmInfo.getInfo("Frequency");
-          String tense = (String)gdbmInfo.getInfo("Tense");
+          DBInfo dbInfo = this.coll_db.getInfo(doc_id);
+          String fre = (String)dbInfo.getInfo("Frequency");
+          String tense = (String)dbInfo.getInfo("Tense");
          
           if(!fre.equals("")){