Changeset 22046 for main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

Timestamp:

2010-05-06T12:55:03+12:00 (14 years ago)

Author:

davidb

Message:

Changes necessary to support new sql-query action

File:

• main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

@@ -1265 +1265 @@
   
     ResultDocInfo_t& trav_docinfo = trav_response.docInfo[0];
+
     // use this for rest of routine
     docinfo = trav_docinfo;
@@ -1281 +1282 @@
     here++;
     if (*(oid.begin()) == '"') translate_parent (oid, docinfo.OID);
-    
+
     //get the information associated with the metadata for child doc
     if (!get_info (oid, collection, "", child_metadata, 
@@ -1296 +1297 @@
     text_t child_metavalue 
       = get_formatted_meta_text(child_docinfo.OID,metaname_rec,meta,siblings_values);
+
+
     if (!first) result += child_field;
     first = false;
     // need to do this here cos otherwise we are in the wrong document
-    result +=  expand_metadata(child_metavalue,collection,collectproto,
-                   child_docinfo,disp,options,logout);
+    text_t em =  expand_metadata(child_metavalue,collection,collectproto,
+                 child_docinfo,disp,options,logout);
+
+    result += em;
   }
   return result;