Changeset 296 for trunk/gsdl/src/recpt

Timestamp:

1999-06-26T13:14:32+12:00 (25 years ago)

Author:

rjmcnab

Message:

Made a couple of changes to handle different encodings.

Location:

trunk/gsdl/src/recpt

Files:

• receptionist.cpp (modified) (7 diffs)
• receptionist.h (modified) (2 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.15  1999/06/26 01:14:32  rjmcnab
+   Made a couple of changes to handle different encodings.
+
    Revision 1.14  1999/06/09 00:08:36  sjboddie
    query string macro (_cgiargq_) is now made html safe before being set
@@ -362 +365 @@
   action *a = actions.getaction (args["a"]);
   if (a != NULL) {
-    if (a->uses_display(args)) prepare_page (a, args, collectproto, logout);
+    if (a->uses_display(args)) prepare_page (a, args, collectproto, (*outconverter), logout);
     if (!a->do_action (args, collectproto, disp, (*outconverter), contentout, logout))
       return false;
@@ -392 +395 @@
 // returns the compressed argument ("e") corresponding to the argument
 // list. This can be used to save preferences between sessions.
-text_t receptionist::get_compressed_arg (cgiargsclass &args, ostream &logout) {
-
+text_t receptionist::get_compressed_arg (cgiargsclass &args, outconvertclass &outconvert,
+                     ostream &logout) {
+  
   text_t compressed_args;
   if (compress_save_args (argsinfo, configinfo.saveconf, args, 
-              compressed_args, logout))
+              compressed_args, outconvert, logout))
     return compressed_args;
   else 
@@ -581 +585 @@
 // prepare_page sets up page parameters, sets display macros
 // and opens the page ready for output 
-void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto *collectproto, 
-                 ostream &logout) {
-  
+void receptionist::prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
+                 outconvertclass &outconvert, ostream &logout) {
   // set up page parameters
   text_t pageparams;
@@ -608 +611 @@
 
   // define general macros
-  define_general_macros (args, logout);
+  define_general_macros (args, outconvert, logout);
 
   
@@ -627 +630 @@
 }
 
-void receptionist::define_general_macros (cgiargsclass &args, ostream &logout) {
-
+void receptionist::define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
+                      ostream &logout) {
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
-  disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, logout));
+  disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, outconvert, logout));
 
   // set _cgiargX_ macros for each cgi argument
@@ -639 +642 @@
     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));
     else 
       disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second);

trunk/gsdl/src/recpt/receptionist.h

@@ -47 +47 @@
   displayclass disp;
   convertinfoclass converters;
+  
   // prepare_page sets up page parameters, sets display macros
   // and opens the page ready for output 
-  void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto, 
-             ostream &logout);
-  void define_general_macros (cgiargsclass &args, ostream &logout);
+  void prepare_page (action *a, cgiargsclass &args, recptproto *collectproto,
+             outconvertclass &outconvert, ostream &logout);
+  void define_general_macros (cgiargsclass &args, outconvertclass &outconvert,
+                  ostream &logout);
 
 public:
@@ -130 +132 @@
   // returns the compressed argument ("e") corresponding to the argument
   // list. This can be used to save preferences between sessions.
-  text_t get_compressed_arg (cgiargsclass &args, ostream &logout);
+  text_t get_compressed_arg (cgiargsclass &args, outconvertclass &outconvert,
+                 ostream &logout);
 
 protected: