Changeset 9852

Timestamp:

2005-05-10T16:44:39+12:00 (19 years ago)

Author:

kjdon

Message:

made the [Text] format item work even if you are not in documentaction. options[Text] will not be defined, so we need to query the collection server for the text. so this may be expensive. also, if the text has macros in it, they may not be defined (eg _thisOID_ for image links etc). but is anyone going to use it anyway?

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -42 +42 @@
 
 static text_t format_summary (const text_t& collection, recptproto* collectproto,
+                  ResultDocInfo_t &docinfo, displayclass &disp, 
+                  text_tmap &options, ostream& logout);
+static text_t format_text (const text_t& collection, recptproto* collectproto,
                   ResultDocInfo_t &docinfo, displayclass &disp, 
                   text_tmap &options, ostream& logout);
@@ -1513 +1516 @@
     }
      case comDoc:
-    return options["text"];
+    return format_text(collection, collectproto, docinfo, disp, options, logout);
+    //return options["text"];
      case comImage:
     return expand_metadata(options["DocImage"], collection, collectproto, docinfo, disp, options, logout);
@@ -1560 +1564 @@
 
 
+// we have only preloaded the text in DocumentAction. But you may want to get the text in query. so copy what we have done with format_summary and get the text here. probably is quite expensive?
+text_t format_text (const text_t& collection, recptproto* collectproto,
+               ResultDocInfo_t &docinfo, displayclass &disp, 
+               text_tmap &options, ostream& logout) {
+  if(!options["text"].empty()) { 
+    return options["text"];
+  }
+  // else get document text here
+  DocumentRequest_t docrequest;
+  DocumentResponse_t docresponse;
+  comerror_t err;
+  docrequest.OID = docinfo.OID;
+  collectproto->get_document (collection, docrequest, docresponse, err, logout);
+  return docresponse.doc;
+
+}
+  
 /* FUNCTION NAME: format_summary
  * DESC: this is invoked when a [Summary] special metadata is processed.