Changeset 16043

Show
Ignore:
Timestamp:
18.06.2008 13:23:27 (12 years ago)
Author:
mdewsnip
Message:

(Adding dynamic classifiers) Moved most of the code from output_section_group (ResultDocInfo?_t, ...) into output_section_group (FilterResponse?_t, ...) (which was empty), because the second case is needed for the dynamic classifiers.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/recpt/hlistbrowserclass.cpp

    r15418 r16043  
    2525 
    2626#include "hlistbrowserclass.h" 
    27 #include <assert.h> 
     27#include "OIDtools.h" 
    2828#include "recptprototools.h" 
    2929 
     
    9494                         recptproto *collectproto, displayclass &disp,  
    9595                         outconvertclass &outconvert, ostream &textout,  
    96                          ostream &logout) { 
    97  
     96                         ostream &logout) 
     97{ 
    9898  // expanded contents are going to cause some nasty recursions 
    9999  // so we'll only continue if being passed the current section 
     
    102102  // get all siblings 
    103103  FilterResponse_t response; 
    104   text_t &arg_cl = args["cl"]; 
    105104  get_children (section.OID + ".pr", args["c"], args["l"], metadata, getParents,  
    106105        collectproto, response, logout); 
    107106 
     107  return output_section_group (response, args, collection, colnumber, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout); 
     108} 
     109 
     110int hlistbrowserclass::output_section_group (FilterResponse_t &response, cgiargsclass &args, 
     111                         const text_t &collection, int colnumber,  
     112                         format_t * formatlistptr, bool use_table,  
     113                         text_tset &metadata, bool &getParents, 
     114                         recptproto * collectproto, displayclass &disp,  
     115                         outconvertclass &outconvert, ostream &textout,  
     116                         ostream &logout) 
     117{ 
    108118  /* use_table is set to true if the format string starts with <td> */ 
    109119  if (use_table || colnumber > 0) { 
     
    134144    text_t &doctype = (*tsibling).metadata["doctype"].values[0]; 
    135145 
    136     if ((*tsibling).OID == section.OID) { 
     146    if ((*tsibling).OID == args["cl"] || is_child_of ((*tsibling).OID, args["cl"])) { 
    137147      link.clear(); 
    138148      highlight = true;    
     
    142152    link += "&amp;cl=" + (*tsibling).OID + "\">"; 
    143153      else { 
    144     link += "&amp;cl=" + arg_cl + "&amp;d=" + (*tsibling).OID;// + "\">"; 
     154    link += "&amp;cl=" + args["cl"] + "&amp;d=" + (*tsibling).OID;// + "\">"; 
    145155    // [modification to allow default document detach settings -- kjdon] 
    146156    if (args["xx"]=="1") { 
     
    182192  return 0; 
    183193} 
    184  
    185 int hlistbrowserclass::output_section_group (FilterResponse_t &/*sections*/, cgiargsclass &/*args*/, 
    186                          const text_t &/*collection*/, int /*colnumber*/,  
    187                          format_t * /*formatlistptr*/, bool /*use_table*/,  
    188                          text_tset &/*metadata*/, bool &/*getParents*/, 
    189                          recptproto * /*collectproto*/, displayclass &/*disp*/,  
    190                          outconvertclass &/*outconvert*/, ostream &/*textout*/,  
    191                          ostream &/*logout*/) { 
    192   return 0; 
    193 }