Changeset 864

Timestamp:

2000-01-25T11:53:09+13:00 (24 years ago)

Author:

sjboddie

Message:

a few small changes to get fastcgi working properly here at Waikato -
hopefully changes will work everywhere ...

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (12 diffs)
• receptionist.h (modified) (4 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.44  2000/01/24 22:53:09  sjboddie
+   a few small changes to get fastcgi working properly here at Waikato -
+   hopefully changes will work everywhere ...
+
    Revision 1.43  1999/12/06 01:14:16  sjboddie
    added arabic encoding
@@ -609 +613 @@
 // if there was a major problem with the cgi arguments.
 bool receptionist::parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
-                   ostream &logout) {
+                   ostream &logout, text_tmap &fcgienv) {
   outconvertclass text_t2ascii;
 
@@ -623 +627 @@
 
   // get the cookie
-  if (configinfo.usecookies) get_cookie(args["z"]);
+  if (configinfo.usecookies) get_cookie(args["z"], fcgienv);
   
   // get the input encoding
@@ -680 +684 @@
 // returns true if cookie already existed, false
 // if it was generated
-bool receptionist::get_cookie (text_t &cookie) {
-
-  char *c = getenv("HTTP_COOKIE");
-  if (c != NULL) {
+bool receptionist::get_cookie (text_t &cookie, text_tmap &fcgienv) {
+
+  text_t cookiestring = gsdl_getenv ("HTTP_COOKIE", fcgienv);
+    
+  text_t::const_iterator end = cookiestring.end();  
+  text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
+
+  while (here+9 < end) { 
+    
+    if (substr(here, here+8) == "GSDL_UID") {
+      cookie = substr (here+9, findchar (here+9, end, ';')); 
+      return true;
+    }
+    here = findchar (cookiestring.begin(), end, 'G');
+  }
+
+  cookie.clear();
+  text_t host = gsdl_getenv("REMOTE_ADDR", fcgienv);
+  time_t ttime = time(NULL);
+  if (!host.empty()) {
+    cookie += host;
+    cookie.push_back ('-');
+  }
+  cookie += text_t(ttime);
+  
+  return false;
+}
+
+// as above but just tests if cookie exists
+bool receptionist::get_cookie (text_tmap &fcgienv) {
+
+  text_t c = gsdl_getenv("HTTP_COOKIE", fcgienv);
+  if (!c.empty()) {
     text_t cookiestring = c;
     
     text_t::const_iterator end = cookiestring.end();  
     text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
-    
-    if (substr(here, here+8) == "GSDL_UID") {
-      cookie = substr (here+9, findchar (here+9, end, ';')); 
-      return true;
-    }
-  }
-
-  cookie.clear();
-  char *host = getenv("REMOTE_ADDR");
-  time_t ttime = time(NULL);
-  if (host != NULL) {
-    cookie += host;
-    cookie.push_back ('-');
-  }
-  cookie += text_t(ttime);
-  
+
+    while (here+9 < end) { 
+      if (substr(here, here+8) == "GSDL_UID") return true;
+      here = findchar (cookiestring.begin(), end, 'G');
+    }
+  }
   return false;
 }
 
-// as above but just tests if cookie exists
-bool receptionist::get_cookie () {
-
-  char *c = getenv("HTTP_COOKIE");
-  if (c != NULL) {
-    text_t cookiestring = c;
-    
-    text_t::const_iterator end = cookiestring.end();  
-    text_t::const_iterator here = findchar (cookiestring.begin(), end, 'G');
-    
-    if (substr(here, here+8) == "GSDL_UID")
-      return true;
-  }
-  return false;
-}
-
-bool receptionist::log_cgi_args (cgiargsclass &args, ostream &logout) {
+bool receptionist::log_cgi_args (cgiargsclass &args, ostream &logout, text_tmap &fcgienv) {
 
   // see if we want to log the cgi arguments
   if (!configinfo.logcgiargs) return true;
   
-  char *host;
-  host = getenv("REMOTE_HOST");
-  if (host == NULL) host = getenv ("REMOTE_ADDR");
-  if (host == NULL) host = "";
-  char *browser = getenv("HTTP_USER_AGENT");
-  if (browser == NULL) browser = "";
+  text_t host = gsdl_getenv ("REMOTE_HOST", fcgienv);
+  if (host.empty()) host = gsdl_getenv ("REMOTE_ADDR", fcgienv);
+  text_t browser = gsdl_getenv ("HTTP_USER_AGENT", fcgienv);
   time_t ttime = time(NULL);
 
@@ -811 +815 @@
 // will return false
 bool receptionist::produce_cgi_page (cgiargsclass &args, ostream &contentout, 
-                     ostream &logout) {
+                     ostream &logout, text_tmap &fcgienv) {
   outconvertclass text_t2ascii;
 
@@ -818 +822 @@
 
   // produce cgi header
-  get_cgihead_info (args, response, response_data, logout);
+  get_cgihead_info (args, response, response_data, logout, fcgienv);
   if (response == location) {
     // location response (url may contain macros!!)
@@ -849 +853 @@
 // Note that images can now be produced by the receptionist.
 void receptionist::get_cgihead_info (cgiargsclass &args, response_t &response,
-                     text_t &response_data, ostream &logout) {
+                     text_t &response_data, ostream &logout, 
+                     text_tmap &fcgienv) {
   outconvertclass text_t2ascii;
 
@@ -872 +877 @@
       response_data += "; charset=GBK";
     } else if (args["w"] == "a") {
-      response_data += "; charset=ISO-8859-6";
+      response_data += "; charset=windows-1256";
     } else {
       response_data += "; charset=ISO-8859-1";      
@@ -878 +883 @@
 
     // add cookie if required
-    if (configinfo.usecookies && !get_cookie())
+    if (configinfo.usecookies && !get_cookie(fcgienv))
       response_data += "\nSet-Cookie: GSDL_UID=" + args["z"]
     + "; expires=25-Dec-37 00:00:00 GMT";
@@ -1073 +1078 @@
   if (!configinfo.collection.empty()) args["c"] = configinfo.collection;
 
-  // if cross-collection is turned on make "cc" default to
-  // all available collections and "c" default to any 
-  // valid collection
-  if (args["ccs"] == "1") {
-    if (args["cc"].empty()) {
-      recptprotolistclass::iterator rprotolist_here = protocols.begin();
-      recptprotolistclass::iterator rprotolist_end = protocols.end();
-      bool first = true;
-      while (rprotolist_here != rprotolist_end) {
-    if ((*rprotolist_here).p != NULL) {
-      text_tarray collist;
-      comerror_t err;
-      (*rprotolist_here).p->get_collection_list (collist, err, logout);
-      if (err == noError) {
-        text_tarray::iterator collist_here = collist.begin();
-        text_tarray::iterator collist_end = collist.end();
-        while (collist_here != collist_end) {
-          if (!first) args["cc"].push_back (',');
-          else if (args["c"].empty()) args["c"] = *collist_here;
-          args["cc"] += *collist_here;
-          first = false;
-          collist_here ++;
-        }
-      }
+  // if current collection uses ccscols make sure
+  // "ccs" argument is set and make "cc" default to
+  // all collections in "ccs"
+  if (!args["c"].empty()) {
+
+    text_t &arg_c = args["c"];
+    ColInfoResponse_t cinfo;
+    comerror_t err;
+    recptproto *collectproto = protocols.getrecptproto (arg_c, logout);
+    collectproto->get_collectinfo (arg_c, cinfo, err, logout);
+
+    if (!cinfo.ccsCols.empty()) {
+      args["ccs"] = 1;
+      if (args["cc"].empty()) {
+    text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
+    text_tarray::const_iterator col_end = cinfo.ccsCols.end();
+    bool first = true;
+    while (col_here != col_end) {
+      if (!first) args["cc"].push_back (',');
+      args["cc"] += *col_here;
+      col_here ++;
+      first = false;
     }
-    rprotolist_here ++;
       }
-    } else if (args["c"].empty()) {
-      text_t argcc = args["cc"];
-      decode_cgi_arg (argcc);
-      text_t::const_iterator it = argcc.begin();
-      args["c"] = substr (it, findchar (it, argcc.end(), ','));
     }
   }
@@ -1219 +1216 @@
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
   disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
-  disp.setmacro ("compressedoptions", "Global", get_compressed_arg(args, logout));
+  text_t compressedoptions = get_compressed_arg(args, logout);
+  disp.setmacro ("compressedoptions", "Global", compressedoptions);
+  // need a decoded version of compressedoptions for use within forms
+  // as browsers encode values from forms before sending to server
+  // (e.g. %25 becomes %2525)
+  decode_cgi_arg (compressedoptions);
+  disp.setmacro ("decodedcompressedoptions", "Global", compressedoptions);
 
   // set _cgiargX_ macros for each cgi argument
@@ -1240 +1243 @@
     argshere ++;
   }
+
+  // display text right to left if language is arabic (and if browser can support it)
+  if (args["l"] == "ar")
+    disp.setmacro ("htmlextra", "Global", " dir=rtl");
 
   // set collection specific macros

trunk/gsdl/src/recpt/receptionist.h

@@ -94 +94 @@
                    ostream &logout);
 
-  bool get_cookie (text_t &cookie);
-  bool get_cookie ();
+  bool get_cookie (text_t &cookie, text_tmap &fcgienv);
+  bool get_cookie (text_tmap &fcgienv);
 
   virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert, 
@@ -165 +165 @@
   // This function should be called for each page request. It returns false
   // if there was a major problem with the cgi arguments.
-  virtual bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, ostream &logout);
-
-  virtual bool log_cgi_args (cgiargsclass &args, ostream &logout);
+  virtual bool parse_cgi_args (const text_t &argstr, cgiargsclass &args, 
+                   ostream &logout, text_tmap &fcgienv);
+
+  virtual bool log_cgi_args (cgiargsclass &args, ostream &logout, text_tmap &fcgienv);
 
   text_t expandmacros (const text_t &astring, cgiargsclass &args, 
@@ -177 +178 @@
   // will return false
   virtual bool produce_cgi_page (cgiargsclass &args, ostream &contentout, 
-                 ostream &logout);
+                 ostream &logout, text_tmap &fcgienv);
   
   // get_cgihead_info determines the cgi header information for
@@ -185 +186 @@
   // Note that images can now be produced by the receptionist.
   virtual void get_cgihead_info (cgiargsclass &args, response_t &response,
-                 text_t &response_data, ostream &logout);
+                 text_t &response_data, ostream &logout,
+                 text_tmap &fcgienv);
   
   // produce the page content