Changeset 668

Timestamp:

1999-10-15T11:59:35+13:00 (25 years ago)

Author:

sjboddie

Message:

finished off browser classes

Location:

trunk/gsdl/src/recpt

Files:

• browserclass.cpp (modified) (2 diffs)
• browserclass.h (modified) (2 diffs)
• datelistbrowserclass.cpp (modified) (2 diffs)
• datelistbrowserclass.h (modified) (1 diff)
• hlistbrowserclass.cpp (modified) (4 diffs)
• hlistbrowserclass.h (modified) (1 diff)
• invbrowserclass.cpp (modified) (2 diffs)
• invbrowserclass.h (modified) (1 diff)
• pagedbrowserclass.cpp (added)
• pagedbrowserclass.h (added)
• vlistbrowserclass.cpp (modified) (8 diffs)
• vlistbrowserclass.h (modified) (1 diff)

trunk/gsdl/src/recpt/browserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.2  1999/10/14 22:59:33  sjboddie
+   finished off browser classes
+
    Revision 1.1  1999/10/10 08:14:03  sjboddie
    - metadata now returns mp rather than array
@@ -62 +65 @@
 }
 
-void browserclass::processOID (cgiargsclass &/*args*/) {
+void browserclass::processOID (cgiargsclass &/*args*/, recptproto */*collectproto*/, ostream &/*logout*/) {
 }
 
-void browserclass::load_metadata_defaults (text_tset &metadata) {
+void browserclass::load_metadata_defaults (text_tset &/*metadata*/) {
 }
 
 text_t browserclass::get_default_formatstring () {
-  return "<td>[link][icon][/link]</td><td>{Or}{[Title],Untitled}</td>";
+  return "<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td>";
 }
 
 int browserclass::output_section_group (ResultDocInfo_t &/*section*/, cgiargsclass &/*args*/,
-                     const int &/*colnumber*/, format_t */*formatlistptr*/,
-                     const bool &/*use_table*/, displayclass &/*disp*/, 
-                     outconvertclass &/*outconvert*/, ostream &/*textout*/, 
-                     ostream &/*logout*/) {
+                    int /*colnumber*/, format_t */*formatlistptr*/,
+                    bool /*use_table*/, text_tset &/*metadata*/, bool &/*getParents*/,
+                    recptproto */*collectproto*/, displayclass &/*disp*/, 
+                    outconvertclass &/*outconvert*/, ostream &/*textout*/, ostream &/*logout*/) {
+  return 0;
+}
+
+int browserclass::output_section_group (FilterResponse_t &/*sections*/, cgiargsclass &/*args*/,
+                    int /*colnumber*/, format_t */*formatlistptr*/, 
+                    bool /*use_table*/, text_tset &/*metadata*/, bool &/*getParents*/,
+                    recptproto */*collectproto*/, displayclass &/*disp*/, 
+                    outconvertclass &/*outconvert*/, ostream &/*textout*/, ostream &/*logout*/) {
   return 0;
 }

trunk/gsdl/src/recpt/browserclass.h

@@ -63 +63 @@
   virtual text_t get_browser_name ();
   
-  virtual void processOID (cgiargsclass &args);
+  virtual void processOID (cgiargsclass &args, recptproto *collectproto, ostream &logout);
   
   // load_metadata_defaults should be called before
@@ -77 +77 @@
   // next section group
   virtual int output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
-                    const int &colnumber, format_t *formatlistptr, 
-                    const bool &use_table, displayclass &disp, 
+                    int colnumber, format_t *formatlistptr, 
+                    bool use_table, text_tset &metadata, bool &getParents,
+                    recptproto *collectproto, displayclass &disp, 
+                    outconvertclass &outconvert, ostream &textout, ostream &logout);
+
+  virtual int output_section_group (FilterResponse_t &sections, cgiargsclass &args,
+                    int colnumber, format_t *formatlistptr, 
+                    bool use_table, text_tset &metadata, bool &getParents,
+                    recptproto *collectproto, displayclass &disp, 
                     outconvertclass &outconvert, ostream &textout, 
                     ostream &logout);

trunk/gsdl/src/recpt/datelistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.2  1999/10/14 22:59:33  sjboddie
+   finished off browser classes
+
    Revision 1.1  1999/10/10 08:14:05  sjboddie
    - metadata now returns mp rather than array
@@ -46 +49 @@
 }
 
