Changeset 11958

Timestamp:

2006-06-21T15:43:49+12:00 (18 years ago)

Author:

kjdon

Message:

don't have short and long help anymore, just one help message. some of the macro names have changed too.

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -897 +897 @@
     ResultDocInfo_tarray::iterator end = response.docInfo.end();
 
-    text_t shorttext;
-    text_t longtext;
+    text_t helptext;
     if (has_search_button) {
-      shorttext = "<ul><li>_textSearchshort_\n";
-      longtext = "_textSearchlong_";
+      helptext = "<ul><li>_textSearchhelp_\n";
     }
 
@@ -931 +929 @@
       text_t title = (*here).metadata["Title"].values[0];
     
-      text_t stext, ltext;
-      disp.expandstring ("help", "_text" + title + "short_", stext);
-      if (stext == ("_text" + title + "short_")) {
-    shorttext += "<li>_help:textdefaultshorttext_";
-    longtext += "_help:textdefaultlongtext_";
+      text_t stext;
+      disp.expandstring ("help", "_text" + title + "help_", stext);
+      if (stext == ("_text" + title + "help_")) {
+    text_t ltext, ttext;
+    disp.expandstring("Global", "_label"+title+"_", ltext);
+    if (ltext == ("_label"+title+"_")) {
+      ltext = title;
+    }
+    disp.expandstring("Global", "_text"+title+"_", ttext);
+    if (ttext == ("_text"+title+"_")) {
+      ttext = title;
+    }
+    helptext += "<li>_help:textdefaulthelp_("+ttext+","+ltext+")";
       } else {
-    shorttext += "<li>_help:text" + title + "short_";
-    longtext += "_help:text" + title + "long_";
+    helptext += "<li>_help:text" + title + "help_";
       }
 
       ++here;
     }
-    shorttext += "</ul>\n";
-    if (response.docInfo.size() > 1) disp.setmacro ("textbrowseoptions", "help", shorttext + longtext);
-    else disp.setmacro ("textbrowseoptions", "help", longtext);
+    helptext += "</ul>\n";
+    disp.setmacro ("textbrowseoptions", "help", helptext);
 
     if (arg_p == "help") {