Changeset 21758 for main/trunk/greenstone2/runtime-src/src/recpt

Timestamp:

2010-03-03T11:06:37+13:00 (14 years ago)

Author:

kjdon

Message:

now we dynamically generate srclink (and /srclink, and new srchref which is the link without the a tag), using srclink_file metadata. This is to get gs2 receptionist stuff out of metadata and into the source code where it belongs

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• browsetoolsclass.cpp (modified) (1 diff)
• browsetoolsclass.h (modified) (1 diff)
• formattools.cpp (modified) (3 diffs)
• formattools.h (modified) (1 diff)
• vlistbrowserclass.cpp (modified) (3 diffs)

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

@@ -107 +107 @@
 }
 
+text_t browsetoolsclass::get_assocfile_path()
+{
+  return "_httpprefix_/collect/[collection]/index/assoc/{Or}{[parent(Top):assocfilepath],[assocfilepath]}/";
+
+}
 // at the moment this just writes out the html to display 
 // the cover image (assuming it's called cover.jpg)

main/trunk/greenstone2/runtime-src/src/recpt/browsetoolsclass.h

@@ -49 +49 @@
 
   virtual text_t get_cover_image();
-
+  virtual text_t get_assocfile_path();
   virtual void load_extended_options(text_tmap &options, cgiargsclass &args, browsermapclass *browsers, 
                                      formatinfo_t &formatinfo, recptproto *collectproto, 

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

@@ -631 +631 @@
     formatlistptr->command = comEndLink;
 
+  else if (meta == "srclink") {
+    formatlistptr->command = comAssocLink;
+    formatlistptr->meta.metaname = "srclink_file";
+    metadata.insert("srclink_file");
+  }
+  else if (meta == "srchref") {
+    formatlistptr->command = comAssocLink;
+    formatlistptr->text = "href";
+    formatlistptr->meta.metaname = "srclink_file";
+    metadata.insert("srclink_file");
+  }
+  else if (meta == "/srclink") {
+    formatlistptr->command = comEndAssocLink;
+    formatlistptr->meta.metaname = "srclink_file";
+  }
+  // and weblink etc
   else if (meta == "href")
     formatlistptr->command = comHref;
@@ -1777 +1793 @@
     return options["link"];
      case comEndLink:
-    if (options["link"].empty()) return "";
+       {
+     if (options["link"].empty()) return "";
     else return "</a>";
+       }
      case comHref:
     return get_href(options["link"]);
@@ -1790 +1808 @@
      case comSummary:
        return format_summary(collection, collectproto, docinfo, disp, options, logout);
-
+     case comAssocLink:
+       {
+     text_t link_filename = get_meta(collection, collectproto, docinfo, disp, formatlistptr->meta, options, logout);
+         if (!link_filename.empty()) {
+       text_t href= expand_metadata(options["assocfilepath"]+link_filename, collection, collectproto, docinfo, disp, options, logout);
+       if (formatlistptr->text == "href") {
+         return href;
+       } 
+       return "<a href=\""+ href + "\">";
+     } 
+     return "";
+       }
+  case comEndAssocLink:
+    {
+    text_t link_filename = get_meta(collection, collectproto, docinfo, disp, formatlistptr->meta, options, logout);
+    if (!link_filename.empty()) {
+      return "</a>";
+    }
+    return "";
+    }
      case comMeta:
     {

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

@@ -38 +38 @@
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,
         comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comTopOID, comRank,
-        comCollection, comDocTermsFreqTotal};
+        comCollection, comDocTermsFreqTotal,
+        comAssocLink, comEndAssocLink};
 
 enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8, mSpecial=16, mTruncate=32, mXMLSafe=64, mHTMLSafe=128};

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

@@ -140 +140 @@
   else options["highlight"] = "0";
   options["DocImage"] = btools.get_cover_image();
+  options["assocfilepath"] = btools.get_assocfile_path();
   textout << outconvert << disp 
       << get_formatted_string (collection, collectproto, 
@@ -205 +206 @@
   options["highlight"] = "0";
   options["DocImage"] = btools.get_cover_image();
-  
+  options["assocfilepath"] = btools.get_assocfile_path();
+
   if ( thissection != endsection ) { // only if there are results (else corrupts display)
     fstring = get_formatted_string (collection, collectproto, *thissection,
@@ -238 +240 @@
     else options["highlight"] = "0";
     options["DocImage"] = btools.get_cover_image();
-    
+    options["assocfilepath"] = btools.get_assocfile_path();
+
     textout << outconvert << disp 
         << " " << get_formatted_string (collection, collectproto, *thissection, disp,