Changeset 19311

Timestamp:

2009-05-03T09:42:26+12:00 (15 years ago)

Author:

davidb

Message:

Further mods to support metadata-spanwrap

File:

• gsdl/trunk/runtime-src/src/recpt/formattools.cpp (modified) (7 diffs)

gsdl/trunk/runtime-src/src/recpt/formattools.cpp

@@ -910 +910 @@
 
       if (metadata_spanwrap) {
-    fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + i + "\">" + fresh_metatext + "</span>";
+    fresh_metatext = "<span class=\"editable-metadata\" metaname=\"" + meta.metaname + "\" metapos=\"" + i + "\">" + fresh_metatext + "</span>";
       }
       formatted_metatext += fresh_metatext;
@@ -935 +935 @@
 
     if (metadata_spanwrap) {
-      fresh_metatext = "<span metaname=\"" + meta.metaname + "\" metapos=\"" + position + "\">" + fresh_metatext + "</span>";
+      fresh_metatext = "<span class=\"editable-metadata\" metaname=\"" + meta.metaname + "\" metapos=\"" + position + "\">" + fresh_metatext + "</span>";
     }
 
@@ -1256 +1256 @@
     if (meta_text == "Text") {
       outtext = format_text(collection, collectproto, docinfo, disp, options, logout);
-    } else {
+    } 
+    else {
 
       text_tset metadata;
@@ -1588 +1589 @@
      case comRel: //if [RelatedDocuments] appears in format string, collect relation data
     return get_related_docs(collection, collectproto, docinfo, logout);
+
      case comSummary:
-    return format_summary(collection, collectproto, docinfo, disp, options, logout);
+       {
+     text_t summary = format_summary(collection, collectproto, docinfo, disp, options, logout);
+     if (metadata_spanwrap) {
+       summary = "<span class=\"editable-metadata\" metaname=\"Summary\">"+summary+"</span>";
+     }
+     return summary;
+       }
+
      case comMeta:
     {
@@ -1595 +1604 @@
        return expand_metadata(metavalue, collection, collectproto, docinfo, disp, options, logout);
     }
+
      case comDoc:
-    return format_text(collection, collectproto, docinfo, disp, options, logout);
-    //return options["text"];
+       return format_text(collection, collectproto, docinfo, disp, options, logout);
+
      case comImage:
     return expand_metadata(options["DocImage"], collection, collectproto, docinfo, disp, options, logout);
@@ -1661 +1671 @@
 text_t format_text (const text_t& collection, recptproto* collectproto,
             ResultDocInfo_t &docinfo, displayclass &disp, 
-            text_tmap &options, ostream& logout) {
+            text_tmap &options, ostream& logout) 
+{
+  text_t text;
+
   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;
-
+    text = 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);
+    text = docresponse.doc;
+  }
+
+  if (metadata_spanwrap) {
+    text = "<div class=\"editable-text\" metaname=\"Text\">"+text+"</div>";
+  }
+
+  return text;
 }
   
@@ -1700 +1720 @@
      collectproto->get_document (collection, docrequest, docresponse, err, logout);
      textToSummarise = docresponse.doc;
-  } else // in practice, this would not happen, because text is only 
-         // loaded with the [Text] command
-     textToSummarise = options["text"];
+  } 
+  else {
+    // in practice, this would not happen, because text is only 
+    // loaded with the [Text] command
+    textToSummarise = options["text"];
+  }
+
   disp.expandstring("_cgiargq_",query);
   return summarise(textToSummarise,query,80);