Changeset 1804

Timestamp:

2000-12-18T17:17:57+13:00 (23 years ago)

Author:

paynter

Message:

Changed phind classifier so that its HTML is generated by documentaction,
instead of pageaction. This ensures that the macros it requires are set
properly and makes it consistant with the other classifiers. But what a
waste of my time it was.

Location:

trunk/gsdl

Files:

• macros/document.dm (modified) (3 diffs)
• macros/phind.dm (deleted)
• src/recpt/documentaction.cpp (modified) (2 diffs)
• src/recpt/phindbrowserclass.cpp (modified) (2 diffs)

trunk/gsdl/macros/document.dm

@@ -5 +5 @@
 #######################################################################
 
-_classificationlinks_ {}
 _imagethispage_ {}
 _httpprevarrow_ {}
 _httpnextarrow_ {}
 _pagetitle_ {}
+_phindclassifier_ {}
 
 #######################################################################
@@ -19 +19 @@
 _navigationbar_
 <p>
-_classificationlinks_
+_phindclassifier_
 </center>
 }
@@ -62 +62 @@
 _textnumpages_ {&nbsp;<i>(_1_ _pages_)</i>}
 _parentarrow_ {}
+
+
+#######################################################################
+# the phind applet
+#
+# The phind applet is only required on phind classifier pages.
+# Consequently, the _phindclassifier_ macro is not usually set.  On screens
+# where it is required, _phindclassifier_ resolves to _phindapplet_, and
+# the following macro is loaded into the web page.
+#######################################################################
+
+_phindapplet_ {
+<APPLET CODEBASE="_httpprefix_/src/phind/client" CODE="Phind.class" WIDTH=500 HEIGHT=400>
+  <PARAM NAME=library      VALUE="_gwcgi_">
+  <PARAM NAME=phindcgi     VALUE="phindcgi">
+  <PARAM NAME=backdrop     VALUE="_httpimg_/phindbg1.jpg">
+  <PARAM NAME=collection   VALUE="_cgiargc_">
+  <PARAM NAME=orientation  VALUE="vertical">
+  <PARAM NAME=depth        VALUE="2">
+  <PARAM NAME=fontsize     VALUE="12">
+  <PARAM NAME=blocksize    VALUE="10">
+  The Phind java applet.
+</APPLET>
+}
 
 

trunk/gsdl/src/recpt/documentaction.cpp

@@ -605 +605 @@
       text_t classtop;
       get_top (arg_cl, classtop);
+      metadata.insert ("childtype");
+
       if (get_info (classtop, collection, metadata, false, collectproto, response, logout)) {
       
@@ -623 +625 @@
       disp.setmacro ("pagetitle", "document", "_text" + title + "page_");
       disp.setmacro ("imagethispage", "document", "_icon" + title + "page_");
+    }
+
+        // Add a macro to display the phind classifier (if appropriate)
+    text_t &childtype = response.docInfo[0].metadata["childtype"].values[0];
+    if (childtype == "Phind") {
+      disp.setmacro ("phindclassifier", "document", "_phindapplet_");
     }
       }

trunk/gsdl/src/recpt/phindbrowserclass.cpp

@@ -41 +41 @@
 }
 
-// redirect to Phind web page
-// I don't really understand what I'm doing here.  Oh well.
+// display a document
 void phindbrowserclass::processOID (cgiargsclass &args, recptproto *collectproto,
                    ostream &logout) {
@@ -59 +58 @@
 
   if (err != noError || response.docInfo[0].OID.empty()) return;
-
-  // redirect to html page
-  args["a"] = "p";
-  args["p"] = "phind";
-  args["hp"] = response.docInfo[0].OID;
 }