Changeset 1254

Timestamp:

2000-06-29T14:47:21+12:00 (24 years ago)

Author:

sjboddie

Message:

added browser info (i.e VList, HList etc.) to status pages

Location:

trunk/gsdl

Files:

• macros/status.dm (modified) (2 diffs)
• src/recpt/browserclass.cpp (modified) (2 diffs)
• src/recpt/pagedbrowserclass.cpp (modified) (2 diffs)
• src/recpt/pagedbrowserclass.h (modified) (1 diff)
• src/recpt/statusaction.cpp (modified) (5 diffs)
• src/recpt/statusaction.h (modified) (1 diff)

trunk/gsdl/macros/status.dm

@@ -72 +72 @@
 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=argumentinfo" target=infoframe>_textarguments_</a><br>
 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=actioninfo" target=infoframe>_textactions_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=browserinfo" target=infoframe>_textbrowsers_</a><br>
 <a href="_gwcgi_?e=_compressedoptions_&a=status&sp=protocolinfo" target=infoframe>_textprotocols_</a>
 
@@ -96 +97 @@
 _textarguments_ {arguments}
 _textactions_ {actions}
+_textbrowsers_ {browsers}
 _textprotocols_ {protocols}
 

trunk/gsdl/src/recpt/browserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.6  2000/06/29 02:47:19  sjboddie
+   added browser info (i.e VList, HList etc.) to status pages
+
    Revision 1.5  1999/11/01 22:04:11  sjboddie
    just a few small changes (that means I can't remember ;)
@@ -81 +84 @@
 
 text_t browserclass::get_default_formatstring () {
-  return "<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td>";
+  return "";
 }
 

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.10  2000/06/29 02:47:20  sjboddie
+   added browser info (i.e VList, HList etc.) to status pages
+
    Revision 1.9  2000/03/31 03:04:32  nzdl
    tidied up some of the browsing code - replaced DocumentImages,
@@ -77 +80 @@
 void pagedbrowserclass::load_metadata_defaults (text_tset &metadata) {
   metadata.insert ("Title");
-}
-
-text_t pagedbrowserclass::get_default_formatstring () {
-  return "";
 }
 

trunk/gsdl/src/recpt/pagedbrowserclass.h

@@ -45 +45 @@
   void load_metadata_defaults (text_tset &metadata);
 
-  text_t get_default_formatstring ();
-
   virtual void processOID (cgiargsclass &args, recptproto *collectproto,
                ostream &logout);

trunk/gsdl/src/recpt/statusaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.29  2000/06/29 02:47:21  sjboddie
+   added browser info (i.e VList, HList etc.) to status pages
+
    Revision 1.28  2000/06/29 00:22:59  sjboddie
    added new numsections field to collection info and made the statusaction
@@ -126 +129 @@
 
  */
-
 
 #include "statusaction.h"
@@ -335 +337 @@
   }
   
+  // browsers
+  browsermapclass *browsers = recpt->get_browsermap_ptr();
+  if (browsers != NULL) {
+    textout << outconvert << "<tr valign=top><th>browsers</th><td>";
+    
+    browserptrmap::iterator browsershere = browsers->begin ();
+    browserptrmap::iterator browsersend = browsers->end ();
+    bool browsersfirst = true;
+    while (browsershere != browsersend) {
+      if (!browsersfirst) textout << outconvert << ", ";
+      browsersfirst = false;
+      assert ((*browsershere).second.b != NULL);
+      if ((*browsershere).second.b != NULL) {
+    textout << outconvert << "\"" << (*browsershere).second.b->get_browser_name() << "\"";
+      }
+      browsershere++;
+    }
+    
+    textout << outconvert << "</td></tr>\n";
+  }
+
   // protocols
   recptprotolistclass *protocols = recpt->get_recptprotolist_ptr ();
@@ -472 +495 @@
       }
       actionshere++;
+    }
+  }
+  
+  textout << outconvert << disp << "</table>\n_status:infofooter_\n";
+}
+
+void statusaction::output_browserinfo (cgiargsclass &/*args*/, displayclass &disp, 
+                       outconvertclass &outconvert, 
+                       ostream &textout, ostream &/*logout*/) {
+  if (recpt == NULL) return;
+  browsermapclass *browsers = recpt->get_browsermap_ptr();
+
+  textout << outconvert << disp << "_status:infoheader_(Browser Information)\n";
+  textout << outconvert
+      << "<h2>Browser information</h2>\n"
+      << "<table>";
+
+  // browser information
+  if (browsers != NULL) {
+    textout << outconvert 
+        << "<tr><th>browser name</th><th>default formatstring</th></tr>\n";
+    
+    browserptrmap::iterator browsershere = browsers->begin ();
+    browserptrmap::iterator browsersend = browsers->end ();
+    while (browsershere != browsersend) {
+      assert ((*browsershere).second.b != NULL);
+      if ((*browsershere).second.b != NULL) {
+    textout << outconvert 
+        << "<tr><td>" << (*browsershere).second.b->get_browser_name()
+        << "</td><td>" << html_safe ((*browsershere).second.b->get_default_formatstring())
+        << "</td></tr>\n";
+      }
+      browsershere++;
     }
   }
@@ -995 +1051 @@
   else if (arg_sp == "argumentinfo") output_argumentinfo (args, disp, outconvert, textout, logout);
   else if (arg_sp == "actioninfo") output_actioninfo (args, disp, outconvert, textout, logout);
+  else if (arg_sp == "browserinfo") output_browserinfo (args, disp, outconvert, textout, logout);
   else if (arg_sp == "protocolinfo") output_protocolinfo (args, disp, outconvert, textout, logout);
   else if (arg_sp == "collectioninfo") output_collectioninfo (args, disp, outconvert, textout, logout);

trunk/gsdl/src/recpt/statusaction.h

@@ -65 +65 @@
               ostream &textout, ostream &logout);
 
+  void output_browserinfo (cgiargsclass &args, displayclass &disp, 
+               outconvertclass &outconvert, 
+               ostream &textout, ostream &logout);
+
   void output_protocolinfo (cgiargsclass &args, displayclass &disp, 
                 outconvertclass &outconvert,