Changeset 450 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

1999-08-12T11:28:03+12:00 (25 years ago)

Author:

sjboddie

Message:

-added support for html classifier

• removed _random_ macro - now use _blank for detach page

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (7 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.21  1999/08/11 23:28:03  sjboddie
+   -added support for html classifier
+   - removed _random_ macro - now use _blank for detach page
+
    Revision 1.20  1999/08/10 23:16:39  sjboddie
    a couple of small changes to get format options DocumentArrowsBottom
@@ -341 +345 @@
         
         // set the _httpbrowseXXX_ macro for this classification
-        text_t link = (*dochere).OID;
+        text_t link;
+        if (classifytype == "HTML") 
+          link = "_httppagex_(html)&hp=" + (*dochere).OID + ".fc";
+        else 
+          link = "_httpdocument_&cl=" + (*dochere).OID;
+
         if (classifytype == "AZList" || classifytype == "DateList") link += ".fc";
-        disp.setmacro ("httpbrowse" + title, "Global", 
-               "_httpdocument_&cl=" + link);
+        disp.setmacro ("httpbrowse" + title, "Global", link); 
+
       }
         javaimagesnavbar += "_java" + title + "_";
@@ -372 +381 @@
 
   // define_internal_macros sets the following macros:
-
-  // _random_               a random number - used for setting target tags to display
-  //                        a random page when you hit the 'detach' button
 
   // _pagetitle_            the title to be displayed at the top of the browser window
@@ -441 +447 @@
   text_t &collection = args["c"];
 
-  disp.setmacro("random", "document", rand());
-
   if (!formatinfo.DocumentArrowsBottom)
     disp.setmacro("navarrows", "document", "");
@@ -504 +508 @@
           javaimagescontent += "_javaexpandtext_";
       } else if (*button_here == "Expand Contents") {
-        if (classifytype == "Hierarchy")
           if (arg_gc == 1)
         javaimagescontent += "_javacontractcontents_";
@@ -568 +571 @@
             
             // set the _httpprevarrow_, _httpnextarrow_ macros while we're here
-            if (sechere != response.docInfo.begin())
-              disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + (*(sechere-1)).OID);
-            if ((sechere + 1) != secend)
-              disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + (*(sechere+1)).OID);
+            if (formatinfo.DocumentArrowsBottom) {
+              if (sechere != response.docInfo.begin())
+            disp.setmacro ("httpprevarrow", "document", "_httpdocument_&cl=" + (*(sechere-1)).OID);
+              if ((sechere + 1) != secend)
+            disp.setmacro ("httpnextarrow", "document", "_httpdocument_&cl=" + (*(sechere+1)).OID);
+            }
 
             lenlinks += sectionheading.size();
@@ -674 +679 @@
 
     // output the document text
+    textout << "<p>\n";
     output_document (OID, args, collectproto, disp, outconvert, textout, logout);