-// configure should be called once for each configuration line
-// the default version does nothing
-void datelistbrowserclass::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
-}
-
-// init should be called after all the configuration is done but
-// before any other methods are called
-bool datelistbrowserclass::init (ostream &/*logout*/) {
-  return true;
-}
-
-// returns the name that specifies the browserclass type
 text_t datelistbrowserclass::get_browser_name () {
   return "DateList";
 }
 
+void datelistbrowserclass::load_metadata_defaults (text_tset &metadata) {
+  metadata.insert ("Date");
+  metadata.insert ("doctype");
+}
+
+text_t datelistbrowserclass::get_default_formatstring () {
+  return "<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td><td>[Date]</td>";
+}
+
+
+int datelistbrowserclass::output_section_group (FilterResponse_t &sections, cgiargsclass &args,
+                        int colnumber, format_t *formatlistptr, 
+                        bool use_table, text_tset &/*metadata*/, bool &/*getParents*/,
+                        recptproto */*collectproto*/, displayclass &disp, 
+                        outconvertclass &outconvert, ostream &textout, ostream &/*logout*/) {
+
+  text_t lastyear = "0000";
+  text_t lastmonth = "00";
+  text_t tabbing, endtabbing;
+
+  if (use_table || colnumber > 0) {
+    textout << "<table><tr><td>";
+    // get tab size
+    text_t tab; int itab;
+    disp.expandstring ("Global", "_tabwidth_", tab);
+    itab = tab.getint();
+    if (colnumber > 0) 
+      textout << "<img src=\"_httpimg_/space.gif\" width=" << (itab*colnumber) << ">";
+    textout<< "</td><td>";
+  }
+
+  textout << "<table>\n";
+
+  ResultDocInfo_tarray::iterator thissection = sections.docInfo.begin();
+  ResultDocInfo_tarray::iterator endsection = sections.docInfo.end();
+
+  while (thissection != endsection) {
+
+    text_t &doctype = (*thissection).metadata["doctype"].values[0];
+    text_t &date = (*thissection).metadata["Date"].values[0]; 
+
+    // bail on this document if it has no date
+    if (date.empty()) continue;
+
+    text_t::const_iterator datebegin = date.begin();
+    int datesize = date.size();
+    
+    if (datesize < 4) continue;
+    text_t thisyear = substr (datebegin, datebegin+4);
+    text_t thismonth = "00";
+    if (datesize >= 6)
+      thismonth = substr (datebegin+4, datebegin+6); 
+
+    text_t link = "<a href=\"_httpdocument_&cl=";
+    text_t icon = "_document:iconclosedbook_";
+      
+    if (doctype == "classify") {
+      icon = "_document:iconclosedbookshelf_";
+      link += (*thissection).OID + "\">";
+    } else link += args["cl"] + "&d=" + (*thissection).OID + "\">";
+
+    textout << "<tr valign=top>";
+
+    if (thisyear != lastyear) {
+      textout << outconvert << "<td><b>" << thisyear << "</b></td>";
+      lastyear = thisyear;
+    } else
+      textout << "<td></td>";
+    
+    if (thismonth != lastmonth) {
+      textout << outconvert << disp << ("<td><b>_textmonth" + thismonth + "_</b></td>");
+      lastmonth = thismonth;
+    } else
+      textout << "<td></td>";
+    
+    if (!use_table) textout << "<td>\n";
+    
+    textout << outconvert << disp 
+            << get_formatted_string (*thissection, formatlistptr, link, icon) << "\n";
+    
+    if (!use_table) textout << "</td>";
+    
+    textout << "</tr>\n";
+    
+    thissection ++;
+  }
+
+  textout << "</table>\n";
+
+  if (use_table  || colnumber > 0) textout << "</td></tr></table>\n";
+  return 1;
+}
+

trunk/gsdl/src/recpt/datelistbrowserclass.h

@@ -39 +39 @@
   virtual ~datelistbrowserclass ();
 
-  // configure should be called once for each configuration line
-  virtual void configure (const text_t &key, const text_tarray &cfgline);
+  text_t get_browser_name ();
 
-  // init should be called after all the configuration is done but
-  // before any other methods are called
-  virtual bool init (ostream &logout);
+  void load_metadata_defaults (text_tset &metadata);
 
