Changeset 512 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

1999-09-02T12:27:21+12:00 (25 years ago)

Author:

rjmcnab

Message:

A few small things.

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.27  1999/09/02 00:27:21  rjmcnab
+   A few small things.
+
    Revision 1.26  1999/08/25 04:43:06  sjboddie
    made FilterRequest_t::docSet an array rather than a set
@@ -607 +610 @@
     if (args["w"] == "u") {
       response_data += "; charset=UTF-8";
+    } else if (args["w"] == "g") {
+      response_data += "; charset=GBK";
     } else {
       response_data += "; charset=ISO-8859-1";      
@@ -872 +877 @@
   // set up page parameters
   text_t pageparams;
-  text_t &collection = args["c"];
 
   bool first = true;
-  if (!collection.empty()) {
-    pageparams +=  "collection=" + collection; first = false;}
-  if (args.getintarg("u") == 1)
-    if (first) {pageparams += "style=htmlonly"; first = false;}
-    else pageparams += ",style=htmlonly";
-  if (args.getintarg("v") == 1)
-    if (first) {pageparams += "version=text"; first = false;}
-    else pageparams += ",version=text";
-  if (args.getintarg("f") == 1) 
-    if (first) {pageparams += ",queryversion=big"; first = false;}
-    else pageparams += ",queryversion=big";
+  if (!args["c"].empty()) {
+    pageparams +=  "collection=" + args["c"]; first = false;}
+
+//    if (args.getintarg("u") == 1)
+//      if (first) {pageparams += "style=htmlonly"; first = false;}
+//      else pageparams += ",style=htmlonly";
+//    if (args.getintarg("v") == 1)
+//      if (first) {pageparams += "version=text"; first = false;}
+//      else pageparams += ",version=text";
+//    if (args.getintarg("f") == 1) 
+//      if (first) {pageparams += ",queryversion=big"; first = false;}
+//      else pageparams += ",queryversion=big";
   if (args["l"] != "en") 
     if (first) pageparams += ",language=" + args["l"];
     else pageparams += ",language=" + args["l"];
 
+  // this should be in a configuration file
+  if (args["rl"] != "1") 
+    if (first) pageparams += ",rl=" + args["rl"];
+    else pageparams += ",rl=" + args["rl"];
+  
   // open the page
   disp.openpage(pageparams, MACROPRECEDENCE);
 
 
-  // define general macros
-  define_general_macros (args, collectproto, outconvert, logout);
-
-  
   // define external macros for each action
   actionptrmap::iterator actionhere = actions.begin ();
@@ -911 +917 @@
   // define internal macros for the current action
   a->define_internal_macros (collectinfo, disp, args, collectproto, logout);
+  
+  // define general macros. the defining of general macros is done here so that
+  // the last possible version of the cgi arguments are used
+  define_general_macros (args, collectproto, outconvert, logout);
 }
 
@@ -927 +937 @@
   cgiargsclass::const_iterator argsend = args.end();
   while (argshere != argsend) {
-    if ((*argshere).first == "q")
+    if (((*argshere).first == "q") ||
+    ((*argshere).first == "qa") ||
+    ((*argshere).first == "qtt") ||
+    ((*argshere).first == "qty") ||
+    ((*argshere).first == "qp") ||
+    ((*argshere).first == "qpl") ||
+    ((*argshere).first == "qr") ||
+    ((*argshere).first == "q2"))
       // need to escape special characters from query string
-      disp.setmacro ("cgiargq", "Global", html_safe((*argshere).second.value));
+      disp.setmacro ("cgiarg" + (*argshere).first, 
+             "Global", html_safe((*argshere).second.value));
     else 
       disp.setmacro ("cgiarg" + (*argshere).first, "Global", (*argshere).second.value);