Changeset 7302

Timestamp:

2004-05-11T13:53:19+12:00 (20 years ago)

Author:

kjdon

Message:

removed a strange piece of code: 'return true; return false;' :-) site_cfg_read(gsdlhome, httpdomain, httpprefix) no longer tests whether these strings are empty (and then return true anyway) and now returns false only if it couldn't configure. the calling code now must check whether gsdlhome is empty before using it

Location:

trunk/gsdl/src

Files:

• colservr/collectset.cpp (modified) (1 diff)
• recpt/recptconfig.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/collectset.cpp

@@ -51 +51 @@
   // cgiwrapper)
   if (site_cfg_read (gsdlhome, httpdomain, httpprefix)) {
-    if (directory_exists(gsdlhome)) {
+    if (!gsdlhome.empty() && directory_exists(gsdlhome)) {
       collectdir = filename_cat (gsdlhome, "collect");
       if (read_dir (collectdir, collections)) {

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -120 +120 @@
   httpprefix.clear();
 
-  if (gsdlconfigurator.configure("gsdlsite.cfg") &&
-      !gsdlhome.empty() && !httpdomain.empty() && !httpprefix.empty()) {
+  if (gsdlconfigurator.configure("gsdlsite.cfg")) {
     return true;
   }
-
-  return true;
 
   return false;