-  // returns the name that specifies the browserclass type
-  virtual text_t get_browser_name ();
+  text_t get_default_formatstring ();
+  
+  int output_section_group (FilterResponse_t &sections, cgiargsclass &args,
+                int colnumber, format_t *formatlistptr, 
+                bool use_table, text_tset &metadata, bool &getParents,
+                recptproto *collectproto, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, ostream &logout);
 };
 

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.2  1999/10/14 22:59:34  sjboddie
+   finished off browser classes
+
    Revision 1.1  1999/10/10 08:14:08  sjboddie
    - metadata now returns mp rather than array
@@ -38 +41 @@
 #include "hlistbrowserclass.h"
 #include <assert.h>
-
+#include "OIDtools.h"
 
 hlistbrowserclass::hlistbrowserclass () {
@@ -46 +49 @@
 }
 
-// configure should be called once for each configuration line
-// the default version does nothing
-void hlistbrowserclass::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
-}
-
-// init should be called after all the configuration is done but
-// before any other methods are called
-bool hlistbrowserclass::init (ostream &/*logout*/) {
-  return true;
-}
-
 // returns the name that specifies the browserclass type
 text_t hlistbrowserclass::get_browser_name () {
@@ -62 +54 @@
 }
 
+text_t hlistbrowserclass::get_default_formatstring () {
+  return "[link][highlight][Title][/highlight][/link]";
+}
+
+// need to change OID to it's child 
+void hlistbrowserclass::processOID (cgiargsclass &args, recptproto *collectproto,
+                    ostream &logout) {
+
+  text_t OID = args["d"];
+  bool is_classify = false;
+  if (OID.empty()) {
+    is_classify = true;
+    OID = args["cl"];
+  }
+
+  FilterResponse_t response;
+  text_tset metadata;
+  metadata.insert ("childtype");
+  text_t classifytype = "Invisible";
+  text_t child_doctype;
+
+  text_tarray OIDs;
+
+  while (classifytype == "Invisible") {
+    OIDs.erase (OIDs.begin(), OIDs.end());
+    
+    OIDs.push_back (OID);
+    OIDs.push_back (OID + ".fc");
+
+    get_info (OIDs, args["c"], metadata, false, collectproto, response, logout);
+
+    OID = response.docInfo[1].OID;
+    classifytype = response.docInfo[0].metadata["childtype"].values[0];
+  }
+  if (is_classify) args["cl"] = OID;
+  else args["d"] = OID;
+}
+
+int hlistbrowserclass::output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
+                         int colnumber, format_t *formatlistptr, 
+                         bool use_table, text_tset &metadata, bool &getParents,
+                         recptproto *collectproto, displayclass &disp, 
+                         outconvertclass &outconvert, ostream &textout, ostream &logout) {
+
+  // get all siblings
+  FilterResponse_t response;
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+  get_children (section.OID + ".pr", args["c"], metadata, getParents, 
+        collectproto, response, logout);
+
+                    
+  if (use_table || colnumber > 0) {
+    textout << "<table><tr><td>";
+    // get tab size
+    text_t tab; int itab;
+    disp.expandstring ("Global", "_tabwidth_", tab);
+    itab = tab.getint();
+    if (colnumber > 0) textout << outconvert << disp 
+                   << "<img src=\"_httpimg_/space.gif\" width=" 
+                   << (itab*colnumber) << ">";
+    textout << "</td>\n";
+  }
+
+  textout << "<table><tr>\n";
+
+  ResultDocInfo_tarray::iterator tsibling = response.docInfo.begin();
+  ResultDocInfo_tarray::iterator esibling = response.docInfo.end();
+
+  text_t icon, link;
+  while (tsibling != esibling) {
+
+    bool highlight = false;
+    textout << "<td>";
+
+    if ((*tsibling).OID == section.OID) {
+      link.clear();
+      highlight = true;
+    } else {
+      link = "<a href=\"_httpdocument_";
+      if (!arg_d.empty()) 
+    link += "&cl=" + arg_cl + "&d=" + (*tsibling).OID + "\">";
+      else 
+    link += "&cl=" + (*tsibling).OID + "\">";
+    }
+
+    textout << outconvert << disp << get_formatted_string (*tsibling, formatlistptr, link, icon, highlight);
+
+    textout << "</td>\n";
+    tsibling ++;
+  }
+
+  textout << "</tr></table>\n";
+  if (use_table  || colnumber > 0) textout << "</tr></table>\n";
+  return 0;
+}
+

