Changeset 279 for trunk/gsdl/src/recpt

Timestamp:

1999-06-16T16:03:48+12:00 (25 years ago)

Author:

sjboddie

Message:

Now sets "cl" arg to "search" when going to a document from a search
results page. This allows the close book icon (in hierarchy toc) to
take you back to the results page if that's where you came from.
If you got to the document page somehow other than from a
classification or a search (i.e. if "cl" isn't set) then the close
book icon is disabled

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (6 diffs)
• queryaction.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/06/16 04:03:47  sjboddie
+   Now sets "cl" arg to "search" when going to a document from a search
+   results page. This allows the close book icon (in hierarchy toc) to
+   take you back to the results page if that's where you came from.
+   If you got to the document page somehow other than from a
+   classification or a search (i.e. if "cl" isn't set) then the close
+   book icon is disabled
+
    Revision 1.5  1999/06/16 03:11:25  sjboddie
    get_info() now takes a getParents argument
@@ -378 +386 @@
   text_t doclink = "<a href=\"_httpdocument_&cl=";
 
-  if (args["d"].empty()) {
-    if (args["cl"].empty()) return;
-    OID = args["cl"];
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+
+  if (arg_d.empty()) {
+    if (arg_cl.empty()) return;
+    OID = arg_cl;
     topOID = OID; // don't always want to expand from top if expanding classifications
     classifytype = "classify";
   } else {
-    OID = args["d"];
-    get_top (args["d"], topOID);
+    OID = arg_d;
+    get_top (arg_d, topOID);
     classifytype = "Document";
   }
@@ -454 +465 @@
     if ((classifytype == "Document") && (is_top((*thissection).OID)) && 
     (args.getintarg("x")))
-      textout << "<a href=\"\" onClick = \"close_detach()";
+      textout << "<a href=\"\" onClick = \"close_detach();\">";
     else {
       if (!gt) {
@@ -461 +472 @@
     if (is_top (thisOID))
       if (classifytype == "classify")
-        link = args["cl"] + "&d=" + thisOID;
+        link = doclink + arg_cl + "&d=" + thisOID + "\">";
       else
-        link = args["cl"];
+        if (arg_cl.empty())
+          link.clear();
+        else if (arg_cl == "search")
+          link = "<a href=\"_httpquery_\">";
+        else
+          link = doclink + arg_cl + "\">";
     else
       if (haschildren)
         if (classifytype == "classify")
-          link = thisOID + ".pr";
+          link = doclink + thisOID + ".pr\">";
         else
-          link = args["cl"] + "&d=" + thisOID + ".pr";
+          link = doclink + arg_cl + "&d=" + thisOID + ".pr\">";
       else
         if (classifytype == "classify")
-          link = thisOID;
+          link = doclink + thisOID + "\">";
         else
-          link = args["cl"] + "&d=" + thisOID;
+          link = doclink + arg_cl + "&d=" + thisOID + "\">";
     
-    textout << outconvert << disp << doclink << link;
+    textout << outconvert << disp << link;
       } else {
-    textout << "<a href=\"#" << count;
+    textout << "<a href=\"#" << count << "\">";
     count ++;
       }
     }
     
-    textout << outconvert << disp << "\">" << icon << "</a></td><td";
+    textout << outconvert << disp << icon << "</a></td><td";
     if (colsremaining > 1) textout << " colspan=" << colsremaining;
     textout << outconvert << disp << ">" << title << "</td></tr>\n";
@@ -502 +518 @@
   FilterResponse_t response;
   text_t doclink = "<a href=\"_httpdocument_";
+
+  text_t &arg_cl = args["cl"];
 
   metadata.push_back ("doctype");
@@ -547 +565 @@
       } else {
     text_t link;
-    if (doctype == "classify") link = "&cl=" + *thisparent + ".pr";
+    if (doctype == "classify") link = doclink + "&cl=" + *thisparent + ".pr";
     else 
-      if (is_top (*thisparent)) link = "&cl=" + args["cl"];
-      else link = "&cl=" + args["cl"] + "&d=" + *thisparent + ".pr";
+      if (is_top (*thisparent)) 
+        if (arg_cl.empty())
+          link.clear();
+        else if (arg_cl == "search")
+          link = "<a href=\"_httpquery_\">";
+        else
+          link = doclink + "&cl=" + arg_cl + "\">";
+      else link = doclink + "&cl=" + arg_cl + "&d=" + *thisparent + ".pr\">";
 
     textout << outconvert << disp << "<tr>" << tab << "<td valign=top>" 
-        << doclink << link << "\">" << icon << "</a></td>";
+        << link << icon << "</a></td>";
       }
       textout << "<td"; 

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/06/16 04:03:48  sjboddie
+   Now sets "cl" arg to "search" when going to a document from a search
+   results page. This allows the close book icon (in hierarchy toc) to
+   take you back to the results page if that's where you came from.
+   If you got to the document page somehow other than from a
+   classification or a search (i.e. if "cl" isn't set) then the close
+   book icon is disabled
+
    Revision 1.4  1999/06/16 02:08:38  sjboddie
    got queryaction working
@@ -321 +329 @@
     while (this_doc != end_doc) {
 
-      text_t link = "<a href=\"_httpdocument_&d=" + (*this_doc).OID + "\">";
+      text_t link = "<a href=\"_httpdocument_&cl=search&d=" + (*this_doc).OID + "\">";
 
       text_t title;