Changeset 19312 for gsdl/trunk/runtime-src/src/recpt/formattools.cpp

Timestamp:

2009-05-03T16:53:02+12:00 (15 years ago)

Author:

davidb

Message:

DocOID is now stored in the span-wrap tag to help with set-metadata call

File:

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

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

@@ -875 +875 @@
 
 
+static text_t spanwrap_metatext(const text_t& metatext, const text_t& OID, 
+                const text_t metaname, int metapos=-1)
+{
+
+  text_t tag_type = (metaname == "Text") ? "div" : "span";
+  text_t editable_type = (metaname == "Text") ? "text" : "metadata";
+
+  text_t wrapped_metatext = "<" + tag_type + " ";
+  wrapped_metatext += "class=\"editable-" + editable_type + "\" ";
+
+  wrapped_metatext += "docoid=\"" + OID + "\" ";  
+  wrapped_metatext += "metaname=\"" + metaname + "\"";
+
+  if (metapos>=0) {
+    text_t metapos_str = metapos;
+    wrapped_metatext += " metapos=\"" + metapos_str + "\"";
+  }
+
+  wrapped_metatext += ">" + metatext + "</" + tag_type + ">";
+
+  return wrapped_metatext;
+}
+
+    
+
 bool parse_formatstring (const text_t &formatstring, format_t *formatlistptr, 
              text_tset &metadata, bool &getParents) {
@@ -886 +911 @@
 // position -1 for all, -2 for the last, 0 for the first, or x for a particular piece
 // metainfo has all the values for the metadata, meta has the request metadata name and options, position tells which values to get
-static text_t get_formatted_meta_text(MetadataInfo_t &metainfo, const metadata_t &meta, int position, bool no_cgisafe = false) 
+
+static text_t get_formatted_meta_text(const text_t& OID, MetadataInfo_t &metainfo, const metadata_t &meta, int position, bool no_cgisafe = false) 
 {
   text_t no_ns_metaname = remove_namespace(meta.metaname);
@@ -910 +936 @@
 
       if (metadata_spanwrap) {
-    fresh_metatext = "<span class=\"editable-metadata\" metaname=\"" + meta.metaname + "\" metapos=\"" + i + "\">" + fresh_metatext + "</span>";
+    fresh_metatext = spanwrap_metatext(fresh_metatext,OID,meta.metaname,i);
       }
       formatted_metatext += fresh_metatext;
@@ -935 +961 @@
 
     if (metadata_spanwrap) {
-      fresh_metatext = "<span class=\"editable-metadata\" metaname=\"" + meta.metaname + "\" metapos=\"" + position + "\">" + fresh_metatext + "</span>";
+      fresh_metatext = spanwrap_metatext(fresh_metatext,OID,meta.metaname,position);
     }
 
@@ -949 +975 @@
   
   MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
+
   switch (meta.mqualifier.parent) {
   case pNone:
@@ -956 +983 @@
   case pImmediate:
     if (parent != NULL) {
-      return get_formatted_meta_text(*parent, meta, siblings_values);
+      text_t parent_oid = get_parent(docinfo.OID);
+      return get_formatted_meta_text(parent_oid,*parent, meta, siblings_values);
     }
     break;
@@ -962 +990 @@
   case pTop:
     if (parent != NULL) {
-      while (parent->parent != NULL) parent = parent->parent;
-      return get_formatted_meta_text(*parent, meta, siblings_values);
+      text_t parent_oid = get_parent(docinfo.OID);
+
+      while (parent->parent != NULL) {
+    parent = parent->parent;
+    parent_oid = get_parent(parent_oid);
+      }
+      return get_formatted_meta_text(parent_oid,*parent, meta, siblings_values);
     }
     break;
@@ -970 +1003 @@
     MetadataInfo_t *parent = docinfo.metadata[meta.metaname].parent;
     if (parent != NULL) {
+      text_t parent_oid = get_parent(docinfo.OID);
+
       text_tarray tmparray;
       while (parent != NULL) {
-    tmparray.push_back (get_formatted_meta_text(*parent, meta, siblings_values, true)); // set no_cgisafe to true, as we'll do it once we have all the metadata
+    tmparray.push_back (get_formatted_meta_text(parent_oid,*parent, meta, siblings_values, true)); // set no_cgisafe to true, as we'll do it once we have all the metadata
     parent = parent->parent;
+    parent_oid = get_parent(parent_oid);
+
       }
       // now join them up - use teh parent separator
@@ -1021 +1058 @@
       MetadataInfo_t& metaname_rec = child_docinfo.metadata[child_metaname];
   
-      text_t child_metavalue = get_formatted_meta_text(metaname_rec,meta,siblings_values);
+      text_t child_metavalue 
+    = get_formatted_meta_text(child_docinfo.OID,metaname_rec,meta,siblings_values);
       return expand_metadata(child_metavalue,collection,collectproto,
              child_docinfo,disp,options,logout);
@@ -1073 +1111 @@
     MetadataInfo_t& metaname_rec = child_docinfo.metadata[child_metaname];
     
-    text_t child_metavalue = get_formatted_meta_text(metaname_rec,meta,siblings_values);
+    text_t child_metavalue 
+      = get_formatted_meta_text(child_docinfo.OID,metaname_rec,meta,siblings_values);
     if (!first) result += child_field;
     first = false;
@@ -1111 +1150 @@
   else if (meta.metacommand & mSibling) { // only siblings
     MetadataInfo_t& metaname_rec = docinfo.metadata[meta.metaname];
-    return get_formatted_meta_text(docinfo.metadata[meta.metaname],meta, siblings_values);
+    return get_formatted_meta_text(docinfo.OID,docinfo.metadata[meta.metaname],meta, siblings_values);
   }
   else {
@@ -1120 +1159 @@
     int metaname_index 
       = (classifier_metaname == meta.metaname) ? docinfo.classifier_metadata_offset : 0;
-    return get_formatted_meta_text(docinfo.metadata[meta.metaname], meta, metaname_index);
+    return get_formatted_meta_text(docinfo.OID,docinfo.metadata[meta.metaname], meta, metaname_index);
   }
   
@@ -1591 +1630 @@
 
      case comSummary:
-       {
-     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;
-       }
+       return format_summary(collection, collectproto, docinfo, disp, options, logout);
 
      case comMeta:
@@ -1689 +1722 @@
 
   if (metadata_spanwrap) {
-    text = "<div class=\"editable-text\" metaname=\"Text\">"+text+"</div>";
+    text = spanwrap_metatext(text,docinfo.OID,"Text");
   }
 
@@ -1707 +1740 @@
   //      the text of the document, processed via the methods in
   //      summarise.cpp
+
+  text_t summary;
+
   if (docinfo.metadata.count("Summary") > 0 &&
       docinfo.metadata["Summary"].values.size() > 0) {
-    return docinfo.metadata["Summary"].values[0];
-  }
-
-  text_t textToSummarise, query;
-  if(options["text"].empty()) { // get document text
-     DocumentRequest_t docrequest;
-     DocumentResponse_t docresponse;
-     comerror_t err;
-     docrequest.OID = docinfo.OID;
-     collectproto->get_document (collection, docrequest, docresponse, err, logout);
-     textToSummarise = docresponse.doc;
-  } 
+    summary = docinfo.metadata["Summary"].values[0];
+  }
   else {
-    // in practice, this would not happen, because text is only 
-    // loaded with the [Text] command
+  
+    text_t textToSummarise, query;
+
+    if(options["text"].empty()) { // get document text
+      DocumentRequest_t docrequest;
+      DocumentResponse_t docresponse;
+      comerror_t err;
+      docrequest.OID = docinfo.OID;
+      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"];
-  }
-
-  disp.expandstring("_cgiargq_",query);
-  return summarise(textToSummarise,query,80);
-}
+    }
+    
+    disp.expandstring("_cgiargq_",query);
+    summary = summarise(textToSummarise,query,80);
+  }
+
+  if (metadata_spanwrap) {
+    summary = spanwrap_metatext(summary,docinfo.OID,"Summary");
+  }
+
+  return summary;
+}