Changeset 1860 for trunk/gsdl/src/recpt/recptconfig.cpp

Timestamp:

2001-01-26T07:26:45+13:00 (23 years ago)

Author:

cs025

Message:

Included CORBA branch for first time

File:

• trunk/gsdl/src/recpt/recptconfig.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/recptconfig.cpp

@@ -27 +27 @@
 #include "fileutil.h"
 #include "cfgread.h"
+#include "cnfgator.h"
 
 
@@ -40 +41 @@
 #endif
 
+class __site_configuration : public configurable {
+private:
+  text_t *gsdlhome;
+  text_t *httpdomain;
+  text_t *httpprefix;
+  int    *maxrequests;
+public:
+  __site_configuration (text_t *_gsdlhome, int *_maxrequests) {
+    gsdlhome = _gsdlhome;
+    httpdomain = NULL;
+    httpprefix = NULL;
+    maxrequests = _maxrequests;
+  }
+
+  __site_configuration (text_t *_gsdlhome, text_t *_httpdomain,
+                        text_t *_httpprefix) {
+    gsdlhome    = _gsdlhome;
+    httpdomain = _httpdomain;
+    httpprefix = _httpprefix;
+    maxrequests = NULL;
+  }
+
+  inline void configure (const text_t &key, const text_tarray &cfgline) {
+    if (key == "gsdlhome") {
+      *gsdlhome = cfgline[0];
+    }
+
+    if (key == "httpprefix" &&
+    httpprefix != NULL) {
+      *httpprefix = cfgline[0];
+    }
+
+    if (key == "httpdomain" &&
+    httpdomain != NULL) {
+      *httpdomain = cfgline[0];
+    }
+
+    if (key == "maxrequests" &&
+    maxrequests != NULL) {
+      *maxrequests = cfgline[0].getint();
+      if ((*maxrequests) < 1) {
+    *maxrequests = 1;
+      }
+    }
+  }
+};
+
 
 // reads site configuration file returning true on success
@@ -45 +93 @@
 // gsdlsite.cfg should be in same directory as library executable
 bool site_cfg_read (receptionist &recpt, text_t &gsdlhome, int &maxrequests) {
+  // initialise configurator, etc.
+  __site_configuration sitecfg (&gsdlhome, &maxrequests);
+  configurator         gsdlconfigurator(&recpt);
 
+  gsdlconfigurator.add_configurable(&sitecfg);
+
+  // blank the gsdl home text
   gsdlhome.clear();
 
-  // Look for gsdlsite.cfg in same directory that executable is in.
-  text_tarray cfgline;
-  text_t key;
-
-#ifdef GSDL_USE_IOS_H
-  ifstream confin ("gsdlsite.cfg", ios::in | ios::nocreate);
-#else
-  ifstream confin ("gsdlsite.cfg", ios::in);
-#endif
-
-  if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-    key = cfgline[0];
-    cfgline.erase(cfgline.begin());
-    
-    if (key == "maxrequests") {
-      maxrequests = cfgline[0].getint();
-      if (maxrequests < 1) maxrequests = 1;
-    }
-
-    if (key == "gsdlhome")
-      gsdlhome = cfgline[0];
-
-    // configure the receptionist
-    recpt.configure (key, cfgline);
-      }
-    }
-    confin.close ();
+  if (gsdlconfigurator.configure("gsdlsite.cfg")) {
     return true;
   }
@@ -82 +108 @@
 }
 
-// this version just grabs gsdlhome, returning true
-// unless unable to read gsdlsite.cfg
-bool site_cfg_read (text_t &gsdlhome) {
+// this version grabs gsdlhome, httpdomain and httpprefix, 
+// returns false if it can't find all of them
+bool site_cfg_read (text_t &gsdlhome, text_t &httpdomain, 
+            text_t &httpprefix) {
+  // get gsdlhome etc
+  __site_configuration sitecfg(&gsdlhome, &httpdomain, &httpprefix);
+  configurator gsdlconfigurator(&sitecfg);
 
   gsdlhome.clear();
+  httpdomain.clear();
+  httpprefix.clear();
 
-  // Look for gsdlsite.cfg in same directory that executable is in.
-  text_tarray cfgline;
-  text_t key;
+  if (gsdlconfigurator.configure("gsdlsite.cfg") &&
+      !gsdlhome.empty() && !httpdomain.empty() && !httpprefix.empty()) {
+    return true;
+  }
 
-#ifdef GSDL_USE_IOS_H
-  ifstream confin ("gsdlsite.cfg", ios::in | ios::nocreate);
-#else
-  ifstream confin ("gsdlsite.cfg", ios::in);
-#endif
+  return true;
 
-  if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-    if (cfgline[0] == "gsdlhome") {
-      gsdlhome = cfgline[1];
-      break;
-    }
-      }
-    }
-    return true;
-    confin.close ();
-  }
   return false;
 }
@@ -121 +138 @@
   // read in the main configuration file
   bool rv = false;
+
   text_t key, filename;
   text_tarray cfgline;
@@ -126 +144 @@
   filename = filename_cat (filename, "main.cfg");
   if (file_exists (filename)) {
-    char *cstr = filename.getcstr();
-    
-#ifdef GSDL_USE_IOS_H
-    ifstream confin (cstr, ios::in | ios::nocreate);
-#else
-    ifstream confin (cstr, ios::in);
-#endif
-
-    delete cstr;
-  
-    if (confin) {
-      while (read_cfg_line(confin, cfgline) >= 0) {
-    if (cfgline.size () >= 2) {
-      key = cfgline[0];
-      cfgline.erase(cfgline.begin());
-    
-      // configure the receptionist
-      recpt.configure (key, cfgline);
-    }
-      }
-      confin.close ();
-      rv = true;
-    }
+    rv = recpt.read_configfile(filename);
   }
   
@@ -165 +161 @@
 
     if (!filename.empty()) {
-      char *cstr = filename.getcstr();
-
-#ifdef GSDL_USE_IOS_H
-      ifstream confin (cstr, ios::in | ios::nocreate);
-#else
-      ifstream confin (cstr, ios::in);
-#endif
-      
-      delete cstr;
-      
-      if (confin) {
-    while (read_cfg_line(confin, cfgline) >= 0) {
-      if (cfgline.size () >= 2) {
-        key = cfgline[0];
-        cfgline.erase(cfgline.begin());
-        
-        // configure the receptionist
-        recpt.configure (key, cfgline);
-      }
-    }
-    confin.close ();
-    rv = true;
-      }
+      rv |= recpt.read_configfile(filename);
     }
   }