Changeset 1011

Timestamp:

2000-03-03T16:40:50+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up w32server

Location:

trunk/gsdl/src/w32server

Files:

• cgiwrapper.cpp (modified) (2 diffs)
• fnord.cpp (modified) (2 diffs)
• locate.cpp (modified) (1 diff)
• locateP.h (deleted)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ -12 +12 @@
 
 #include "gsdlconf.h"
-#include "gsdlhome.h"
 #include "recptconfig.h"
 
@@ -509 +508 @@
   text_tset::const_iterator ehome = gsdlhomes.end();
   while (thome != ehome) {
-    if (!site_cfg_read (recpt, *thome, collection, maxrequests)) {
+    // TODO: should only need to do this once now I think
+    // gsdlsite.cfg will need to be installed along with executable
+    //    if (!site_cfg_read (recpt, *thome, maxrequests)) {
       // couldn't find the site configuration file
-      page_errorsitecfg (*thome, collection);
-      return 0;
-    } else if (!main_cfg_read (recpt, *thome, collection)) {
+    //      page_errorsitecfg (*thome, collection);
+    //      return 0;
+    //    } else 
+    if (!main_cfg_read (recpt, *thome, collection)) {
       // couldn't find the main configuration file
       page_errormaincfg (*thome, collection);

trunk/gsdl/src/w32server/fnord.cpp

@@ -29 +29 @@
 #include "resource.h"
 #include "locate.h"
-#include "locateP.h"
 #include "cgiwrapper.h"
 #include "startbrowser.h"
@@ -77 +76 @@
 #define ENTERBUTTONY ((MAINWINDOWHEIGHT-RESTHEIGHT)+5)
 
-#define VERSIONSTRING "version 1.0"
+#define VERSIONSTRING "version 2.12"
 const char versionstring[] = VERSIONSTRING;
 

trunk/gsdl/src/w32server/locate.cpp

@@ -1 +1 @@
 #include <windows.h>
 #include <stdio.h>
-#include "locateP.h"
 #include "locate.h"
 #include "settings.h"