Changeset 4222

Timestamp:

2003-05-02T11:19:38+12:00 (21 years ago)

Author:

kjdon

Message:

MGPPWrapper methods getDocument and loadIndexData no longer take basepath arg

Location:

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

Files:

• GS2MGPPRetrieve.java (modified) (2 diffs)
• PhindPhraseBrowse.java (modified) (5 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPRetrieve.java

@@ -103 +103 @@
 
     // The location of the MGPP text files
-    // String basedir = GSFile.collectionBaseDir(site_home_, cluster_name_);
-    // String textdir = GSFile.collectionTextPath(cluster_name_);
-    String basedir = "";
     String textdir = GSFile.collectionBaseDir(site_home_, cluster_name_) +
         File.separatorChar + GSFile.collectionTextPath(cluster_name_);
@@ -120 +117 @@
 
         long doc_num = gdbm_src_.oid2Docnum(doc_id);
-        String doc_content = mgpp_src_.getDocument(basedir, textdir, default_level_, doc_num);
+        String doc_content = mgpp_src_.getDocument(textdir, default_level_, doc_num);
         doc_content = resolveImages(doc_content, doc_id);
 

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -168 +168 @@
 
     // set the mgpp index data - we are looking up pword
-    mgpp_src_.loadIndexData("", basepath_+File.separatorChar+"pword");
+    mgpp_src_.loadIndexData(basepath_+File.separatorChar+"pword");
 
     mgpp_src_.runQuery(word);
@@ -187 +187 @@
                     long last_d) {
 
-    String record = mgpp_src_.getDocument("", basepath_+File.separatorChar+"pdata", "Document",
+    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
                           phrase);
     if (record.equals("")) {
@@ -267 +267 @@
     
     // look up the phrase in the pdata thingy
-    String record = mgpp_src_.getDocument("", basepath_+File.separatorChar+"pdata", "Document",
+    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
                           phrase_num);
 
@@ -341 +341 @@
     
     // look up the phrase in the docs thingy
-    String record = mgpp_src_.getDocument("", basepath_+File.separatorChar+"docs", "Document",
+    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"docs", "Document",
                           doc_num);
     
@@ -397 +397 @@
 
     // look up the phrase in the pdata thingy
-    String record = mgpp_src_.getDocument("", basepath_+File.separatorChar+"pdata", "Document",
+    String record = mgpp_src_.getDocument(basepath_+File.separatorChar+"pdata", "Document",
                           phrase_num);