Changeset 163 for trunk/gsdl/src/colservr/mgsearch.cpp

Timestamp:

1999-02-22T11:31:35+13:00 (25 years ago)

Author:

rjmcnab

Message:

Removed locateinfo.

File:

• trunk/gsdl/src/colservr/mgsearch.cpp (modified) (9 diffs)

trunk/gsdl/src/colservr/mgsearch.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/02/21 22:31:35  rjmcnab
+
+   Removed locateinfo.
+
    Revision 1.4  1999/02/03 01:13:27  sjboddie
 
@@ -34 +38 @@
 #include "gsdlconf.h"
 #include "mgsearch.h"
+#include "fileutil.h"
 
 #include <string.h>
@@ -62 +67 @@
 
 #include "mgq.h"
-#include "locateinfo.h"
+// #include "locateinfo.h"
 #include "gsdlunicode.h"
 #include "unitool.h"
@@ -135 +140 @@
 //}
 
-void getrealindexparts (const text_tarray &indexmap, const text_tarray &subcollectionmap,
+void getrealindexparts (const text_tarray &/*indexmap*/, const text_tarray &/*subcollectionmap*/,
             const text_tarray &languagemap, const text_t &realindex,
             text_t &index, text_t &subcollection, text_t &language) {
@@ -163 +168 @@
 
 
-void getdirindexparts (const text_tarray &indexmap, const text_tarray &subcollectionmap,
+void getdirindexparts (const text_tarray &/*indexmap*/, const text_tarray &/*subcollectionmap*/,
                const text_tarray &languagemap, const text_t &dirindex,
                text_t &index, text_t &subcollection, text_t &language) {
@@ -348 +353 @@
 }
 
-text_t getdoclevelindex (const text_tarray &indexmap) {
+text_t getdoclevelindex (const text_tarray &/*indexmap*/) {
   //text_tarray::const_iterator here = indexmap.begin();
   //text_tarray::const_iterator end = indexmap.end();
@@ -446 +451 @@
 
 
+static text_t getindexsuffix (const text_t &collection, 
+                  const text_t &index) {
+  text_t indexsuffix = "index";
+  indexsuffix = filename_cat (indexsuffix, index);
+  indexsuffix = filename_cat (indexsuffix, collection);
+  return indexsuffix;
+}
+
+
+
 
 ////////////////////
@@ -505 +520 @@
                      queryparams.search_index)).getcstr();
   assert (idxsuffix != NULL);
-  char *txtsuffix = (gettextsuffix (queryparams.collection)).getcstr();
+  char *txtsuffix = (getindexsuffix (queryparams.collection, "text")).getcstr();
   assert (txtsuffix != NULL);
 
@@ -683 +698 @@
                      defaultindex)).getcstr();
       assert (idxsuffix != NULL);
-      char *txtsuffix = (gettextsuffix (collection)).getcstr();
+      char *txtsuffix = (getindexsuffix (collection, "text")).getcstr();
       assert (txtsuffix != NULL);