Changeset 7432 for trunk/gsdl/src/recpt/pageaction.cpp

Timestamp:

2004-05-25T16:31:41+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Added language parameter to all calls of get_info, get_children, has_children, and get_contents. Also, removed some of the modifications so it compiles again.

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -220 +220 @@
           text_t collectionname = *collist_here;
           
-          if (get_info ("collection", *collist_here, metadata, false, 
+          if (get_info ("collection", *collist_here, "", metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
         if (!lang.empty() && !response.docInfo[0].metadata["collectionname:"+lang].values[0].empty()) {
@@ -349 +349 @@
           text_t alt = collectionname;
 
-          if (get_info ("collection", *collist_here, metadata, false, 
+          if (get_info ("collection", *collist_here, "", metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
         // get the "collectionname"
@@ -501 +501 @@
           text_t collectionname = *collist_here;
 
-          if (get_info ("collection", *collist_here, metadata, false, 
+          if (get_info ("collection", *collist_here, "", metadata, false, 
                 (*rprotolist_here).p, response, logout)) {
         if (!response.docInfo[0].metadata["collectionname"].values[0].empty()) {
@@ -760 +760 @@
     cinfo = recpt->get_collectinfo_ptr (collectproto, arg_c, logout);
     
-    disp.setmacro ("numdocs", "Global", cinfo->numDocs);
+    disp.setmacro ("numdocs", displayclass::defaultpackage, cinfo->numDocs);
     unsigned long current_time = time(NULL);
     unsigned long builddate = (current_time - cinfo->buildDate) / 86400;
-    disp.setmacro ("builddate", "Global", builddate);
+    disp.setmacro ("builddate", displayclass::defaultpackage, builddate);
     
     text_t numbytes;
@@ -773 +773 @@
       numbytes = (text_t)cinfo->numBytes + " bytes";
     }
-    disp.setmacro("numbytes", "Global", numbytes);
+    disp.setmacro("numbytes", displayclass::defaultpackage, numbytes);
   }
 
@@ -780 +780 @@
   if (arg_p == "about") {
     if (cinfo == NULL) {
-      disp.setmacro("cvariable", "Global", arg_c);
+      disp.setmacro("cvariable", displayclass::defaultpackage, arg_c);
       disp.setmacro("content", arg_p, "<p>_textbadcollection_<p>");
       return;
@@ -795 +795 @@
       check = cinfo->format.find("Usability");
       if(check != cinfo->format.end()){
-    disp.setmacro("usability","Global","_imageusab_");
-    disp.setmacro("usabinterface","Global",("_usab"+(*check).second+"_"));
-    disp.setmacro("usabilityscript", "Global", "_usabshowscript_");
+    disp.setmacro("usability", displayclass::defaultpackage, "_imageusab_");
+    disp.setmacro("usabinterface", displayclass::defaultpackage, ("_usab"+(*check).second+"_"));
+    disp.setmacro("usabilityscript", displayclass::defaultpackage, "_usabshowscript_");
       }
     }
@@ -821 +821 @@
   
     if (cinfo == NULL) {
-      disp.setmacro("cvariable", "Global", arg_c);
+      disp.setmacro("cvariable", displayclass::defaultpackage, arg_c);
       disp.setmacro("content", arg_p, "<p>_textbadcollection_<p>");
       return;
@@ -894 +894 @@
     //****************
     bool getParents = false;
-    get_children ("", args["c"], metadata, getParents, collectproto, response, logout);
+    get_children ("", args["c"], args["l"], metadata, getParents, collectproto, response, logout);
 
     int numbrowseoptions = response.docInfo.size();