Changeset 1123 for trunk/gsdl/src

Timestamp:

2000-04-18T16:02:02+12:00 (24 years ago)

Author:

kjm18

Message:

added basepath to LoadData, needed if text and index are in different directories

Location:

trunk/gsdl/src/mgpp/text

Files:

• TextGet.cpp (modified) (2 diffs)
• TextGet.h (modified) (1 diff)
• mg_decompress_text.cpp (modified) (4 diffs)

trunk/gsdl/src/mgpp/text/TextGet.cpp

@@ -478 +478 @@
 
 void TextData::Clear () {
-  cd.Clear(); // not implemented
+  cd.Clear(); 
   textFile = NULL;
   textIdxFile = NULL;
@@ -485 +485 @@
 }
 
-bool TextData::LoadData (char *textname) {
+bool TextData::LoadData (char *basepath, char *textname) {
+  
+  if (textname[0] == '\0') return false;
+  
+  // set the basepath
+  set_basepath(basepath);
+  
   // load the compression dictionary
   if (!OpenLoadCompDict (textname, cd)) return false;

trunk/gsdl/src/mgpp/text/TextGet.h

@@ -42 +42 @@
   // loads compression dictionary, the compressed text header,
   // and all level informaiton
-  bool LoadData (char *textname);
+  bool LoadData (char *basepath, char *textname);
   bool UnloadData ();
 };

trunk/gsdl/src/mgpp/text/mg_decompress_text.cpp

@@ -34 +34 @@
   int ch;
   char *filename = "";
+  char *basePath = "";
   UCArray level;
   SetCStr (level, "Document");
@@ -47 +48 @@
       break;
     case 'd':
+      basePath = optarg;
       set_basepath (optarg);
       break;
@@ -62 +64 @@
   // load up the text information
   TextData td;
-  if (!td.LoadData (filename)) {
+  if (!td.LoadData (basePath, filename)) {
     FatalError (1, "Couldn't load text information for \"%s\"", filename);
   }
@@ -90 +92 @@
   return 0;
 }
+
+