Changeset 2706 for trunk/gsdl/src

Timestamp:

2001-08-21T10:44:35+12:00 (23 years ago)

Author:

sjboddie

Message:

added [href] format string entity

Location:

trunk/gsdl/src/recpt

Files:

• formattools.cpp (modified) (5 diffs)
• formattools.h (modified) (2 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -340 +340 @@
   if (langcode == "zu") return "Zulu";
   return "";
+}
+
+text_t get_href (const text_t &link) {
+
+  text_t href;
+
+  text_t::const_iterator here = findchar(link.begin(), link.end(), '"');
+  text_t::const_iterator end = link.end();
+  
+  here ++;
+  while (here != end) {
+    if (*here == '"') break;
+    href.push_back(*here);
+    here ++;
+  }
+
+  return href;
 }
 
@@ -492 +509 @@
     formatlistptr->command = comEndLink;
 
+  else if (meta == "href")
+    formatlistptr->command = comHref;
+
   else if (meta == "num")
     formatlistptr->command = comNum;
@@ -917 +937 @@
               ResultDocInfo_t &docinfo, displayclass &disp, 
               format_t *formatlistptr,
-              const text_t &link, const text_t &icon, 
+              const text_t &link, const text_t &icon,
               const text_t &text, bool highlight,
               ostream& logout) {
@@ -931 +951 @@
     if (link.empty()) return "";
     else return "</a>";
+  case comHref:
+    return get_href(link);
   case comIcon:
     return icon;
@@ -1055 +1077 @@
                   text, logout);
 }
-
-
-
-
-
-
-

trunk/gsdl/src/recpt/formattools.h

@@ -34 +34 @@
 
 enum command_t {comIf, comOr, comMeta, comText, comLink, comEndLink, comNum, comIcon, 
-        comDoc, comHighlight, comEndHighlight, comRel};//changed
+        comDoc, comHighlight, comEndHighlight, comRel, comHref};
 enum pcommand_t {pNone, pImmediate, pTop, pAll};
 enum dcommand_t {dMeta, dText};
@@ -108 +108 @@
 text_t iso639 (const text_t &langcode);
 
+text_t get_href (const text_t &link);
+
 text_t get_related_docs(const text_t& collection, recptproto* collectproto,
               ResultDocInfo_t &docinfo, ostream& logout);