Changeset 281 for trunk/gsdl/src/recpt

Timestamp:

1999-06-17T11:53:15+12:00 (25 years ago)

Author:

sjboddie

Message:

tidied a few things up. documentaction::define_external_macros now
resets the "c" arg if it's set to something stupid by the .xx suffixes

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (5 diffs)
• documentaction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/06/16 23:53:14  sjboddie
+   tidied a few things up. documentaction::define_external_macros now
+   resets the "c" arg if it's set to something stupid by the .xx suffixes
+
    Revision 1.6  1999/06/16 04:03:47  sjboddie
    Now sets "cl" arg to "search" when going to a document from a search
@@ -132 +136 @@
       textout << outconvert << "<h4><i>" << author << "</i></h4>\n";
 
-    textout << "</td></tr></table>\n";
+    textout << "</td></tr></table></center>\n";
     textout << "\n<!-- end of Table of Contents -->\n";
 
@@ -269 +273 @@
   text_tarray metadata;
   FilterResponse_t response;
-  text_t doclink = "<a href=\"_httpdocument_&cl=" + args["cl"] + "&d=";
+  text_t &arg_cl = args["cl"];
+  text_t doclink = "<a href=\"_httpdocument_&cl=" + arg_cl + "&d=";
   bool iscreator = false;
   if (classifytitle == "Creator") iscreator = true;
@@ -275 +280 @@
   metadata.push_back ("Title");
   metadata.push_back ("Creator");
-  if (get_children (args["cl"], args["c"], metadata, collectproto, response, logout)) {
+  if (get_children (arg_cl, args["c"], metadata, collectproto, response, logout)) {
 
     textout
@@ -286 +291 @@
     while (sechere != secend) {
 
+      const text_t &title = (*sechere).metadata[0].values[0];
+      const text_t &creator = (*sechere).metadata[1].values[0];
+
       if (iscreator) {
-    if (!((*sechere).metadata[1].values[0].empty())) {
+    if (!creator.empty()) {
       textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
           << "\">_iconclosedbook_</a></td><td>" 
-          << (*sechere).metadata[1].values[0] << "</td><td>";
-
-      if (!((*sechere).metadata[0].values[0].empty()))
-        textout << outconvert << "&nbsp;&nbsp;" << (*sechere).metadata[0].values[0];
+          << creator << "</td><td>";
+
+      if (!title.empty())
+        textout << outconvert << "&nbsp;&nbsp;" << title;
     }
       } else {
-    if (!((*sechere).metadata[0].values[0].empty())) {
+    if (!title.empty()) {
       textout << outconvert << disp << "<tr><td valign=top>" << doclink << (*sechere).OID 
-          << "\">_iconclosedbook_</a></td><td>" 
-          << (*sechere).metadata[0].values[0] << "</td><td>";
-
-      if (!((*sechere).metadata[1].values[0].empty()))
-        textout << outconvert << "&nbsp;&nbsp;" << (*sechere).metadata[1].values[0];
+          << "\">_iconclosedbook_</a></td><td>" << title << "</td><td>";
+
+      if (!creator.empty())
+        textout << outconvert << "&nbsp;&nbsp;" << creator;
     }
       }

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/06/16 23:53:15  sjboddie
+   tidied a few things up. documentaction::define_external_macros now
+   resets the "c" arg if it's set to something stupid by the .xx suffixes
+
    Revision 1.5  1999/06/16 03:10:49  sjboddie
    define_internal_macros() now sets _pagetitle_ macro to document's title
@@ -221 +225 @@
     disp.setmacro ("cgiargd", "Global", arg_d);
   }
+  // we'll also check here that the "cl" argument has a "classify" doctype 
+  // (in case ".fc" or ".lc" have screwed up)
   if (needs_translating (arg_cl)) {
+    request.fields.push_back("doctype");
     request.docSet.insert (arg_cl);
+    request.filterResultOptions = FRmetadata;
     collectproto->filter (collection, request, response, err, logout);
-    arg_cl = response.docInfo[0].OID;
+    // set to original value (without .xx stuff) if doctype isn't "classify"
+    if (response.docInfo[0].metadata[0].values[0] != "classify")
+      strip_suffix (arg_cl);
+    else
+      arg_cl = response.docInfo[0].OID;
     disp.setmacro ("cgiargcl", "Global", arg_cl);
   }