Changeset 297 for trunk/gsdl/src/recpt

Timestamp:

1999-06-28T09:49:03+12:00 (25 years ago)

Author:

sjboddie

Message:

fixed a couple of version conflicts - tidied up some small things

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (7 diffs)
• receptionist.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.11  1999/06/27 21:49:01  sjboddie
+   fixed a couple of version conflicts - tidied up some small things
+
    Revision 1.10  1999/06/26 01:07:21  rjmcnab
    Fixed a small "bug" -- well I probably just covered another one...
@@ -186 +189 @@
 }
 
-// at the moment this just sets a _thisOID_ macro to archivedir
-// and writes out the html to display the cover image
+// at the moment this just rites out the html to display 
+// the cover image (assuming it's called cover.jpg)
 // this whole thing should be done with a call to the collection
 // server which would send a link to the cover image if there
 // was one otherwise send title, author and stuff
-void output_cover_image (cgiargsclass &args, recptproto *collectproto, 
+void output_cover_image (cgiargsclass &args, recptproto */*collectproto*/, 
              displayclass &disp, outconvertclass &outconvert, 
-             ostream &textout, ostream &logout) {
+             ostream &textout, ostream &/*logout*/) {
 
   if (args["d"].empty()) return;
-  
-  FilterResponse_t response;
-  text_tarray metadata;
-  metadata.push_back ("archivedir");
-
-  text_t top;
-  get_top (args["d"], top);
-  if (get_info (top, args["c"], metadata, false, collectproto, response, logout)) {
-
-    text_t &archivedir = response.docInfo[0].metadata[0].values[0];
-    disp.setmacro ("thisOID", "Global", archivedir);
-
-    textout << outconvert << disp << 
-      "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
-  }
+
+  textout << outconvert << disp << 
+    "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
 }
 
@@ -288 +279 @@
   text_t doclink = "<a href=\"_httpdocument_&cl=" + arg_cl + "&d=";
 
-  if (classifytitle != "Title") metadata.push_back (classifytitle);
+  metadata.push_back (classifytitle);
   metadata.push_back ("Title");
 
@@ -295 +286 @@
     textout
       << "\n<!-- Table of Contents produced by browsetools::output_list_toc "
-      << "-->\n\n<table cellpadding=0 cellspacing=2>\n";
+      << "-->\n\n<p>\n";
 
     ResultDocInfo_tarray::const_iterator sechere = response.docInfo.begin();
@@ -305 +296 @@
       const text_t &title = (*sechere).metadata[1].values[0];
 
-      textout << outconvert << "<tr><td valign=top>";
       if (!ctitle.empty()) {
-    textout << outconvert << disp << doclink << (*sechere).OID 
-        << "\">_document:iconclosedbook_</a></td><td>" 
-        << ctitle << "</td><td>";
+    textout << outconvert << disp << "<br>" << doclink << (*sechere).OID 
+        << "\">" + ctitle + "</a>\n"; 
       } else if (!title.empty()) {
-    textout << outconvert << disp << doclink << (*sechere).OID 
-        << "\">_document:iconclosedbook_</a></td><td>" << title << "</td><td>";
-      }
-      textout << outconvert << "</td></tr>\n";
-
+    textout << outconvert << disp << "<br>" << doclink << (*sechere).OID 
+        << "\">" + title + "</a>\n";
+      }
       sechere ++;
     }
-    textout << outconvert << "</table>\n<!-- end of Table of Contents -->\n";
+
+    textout << "\n<!-- end of Table of Contents -->\n";
   }
 }
@@ -617 +605 @@
         tabcount ++;
       else 
-        icontabs.erase (icontabs.begin(), icontabs.begin()+9);
+        icontabs.erase (icontabs.begin(), icontabs.begin()+18);
     }
       }
@@ -634 +622 @@
       } else {
     text_t link;
-    if (doctype == "classify") link = doclink + "&cl=" + *thisparent + ".pr";
+    if (doctype == "classify") link = doclink + "&cl=" + *thisparent + ".pr\">";
     else 
       if (is_top (*thisparent)) 

trunk/gsdl/src/recpt/receptionist.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.16  1999/06/27 21:49:03  sjboddie
+   fixed a couple of version conflicts - tidied up some small things
+
    Revision 1.15  1999/06/26 01:14:32  rjmcnab
    Made a couple of changes to handle different encodings.
@@ -94 +97 @@
     else if (key == "collection") configinfo.collection = cfgline[0];
     else if (key == "collectdir") configinfo.collectdir = cfgline[0];
+    else if (key == "httpprefix") configinfo.httpprefix = cfgline[0];
     else if (key == "httpimg") configinfo.httpimg = cfgline[0];
     else if (key == "gwcgi") configinfo.gwcgi = cfgline[0];
@@ -634 +638 @@
   disp.setmacro ("gwcgi", "Global", configinfo.gwcgi);
   disp.setmacro ("httpimg", "Global", configinfo.httpimg);
+  disp.setmacro ("httpprefix", "Global", configinfo.httpprefix);
   disp.setmacro("compressedoptions", "Global", get_compressed_arg(args, outconvert, logout));