trunk/gsdl/src/recpt/hlistbrowserclass.h

@@ -39 +39 @@
   virtual ~hlistbrowserclass ();
 
-  // configure should be called once for each configuration line
-  virtual void configure (const text_t &key, const text_tarray &cfgline);
-
-  // init should be called after all the configuration is done but
-  // before any other methods are called
-  virtual bool init (ostream &logout);
-
   // returns the name that specifies the browserclass type
   virtual text_t get_browser_name ();
+
+  text_t get_default_formatstring ();
+  
+  void processOID (cgiargsclass &args, recptproto *collectproto,
+           ostream &logout);
+
+  int output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
+                int colnumber, format_t *formatlistptr, 
+                bool use_table, text_tset &metadata, bool &getParents,
+                recptproto *collectproto, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, 
+                ostream &logout);
+
 };
 
 #endif
+

trunk/gsdl/src/recpt/invbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.2  1999/10/14 22:59:34  sjboddie
+   finished off browser classes
+
    Revision 1.1  1999/10/10 08:28:06  sjboddie
    - metadata now returns map rather than array
@@ -45 +48 @@
 }
 
-
-
-// configure should be called once for each configuration line
-// the default version does nothing
-void invbrowserclass::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
-}
-
-// init should be called after all the configuration is done but
-// before any other methods are called
-bool invbrowserclass::init (ostream &/*logout*/) {
-  return true;
-}
-
 // returns the name that specifies the browserclass type
 text_t invbrowserclass::get_browser_name () {
   return "Invisible";
 }
-
-// this browser class does nothing by default - it should
-// be overridden for receptionists wanting to display 
-// 'Invisible' classifications in some way
-int invbrowserclass::output_section_group (const ResultDocInfo_t &/*section*/, cgiargsclass &/*args*/,
-                       const int &/*colnumber*/, format_t */*formatlistptr*/,
-                       const bool &/*use_table*/, displayclass &/*disp*/, 
-                       outconvertclass &/*outconvert*/, ostream &/*textout*/,
-                       ostream &/*logout*/) {
-  return 0;
-}

trunk/gsdl/src/recpt/invbrowserclass.h

@@ -36 +36 @@
 
 public:
+
+  // this browser class does nothing by default - it should
+  // be overridden for receptionists wanting to display 
+  // 'Invisible' classifications in some way
+
   invbrowserclass ();
   virtual ~invbrowserclass ();
-
-  // configure should be called once for each configuration line
-  virtual void configure (const text_t &key, const text_tarray &cfgline);
-
-  // init should be called after all the configuration is done but
-  // before any other methods are called
-  virtual bool init (ostream &logout);
 
   // returns the name that specifies the browserclass type
   virtual text_t get_browser_name ();
 
-  int output_section_group (const ResultDocInfo_t &section, cgiargsclass &args,
-                const int &colnumber, format_t *formatlistptr, 
-                const bool &use_table, displayclass &disp, 
-                outconvertclass &outconvert, ostream &textout, 
-                ostream &logout);
 };
 

trunk/gsdl/src/recpt/vlistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.2  1999/10/14 22:59:34  sjboddie
+   finished off browser classes
+
    Revision 1.1  1999/10/10 08:14:11  sjboddie
    - metadata now returns mp rather than array
@@ -46 +49 @@
 }
 
-
-
-// configure should be called once for each configuration line
-// the default version does nothing
-void vlistbrowserclass::configure (const text_t &/*key*/, const text_tarray &/*cfgline*/) {
-}
-
-// init should be called after all the configuration is done but
-// before any other methods are called
-bool vlistbrowserclass::init (ostream &/*logout*/) {
-  return true;
-}
-
 // returns the name that specifies the browserclass type
 text_t vlistbrowserclass::get_browser_name () {
@@ -64 +54 @@
 }
 
-void vlistbrowserclass::processOID (cgiargsclass &/*args*/) {
-}
-
 void vlistbrowserclass::load_metadata_defaults (text_tset &metadata) {
   metadata.insert ("haschildren");
   metadata.insert ("doctype");
-  metadata.insert ("classifytype");
+}
+
+text_t vlistbrowserclass::get_default_formatstring () {
+  return "<td>[link][icon][/link]</td><td>[highlight]{Or}{[Title],Untitled}[/highlight]</td>";
 }
 
 int vlistbrowserclass::output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
