Changeset 407 for trunk/gsdl/src/recpt/formattools.cpp

Timestamp:

1999-07-20T15:02:16+12:00 (25 years ago)

Author:

sjboddie

Message:

added an [icon] option, added ability to call get_formatted_string
with icon and link arguments set

File:

• trunk/gsdl/src/recpt/formattools.cpp (modified) (11 diffs)

trunk/gsdl/src/recpt/formattools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.4  1999/07/20 03:02:15  sjboddie
+   added an [icon] option, added ability to call get_formatted_string
+   with icon and link arguments set
+
    Revision 1.3  1999/07/09 02:44:35  sjboddie
    fixed parent(All) function so it only outputs parents and not current
@@ -34 +38 @@
 
 // a few function prototypes
-static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr);
+static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                 const text_t &link, const text_t &icon);
 
 static bool parse_action (text_t::const_iterator &here, const text_t::const_iterator &end, 
@@ -134 +139 @@
   else if (meta == "num")
     formatlistptr->command = comNum;
+
+  else if (meta == "icon")
+    formatlistptr->command = comIcon;
 
   else {
@@ -385 +393 @@
 }
 
-static text_t get_or (const ResultDocInfo_t &docinfo, format_t *orptr) {
+static text_t get_or (const ResultDocInfo_t &docinfo, format_t *orptr,
+              const text_t &link, const text_t &icon) {
 
   text_t tmp;
   while (orptr != NULL) {
 
-    tmp = format_string (docinfo, orptr);
+    tmp = format_string (docinfo, orptr, link, icon);
     if (!tmp.empty()) return tmp;
 
@@ -399 +408 @@
 
 static text_t get_if (const ResultDocInfo_t &docinfo, const decision_t &decision,
-              format_t *ifptr, format_t *elseptr) {
+              format_t *ifptr, format_t *elseptr, const text_t &link, 
+              const text_t &icon) {
 
   // not much of a choice yet ...
@@ -405 +415 @@
     if (get_meta (docinfo, decision.meta) != "") {
       if (ifptr != NULL)
-    return get_formatted_string (docinfo, ifptr);
+    return get_formatted_string (docinfo, ifptr, link, icon);
     }
     else {
       if (elseptr != NULL)
-    return get_formatted_string (docinfo, elseptr);
+    return get_formatted_string (docinfo, elseptr, link, icon);
     }
   }
@@ -415 +425 @@
 }
 
-static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr) {
+static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                 const text_t &link, const text_t &icon) {
 
   if (formatlistptr == NULL) return "";
@@ -423 +434 @@
     return formatlistptr->text;
   case comLink:
-    return "<a href=\"_httpdocument_&cl=search&d=" + docinfo.OID + "\">";
+    return link;
   case comEndLink:
     return "</a>";
+  case comIcon:
+    return icon;
   case comNum:
     return docinfo.result_num;
@@ -431 +444 @@
     return get_meta (docinfo, formatlistptr->meta);
   case comIf:
-    return get_if (docinfo, formatlistptr->decision, formatlistptr->ifptr, formatlistptr->elseptr);
+    return get_if (docinfo, formatlistptr->decision, formatlistptr->ifptr, 
+           formatlistptr->elseptr, link, icon);
   case comOr:
-    return get_or (docinfo, formatlistptr->orptr);
+    return get_or (docinfo, formatlistptr->orptr, link, icon);
   }
   return "";
@@ -440 +454 @@
 
 
-text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr) {
+text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                 const text_t &link, const text_t &icon) {
 
   text_t ft;
   while (formatlistptr != NULL) {
-    ft += format_string (docinfo, formatlistptr);
+    ft += format_string (docinfo, formatlistptr, link, icon);
     formatlistptr = formatlistptr->nextptr;
   }
@@ -451 +466 @@
 
 
-
-
+text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr) {
+
+  text_t link = "<a href=\"_httpdocument_&cl=search&d=" + docinfo.OID + "\">";
+  text_t icon = "_icontext_";
+
+  text_t ft;
+  while (formatlistptr != NULL) {
+    ft += format_string (docinfo, formatlistptr, link, icon);
+    formatlistptr = formatlistptr->nextptr;
+  }
+  return ft;
+}
+
+
+
+