Changeset 2487 for trunk/gsdl/src/phind/host/phindcgi.cpp

Timestamp:

2001-06-01T14:51:29+12:00 (23 years ago)

Author:

sjboddie

Message:

Changes to get phind working under windows

File:

• trunk/gsdl/src/phind/host/phindcgi.cpp (modified) (9 diffs)

trunk/gsdl/src/phind/host/phindcgi.cpp

@@ -37 +37 @@
  */
 
-
-#include <iostream.h>
-#include <fstream.h>
+#if defined(GSDL_USE_IOS_H)
+#  include <fstream.h>
+#  include <iostream.h>
+#else
+#  include <fstream>
+#  include <iostream>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include <vector.h>
-#include <algo.h>
+#if defined(GSDL_USE_STL_H)
+#  if defined(GSDL_USE_ALGO_H)
+#    include <algo.h>
+#  else
+#    include <algorithm.h>
+#  endif
+#  include <vector.h>
+#else
+#  include <algorithm>
+#  include <vector>
+#endif
 
 // Include MGPP functionality.
@@ -55 +69 @@
 
 // Include GSDL's text_t object, which makes parsing cgi arguments easier.
-#include <text_t.h>
+#include "text_t.h"
+#include "fileutil.h"
 // Note that GSDL stores strings as text_t objects (vectors of 16-bit short int), 
 // while MGPP stores strings as UCArray objects (vectors of 8-bit unsigned char).
@@ -156 +171 @@
   }
   
-  char basepath[FILENAME_MAX] = "";
-  strcat(basepath, gsdlhome);
-  strcat(basepath, "/collect/");
-  strcat(basepath, collection);
-  strcat(basepath, "/index/phind");
-  strcat(basepath, classifier);
+  text_t basepathstr = filename_cat(gsdlhome, "collect", collection, 
+                    "index", text_t("phind") + classifier);
+
+  char *basepath = basepathstr.getcstr();
 
   // If we don't know the phrase number, look itup
@@ -183 +196 @@
   // Create a TextData object to read the phrase data (pdata)
   TextData textdata;
-  char filename[FILENAME_MAX] = "pdata";
-  if (!textdata.LoadData (basepath, filename)) {
-    FatalError (1, "Couldn't load text information for \"%s\"", filename);
-  }
+
+  text_t fullpath = filename_cat(basepath, "pdata");
+  char *fullpathc = fullpath.getcstr();
+#if defined __WIN32__
+  char *base = "";
+#else
+  char *base = "/";
+#endif
+
+  if (!textdata.LoadData (base, fullpathc)) {
+    FatalError (1, "Couldn't load text information for \"%s\"", fullpathc);
+  }
+
+  delete fullpathc;
+
   get_phrase_all_data(textdata, phrase, word, tf, ef, lf, df, el, 
               linkdest, linktype, docNums, docfreq);
@@ -404 +428 @@
 
   textdata.UnloadData ();
+
+  delete basepath;
+
   return 0;
 }
@@ -494 +521 @@
              unsigned long first, unsigned long last) {
   
+  //  _chdir(basepath);
+
   // Create a TextData object to read the document data
   TextData docdata;
-  char filename[FILENAME_MAX] = "docs";
-  if (!docdata.LoadData (basepath, filename)) {
-    FatalError (1, "Couldn't load text information for \"%s\"", filename);
-  }
+
+  text_t fullpath = filename_cat(basepath, "docs");
+  char *fullpathc = fullpath.getcstr();
+#if defined __WIN32__
+  char *base = "";
+#else
+  char *base = "/";
+#endif
+
+  if (!docdata.LoadData (base, fullpathc)) {
+    FatalError (1, "Couldn't load text information for \"%s\"", fullpathc);
+  }
+
+  delete fullpathc;
 
   UCArray title, hash;
@@ -795 +834 @@
       }
       // store the gsdlhome string
-      gsdlhome = new (char)[len-i];
+      gsdlhome = new char[len-i];
       strncpy(gsdlhome, &(buffer[i]), len-i);
     } 
@@ -916 +955 @@
   // if no classifier number is supplied, default to 1.
   if (classifier == NULL) {
-    classifier = new (char)[2];
+    classifier = new char[2];
     strcpy(classifier, "1");
   }
@@ -971 +1010 @@
   // Open the index file for searching
   IndexData indexData;
-  char indexfilename[FILENAME_MAX] = "pword";
-  if (!indexData.LoadData (basepath, indexfilename)) {
-    FatalError (1, "Couldn't load index information for \"%s\"", indexfilename);
-  }
+
+  text_t fullpath = filename_cat(basepath, "pword");
+  char *fullpathc = fullpath.getcstr();
+#if defined __WIN32__
+  char *base = "";
+#else
+  char *base = "/";
+#endif
+
+  if (!indexData.LoadData (base, fullpathc)) {
+    FatalError (1, "Couldn't load index information for \"%s\"", fullpathc);
+  }
+
+  delete fullpathc;
 
   // set up the query object