Changeset 7429

Timestamp:

2004-05-25T13:47:36+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Added a couple of addarginfo methods.

Location:

trunk/gsdl/src/recpt

Files:

• cgiargs.cpp (modified) (7 diffs)
• cgiargs.h (modified) (3 diffs)

trunk/gsdl/src/recpt/cgiargs.cpp

@@ -177 +177 @@
 // as the results will be meaningless.
 bool cgiargsinfoclass::addarginfo (ostream *logout, const cgiarginfo &info) {
-  outconvertclass text_t2ascii;
 
   cgiarginfo *orginfo = getarginfo (info.shortname);
@@ -187 +186 @@
   if (orginfo->longname != info.longname) {
     if (logout != NULL) {
+      outconvertclass text_t2ascii;
       (*logout) << text_t2ascii << "Error: cgi argument name clash for argument \""
         << info.shortname << "\".\nOne long name was\n  \"" << orginfo->longname 
@@ -196 +196 @@
   if (orginfo->multiplevalue != info.multiplevalue) {
     if (logout != NULL) {
+      outconvertclass text_t2ascii;
       (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname 
         << "\" was given as being a single value option\n"
@@ -205 +206 @@
   if (orginfo->multiplechar != info.multiplechar) {
     if (logout != NULL) {
+      outconvertclass text_t2ascii;
       (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname 
         << "\" was given as being a single character option\n"
@@ -214 +216 @@
   if (!info.multiplechar && info.argdefault.size() > 1) {
     if (logout != NULL) {
+      outconvertclass text_t2ascii;
       (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname
         << "\" was defined as being a single character option\n"
@@ -227 +230 @@
        info.savedarginfo==cgiarginfo::mustnot)) {
     if (logout != NULL) {
+      outconvertclass text_t2ascii;
       (*logout) << text_t2ascii << "Error: it was specified that cgi argument \"" 
         << info.shortname << "\" should be saved in the state\n"
@@ -260 +264 @@
 }
 
+bool cgiargsinfoclass::addarginfo (ostream *logout, const text_t& argshortname, const text_tmap& mapinfo)
+{
+  cgiarginfo *arginfo = getarginfo (argshortname);
+  if (arginfo == NULL) {
+    arginfo = &(argsinfo[argshortname]);
+    arginfo->shortname = argshortname;
+    arginfo->defaultstatus = cgiarginfo::config;
+  }
+  text_tmap::const_iterator thisInfo = mapinfo.begin();
+  text_tmap::const_iterator endInfo = mapinfo.end();
+  while (thisInfo != endInfo) {
+    if (thisInfo->first == "longname") arginfo->longname = thisInfo->second;
+    else if (thisInfo->first == "multiplechar") arginfo->multiplechar = (thisInfo->second == "true");
+    else if (thisInfo->first == "defaultstatus") {
+      if (thisInfo->second == "none") arginfo->defaultstatus = cgiarginfo::none;
+      else if (thisInfo->second == "weak") arginfo->defaultstatus = cgiarginfo::weak;
+      else if (thisInfo->second == "good") arginfo->defaultstatus = cgiarginfo::good;
+      else if (thisInfo->second == "config") arginfo->defaultstatus = cgiarginfo::config;
+      else if (thisInfo->second == "imperative") arginfo->defaultstatus = cgiarginfo::imperative;
+    }
+    else if (thisInfo->first == "argdefault") {
+      arginfo->argdefault = thisInfo->second;
+    }
+    else if (thisInfo->first == "savedarginfo") {
+      if (thisInfo->second == "mustnot") arginfo->savedarginfo = cgiarginfo::mustnot;
+      else if (thisInfo->second == "can") arginfo->savedarginfo = cgiarginfo::can;
+      else if (thisInfo->second == "must") arginfo->savedarginfo = cgiarginfo::must;
+    } else if (logout != NULL) {
+      (*logout) << ("Invalid argument for cgiarg for " + argshortname + " (" + thisInfo->first + ")\n");
+    }
+    thisInfo++;
+  }
+  return true;
+}
+
+bool cgiargsinfoclass::addarginfo (ostream *logout, const confcgiarg_tmap& info)
+{
+  confcgiarg_tmap::const_iterator thisArg = info.begin();
+  confcgiarg_tmap::const_iterator endArg = info.end();
+  while (thisArg != endArg) {
+    if (!addarginfo(logout, thisArg->first, thisArg->second)) return false;
+    thisArg++;
+  }
+  return true;
+}
+
 cgiarginfo *cgiargsinfoclass::getarginfo (const text_t &key) {
   iterator here = argsinfo.find (key);

trunk/gsdl/src/recpt/cgiargs.h

@@ -50 +50 @@
 // response_t is used to define what type of cgi header 
 // should be produced
-enum response_t {location, content};
+// fullcontent same as content but the action should put content-type as last header.
+enum response_t {location, content, fullcontent};
 
 
@@ -68 +69 @@
 
 typedef map<text_t, cgiarg_t, lttext_t> cgiarg_tmap;
+typedef map<text_t, text_tmap, lttext_t> confcgiarg_tmap;
 
 // cgiargsclass is used to store a particular set
@@ -225 +227 @@
   bool addarginfo (ostream *logout, const cgiargsinfoclass &info);
 
+  // addarginfo will override args info with info loaded from config files
+  // if the args do not exists will be created
+  bool addarginfo (ostream *logout, const text_t& argshortname, const text_tmap& mapinfo);
+  bool addarginfo (ostream *logout, const confcgiarg_tmap& info);
+
   cgiarginfo *getarginfo (const text_t &key);
   const cgiarginfo *getarginfo (const text_t &key) const;