Changeset 911 for trunk/cstr/src/recpt/cstrdocaction.cpp

Timestamp:

2000-02-07T10:27:04+13:00 (24 years ago)

Author:

sjboddie

Message:

updated cstr

File:

• trunk/cstr/src/recpt/cstrdocaction.cpp (modified) (10 diffs)

trunk/cstr/src/recpt/cstrdocaction.cpp

@@ -28 +28 @@
 /*
    $Log$
-   Revision 1.1  2000/02/01 22:32:37  sjboddie
-   Initial revision
+   Revision 1.2  2000/02/06 21:25:21  sjboddie
+   updated cstr
 
    Revision 1.1  1999/09/07 21:49:42  sjboddie
@@ -40 +40 @@
 #include "cstrdocaction.h"
 #include "cstrbrowsetools.h"
+#include "browsetools.h"
 #include "OIDtools.h"
 #include "querytools.h"
@@ -92 +93 @@
 void cstrdocaction::set_java_macros (cgiargsclass &args, displayclass &disp) {
 
-  text_t javaimagescontent = "_javaextras__javapostscript_";
+  text_t javaimagescontent = "<!----java images content------->\n_javaextras__javapostscript_";
 
   text_t &arg_gg = args["gg"];
@@ -134 +135 @@
     button_here ++;
   }
+  javaimagescontent += "<!--end java img content--->\n";
   disp.setmacro ("javaimagescontent", "document", javaimagescontent);
 }
@@ -205 +207 @@
       disp.setmacro ("header", "document", "_textheader_");
 
-      disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata[2].values[0]);
-
-      text_t &classifytype = response.docInfo[0].metadata[1].values[0];
+      disp.setmacro ("thisOID", "Global", response.docInfo[0].metadata["archivedir"].values[0]);
+
+      text_t &classifytype = response.docInfo[0].metadata["classifytype"].values[0];
       if (classifytype.empty()) classifytype = "Book"; // defaults to Book
 
@@ -228 +230 @@
       if (get_info (classtop, collection, metadata, false, collectproto, response, logout)) {
       
-    text_t &title = response.docInfo[0].metadata[0].values[0];
-    text_t &classifytype = response.docInfo[0].metadata[1].values[0];
+    text_t &title = response.docInfo[0].metadata["Title"].values[0];
+    text_t &classifytype = response.docInfo[0].metadata["classifytype"].values[0];
 
     disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
@@ -284 +286 @@
     while (this_figure != end_figure) {
       textout << outconvert << disp 
-          << "<p><center><img border=1 src=\"_httpcollection_/archives/_thisOID_/" 
+          << "<p><center><img border=1 src=\"_httpcollimg_/_thisOID_/" 
           << *this_figure << "\"></center>\n";
       this_figure ++;
@@ -306 +308 @@
     while (this_facs != end_facs) {
       textout << outconvert << disp 
-            << "<p><center><img border=1 src=\"_httpcollection_/archives/_thisOID_/" 
+            << "<p><center><img border=1 src=\"_httpcollimg_/_thisOID_/" 
           << *this_facs << "\"></center>\n";
       this_facs ++;
@@ -359 +361 @@
     }
     
-    int metasize = metadata.size();
-    
     if (get_info (OID, collection, metadata, getParents, collectproto, inforesponse, logout)) {
       int hastxt = inforesponse.docInfo[0].metadata["hastxt"].values[0].getint();
@@ -438 +438 @@
   }
 }
+
+
+bool cstrdocaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
+                browsermapclass *browsers, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, 
+                ostream &logout) {
+
+
+  // must have a valid collection server
+  recptproto *collectproto = protos->getrecptproto (args["c"], logout);
+  if (collectproto == NULL) {
+    logout << "cstrdocaction::do_action called with NULL collectproto\n";
+    textout << outconvert << disp << "_document:header_\n" 
+        << "Error: Attempt to get document without setting collection\n"
+        << "_document:footer_\n";
+  } else {  
+    
+    text_t OID = args["d"];
+    if (OID.empty()) OID = args["cl"];
+    if (OID.empty()) {
+      textout << outconvert << disp << "Document contains no data_document:footer_\n";
+      return true;
+    }
+
+    textout << outconvert << disp << "_document:header_\n"
+        << "_document:content_\n";
+
+    if (args["d"].empty()) {
+      output_toc (args, browsers, formatinfo, collectproto, 
+          disp, outconvert, textout, logout);
+    } else {
+      output_cstr_toc (args, browsers, formatinfo, collectproto, 
+               disp, outconvert, textout, logout);
+
+      textout << "<p>\n";
+      output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+    }
+
+    textout << outconvert << disp << "_document:footer_\n";
+  }
+  return true;
+}
+
+
+
+
+
+
+
+
+
+
+
+