Changeset 19109

Timestamp:

2009-04-20T14:15:11+12:00 (15 years ago)

Author:

kjdon

Message:

httpimg changed to httpweb, and default is now httpprefix/web. not /images or /gsdl/images

Location:

gsdl/trunk/runtime-src/src/recpt

Files:

• cgiwrapper.cpp (modified) (3 diffs)
• receptionist.cpp (modified) (4 diffs)
• receptionist.h (modified) (2 diffs)
• statusaction.cpp (modified) (1 diff)

gsdl/trunk/runtime-src/src/recpt/cgiwrapper.cpp

@@ -318 +318 @@
     cout << text_t2ascii << "  dbhome=" << configinfo.dbhome << "\n";
   cout << text_t2ascii << "  httpprefix=" << configinfo.httpprefix << "\n";
-  cout << text_t2ascii << "  httpimg=" << configinfo.httpimg << "\n";
+  cout << text_t2ascii << "  httpweb=" << configinfo.httpweb << "\n";
   cout << text_t2ascii << "  gwcgi=" << configinfo.gwcgi << "\n\n"
        << "  Note that unless gwcgi has been set from a configuration\n"
@@ -479 +479 @@
   int maxrequests = 10000;
   recpt.configure ("collection", collection);
-  recpt.configure ("httpimg", "/gsdl/images");
   char *script_name = getenv("SCRIPT_NAME");
   if (script_name != NULL) recpt.configure("gwcgi", script_name);
@@ -504 +503 @@
     page_errorcollect (gsdlhome, errorpage, debug);
   }
+
+  // set up the httpweb variable if it hasn't been defined yet
+  if (configinfo.httpweb.empty()) {
+    recpt.configure("httpweb", configinfo.httpprefix+"/web");
+  }
+  
   // get the query string if it is not being run as a fastcgi
   // script

gsdl/trunk/runtime-src/src/recpt/receptionist.cpp

@@ -58 +58 @@
   collectdir.clear();
   httpprefix.clear();
-  httpimg = "/images";
+  httpweb.clear();
   gwcgi.clear();
   macrofiles.erase(macrofiles.begin(), macrofiles.end());
@@ -91 +91 @@
 #endif
 }
+
 
 void collectioninfo_t::clear () {
@@ -236 +237 @@
     else if (key == "collectdir") configinfo.collectdir = cfgline[0];
     else if (key == "httpprefix") configinfo.httpprefix = cfgline[0];
-    else if (key == "httpimg") configinfo.httpimg = cfgline[0];
+    else if (key == "httpweb") configinfo.httpweb = cfgline[0];
     else if (key == "gwcgi") configinfo.gwcgi = cfgline[0];
     else if (key == "macrofiles") {
@@ -1454 +1455 @@
   disp.setmacro ("gsdlhome", displayclass::defaultpackage, dm_safe(configinfo.gsdlhome));
   disp.setmacro ("gwcgi", displayclass::defaultpackage, configinfo.gwcgi);
-  disp.setmacro ("httpimg", displayclass::defaultpackage, configinfo.httpimg);
+  disp.setmacro ("httpweb", displayclass::defaultpackage, configinfo.httpweb);
   disp.setmacro ("httpprefix", displayclass::defaultpackage, configinfo.httpprefix);
 

gsdl/trunk/runtime-src/src/recpt/receptionist.h

@@ -84 +84 @@
    colinfo_tmap collectinfo;
    text_t httpprefix;
-   text_t httpimg;    // will equal /images if not set
+  text_t httpweb; // will be set to httpprefix/web if not set
    text_t gwcgi;
    text_tset macrofiles;
@@ -118 +118 @@
    void clear ();
    recptconf () {clear();}
+  
 };
 

gsdl/trunk/runtime-src/src/recpt/statusaction.cpp

@@ -149 +149 @@
       << "<tr valign=top><th>httpprefix</th><td>\"" << rcinfo.httpprefix
       << "\"</td></tr>\n"
-      << "<tr valign=top><th>httpimg</th><td>\"" << rcinfo.httpimg
+      << "<tr valign=top><th>httpweb</th><td>\"" << rcinfo.httpweb
       << "\"</td></tr>\n"
       << "<tr valign=top><th>gwcgi</th><td>\"" << rcinfo.gwcgi