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

Timestamp:

2004-11-05T14:37:31+13:00 (19 years ago)

Author:

kjdon

Message:

modified prepare_page() to fix the bug whereby if l=en, macros which had
explicit [l=en] would not be found.

File:

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

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1331 +1331 @@
   text_tmap::iterator params_end = configinfo.pageparams.end();
   while (params_here != params_end) {
-    if (args[(*params_here).first] != (*params_here).second) {
+    // page params are those from main.cfg (eg pageparam v 0) plus
+    // two defaults set in recptconf.clear() (c="" and l=en)
+    // This used to check if the current value of the page param
+    // == the default value, then don't add in it the list
+    // but if l=en, and there is a macro with [l=en], then it doesn't
+    // find it.
+    // so now all page params will go into the list. I assume this will 
+    // mean more attempts to find each macro, but nothing worsee than 
+    // that.  --kjdon
+    //if (args[(*params_here).first] != (*params_here).second) {
       if (!first) pageparams += ",";
       first = false;
@@ -1337 +1346 @@
       pageparams += "=";
       pageparams += args[(*params_here).first];
-    }
+      // }
     
     ++params_here;