Changeset 21758 for main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp

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

File:

• main/trunk/greenstone2/runtime-src/src/recpt/formattools.cpp (modified) (3 diffs)

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:
     {