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

trunk/gsdl/src/recpt/browsetools.cpp

@@ -126 +126 @@
   parse_formatstring (formatinfo.DocumentHeading, formatlistptr, metadata, getParents);
 
-  if (!get_info (args["d"], args["c"], metadata, getParents, collectproto, response, logout))
+  if (!get_info (args["d"], args["c"], args["l"], metadata, getParents, collectproto, response, logout))
     return;
 
@@ -159 +159 @@
   parse_formatstring (formatinfo.RelatedDocuments, formatlistptr, metadata, getParents);
 
-  if (!get_info (args["d"], args["c"], metadata, getParents, collectproto, response, logout))
+  if (!get_info (args["d"], args["c"], args["l"], metadata, getParents, collectproto, response, logout))
     return;
   
@@ -223 +223 @@
 
     FilterResponse_t tmp;
-    get_children (section.OID, args["c"], metadata, getParents, collectproto, tmp, logout);
+    get_children (section.OID, args["c"], args["l"], metadata, getParents, collectproto, tmp, logout);
     ResultDocInfo_tarray::iterator thisdoc = tmp.docInfo.begin();
     ResultDocInfo_tarray::iterator lastdoc = tmp.docInfo.end();
@@ -286 +286 @@
   metadata.insert (classifytype);
 
-  if (!get_info (tOID, args["c"], metadata, getParents, collectproto, response, logout))
+  if (!get_info (tOID, args["c"], args["l"], metadata, getParents, collectproto, response, logout))
     return;
   classifytype = response.docInfo[0].metadata[classifytype].values[0];
@@ -328 +328 @@
 
   // protocol call
-  if (!get_info (OID, args["c"], metadata, getParents, collectproto, response, logout))
+  if (!get_info (OID, args["c"], args["l"], metadata, getParents, collectproto, response, logout))
     return;
 
@@ -474 +474 @@
     get_top (args["cl"], classification);    
 
-  bool haschildren = has_children (OID, args["c"], collectproto, logout);
+  bool haschildren = has_children (OID, args["c"], args["l"], collectproto, logout);
 
   if ((!args["d"].empty()) && fulltoc)
@@ -486 +486 @@
     metadata.insert ("childtype");
     
-    if (!get_info (parents, args["c"], metadata, getParents, collectproto, response, logout))
+    if (!get_info (parents, args["c"], args["l"], metadata, getParents, collectproto, response, logout))
       return;
     
@@ -494 +494 @@
             browsermap, formatinfo, formatlistmap);
 
-    if (!get_info (parents, args["c"], metadata, getParents, collectproto, response, logout))
+    if (!get_info (parents, args["c"], args["l"], metadata, getParents, collectproto, response, logout))
       return;
     
@@ -541 +541 @@
 
   if (haschildren) 
-    get_children (OID, args["c"], metadata, getParents,
+    get_children (OID, args["c"], args["l"], metadata, getParents,
           collectproto, response, logout);
   else if (!is_top(OID)) {
-    get_children (OID + ".pr", args["c"], metadata, getParents, 
+    get_children (OID + ".pr", args["c"], args["l"], metadata, getParents, 
           collectproto, response, logout);
     haschildren = true;
@@ -576 +576 @@
     if (OID.empty()) OID = args["cl"];
 
-    bool haschildren = has_children (OID, args["c"], collectproto, logout);
+    bool haschildren = has_children (OID, args["c"], args["l"], collectproto, logout);
 
     // get parents list
@@ -597 +597 @@
         metadata.insert ("thistype");
 
-        get_info ( topOID, args["c"], metadata, getParents, collectproto, response, logout);
+        get_info ( topOID, args["c"], args["l"], metadata, getParents, collectproto, response, logout);
         if (!response.docInfo[0].metadata["thistype"].values.empty()) 
             classifytype = response.docInfo[0].metadata["thistype"].values[0];
@@ -617 +617 @@
         metadata.insert ("haschildren");
 
-        get_info (topOID, args["c"], metadata, getParents, collectproto, response, logout);
+        get_info (topOID, args["c"], args["l"], metadata, getParents, collectproto, response, logout);
 
         // ouput top OID section
@@ -656 +656 @@
 
         OID = parents[tabcount];
-        get_info (OID, args["c"], metadata, getParents, collectproto, response, logout);
+        get_info (OID, args["c"], args["l"], metadata, getParents, collectproto, response, logout);
         get_top (OID, classification);
 
@@ -683 +683 @@
 
         if (haschildren) 
-            get_children (OID, args["c"], metadata, getParents,
+            get_children (OID, args["c"], args["l"], metadata, getParents,
                 collectproto, response, logout);
         else if (!is_top(OID)) {
-            get_children (OID + ".pr", args["c"], metadata, getParents, 
+            get_children (OID + ".pr", args["c"], args["l"], metadata, getParents, 
             collectproto, response, logout);
             haschildren = true;
@@ -713 +713 @@
         if (tabcount) pOID = parents[tabcount-1];
         else pOID = OID;
-        get_info (pOID, args["c"], metadata, getParents, collectproto, response, logout);
+        get_info (pOID, args["c"], args["l"], metadata, getParents, collectproto, response, logout);
 
         // get classifytype of this level
@@ -738 +738 @@
         use_table = is_table_content (formatlistptr);
 
-        get_children (OID, args["c"], metadata, getParents, collectproto, response, logout);
+        get_children (OID, args["c"], args["l"], metadata, getParents, collectproto, response, logout);
 
         ResultDocInfo_tarray::iterator thissibling = response.docInfo.begin();