Changeset 366

Timestamp:

1999-07-11T13:05:20+12:00 (25 years ago)

Author:

rjmcnab

Message:

Stored origin of cgiarg with argument.

Location:

trunk/gsdl/src/recpt

Files:

• cgiutils.cpp (modified) (5 diffs)
• receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/cgiutils.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/07/11 01:05:19  rjmcnab
+   Stored origin of cgiarg with argument.
+
    Revision 1.5  1999/06/26 01:08:36  rjmcnab
    Added encoding and decoding of multibyte compresesd arguments.
@@ -119 +122 @@
     value.setencoding(1); // other encoding
     // store this key=value pair
-    if (!key.empty()) args.setarg (key, value);
+    if (!key.empty()) args.setarg (key, value, cgiarg_t::cgi_arg);
   }
 }
@@ -303 +306 @@
       arg_ehere = getdelimitstr (arg_ehere, arg_eend, '-', argvalue);
       argvalue.setencoding(1); // other encoding
-      if (!argvalue.empty()) args.setdefaultarg (argname, argvalue);
+      if (!argvalue.empty()) args.setdefaultarg (argname, argvalue, cgiarg_t::compressed_arg);
     } else {
-      args.setdefaultcarg (argname,*arg_ehere);
+      args.setdefaultcarg (argname,*arg_ehere, cgiarg_t::compressed_arg);
       arg_ehere++;
     }
@@ -327 +330 @@
     if ((*argsinfohere).second.defaultstatus != cgiarginfo::none) {
       args.setdefaultarg ((*argsinfohere).second.shortname,
-              (*argsinfohere).second.argdefault);
+              (*argsinfohere).second.argdefault, cgiarg_t::default_arg);
     }
     argsinfohere++;
@@ -414 +417 @@
 
   while (here != end) {
-    if ((*here).second.getencoding() > 0) {
-      (*here).second = inconvert.convert((*here).second);
+    if ((*here).second.value.getencoding() > 0) {
+      (*here).second.value = inconvert.convert((*here).second.value);
     }
     

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.18  1999/07/11 01:05:20  rjmcnab
+   Stored origin of cgiarg with argument.
+
    Revision 1.17  1999/07/10 22:18:26  rjmcnab
    Added calls to define_external_cgiargs.
@@ -681 +684 @@
     if ((*argshere).first == "q")
       // need to escape special characters from query string
-      disp.setmacro ("cgiargq", "Global", html_safe((*argshere).second));
+      disp.setmacro ("cgiargq", "Global", html_safe((*argshere).second.value));
     else 
-      disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second);
+      disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second.value);
     argshere ++;
   }