Changeset 9676

Timestamp:

2005-04-14T12:21:44+12:00 (19 years ago)

Author:

jrm21

Message:

stll set _encodingoption_ if there is only 1 encoding specified in the
main.cfg file, otherwise we see an ugly unexpanded macro

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -699 +699 @@
     encodingoption += "</select>\n";
     disp.setmacro ("encodingoption", args["p"], encodingoption);
-  }
+  } else if (configinfo.encodings.size() == 1) {
+    text_t encodingoption;
+    text_tmap::const_iterator thisenc = configinfo.encodings.begin();
+    encodingoption = (*thisenc).first;
+    disp.setmacro ("encodingoption", args["p"], encodingoption);
+  } else { // size == 0. shouldn't really happen, but allow it
+    disp.setmacro ("encodingoption", args["p"], "None");
+  }
+
 }