Changeset 7433 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

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

Author:

mdewsnip

Message:

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

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (9 diffs)

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));
       }
     }