-                         const int &colnumber, format_t *formatlistptr, 
-                         const bool &use_table, displayclass &disp, 
-                         outconvertclass &outconvert, ostream &textout, 
-                         ostream &logout) {
+                         int colnumber, format_t *formatlistptr, 
+                         bool use_table, text_tset &/*metadata*/, bool &/*getParents*/,
+                         recptproto */*collectproto*/, displayclass &disp, 
+                         outconvertclass &outconvert, ostream &textout, ostream &/*logout*/) {
 
   text_t link, icon;
   get_link_icon (section, args, link, icon);
-
-  output_section (section, colnumber, formatlistptr, use_table, 
-          link, icon, disp, outconvert, textout, logout);
-  
-  return 1;
-}
-
-void vlistbrowserclass::output_section (ResultDocInfo_t &section, const int &colnumber, 
-                    format_t *formatlistptr, const bool &use_table, 
-                    const text_t &link, const text_t &icon, 
-                    displayclass &disp, outconvertclass &outconvert, 
-                    ostream &textout, ostream &logout) {
-                    
+  bool highlight = false;
+  if (!args["d"].empty()) {
+    if (args["d"] == section.OID) highlight = true;
+  } else 
+    if (args["cl"] == section.OID) highlight = true;
+
+
   if (use_table || colnumber > 0) {
-    textout << "<table><tr><td>";
+    textout << "<table><tr>";
     // get tab size
     text_t tab; int itab;
@@ -101 +85 @@
     itab = tab.getint();
     if (colnumber > 0) textout << outconvert << disp 
-                   << "<img src=\"_httpimg_/space.gif\" width=" 
-                   << (itab*colnumber) << ">";
-    textout << "</td>";
-  }
-
-  textout << outconvert << disp << get_formatted_string (section, formatlistptr, link, icon);
-
+                   << "<td><img src=\"_httpimg_/space.gif\" width=" 
+                   << (itab*colnumber) << "></td>";
+  }
+
+  textout << outconvert << disp << get_formatted_string (section, formatlistptr, 
+                             link, icon, highlight);
+  
   if (use_table  || colnumber > 0) textout << "</tr></table>\n";
+
+  return 1;
+}
+
+int vlistbrowserclass::output_section_group (FilterResponse_t &sections, cgiargsclass &args,
+                         int colnumber, format_t *formatlistptr, 
+                         bool use_table, text_tset &/*metadata*/, bool &/*getParents*/,
+                         recptproto */*collectproto*/, displayclass &disp, 
+                         outconvertclass &outconvert, ostream &textout, ostream &/*logout*/) {
+
+  text_t link, icon;
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
+
+  if (colnumber > 0) {
+    textout << "<table><tr>";
+    // get tab size
+    text_t tab; int itab;
+    disp.expandstring ("Global", "_tabwidth_", tab);
+    itab = tab.getint();
+    if (colnumber > 0) textout << outconvert << disp 
+                   << "<td><img src=\"_httpimg_/space.gif\" width=" 
+                   << (itab*colnumber) << "></td>";
+    textout << "<td>";
+  }
+  if (use_table) textout << "<table>\n";
+
+  ResultDocInfo_tarray::iterator thissection = sections.docInfo.begin();
+  ResultDocInfo_tarray::iterator endsection = sections.docInfo.end();
+
+  while (thissection != endsection) {
+
+    get_link_icon (*thissection, args, link, icon);
+    bool highlight = false;
+    if (!arg_d.empty()) {
+      if (arg_d == (*thissection).OID) highlight = true;
+    } else 
+      if (arg_cl == (*thissection).OID) highlight = true;
+
+    if (use_table || colnumber > 0) textout << "<tr>";
+    textout << outconvert << disp << get_formatted_string (*thissection, formatlistptr, 
+                               link, icon, highlight);
+    if (use_table || colnumber > 0) textout << "</tr>";
+    textout << "\n";
+    thissection ++;
+  }
+
+  if (use_table) textout << "</table>\n";
+  if (colnumber > 0) textout << "</table></td></tr></table>\n";
+
+  return 1;
 }
 
@@ -119 +154 @@
   link = "<a href=\"_httpdocument_";
   icon = "_document:icontext_";
