Changeset 746 for trunk/gsdl/src

Timestamp:

1999-10-26T11:29:32+13:00 (25 years ago)

Author:

sjboddie

Message:

receptionist now checks collect diectory for collections
rather than collections.txt file

Location:

trunk/gsdl/src/recpt

Files:

• librarymain.cpp (modified) (4 diffs)
• nullproto.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.18  1999/10/25 22:29:31  sjboddie
+   receptionist now checks collect diectory for collections
+   rather than collections.txt file
+
    Revision 1.17  1999/10/19 03:23:43  davidb
    Collection building support through web pages
@@ -98 +102 @@
 #include "mgsearch.h"
 #include "mggdbmsource.h"
+#include "fileutil.h"
 #include <assert.h>
 
@@ -127 +132 @@
 
   text_tarray collections;
-
-  ifstream collist (GSDL_GSDLHOME "/etc/collections.txt");
-  if (!collist) {
-    exit(1);
-  }
-  char collection[100];
-  while (!collist.eof()) {
-    collist.getline (collection, 100);
-    if (collection[0] != '\0')
-      collections.push_back (collection);
-  }
-  collist.close();
+  if (!read_dir (GSDL_GSDLHOME "/collect", collections)) exit (1);
 
   text_tarray::const_iterator thiscol = collections.begin();
@@ -144 +138 @@
 
   while (thiscol != endcol) {
+
+    // ignore the modelcol
+    if (*thiscol == "modelcol") {
+      thiscol ++;
+      continue;
+    }
 
     // this memory is created but never destroyed

trunk/gsdl/src/recpt/nullproto.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.11  1999/10/25 22:29:32  sjboddie
+   receptionist now checks collect diectory for collections
+   rather than collections.txt file
+
    Revision 1.10  1999/10/19 03:23:43  davidb
    Collection building support through web pages
@@ -117 +121 @@
            << configinfo.gsdlhome << "\"\n";
     //  return false; //****
+    here ++;
+    continue;
       }
 
@@ -123 +129 @@
     outconvertclass text_t2ascii;
     logout << text_t2ascii 
-           << "Error: couldn't read collect.cfg file for collection \""
+           << "Warning: couldn't read collect.cfg file for collection \""
            << configinfo.collection << "\", gsdlhome=\"" 
            << configinfo.gsdlhome << "\"\n";
-    return false;
+    //  return false; //****
+    here ++;
+    continue;
       }