Changeset 776 for trunk/gsdl/src/recpt

Timestamp:

1999-11-09T09:26:38+13:00 (25 years ago)

Author:

sjboddie

Message:

added multiplevalue option to cgiarginfo

Location:

trunk/gsdl/src/recpt

Files:

• cgiargs.cpp (modified) (5 diffs)
• cgiargs.h (modified) (1 diff)
• cgiutils.cpp (modified) (3 diffs)
• cgiutils.h (modified) (1 diff)
• queryaction.cpp (modified) (2 diffs)
• receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiargs.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.10  1999/11/08 20:26:38  sjboddie
+   added multiplevalue option to cgiarginfo
+
    Revision 1.9  1999/09/07 04:56:53  sjboddie
    added GPL notice
@@ -177 +180 @@
 cgiarginfo::cgiarginfo () {
   multiplechar = false;
+  multiplevalue = false;
   defaultstatus = weak;
   savedarginfo = can;
@@ -186 +190 @@
       (x.longname == y.longname) &&
       (x.multiplechar == y.multiplechar) &&
+      (x.multiplevalue == y.multiplevalue) &&
       (x.defaultstatus == y.defaultstatus) &&
       (x.argdefault == y.argdefault) &&
@@ -196 +201 @@
        ((x.longname < y.longname) ||
         ((x.longname == y.longname) &&
-         ((x.multiplechar < y.multiplechar) ||
-          ((x.multiplechar == y.multiplechar) &&
-           ((x.defaultstatus < y.defaultstatus) ||
-        ((x.defaultstatus == y.defaultstatus) &&
-         ((x.argdefault < y.argdefault) ||
-          ((x.argdefault == y.argdefault) &&
-           ((x.savedarginfo < y.savedarginfo))))))))))));
+         ((x.multiplevalue < y.multiplevalue) ||
+          ((x.multiplevalue == y.multiplevalue) &&
+           ((x.multiplechar < y.multiplechar) ||
+        ((x.multiplechar == y.multiplechar) &&
+         ((x.defaultstatus < y.defaultstatus) ||
+          ((x.defaultstatus == y.defaultstatus) &&
+           ((x.argdefault < y.argdefault) ||
+            ((x.argdefault == y.argdefault) &&
+             ((x.savedarginfo < y.savedarginfo))))))))))))));
 }
 
@@ -233 +240 @@
   }
 
+  if (orginfo->multiplevalue != info.multiplevalue) {
+    if (logout != NULL) {
+      (*logout) << text_t2ascii << "Error: cgi argument \"" << info.shortname 
+        << "\" was given as being a single value option\n"
+        << "and a multiple value option.\n\n";
+    }
+    return false; // found a clash
+  }
+
   if (orginfo->multiplechar != info.multiplechar) {
     if (logout != NULL) {

trunk/gsdl/src/recpt/cgiargs.h

@@ -153 +153 @@
   bool multiplechar;
 
+  // multiplevalue should be set to true the argument may have 
+  // multiple values (as is the case when multiple checkboxes
+  // use the same name)
+  bool multiplevalue;
+
   // defaultstatus_t indicates how good the default is when different
   // defaults are given for one argument. "none" means there is no default

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.12  1999/11/08 20:26:38  sjboddie
+   added multiplevalue option to cgiarginfo
+
    Revision 1.11  1999/11/01 22:03:35  sjboddie
    Added ability to handle multiple arguments with the same name (as
@@ -143 +146 @@
 
 // split up the cgi arguments
-void split_cgi_args (text_t argstr, cgiargsclass &args) {
+void split_cgi_args (const cgiargsinfoclass &argsinfo, text_t argstr, 
+             cgiargsclass &args) {
   args.clear();
   
@@ -165 +169 @@
       // multiple checkboxes using the same name) we'll 
       // create a comma separated list of all the values
-      if (!args[key].empty())
-    args[key] += "," + value;
-      else 
+      // (if multiplevalue)
+      if (!args[key].empty()) {
+    const cgiarginfo *info = argsinfo.getarginfo (key);
+    if (info != NULL && info->multiplevalue)
+      args[key] += "," + value;
+    else args.setarg (key, value, cgiarg_t::cgi_arg);
+      } else 
     args.setarg (key, value, cgiarg_t::cgi_arg);
     }

trunk/gsdl/src/recpt/cgiutils.h

@@ -39 +39 @@
 
 // split up the cgi arguments
-void split_cgi_args (text_t argstr, cgiargsclass &args);
+void split_cgi_args (const cgiargsinfoclass &argsinfo, text_t argstr, 
+             cgiargsclass &args);
 
 // turns any '-' in a cgi argument into "(-)"

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.30  1999/11/08 20:26:37  sjboddie
+   added multiplevalue option to cgiarginfo
+
    Revision 1.29  1999/11/04 20:29:53  sjboddie
    small change to cross-collection searching
@@ -330 +333 @@
   arg_ainfo.longname = "collections to search";
   arg_ainfo.multiplechar = true;
+  arg_ainfo.multiplevalue = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "";

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.40  1999/11/08 20:26:37  sjboddie
+   added multiplevalue option to cgiarginfo
+
    Revision 1.39  1999/11/03 22:49:10  sjboddie
    A location url may now contain macros
@@ -584 +587 @@
   // get an initial list of cgi arguments
   args.clear();
-  split_cgi_args (argstr, args);
+  split_cgi_args (argsinfo, argstr, args);
 
   // expand the compressed argument (if there was one)