Changeset 2945

Timestamp:

2002-02-04T14:44:17+13:00 (22 years ago)

Author:

sjboddie

Message:

The "l" and "w" (interface language and encoding) arguments are now
preserved when moving from one collection to another through the home
page. A nicer way to do this would be to add the ability to define
certain arguments as being "collection specific" (since there are many
arguments whose values we don't want to retain when moving between
collections) and let all the rest be retained (rather than making a
special case of "l" and "w"). For now this rather inelegant solution
will do the trick though.

Location:

trunk/gsdl

Files:

• macros/base.dm (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (3 diffs)
• src/recpt/pageaction.h (modified) (1 diff)

trunk/gsdl/macros/base.dm

@@ -215 +215 @@
 #_httppagehome_ {_httppagex_(home)}
 ###_httppagehome_ {http://www.nzdl.org/cgi-bin/dblibrary?a=p&p=home}
-_httppagehome_ {_gwcgi_?a=p&p=home}
+_httppagehome_ {_gwcgi_?a=p&p=home&l=_cgiargl_&w=_cgiargw_}
 _httppagehelp_ {_httppagex_(help)}
 _httppagepref_ {_httppagex_(preferences)}

trunk/gsdl/src/recpt/pageaction.cpp

@@ -104 +104 @@
 
 void pageaction::set_homeextra_macro (displayclass &disp, recptprotolistclass *protos, 
-                      ostream &logout) {
+                      cgiargsclass &args, ostream &logout) {
   text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
   bool found_valid_col = false;
@@ -194 +194 @@
           if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
 
-          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type+"\">";
+          text_t link = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
+          link += "&l=" + args["l"] + "&w=" + args["w"] + "\">";
 
           if (!cinfo->receptionist.empty()) 
@@ -457 +458 @@
 
   if (arg_p == "home") {
-    set_homeextra_macro (disp, protos, logout);
+    set_homeextra_macro (disp, protos, args, logout);
     if (status_disabled) disp.setmacro ("textgoadmin", "home", "");
     if (collector_disabled) disp.setmacro ("textgocollector", "home", "");

trunk/gsdl/src/recpt/pageaction.h

@@ -68 +68 @@
 protected:
   void set_homeextra_macro (displayclass &disp, recptprotolistclass *protos, 
-                ostream &logout);
+                cgiargsclass &args, ostream &logout);
 
   void set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos,