Changeset 7433

Timestamp:

2004-05-26T11:35:09+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Replaced all "Global" with displayclass::defaultpackage.

Location:

trunk/gsdl/src/recpt

Files:

• datelistbrowserclass.cpp (modified) (1 diff)
• documentaction.cpp (modified) (9 diffs)
• highlighttext.cpp (modified) (1 diff)
• hlistbrowserclass.cpp (modified) (1 diff)
• langaction.cpp (modified) (1 diff)
• queryaction.cpp (modified) (6 diffs)
• vlistbrowserclass.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -79 +79 @@
     // get tab size
     text_t tab; int itab;
-    disp.expandstring ("Global", "_tabwidth_", tab);
+    disp.expandstring (displayclass::defaultpackage, "_tabwidth_", tab);
     itab = tab.getint();
     if (colnumber > 0) 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -325 +325 @@
   ResultDocInfo_tarray::iterator docend = response.docInfo.end();
     
-  disp.expandstring ("Global", "_pagewidth_", width);
+  disp.expandstring (displayclass::defaultpackage, "_pagewidth_", width);
   twidth = width.getint();
       
@@ -349 +349 @@
     if (numc > 0) swidth = swidth / numc;
   }
-  disp.setmacro ("widthtspace", "Global", swidth);
+  disp.setmacro ("widthtspace", displayclass::defaultpackage, swidth);
 }
 
@@ -422 +422 @@
         else {
            navigationbar += "_image" + title + "_";
-           disp.setmacro ("httpbrowse" + title, "Global", "_httpdocument_&cl=" + (*dochere).OID+date_extra);
+           disp.setmacro ("httpbrowse" + title, displayclass::defaultpackage, "_httpdocument_&cl=" + (*dochere).OID+date_extra);
         }
      }
@@ -474 +474 @@
    }
 
-   disp.setmacro ("navigationbar", "Global", navigationbar);
+   disp.setmacro ("navigationbar", displayclass::defaultpackage, navigationbar);
 }
 
@@ -546 +546 @@
     if (args["fc"] == "1") {
       text_t httpdocument;
-      disp.expandstring ("Global", "_httpdocument_", httpdocument);
+      disp.expandstring (displayclass::defaultpackage, "_httpdocument_", httpdocument);
       httpdocument += "&f=1";
-      disp.setmacro ("httpdocument", "Global", httpdocument);
-      disp.setmacro ("gsdltop", "Global", "documenttop");
+      disp.setmacro ("httpdocument", displayclass::defaultpackage, httpdocument);
+      disp.setmacro ("gsdltop", displayclass::defaultpackage, "documenttop");
       formatinfo.DocumentText = "[Text]";
     }
@@ -556 +556 @@
       text_t httppagehome;
       if (get_link (args, protos, (*it).second, httppagehome, logout))
-    disp.setmacro ("httppagehome", "Global", httppagehome);
+    disp.setmacro ("httppagehome", displayclass::defaultpackage, httppagehome);
     } 
   }
@@ -592 +592 @@
   text_tmap::iterator usability = cinfo.format.find("Usability");
   if(usability!=cinfo.format.end()){
-    disp.setmacro("usability","Global","_imageusab_");
-    disp.setmacro("usabinterface","Global",("_usab"+(*usability).second+"_"));
-    disp.setmacro("usabilityscript", "Global", "_usabshowscript_");
+    disp.setmacro("usability",displayclass::defaultpackage,"_imageusab_");
+    disp.setmacro("usabinterface",displayclass::defaultpackage,("_usab"+(*usability).second+"_"));
+    disp.setmacro("usabilityscript", displayclass::defaultpackage, "_usabshowscript_");
   }
 }
@@ -836 +836 @@
 
       if (is_top (arg_d))
-    disp.setmacro ("thisOID", "Global", dm_safe(response.docInfo[0].metadata["archivedir"].values[0]));
+    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(response.docInfo[0].metadata["archivedir"].values[0]));
       else {
     MetadataInfo_t *parentad = response.docInfo[0].metadata["archivedir"].parent;
@@ -844 +844 @@
       parentad = parentad->parent;
     }
-    disp.setmacro ("thisOID", "Global", dm_safe(thisOID));
+    disp.setmacro ("thisOID", displayclass::defaultpackage, dm_safe(thisOID));
       }
     }

trunk/gsdl/src/recpt/highlighttext.cpp

@@ -61 +61 @@
   text_t shl = "<b><u>";
   text_t ehl = "</u></b>";
-  if (disp.isdefaultmacro("Global", "starthighlight")) {
-    disp.expandstring("Global", "_starthighlight_", shl);
-  }
-  if (disp.isdefaultmacro("Global", "endhighlight")) {
-    disp.expandstring("Global", "_endhighlight_", ehl);
+  if (disp.isdefaultmacro(displayclass::defaultpackage, "starthighlight")) {
+    disp.expandstring(displayclass::defaultpackage, "_starthighlight_", shl);
+  }
+  if (disp.isdefaultmacro(displayclass::defaultpackage, "endhighlight")) {
+    disp.expandstring(displayclass::defaultpackage, "_endhighlight_", ehl);
   }
 

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -107 +107 @@
     // get tab size
     text_t tab; int itab;
-    disp.expandstring ("Global", "_tabwidth_", tab);
+    disp.expandstring (displayclass::defaultpackage, "_tabwidth_", tab);
     itab = tab.getint();
     if (colnumber > 0) textout << outconvert << disp 

trunk/gsdl/src/recpt/langaction.cpp

@@ -218 +218 @@
   // overwrite the global content (which should be overwritten by package)
   // makes it obvious that package macros aren't defined, compared to "oops..."
-  disp.setmacro("content", "Global", "\\_translang:content\\_");
+  disp.setmacro("content", displayclass::defaultpackage, "\\_translang:content\\_");
 
   // Make sure the source and target languages are different!

trunk/gsdl/src/recpt/queryaction.cpp

@@ -616 +616 @@
   if (option.validValues.size() == 1) {
     if (display_single) {
-      disp.setmacro (macroname + "selection", "Global", "_" + option.defaultValue + "_");
+      disp.setmacro (macroname + "selection", displayclass::defaultpackage, "_" + option.defaultValue + "_");
     }
     return;    
@@ -641 +641 @@
   }
   macrovalue += "</select>\n";
-  disp.setmacro (macroname + "selection", "Global", macrovalue);
+  disp.setmacro (macroname + "selection", displayclass::defaultpackage, macrovalue);
 }
 
@@ -744 +744 @@
       opt = 1;
     }
-    disp.setmacro ("gformselection", "Global", "_"+option.validValues[opt]+"_");
+    disp.setmacro ("gformselection", displayclass::defaultpackage, "_"+option.validValues[opt]+"_");
     return;
   }
@@ -765 +765 @@
   }
   macrovalue += "</select>\n";
-  disp.setmacro ("gformselection", "Global", macrovalue);
+  disp.setmacro ("gformselection", displayclass::defaultpackage, macrovalue);
 }
 void queryaction::define_form_macros (displayclass &disp, cgiargsclass &args, 
@@ -1254 +1254 @@
 
     // Display the "this collection is not installed on this system" page
-    disp.setmacro("cvariable", "Global", collection);
+    disp.setmacro("cvariable", displayclass::defaultpackage, collection);
     disp.setmacro("content", "query", "<p>_textbadcollection_<p>");
 
@@ -1375 +1375 @@
 
       // also reset the _cgiargq_ macro as it has changed now
-      disp.setmacro("cgiargq", "Global", html_safe(args["q"]));
+      disp.setmacro("cgiargq", displayclass::defaultpackage, html_safe(args["q"]));
       
       // reset the compressed options to include the q arg
       text_t compressedoptions = recpt->get_compressed_arg(args, logout);
       if (!compressedoptions.empty()) {
-    disp.setmacro ("compressedoptions", "Global", dm_safe(compressedoptions));
+    disp.setmacro ("compressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
     // need a decoded version of compressedoptions for use within forms
     // as browsers encode values from forms before sending to server
     // (e.g. %25 becomes %2525)
     decode_cgi_arg (compressedoptions);
-    disp.setmacro ("decodedcompressedoptions", "Global", dm_safe(compressedoptions));
+    disp.setmacro ("decodedcompressedoptions", displayclass::defaultpackage, dm_safe(compressedoptions));
       }
     } // form search

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -88 +88 @@
     // get tab size
     text_t tab; int itab;
-    disp.expandstring ("Global", "_tabwidth_", tab);
+    disp.expandstring (displayclass::defaultpackage, "_tabwidth_", tab);
     itab = tab.getint();
     if (colnumber > 0) textout << outconvert << disp 
@@ -130 +130 @@
     // get tab size
     text_t tab; int itab;
-    disp.expandstring ("Global", "_tabwidth_", tab);
+    disp.expandstring (displayclass::defaultpackage, "_tabwidth_", tab);
     itab = tab.getint();
     if (colnumber > 0) textout << outconvert << disp