Changeset 154

Timestamp:

1999-02-08T14:28:01+13:00 (25 years ago)

Author:

rjmcnab

Message:

Got the receptionist producing something using the statusaction.

Location:

trunk/gsdl/src/recpt

Files:

• cgiargs.cpp (modified) (6 diffs)
• cgiargs.h (modified) (5 diffs)
• cgiutils.h (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiargs.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/02/08 01:28:00  rjmcnab
+   Got the receptionist producing something using the statusaction.
+
    Revision 1.4  1999/02/05 10:42:41  rjmcnab
 
@@ -134 +137 @@
 // processing with the arguments should be done if this happens
 // as the results will be meaningless.
-bool cgiargsinfoclass::addarginfo (ostream &logout, const cgiarginfo &info) {
+bool cgiargsinfoclass::addarginfo (ostream *logout, const cgiarginfo &info) {
   outconvertclass text_t2ascii;
 
@@ -144 +147 @@
 
   if (orginfo->longname != info.longname) {
-    logout << text_t2ascii << "Error: cgi argument name clash for argument \""
-       << info.shortname << "\".\nOne long name was\n  \"" << orginfo->longname 
-       << "\"\nand the other was\n  \"" << info.longname << "\".\n\n";
+    if (logout != NULL) {
+      (*logout) << text_t2ascii << "Error: cgi argument name clash for argument \""
+        << info.shortname << "\".\nOne long name was\n  \"" << orginfo->longname 
+        << "\"\nand the other was\n  \"" << info.longname << "\".\n\n";
+    }
     return false; // found a clash
   }
 
   if (orginfo->multiplechar != info.multiplechar) {
-    logout << text_t2ascii << "Error: cgi argument \"" << info.shortname 
-       << "\" was given as being a single character option\n"
-       << "and a multiple character option.\n\n";
+    if (logout != NULL) {
+      (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname 
+        << "\" was given as being a single character option\n"
+        << "and a multiple character option.\n\n";
+    }
     return false; // found a clash
   }
-
+  
   if (!info.multiplechar && info.argdefault.size() > 1) {
-    logout << text_t2ascii << "Error: cgi argument \"" << info.shortname
-       << "\" was defined as being a single character option\n"
-       << "but a multiple character default was given.\n\n";
+    if (logout != NULL) {
+      (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname
+        << "\" was defined as being a single character option\n"
+        << "but a multiple character default was given.\n\n";
+    }
     return false;  // found a problem
   }
@@ -169 +178 @@
       (orginfo->savedarginfo==cgiarginfo::must && 
        info.savedarginfo==cgiarginfo::mustnot)) {
-    logout << text_t2ascii << "Error: it was specified that cgi argument \"" 
-       << info.shortname << "\" should be saved in the state\n"
-       << "information and that it should not be save in the state information.\n\n";
+    if (logout != NULL) {
+      (*logout) << text_t2ascii << "Error: it was specified that cgi argument \"" 
+        << info.shortname << "\" should be saved in the state\n"
+        << "information and that it should not be save in the state information.\n\n";
+    }
     return false; // found a clash
   }
@@ -189 +200 @@
 }
 
-bool cgiargsinfoclass::addarginfo (ostream &logout, const cgiargsinfoclass &info) {
+bool cgiargsinfoclass::addarginfo (ostream *logout, const cgiargsinfoclass &info) {
   const_iterator here = info.begin ();
   const_iterator end = info.end ();
@@ -217 +228 @@
 
 
-// utilities related to cgi arguments
-
-
-static text_t::const_iterator get_next_save_arg (text_t::const_iterator first, 
-                       text_t::const_iterator last,
-                       text_t &argname) {
-  first = getdelimitstr (first, last, '-', argname);
-  return first;
-}
-
-
-
-
-
-// check_save_conf_str checks the configuration string for
-// the saved args and makes sure it does not conflict with
-// the information about the arguments. If an error is encountered
-// it will return false and the program should not produce any
-// output.
-bool check_save_conf_str (const text_t &saveconf, 
-              const cgiargsinfoclass &argsinfo,
-              ostream &logout) {
-  outconvertclass text_t2ascii;
-
-  text_tset argsset;
-  text_t::const_iterator saveconfhere = saveconf.begin ();
-  text_t::const_iterator saveconfend = saveconf.end ();
-  text_t argname;
-  const cgiarginfo *info;
-
-  // first check to make sure all saved arguments can be saved
-  
-  while (saveconfhere != saveconfend) {
-    saveconfhere = get_next_save_arg (saveconfhere, saveconfend, argname);
-
-    if (!argname.empty()) {
-      // save the argument name for later
-      argsset.insert (argname);
-
-      // check the argument
-      info =  argsinfo.getarginfo (argname);
-      if (info == NULL) {
-    logout << text_t2ascii << "Error: the cgi argument \"" << argname 
-           << "\" is used in the configuration string for the\n"
-           << "saved arguments but does not exist as a valid argument.\n\n";
-    return false;
-      }
-      if (info->savedarginfo == cgiarginfo::mustnot) {
-    logout << text_t2ascii << "Error: the cgi argument \"" << argname
-           << "\" is used in the configuration string for the\n"
-           << "saved arguments but has been specified as an argument whose\n"
-           << "state must not be saved.\n\n";
-    return false;
-      }
-    }
-  }
-
-
-  // next check that all saved arguments that should be saved
-  // are saved
-  cgiargsinfoclass::const_iterator argsinfohere = argsinfo.begin ();
-  cgiargsinfoclass::const_iterator argsinfoend = argsinfo.end ();
-
-  while (argsinfohere != argsinfoend) {
-    if (((*argsinfohere).second.savedarginfo == cgiarginfo::must) &&
-    (argsset.find((*argsinfohere).second.shortname) == argsset.end())) {
-      logout << text_t2ascii << "Error: the cgi argument \"" 
-         << (*argsinfohere).second.shortname << "\" was specified as needing to\n"
-         << "be save but was not listed in the saved arguments.\n\n";
-      return false;
-    }
-
-    argsinfohere++;
-  }
-  
-  return true; // made it, no clashes
-}
-
-
-
-// create_save_conf_str will create a configuration string
-// based on the information in argsinfo. This method of configuration
-// is not recomended as small changes can produce large changes in
-// the resulting configuration string (for instance a totally different
-// ordering)
-text_t create_save_conf_str (const cgiargsinfoclass &argsinfo,
-                 ostream &logout);
-
-// expand_save_args will expand the saved arguments based
-// on saveconf placing the results in args if they are not
-// already defined. If it encounters an error it will return false
-// and output more information to logout.
-bool expand_save_args (const text_t &saveconf, 
-               cgiargsclass &args,
-               ostream &logout);
-
-// adds the default values for those arguments which have not
-// been specified
-void add_default_args (const cgiargsinfoclass &argsinfo,
-               cgiargsclass &args,
-               ostream &logout);
-

trunk/gsdl/src/recpt/cgiargs.h

@@ -33 +33 @@
 #endif
 
+
+// response_t is used to define what type of cgi header 
+// should be produced
+enum response_t {location, content};
 
 
@@ -77 +81 @@
   // setdefaultarg, setdefaultintarg, and setdefaultcarg will 
   // only set the argument if it is not already set
-  // getargs NULLs if there isn't an entry with
+  // getargs returns NULL if there isn't an entry with
   // 'key' already defined, getintarg returns 0 if there wasn't an
   // entry with 'key' defined and operator[] returns "" if
@@ -114 +118 @@
 
   // defaultstatus_t indicates how good the default is when different
-  // defaults are given for one argument. "weak" is a basic guess that doesn't
-  // hold much weight, "good" is a better guess, "config" was a default
+  // defaults are given for one argument. "none" means there is no default
+  // (a default might be given elsewhere). "weak" is a basic guess that
+  // doesn't hold much weight, "good" is a better guess, "config" was a default
   // given in a configuration file, and "imperative" means it must not
   // be overriden at any costs (unless there is another "imperative"...)
-  // Note: I assume that the comparison weak < good < config < imperative
+  // Note: I assume that the comparison none < weak < good < config < imperative
   // holds :-/
-  enum defaultstatus_t {weak, good, config, imperative};
+  enum defaultstatus_t {none, weak, good, config, imperative};
 
   defaultstatus_t defaultstatus;
@@ -178 +183 @@
   // processing with the arguments should be done if this happens
   // as the results will be meaningless.
-  bool addarginfo (ostream &logout, const cgiarginfo &info);
-  bool addarginfo (ostream &logout, const cgiargsinfoclass &info);
+  bool addarginfo (ostream *logout, const cgiarginfo &info);
+  bool addarginfo (ostream *logout, const cgiargsinfoclass &info);
 
   cgiarginfo *getarginfo (const text_t &key);
@@ -187 +192 @@
 
 
-
-// utilities related to cgi arguments
-
-// check_compress_conf_str checks the configuration string for
-// the compressed args and makes sure it does not conflict with
-// the information about the arguments. If an error is encountered
-// it will return false and the program should not produce any
-// output.
-bool check_compress_conf_str (const text_t &compressconf, 
-                  const cgiargsinfoclass &argsinfo,
-                  ostream &logout);
-
-// create_compress_conf_str will create a configuration string
-// based on the information in argsinfo. This method of configuration
-// is not recomended as small changes can produce large changes in
-// the resulting configuration string (for instance a totally different
-// ordering)
-text_t create_compress_conf_str (const cgiargsinfoclass &argsinfo,
-                 ostream &logout);
-
-// expand_compress_args will expand the compressed arguments based
-// on compressconf placing the results in args if they are not
-// already defined. If it encounters an error it will return false
-// and output more information to logout.
-bool expand_compress_args (const text_t &compressconf, 
-               cgiargsclass &args,
-               ostream &logout);
-
-// adds the default values for those arguments which have not
-// been specified
-void add_default_args (const cgiargsinfoclass &argsinfo,
-               cgiargsclass &args,
-               ostream &logout);
-
-
 #endif

trunk/gsdl/src/recpt/cgiutils.h

@@ -14 +14 @@
 #define CGIUTILS_H
 
+#include "gsdlconf.h"
 #include "text_t.h"
 #include "cgiargs.h"
+
 
 // convert %xx and + to their appropriate equivalents
@@ -21 +23 @@
 
 // split up the cgi arguments
-void parse_cgi_args (text_t argstr, cgiargsclass &args);
+void split_cgi_args (text_t argstr, cgiargsclass &args);
 
 // returns the encoded version of a cgi argument
 text_t cgi_safe (const text_t &intext);
 
+// check_save_conf_str checks the configuration string for
+// the saved args and makes sure it does not conflict with
+// the information about the arguments. If an error is encountered
+// it will return false and the program should not produce any
+// output.
+bool check_save_conf_str (const text_t &saveconf, 
+              const cgiargsinfoclass &argsinfo,
+              ostream &logout);
+
+// create_save_conf_str will create a configuration string
+// based on the information in argsinfo. This method of configuration
+// is not recomended as small changes can produce large changes in
+// the resulting configuration string (for instance a totally different
+// ordering). Only arguments which "must" be saved are included in
+// the resulting string.
+text_t create_save_conf_str (const cgiargsinfoclass &argsinfo,
+                 ostream &logout);
+
+// expand_compress_args will expand the compressed arguments based
+// on compressconf placing the results in args if they are not
+// already defined. If it encounters an error it will return false
+// and output more information to logout.
+bool expand_save_args (const cgiargsinfoclass &argsinfo,
+               const text_t &saveconf, 
+               cgiargsclass &args,
+               ostream &logout);
+
+// adds the default values for those arguments which have not
+// been specified
+void add_default_args (const cgiargsinfoclass &argsinfo,
+               cgiargsclass &args,
+               ostream &logout);
+
+// compress_save_args will compress the arguments and return
+// them in compressed_args. If an error was encountered
+// compressed_args will be set to to "", an error will be
+// written to logout, and the function will return false.
+bool compress_save_args (const cgiargsinfoclass &argsinfo,
+             const text_t &saveconf,
+             cgiargsclass &args,
+             text_t &compressed_args,
+             ostream &logout);
+
+// args_tounicode converts any arguments which are not in unicode
+// to unicode using inconvert
+void args_tounicode (cgiargsclass &args, inconvertclass &inconvert);
+
 #endif