Changeset 9948

Timestamp:

2005-05-25T13:51:57+12:00 (19 years ago)

Author:

kjdon

Message:

added [collection] and [collection:metaname] items to format statements. [collection] returns the coll name, and [collection:metaname] returns collection metadata, eg [collection:collectionname] or [colleciton:collectionextra]. this is really only useful for crosscollection searching, where you can't use the _collectionname_ etc macros.

Location:

trunk/gsdl/src/recpt

Files:

• formattools.cpp (modified) (13 diffs)
• formattools.h (modified) (1 diff)

trunk/gsdl/src/recpt/formattools.cpp

@@ -400 +400 @@
 //'.. no related documents .. ' is returned.
 text_t get_related_docs(const text_t& collection, recptproto* collectproto,
-               ResultDocInfo_t &docinfo, ostream& logout){
+            ResultDocInfo_t &docinfo, ostream& logout){
   
   text_tset metadata;
@@ -627 +627 @@
 }
 
+static void parse_coll_meta(text_t &meta, metadata_t &metaoption) {
+  if (meta == "collection") {
+    // no qualifiers
+    metaoption.metaname = g_EmptyText;
+    return;
+  }
+  meta = substr (meta.begin()+11, meta.end());
+  metaoption.metaname = meta;
+  
+}
+
 static void parse_meta (text_t &meta, format_t *formatlistptr,
             text_tset &metadata, bool &getParents) {
@@ -681 +692 @@
   else if (meta == "DocRank")
     formatlistptr->command = comRank;
+  else if (meta.size() >= 10 && (substr(meta.begin(), meta.begin()+10) == "collection")) {
+    formatlistptr->command = comCollection;
+    parse_coll_meta(meta, formatlistptr->meta);
+  }
   else {
     formatlistptr->command = comMeta;
@@ -686 +701 @@
   }
 }
+
 
 static bool parse_string (const text_t &formatstring, format_t *formatlistptr, 
@@ -1025 +1041 @@
 }
 
-static text_t get_child_meta (const text_t& collection, recptproto* collectproto,
+static text_t get_child_meta (const text_t& collection, 
+                  recptproto* collectproto,
                   ResultDocInfo_t &docinfo, displayclass &disp,
                   const metadata_t &meta, text_tmap &options,
@@ -1127 +1144 @@
   while (orptr != NULL) {
 
-    tmp = format_string (collection,collectproto, docinfo, disp, orptr, 
+    tmp = format_string (collection,collectproto,docinfo, disp, orptr, 
              options, logout);
     if (!tmp.empty()) return tmp;
@@ -1368 +1385 @@
           logout) != "") {
       if (ifptr != NULL)
-    return get_formatted_string (collection,collectproto, docinfo, disp, ifptr, 
+    return get_formatted_string (collection,collectproto,docinfo, disp, ifptr, 
                      options, logout);
     }
     else {
       if (elseptr != NULL)
-    return get_formatted_string (collection,collectproto, docinfo, disp, elseptr,
+    return get_formatted_string (collection,collectproto,docinfo, disp, elseptr,
                      options, logout);
     }
@@ -1441 +1458 @@
 
 static text_t expand_metadata(const text_t &metavalue, const text_t& collection,
-                  recptproto* collectproto, ResultDocInfo_t &docinfo,
+                  recptproto* collectproto,
+                  ResultDocInfo_t &docinfo,
                   displayclass &disp, text_tmap &options,
                   ostream &logout) {
@@ -1464 +1482 @@
         {
            text_t expanded_metavalue
-          = get_formatted_string(collection, collectproto, 
+         = get_formatted_string(collection, collectproto,
                      response.docInfo[0], disp, expanded_formatlistptr, 
                      options, logout);
@@ -1481 +1499 @@
 }
 
+text_t get_collection_meta(const text_t& collection, recptproto* collectproto,
+               displayclass &disp, 
+               text_t meta_name, ostream& logout) {
+  
+  ColInfoResponse_t collectinfo;
+  comerror_t err;
+  collectproto->get_collectinfo (collection, collectinfo,err,logout);
+  text_t meta_value = "";
+  text_t lang;
+  disp.expandstring("_cgiargl_",lang);
+  if (lang.empty()) {
+    lang = "en";
+  }
+
+  if (err == noError) {
+    meta_value = collectinfo.get_collectionmeta(meta_name, lang);
+  }
+  return meta_value;
+  
+
+}
 text_t format_string (const text_t& collection, recptproto* collectproto,
               ResultDocInfo_t &docinfo, displayclass &disp, 
@@ -1512 +1551 @@
      case comMeta:
     {
-       const text_t& metavalue =  get_meta (collection,collectproto,docinfo, disp,formatlistptr->meta,options,logout);
+       const text_t& metavalue =  get_meta (collection,collectproto, docinfo, disp,formatlistptr->meta,options,logout);
        return expand_metadata(metavalue, collection, collectproto, docinfo, disp, options, logout);
     }
@@ -1543 +1582 @@
     return get_or (collection,collectproto, docinfo, disp, formatlistptr->orptr, 
                options, logout);
+     case comCollection:
+       if (formatlistptr->meta.metaname == g_EmptyText) {
+     return collection;
+       }
+       return get_collection_meta(collection, collectproto, disp, formatlistptr->meta.metaname, logout);
+    
   }
   return "";
@@ -1566 +1611 @@
 // 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) {
+            ResultDocInfo_t &docinfo, displayclass &disp, 
+            text_tmap &options, ostream& logout) {
   if(!options["text"].empty()) { 
     return options["text"];

trunk/gsdl/src/recpt/formattools.h

@@ -36 +36 @@
         comDoc, comHighlight, comEndHighlight, comRel, comHref, comSummary,
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,
-        comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comRank};
+        comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comRank, comCollection};
 
 enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8};