Changeset 7432 for trunk/gsdl/src/recpt/documentaction.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/documentaction.cpp (modified) (12 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -297 +297 @@
       // get metadata for parent document
       get_top (args["d"], top);
-      if (get_info (top, args["c"], metadata, false, collectproto, filt_response, logout)) {
+      if (get_info (top, args["c"], args["l"], metadata, false, collectproto, filt_response, logout)) {
     text_t url = filt_response.docInfo[0].metadata["URL"].values[0];
     
@@ -571 +571 @@
     metadata.insert ("mdtype"); // in case there is a datelist
     bool getParents = false;
-    get_children ("", collection, metadata, getParents, collectproto, response, logout);
+    get_children ("", collection, args["l"], metadata, getParents, collectproto, response, logout);
     
     bool has_search_button = true;
@@ -608 +608 @@
   recptproto *collectproto = protos->getrecptproto (args["c"], logout);
 
-  if (get_info (inlink, args["c"], metadata, false, collectproto, response, logout)) {
+  if (get_info (inlink, args["c"], args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
       outlink = "_httpdocument_&d=" + response.docInfo[0].metadata["section"].values[0];
@@ -631 +631 @@
       collectproto = protos->getrecptproto (*col_here, logout);
       
-      if (get_info (inlink, *col_here, metadata, false, collectproto, response, logout)) {
+      if (get_info (inlink, *col_here, args["l"], metadata, false, collectproto, response, logout)) {
     if (!response.docInfo[0].metadata["section"].values[0].empty()) {
       outlink = "_httpdocument_&c=" + *col_here + "&d=" +
@@ -786 +786 @@
        //related documents in a vertical list. This is the default format.
 
-       if (get_info (arg_d, collection, metadata, options, false, collectproto, response, logout)) 
+       if (get_info (arg_d, collection, args["l"], metadata, options, false, collectproto, response, logout)) 
      relation += get_related_docs(collection, collectproto, response.docInfo[0], logout);
        
@@ -796 +796 @@
   
     // get metadata for this document and it's parents
-    if (get_info (arg_d, collection, metadata, options, 
+    if (get_info (arg_d, collection, args["l"], metadata, options, 
           true, collectproto, response, logout)) {
 
@@ -856 +856 @@
       metadata.insert ("parameters");
 
-      if (get_info (classtop, collection, metadata, false, collectproto, response, logout)) {
+      if (get_info (classtop, collection, args["l"], metadata, false, collectproto, response, logout)) {
       
     text_t &title = response.docInfo[0].metadata["Title"].values[0];
@@ -1127 +1127 @@
   }
     
-  if (get_info (OID, collection, metadata, getParents, collectproto, inforesponse, logout)) {
+  if (get_info (OID, collection, args["l"], metadata, getParents, collectproto, inforesponse, logout)) {
     int hastxt = inforesponse.docInfo[0].metadata["hastxt"].values[0].getint();
     int haschildren = inforesponse.docInfo[0].metadata["haschildren"].values[0].getint();
@@ -1152 +1152 @@
       if (args["d"].empty()) is_classify = true;
 
-      get_contents (exOID, is_classify, metadata, collection, 
+      get_contents (exOID, is_classify, metadata, collection, args["l"], 
             collectproto, inforesponse, logout);
     
@@ -1218 +1218 @@
   // get info on current section
   metadata.insert("haschildren");
-  if (!get_info(arg_d, args["c"], metadata, false, collectproto, response, logout)) {
+  if (!get_info(arg_d, args["c"], args["l"], metadata, false, collectproto, response, logout)) {
     logout << "error 1 in documentaction::set_arrow_macros\n";
     return;
@@ -1229 +1229 @@
   text_t thisoid = arg_d;
   while (parentcount > 0) {
-    get_children (get_parent(thisoid), args["c"], metadata, false, 
+    get_children (get_parent(thisoid), args["c"], args["l"], metadata, false, 
           collectproto, response, logout);
     ResultDocInfo_tarray::iterator this_sibling = response.docInfo.begin();
@@ -1242 +1242 @@
       // down to the last descendant
       while (section_has_children) {
-        get_children (previous_sibling, args["c"], metadata, false, 
+        get_children (previous_sibling, args["c"], args["l"], metadata, false, 
               collectproto, presponse, logout);
         if (!presponse.docInfo.empty()) {