-  int haschildren = section.metadata["haschildren"].values.back().getint();
-  const text_t doctype = section.metadata["doctype"].values.back();
+  int haschildren = section.metadata["haschildren"].values[0].getint();
+  const text_t doctype = section.metadata["doctype"].values[0];
+
+  text_t &arg_d = args["d"];
+  text_t &arg_cl = args["cl"];
 
   if (args["a"] == "q") {
@@ -128 +166 @@
     link += "&cl=search&d=" + section.OID + "\">";
 
-  } else if (!args["d"].empty()) {
+  } else if (!arg_d.empty()) {
     // document level
     if (is_top(section.OID)) {
       icon = "_document:iconopenbook_";
-      if (args["cl"] == "search") link = "<a href=\"_httpquery_\">";
-      else link += "&cl=" + args["cl"] + "&d=" + section.OID + ".pr\">";
+      if (arg_cl == "search") link = "<a href=\"_httpquery_\">";
+      else link += "&cl=" + arg_cl + "\">";
     
     } else if (haschildren == 1) {
-      if ((args["gc"] == "1") || (is_child_of (section.OID, args["d"]))) {
+      if ((args["gc"] == "1") || 
+      (is_child_of (section.OID, arg_d)) ||
+      (section.OID == arg_d)) {
     icon = "_document:iconopenfolder_";
-    link += "&cl=" + args["cl"] + "&d=" + section.OID + ".pr\">";
+    link += "&cl=" + arg_cl + "&d=" + section.OID + ".pr\">";
       } else {
     icon = "_document:iconclosedfolder_";
-    link += "&cl=" + args["cl"] + "&d=" + section.OID + "\">";
+    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
       }
-    } else link += "&cl=" + args["cl"] + "&d=" + section.OID + "\">";
+    } else link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
 
   } else {
@@ -149 +189 @@
     if (haschildren == 1) {
       if (doctype == "classify") {
-    if ((args["gc"] == "1") || (is_child_of (section.OID, args["cl"]))) {
+    if ((args["gc"] == "1") || 
+        (is_child_of (section.OID, arg_cl)) || 
+        (section.OID == arg_cl)) {
       icon = "_document:iconopenbookshelf_";
       link += "&cl=" + section.OID + ".pr\">";
@@ -158 +200 @@
       } else {
     icon = "_document:iconclosedbook_";
-    link += "&cl=" + args["cl"] + "&d=" + section.OID + "\">";
+    link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
       }
     } else {
       if (doctype == "classify") link = "";
-      else link += "&cl=" + args["cl"] + "&d=" + section.OID + "\">";
+      else link += "&cl=" + arg_cl + "&d=" + section.OID + "\">";
     }
   }

trunk/gsdl/src/recpt/vlistbrowserclass.h

@@ -39 +39 @@
   virtual ~vlistbrowserclass ();
 
-  // configure should be called once for each configuration line
-  virtual void configure (const text_t &key, const text_tarray &cfgline);
-
-  // init should be called after all the configuration is done but
-  // before any other methods are called
-  virtual bool init (ostream &logout);
-
-  // returns the name that specifies the browserclass type
   virtual text_t get_browser_name ();
-
-  void processOID (cgiargsclass &/*args*/);
 
   void load_metadata_defaults (text_tset &metadata);
 
+  text_t get_default_formatstring ();
+
   int output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
-                const int &colnumber, format_t *formatlistptr, 
-                const bool &use_table, displayclass &disp, 
-                outconvertclass &outconvert, ostream &textout, 
-                ostream &logout);
+                int colnumber, format_t *formatlistptr, 
+                bool use_table, text_tset &metadata, bool &getParents,
+                recptproto *collectproto, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, ostream &logout);
+
+  int output_section_group (FilterResponse_t &sections, cgiargsclass &args,
+                int colnumber, format_t *formatlistptr, 
+                bool use_table, text_tset &metadata, bool &getParents,
+                recptproto *collectproto, displayclass &disp, 
+                outconvertclass &outconvert, ostream &textout, ostream &logout);
 
 protected:
-  void output_section (ResultDocInfo_t &section, const int &colnumber, 
-               format_t *formatlistptr, const bool &use_table, 
-               const text_t &link, const text_t &icon, 
-               displayclass &disp, outconvertclass &outconvert, 
-               ostream &textout, ostream &logout);
 
   void get_link_icon (ResultDocInfo_t &section, cgiargsclass &args,