Changeset 2344 for trunk/gsdl/src/colservr/collectset.cpp

Timestamp:

2001-04-30T10:44:08+12:00 (23 years ago)

Author:

sjboddie

Message:

Made the web library print some more reasonable debug info if gsdlhome
isn't set to a valid value

File:

• trunk/gsdl/src/colservr/collectset.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/collectset.cpp

@@ -42 +42 @@
 #include "colservrconfig.h"
 #include "recptconfig.h"
-
+#include "fileutil.h"
 #include "collectset.h"
 
@@ -53 +53 @@
   // cgiwrapper)
   if (site_cfg_read (gsdlhome, httpdomain, httpprefix)) {
-    collectdir = filename_cat (gsdlhome, "collect");
-
-    if (!read_dir (collectdir, collections)) {
-      cerr << "couldn't read collect directory - make sure gsdlhome field is correct in gsdlsite.cfg\n";
-      exit (1);
-    }
-  }
-    
-  text_tarray::const_iterator thiscol = collections.begin();
-  text_tarray::const_iterator endcol = collections.end();
-
-  while (thiscol != endcol) {
-    // ignore the modelcol
-    if (*thiscol == "modelcol") {
-      thiscol ++;
-      continue;
-    }
-
-    // Dummy call to add collection added 24/11/2000;
-    // we already do this ourselves! 
-    // this->add_collection(*thiscol, &recpt, gsdlghome, gsdlhome);
-
-    // read config file to see if built with mg or mgpp
-    text_t buildtype = "mg"; // mg is default
-    text_tarray cfgline;
-    text_t key;
-    text_t filename = filename_cat(collectdir, *thiscol, "index" , "build.cfg");
-    ifstream confin(filename.getcstr());
-
-    if (confin) {
-      while (read_cfg_line(confin, cfgline) >= 0) {
-    if (cfgline.size() ==2 ) {
-      key = cfgline[0];
-      cfgline.erase(cfgline.begin());
-      if (key =="buildtype") {
-        buildtype = cfgline[0];
-        break;
+    if (directory_exists(gsdlhome)) {
+      collectdir = filename_cat (gsdlhome, "collect");
+      if (read_dir (collectdir, collections)) {
+    
+    text_tarray::const_iterator thiscol = collections.begin();
+    text_tarray::const_iterator endcol = collections.end();
+
+    while (thiscol != endcol) {
+      // ignore the modelcol
+      if (*thiscol == "modelcol") {
+        thiscol ++;
+        continue;
       }
+
+      // read config file to see if built with mg or mgpp
+      text_t buildtype = "mg"; // mg is default
+      text_tarray cfgline;
+      text_t key;
+      text_t filename = filename_cat(collectdir, *thiscol, "index" , "build.cfg");
+      ifstream confin(filename.getcstr());
+
+      if (confin) {
+        while (read_cfg_line(confin, cfgline) >= 0) {
+          if (cfgline.size() ==2 ) {
+        key = cfgline[0];
+        cfgline.erase(cfgline.begin());
+        if (key =="buildtype") {
+          buildtype = cfgline[0];
+          break;
+        }
+          }
+        }
+      }
+      
+      confin.close();
+    
+      // this memory is created but never destroyed
+      // we're also not doing any error checking to make sure we didn't
+      // run out of memory
+      collectserver *cserver = new collectserver();
+      gdbmclass *gdbmhandler = new gdbmclass();
+    
+      // add a null filter
+      filterclass *filter = new filterclass ();
+      cserver->add_filter (filter);
+      
+      // add a browse filter
+      browsefilterclass *browsefilter = new browsefilterclass();
+      browsefilter->set_gdbmptr (gdbmhandler);
+      cserver->add_filter (browsefilter);
+      
+      if (buildtype == "mg") {
+        mgsearchclass *mgsearch = new mgsearchclass();
+        
+        // add a query filter
+        mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
+        queryfilter->set_gdbmptr (gdbmhandler);
+        queryfilter->set_mgsearchptr (mgsearch);
+        cserver->add_filter (queryfilter);
+        
+        // add a mg and gdbm source
+        mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
+        mggdbmsource->set_gdbmptr (gdbmhandler);
+        mggdbmsource->set_mgsearchptr (mgsearch);
+        cserver->add_source (mggdbmsource);
+      }
+#ifndef __WIN32__
+      
+      else if (buildtype == "mgpp") {
+        
+        mgppsearchclass *mgsearch = new mgppsearchclass();
+        
+        // add a query filter
+        mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
+        queryfilter->set_gdbmptr (gdbmhandler);
+        queryfilter->set_mgsearchptr (mgsearch);
+        cserver->add_filter (queryfilter);
+        
+        // add a mg and gdbm source
+        mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
+        mggdbmsource->set_gdbmptr (gdbmhandler);
+        mggdbmsource->set_mgsearchptr (mgsearch);
+        cserver->add_source (mggdbmsource);   
+      }
+#endif
+      
+      // inform collection server and everything it contains about its
+      // collection name
+      cserver->configure ("collection", *thiscol);
+      // AZIZ: added on 10/10/00
+      //       the cserver object does not have a reference to gsdlhome
+      cserver->configure ("gsdlhome", gsdlhome);
+    
+      // GRB: removed    proto.add_collectserver (cserver);
+      // GRB: added to build our own cservers list
+      cservers.addcollectserver (cserver);
+
+      thiscol ++;
     }
       }
     }
-    
-    confin.close();
-
-    // this memory is created but never destroyed
-    // we're also not doing any error checking to make sure we didn't
-    // run out of memory
-    collectserver *cserver = new collectserver();
-    gdbmclass *gdbmhandler = new gdbmclass();
-    
-    // add a null filter
-    filterclass *filter = new filterclass ();
-    cserver->add_filter (filter);
-    
-    // add a browse filter
-    browsefilterclass *browsefilter = new browsefilterclass();
-    browsefilter->set_gdbmptr (gdbmhandler);
-    cserver->add_filter (browsefilter);
-    
-    if (buildtype == "mg") {
-       mgsearchclass *mgsearch = new mgsearchclass();
- 
-       // add a query filter
-       mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
-       queryfilter->set_gdbmptr (gdbmhandler);
-       queryfilter->set_mgsearchptr (mgsearch);
-       cserver->add_filter (queryfilter);
-       
-       // add a mg and gdbm source
-       mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-       mggdbmsource->set_gdbmptr (gdbmhandler);
-       mggdbmsource->set_mgsearchptr (mgsearch);
-       cserver->add_source (mggdbmsource);
-    }
-#ifndef __WIN32__
-
-    else if (buildtype == "mgpp") {
-
-      mgppsearchclass *mgsearch = new mgppsearchclass();
-
-      // add a query filter
-      mgppqueryfilterclass *queryfilter = new mgppqueryfilterclass();
-      queryfilter->set_gdbmptr (gdbmhandler);
-      queryfilter->set_mgsearchptr (mgsearch);
-      cserver->add_filter (queryfilter);
-      
-      // add a mg and gdbm source
-      mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass ();
-      mggdbmsource->set_gdbmptr (gdbmhandler);
-      mggdbmsource->set_mgsearchptr (mgsearch);
-      cserver->add_source (mggdbmsource);   
-    }
-#endif
-
-    // inform collection server and everything it contains about its
-    // collection name
-    cserver->configure ("collection", *thiscol);
-    // AZIZ: added on 10/10/00
-    //       the cserver object does not have a reference to gsdlhome
-    cserver->configure ("gsdlhome", gsdlhome);
-    
-    // GRB: removed    proto.add_collectserver (cserver);
-    // GRB: added to build our own cservers list
-    cservers.addcollectserver (cserver);
-
-    thiscol ++;
   }
 }