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

Timestamp:

1999-08-11T10:38:09+12:00 (25 years ago)

Author:

sjboddie

Message:

added some more format options

File:

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

trunk/gsdl/src/recpt/formattools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/08/10 22:38:08  sjboddie
+   added some more format options
+
    Revision 1.6  1999/07/30 02:25:42  sjboddie
    made format_date function global
@@ -42 +45 @@
 // a few function prototypes
 static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
-                 const text_t &link, const text_t &icon);
+                 const text_t &link, const text_t &icon, const text_t &text);
 
 static bool parse_action (text_t::const_iterator &here, const text_t::const_iterator &end, 
@@ -71 +74 @@
   orptr = NULL;
 };
+
+void formatinfo_t::clear() {
+  DocumentImages = false;
+  // note that DocumentTopPages is used in receptionist when translating
+  // OIDs. changing the default here may require changing it there too.
+  DocumentTopPages = true;
+  DocumentHeading = "{Or}{[parent(Top):Title],[Title],untitled}";
+  DocumentArrowsTop = true;
+  DocumentArrowsBottom = true;
+  DocumentGoTo = true;
+  DocumentButtons.erase (DocumentButtons.begin(), DocumentButtons.end());
+  DocumentButtons.push_back ("Detach");
+  DocumentButtons.push_back ("Highlight");
+  DocumentButtons.push_back ("Expand Text");
+  DocumentButtons.push_back ("Expand Contents");
+  DocumentText = "[Text]";
+}
+
 
 // returns a date of form _textmonthnn_ 31, 1999 
@@ -167 +188 @@
   else if (meta == "icon")
     formatlistptr->command = comIcon;
+
+  else if (meta == "Text")
+    formatlistptr->command = comDoc;
 
   else {
@@ -434 +458 @@
 
 static text_t get_or (const ResultDocInfo_t &docinfo, format_t *orptr,
-              const text_t &link, const text_t &icon) {
+              const text_t &link, const text_t &icon, const text_t &text) {
 
   text_t tmp;
   while (orptr != NULL) {
 
-    tmp = format_string (docinfo, orptr, link, icon);
+    tmp = format_string (docinfo, orptr, link, icon, text);
     if (!tmp.empty()) return tmp;
 
@@ -449 +473 @@
 static text_t get_if (const ResultDocInfo_t &docinfo, const decision_t &decision,
               format_t *ifptr, format_t *elseptr, const text_t &link, 
-              const text_t &icon) {
+              const text_t &icon, const text_t &text) {
 
   // not much of a choice yet ...
@@ -455 +479 @@
     if (get_meta (docinfo, decision.meta) != "") {
       if (ifptr != NULL)
-    return get_formatted_string (docinfo, ifptr, link, icon);
+    return get_formatted_string (docinfo, ifptr, link, icon, text);
     }
     else {
       if (elseptr != NULL)
-    return get_formatted_string (docinfo, elseptr, link, icon);
+    return get_formatted_string (docinfo, elseptr, link, icon, text);
     }
   }
@@ -465 +489 @@
 }
 
-static text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
-                 const text_t &link, const text_t &icon) {
+text_t format_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+              const text_t &link, const text_t &icon, const text_t &text) {
 
   if (formatlistptr == NULL) return "";
@@ -476 +500 @@
     return link;
   case comEndLink:
-    return "</a>";
+    if (link.empty) return "";
+    else return "</a>";
   case comIcon:
     return icon;
@@ -483 +508 @@
   case comMeta:
     return get_meta (docinfo, formatlistptr->meta);
+  case comDoc:
+    return text;
   case comIf:
     return get_if (docinfo, formatlistptr->decision, formatlistptr->ifptr, 
-           formatlistptr->elseptr, link, icon);
+           formatlistptr->elseptr, link, icon, text);
   case comOr:
-    return get_or (docinfo, formatlistptr->orptr, link, icon);
+    return get_or (docinfo, formatlistptr->orptr, link, icon, text);
   }
   return "";
 }
-
 
 
@@ -497 +523 @@
                  const text_t &link, const text_t &icon) {
 
+  text_t text;
+
   text_t ft;
   while (formatlistptr != NULL) {
-    ft += format_string (docinfo, formatlistptr, link, icon);
+    ft += format_string (docinfo, formatlistptr, link, icon, text);
     formatlistptr = formatlistptr->nextptr;
   }
@@ -510 +538 @@
   text_t link = "<a href=\"_httpdocument_&cl=search&d=" + docinfo.OID + "\">";
   text_t icon = "_icontext_";
+  text_t text;
 
   text_t ft;
   while (formatlistptr != NULL) {
-    ft += format_string (docinfo, formatlistptr, link, icon);
+    ft += format_string (docinfo, formatlistptr, link, icon, text);
     formatlistptr = formatlistptr->nextptr;
   }
@@ -520 +549 @@
 
 
-
-
+text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                 const text_t &text) {
+
+  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, text);
+    formatlistptr = formatlistptr->nextptr;
+  }
+  return ft;
+}
+
+
+text_t get_formatted_string (const ResultDocInfo_t &docinfo, format_t *formatlistptr,
+                 const text_t &link, const text_t &icon, const text_t &text) {
+
+  text_t ft;
+  while (formatlistptr != NULL) {
+    ft += format_string (docinfo, formatlistptr, link, icon, text);
+    formatlistptr = formatlistptr->nextptr;
+  }
+  return ft;
+}
+
+
+