Changeset 8485

Timestamp:

2004-11-08T16:58:26+13:00 (19 years ago)

Author:

jrm21

Message:

1) explicitly added 'l=en' to the list of seen macro parameters, otherwise
it will ignore any such macros later.

2) rename 'param' argument to functions since displayclass has a member var
with the same name. (compile with -Wshadow in your CCFLAGS)

3) added a setcollectionmacro() public function - the existing one is
protected, so now it mirrors the setdefaultmacro() arrangement

CVS: ----------------------------------------------------------------------

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (9 diffs)
• display.h (modified) (1 diff)

trunk/gsdl/lib/display.cpp

@@ -23 +23 @@
  *
  *********************************************************************/
+#include <ostream>
 
 #include "display.h"
@@ -578 +579 @@
 
   logout = NULL;
+
+  /* this is a bit of a hack, but if the displayclass has never seen this
+     parameter before when it does openpage() then macros with this set will
+     always be ignored. And we set collection-specific macros after doing
+     openpage() - jrm */
+  allparams.insert("l=en");
 }
 
@@ -598 +605 @@
 //        -4 if no macroname was supplied
 int displayclass::setdefaultmacro (text_t package, const text_t &macroname, 
-                   text_t params, const text_t &macrovalue) 
-{
-  return setdefaultmacro (package, macroname, params, "memory", macrovalue);
+                   text_t mparams, const text_t &macrovalue) 
+{
+  return setdefaultmacro (package, macroname, mparams, "memory", macrovalue);
 }
 
@@ -982 +989 @@
   sort(orderparamlist->begin(), orderparamlist->end());
 
-//   paramspeclist::iterator pshere = orderparamlist->begin();
-//   paramspeclist::iterator psend = orderparamlist->end();
-//   while (pshere != psend) 
-//     {
-//       cerr << text_t2ascii << "param=" << (*pshere).param;
-//       cerr << " spec=" << (int)((*pshere).spec) << "\n";
-//       pshere++;
-//     }
+#if 0 // debugging
+  outconvertclass text_t2ascii;
+
+  paramspeclist::iterator pshere = orderparamlist->begin();
+  paramspeclist::iterator psend = orderparamlist->end();
+  while (pshere != psend) 
+    {
+      cerr << text_t2ascii << "param=" << (*pshere).param;
+      cerr << " spec=" << (int)((*pshere).spec) << "\n";
+      pshere++;
+    }
+#endif
 }
 
@@ -1245 +1256 @@
 int displayclass::setparammacro (parammacros_t* macrotable, 
                  text_t package, const text_t &macroname, 
-                 text_t params, const text_t &filename,
+                 text_t macroparams, const text_t &filename,
                  const text_t &macrovalue) 
 {
@@ -1253 +1264 @@
   // put the parameters in a standard form
   paramhashtype paramhash;
-  if (params.empty()) params = "ignore=yes";
-  splitparams (params, paramhash);
-  joinparams (paramhash, params);
+  if (macroparams.empty()) macroparams = "ignore=yes";
+  splitparams (macroparams, paramhash);
+  joinparams (paramhash, macroparams);
 
   // make package "Global" if it doesn't point to anything yet
@@ -1261 +1272 @@
 
   // remember these parameters
-  allparams.insert (params);
+  allparams.insert (macroparams);
 
   // remember this filename (this part isn't finished yet -- Rodger).
 
   // set the macro
-  return macrotable->setmacro(package, macroname, params, filename, macrovalue);
+  return macrotable->setmacro(package, macroname, macroparams, filename,
+                  macrovalue);
 }
 
@@ -1276 +1288 @@
 //        -4 if no macroname was supplied
 int displayclass::setdefaultmacro (text_t package, const text_t &macroname, 
-                   text_t params, const text_t &filename,
+                   text_t macroparams, const text_t &filename,
                    const text_t &macrovalue) 
 {
-  return setparammacro(defaultmacros,package,macroname,params,filename,macrovalue);
-}
-
+  return setparammacro(defaultmacros,package,macroname,macroparams,
+               filename,macrovalue);
+}
+
+// public function
+int displayclass::setcollectionmacro(text_t package, const text_t &macroname, 
+                     text_t mparams, const text_t &macrovalue)
+{
+  return setcollectionmacro(package, macroname, mparams, "memory", macrovalue);
+}
 
 // setcollectionmacro adds an entry to the list of collection specific macros 
@@ -1290 +1309 @@
 //        -4 if no macroname was supplied
 int displayclass::setcollectionmacro (text_t package, const text_t &macroname, 
-                      text_t params, const text_t &filename,
+                      text_t mparams, const text_t &filename,
                       const text_t &macrovalue) 
 {
-  return setparammacro(collectionmacros,package,macroname,params,filename,macrovalue);
+  return setparammacro(collectionmacros,package,macroname,mparams,
+               filename,macrovalue);
 }
 

trunk/gsdl/lib/display.h

@@ -195 +195 @@
   int loaddefaultmacros (text_t thisfilename);
 
+
+  // overrides (or sets) a macro for the current page.
+  // returns 0 if there was no error,
+  //        -1 if it redefined a macro
+  //        -4 if no macroname was supplied
+  int setcollectionmacro (text_t package, const text_t &macroname, 
+              text_t params, const text_t &macrovalue);
+
   // loads a collection specific macro file 
   // returns 0 if didn't need to load the file (it was already loaded)