Ignore:
Timestamp:
2000-02-17T15:42:25+13:00 (24 years ago)
Author:
sjboddie
Message:

minor stuff - fixed some cvs conflicts

File:
1 edited

Legend:

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

    r928 r941  
    2929/*
    3030   $Log$
     31   Revision 1.38  2000/02/17 02:42:24  sjboddie
     32   minor stuff - fixed some cvs conflicts
     33
    3134   Revision 1.37  2000/02/15 22:53:47  kjm18
    3235   search history stuff added.
     
    230233// server which would send a link to the cover image if there
    231234// was one otherwise send title, author and stuff
    232  void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/,
    233                 displayclass &disp, outconvertclass &outconvert,
    234                 ostream &textout, ostream &/*logout*/) {
     235void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/,
     236             displayclass &disp, outconvertclass &outconvert,
     237             ostream &textout, ostream &/*logout*/) {
    235238 
    236239  if (args["d"].empty()) return;
     
    238241  textout << outconvert << disp <<
    239242    "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
    240  }
    241 
    242  void output_titles (cgiargsclass &args, recptproto *collectproto,
    243                formatinfo_t &formatinfo, displayclass &disp,
    244                outconvertclass &outconvert, ostream &textout,
    245                ostream &logout) {
     243}
     244
     245void output_titles (cgiargsclass &args, recptproto *collectproto,
     246            formatinfo_t &formatinfo, displayclass &disp,
     247            outconvertclass &outconvert, ostream &textout,
     248            ostream &logout) {
    246249
    247250  if (args["d"].empty()) return;
    248 
     251 
    249252  text_tset metadata;
    250253  bool getParents;
     
    622625    get_children (OID, args["c"], metadata, getParents,
    623626          collectproto, response, logout);
    624   else
     627  else if (!is_top(OID)) {
    625628    get_children (OID + ".pr", args["c"], metadata, getParents,
    626629          collectproto, response, logout);
     630    haschildren = true;
     631  }
    627632
    628633  // display children
    629   bool use_table = is_table_content (formatlistptr);
    630   bptr->output_section_group (response, args, "", tabcount, formatlistptr, use_table,
    631                   metadata, getParents, collectproto, disp, outconvert,
    632                   textout, logout);
     634  if (haschildren) {
     635    bool use_table = is_table_content (formatlistptr);
     636    bptr->output_section_group (response, args, "", tabcount, formatlistptr, use_table,
     637                metadata, getParents, collectproto, disp, outconvert,
     638                textout, logout);
     639  }
    633640 
    634641  delete formatlistptr;
Note: See TracChangeset for help on using the changeset viewer.