Changeset 1084 for branches


Ignore:
Timestamp:
2000-04-10T11:16:49+12:00 (24 years ago)
Author:
sjboddie
Message:

Added DocumentColumns stuff to New_Config_Format-branch branch

Location:
branches/New_Config_Format-branch/gsdl/src/recpt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/New_Config_Format-branch/gsdl/src/recpt/browsetools.cpp

    r1079 r1084  
    2929/*
    3030   $Log$
    31    Revision 1.42  2000/04/07 04:40:43  sjboddie
    32    Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
    33    from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
    34    separate development branch (New_Config_Format-branch) for now. The plan
    35    is to redesign the configuration file format a bit and limit the number of
    36    distributions floating around that take different configuration formats).
     31   Revision 1.42.2.1  2000/04/09 23:16:44  sjboddie
     32   Added DocumentColumns stuff to New_Config_Format-branch branch
     33
     34   Revision 1.41  2000/04/03 07:25:02  sjboddie
     35   replaced old DocumentIcon and DocumentContents format options
     36   with DocumentColumn stuff
     37
     38   Revision 1.40  2000/03/31 03:04:30  nzdl
     39   tidied up some of the browsing code - replaced DocumentImages,
     40   DocumentTitles and DocumentHeading with DocumentIcon
    3741
    3842   Revision 1.39  2000/02/25 02:28:43  sjboddie
    … …  
    185189
    186190
    187 // output_controls displays the detach, expand/contract contents,
    188 // expand/contract text and highlighting/no highlighting buttons
    189 
    190 void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
    191               recptproto * /*collectproto*/, displayclass &disp,
    192               outconvertclass &outconvert, ostream &textout,
    193               ostream &/*logout*/) {
    194 
    195   if (args["u"] != "1") {
    196    
    197     FilterResponse_t response;
    198     text_tarray metadata;
    199     text_tarray buttons;
    200    
    201     text_tarray::const_iterator here = ibuttons.begin();
    202     text_tarray::const_iterator end = ibuttons.end();
    203    
    204     while (here != end) {
    205      
    206       if (*here == "Detach")
    207     buttons.push_back ("_document:imagedetach_");
    208       else if (*here == "Highlight") {
    209     if (args["hl"] == "1")
    210       buttons.push_back ("_document:imagenohighlight_");
    211     else
    212       buttons.push_back ("_document:imagehighlight_");
    213       } else if (*here == "Expand Contents") {
    214     if (args["gc"] == "1")
    215       buttons.push_back ("_document:imagecontracttoc_");
    216     else
    217       buttons.push_back ("_document:imageexpandtoc_");
    218       } else if (*here == "Expand Text") {
    219     if (args.getintarg("gt"))
    220       buttons.push_back ("_document:imagecontracttext_");
    221     else
    222       buttons.push_back ("_document:imageexpandtext_");
    223       }
    224       here ++;
    225     }
    226    
    227     here = buttons.begin();
    228     end = buttons.end();
    229     int count = 0;
    230     while (here != end) {
    231       if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
    232       textout << outconvert << disp << *here;
    233       count ++;
    234       here ++;
    235     }
    236   }
    237 }
    238 
    239 
    240 // at the moment this just writes out the html to display
    241 // the cover image (assuming it's called cover.jpg)
    242 // this whole thing should be done with a call to the collection
    243 // server which would send a link to the cover image if there
    244 // was one otherwise send title, author and stuff
    245 void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/,
    246              displayclass &disp, outconvertclass &outconvert,
    247              ostream &textout, ostream &/*logout*/) {
    248  
    249   if (args["d"].empty()) return;
    250  
    251   textout << outconvert << disp <<
    252     "<img src=\"_httpcollimg_/_thisOID_/cover.jpg\"><br>\n";
    253 }
    254 
    255 void output_titles (cgiargsclass &args, recptproto *collectproto,
    256             formatinfo_t &formatinfo, displayclass &disp,
    257             outconvertclass &outconvert, ostream &textout,
    258             ostream &logout) {
    259 
    260   if (args["d"].empty()) return;
    261  
    262   text_tset metadata;
    263   bool getParents;
    264   FilterResponse_t response;
    265 
    266   format_t *formatlistptr = new format_t();
    267   parse_formatstring (formatinfo.DocumentHeading, formatlistptr, metadata, getParents);
    268 
    269   if (!get_info (args["d"], args["c"], metadata, getParents, collectproto, response, logout))
    270     return;
    271 
    272   textout << outconvert << disp << get_formatted_string (response.docInfo[0], formatlistptr);
    273 }
    274 
    275 
    276191static void recurse_contents (ResultDocInfo_t &section, cgiargsclass &args, bool fulltoc,
    277192                  browserclass *bptr, text_tset &metadata, bool &getParents,
    278193                  format_t *formatlistptr, format_tmap &formatlistmap,
    279                   formatinfo_t &formatinfo, browsermapclass *browsermap,
     194                  text_tmap &formatstrings, browsermapclass *browsermap,
    280195                  int tabcount, recptproto *collectproto, displayclass &disp,
    281196                  outconvertclass &outconvert, ostream &textout, ostream &logout) {
    … …  
    311226
    312227    // get the formatstring if there is one
    313     if (!get_formatstring (classification, classifytype,
    314                formatinfo.formatstrings, formatstring))
     228    if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
    315229      formatstring = bptr->get_default_formatstring();
    316230
    … …  
    331245    while (thisdoc != lastdoc) {
    332246      recurse_contents (*thisdoc, args, fulltoc, bptr, metadata, getParents,
    333             formatlistptr, formatlistmap, formatinfo, browsermap,
     247            formatlistptr, formatlistmap, formatstrings, browsermap,
    334248            tabcount, collectproto, disp, outconvert, textout, logout);
    335249      thisdoc ++;
    … …  
    346260// the current one
    347261
    348 void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    349             browsermapclass *browsermap, formatinfo_t &formatinfo,
    350             recptproto *collectproto, displayclass &disp,
    351             outconvertclass &outconvert, ostream &textout,
    352             ostream &logout) {
     262static void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
     263                   browsermapclass *browsermap, text_tmap &formatstrings,
     264                   recptproto *collectproto, displayclass &disp,
     265                   outconvertclass &outconvert, ostream &textout,
     266                   ostream &logout) {
    353267 
    354268  if (args["d"].empty() && args["cl"].empty()) return;
    … …  
    422336
    423337  // get the formatstring if there is one or use the browsers default
    424   if (!get_formatstring (classification, classifytype,
    425              formatinfo.formatstrings, formatstring))
     338  if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
    426339    formatstring = bptr->get_default_formatstring();
    427340
    … …  
    437350
    438351  recurse_contents (response.docInfo[0], args, fulltoc, bptr, metadata,
    439             getParents, formatlistptr, formatlistmap, formatinfo, browsermap,
     352            getParents, formatlistptr, formatlistmap, formatstrings, browsermap,
    440353            tabcount, collectproto, disp, outconvert, textout, logout);
    441354
    … …  
    452365static void load_formatstring (const text_t &classifytype, text_tset &metadata,
    453366                   bool &getParents, const text_t &classification,
    454                    browsermapclass *browsermap, formatinfo_t &formatinfo,
     367                   browsermapclass *browsermap, text_tmap &formatstrings,
    455368                   format_tmap &formatlistmap) {
    456369  text_t formatstring;
    … …  
    461374
    462375  // get the formatstring if there is one or use the browsers default
    463   if (!get_formatstring (classification, classifytype,
    464              formatinfo.formatstrings, formatstring))
     376  if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
    465377    formatstring = bptr->get_default_formatstring();
    466378
    … …  
    476388static void load_formatstrings (FilterResponse_t &response, text_tset &metadata,
    477389                bool &getParents, const text_t &classification,
    478                 browsermapclass *browsermap, formatinfo_t &formatinfo,
     390                browsermapclass *browsermap, text_tmap &formatstrings,
    479391                format_tmap &formatlistmap) {
    480392
    … …  
    488400    if (is_top ((*thisdoc).OID))
    489401      load_formatstring ((*thisdoc).metadata["thistype"].values[0], metadata,
    490              getParents, classification, browsermap, formatinfo,
     402             getParents, classification, browsermap, formatstrings,
    491403             formatlistmap);
    492404
    … …  
    495407    if (it == cache.end()) {
    496408      load_formatstring (childtype, metadata, getParents, classification,
    497              browsermap, formatinfo, formatlistmap);
     409             browsermap, formatstrings, formatlistmap);
    498410      cache.insert (childtype);
    499411    }
    … …  
    503415
    504416static void output_parents (FilterResponse_t &response, cgiargsclass &args,
    505                 browsermapclass *browsermap, formatinfo_t &formatinfo,
     417                browsermapclass *browsermap, text_tmap &formatstrings,
    506418                format_tmap &formatlistmap, const text_t &classification,
    507419                int &tabcount, text_tset &metadata, bool &getParents,
    … …  
    530442
    531443    // get the formatstring if there is one or use the browsers default
    532     if (!get_formatstring (classification, classifytype,
    533                formatinfo.formatstrings, formatstring))
     444    if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
    534445      formatstring = bptr->get_default_formatstring();
    535446   
    … …  
    551462}
    552463
    553 void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    554               browsermapclass *browsermap, formatinfo_t &formatinfo,
    555               recptproto *collectproto, displayclass &disp,
    556               outconvertclass &outconvert, ostream &textout,
    557               ostream &logout) {
     464static void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
     465                 browsermapclass *browsermap, text_tmap &formatstrings,
     466                recptproto *collectproto, displayclass &disp,
     467                outconvertclass &outconvert, ostream &textout,
     468                ostream &logout) {
    558469
    559470  FilterResponse_t response;
    … …  
    588499    format_tmap formatlistmap; 
    589500    load_formatstrings (response, metadata, getParents, classification,
    590             browsermap, formatinfo, formatlistmap);
     501            browsermap, formatstrings, formatlistmap);
    591502
    592503    if (!get_info (parents, args["c"], metadata, getParents, collectproto, response, logout))
    … …  
    594505   
    595506    // display each parent
    596     output_parents (response, args, browsermap, formatinfo, formatlistmap,
     507    output_parents (response, args, browsermap, formatstrings, formatlistmap,
    597508            classification, tabcount, metadata, getParents,
    598509            collectproto, disp, outconvert, textout, logout);
    … …  
    625536
    626537  // get the formatstring if there is one or use the browsers default
    627   if (!get_formatstring (classification, classifytype,
    628              formatinfo.formatstrings, formatstring))
     538  if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
    629539    formatstring = bptr->get_default_formatstring();
    630540
    … …  
    653563
    654564void output_toc (cgiargsclass &args, browsermapclass *browsermap,
    655                  formatinfo_t &formatinfo, recptproto *collectproto,
     565                 text_tmap &formatstrings, recptproto *collectproto,
    656566                 displayclass &disp, outconvertclass &outconvert,
    657567                 ostream &textout, ostream &logout) {
    658568
    659569  int tabcount = 0;
    660   bool havecontrols = false;
    661570  bool fulltoc = false;
    662571
    … …  
    665574    text_t cl_top, full_toc;
    666575    get_top (args["cl"], cl_top);
    667     if (get_formatstring (cl_top, "FullTOC", formatinfo.formatstrings, full_toc))
     576    if (get_formatstring (cl_top, "FullTOC", formatstrings, full_toc))
    668577      if (full_toc == "true") fulltoc = true;
    669578  }
    670  
    671   // get the cover image (if there is one) and the control buttons
    672   // if we're inside a book
    673   if ((!fulltoc) && (!args["d"].empty())) {
    674     textout << "<p><table cellpadding=0 cellspacing=0><tr>\n";
    675     textout << "<td valign=top";
    676     if (formatinfo.DocumentContents) textout << " width=200>\n";
    677     else textout << " width=100%>\n";
    678     if (formatinfo.DocumentImages)
    679       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
    680     else if (formatinfo.DocumentTitles)
    681       output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
    682     output_controls (args, formatinfo.DocumentButtons, collectproto, disp,
    683              outconvert, textout, logout);
    684     textout << "</td><td valign=top>\n";
    685     havecontrols = true;
    686   }
    687 
    688   if (formatinfo.DocumentContents || args["d"].empty()) {
    689     if (args.getintarg("gc") == 1) {
     579
     580  if (args["gc"] == 1) {
    690581     
    691       // expanded table of contents
    692       expanded_contents (args, tabcount, fulltoc, browsermap, formatinfo,
     582    // expanded table of contents
     583    expanded_contents (args, tabcount, fulltoc, browsermap, formatstrings,
     584               collectproto, disp, outconvert, textout, logout);
     585  } else {
     586     
     587    // contracted table of contents
     588    contracted_contents (args, tabcount, fulltoc, browsermap, formatstrings,
    693589             collectproto, disp, outconvert, textout, logout);
    694     } else {
    695      
    696       // contracted table of contents
    697       contracted_contents (args, tabcount, fulltoc, browsermap, formatinfo,
    698                collectproto, disp, outconvert, textout, logout);
    699     }
    700   }
    701 
    702   if (havecontrols) textout << "</td></tr></table>\n";
    703 }
    704 
    705 
    706 
     590  }
     591}

  • branches/New_Config_Format-branch/gsdl/src/recpt/browsetools.h

    r1079 r1084  
    4040typedef map<text_t, format_t*, lttext_t> format_tmap;
    4141
    42 void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    43             browsermapclass *browsermap, formatinfo_t &formatinfo,
    44             recptproto *collectproto, displayclass &disp,
    45             outconvertclass &outconvert, ostream &textout,
    46             ostream &logout);
    47 
    48 void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    49               browsermapclass *browsermap, formatinfo_t &formatinfo,
    50               recptproto *collectproto, displayclass &disp,
    51               outconvertclass &outconvert, ostream &textout,
    52               ostream &logout);
    53 
    5442void output_toc (cgiargsclass &args, browsermapclass *browsermap,
    55                  formatinfo_t &formatinfo, recptproto *collectproto,
     43                 text_tmap &formatstrings, recptproto *collectproto,
    5644                 displayclass &disp, outconvertclass &outconvert,
    5745                 ostream &textout, ostream &logout);
    5846
    59 void output_titles (cgiargsclass &args, recptproto *collectproto,
    60             formatinfo_t &formatinfo, displayclass &disp,
    61             outconvertclass &outconvert, ostream &textout,
    62             ostream &logout);
    63 
    64 void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
    65               recptproto *collectproto, displayclass &disp,
    66               outconvertclass &outconvert, ostream &textout,
    67               ostream &logout);
    68    
    69 void output_cover_image (cgiargsclass &args, recptproto *collectproto,
    70              displayclass &disp, outconvertclass &outconvert,
    71              ostream &textout, ostream &logout);
    72 
    73 
    7447#endif

  • branches/New_Config_Format-branch/gsdl/src/recpt/documentaction.cpp

    r1079 r1084  
    2828/*
    2929   $Log$
    30    Revision 1.37  2000/04/07 04:40:44  sjboddie
    31    Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
    32    from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
    33    separate development branch (New_Config_Format-branch) for now. The plan
    34    is to redesign the configuration file format a bit and limit the number of
    35    distributions floating around that take different configuration formats).
     30   Revision 1.37.2.1  2000/04/09 23:16:46  sjboddie
     31   Added DocumentColumns stuff to New_Config_Format-branch branch
     32
     33   Revision 1.36  2000/04/03 07:26:28  sjboddie
     34   replaced old DocumentIcon and DocumentContents format options
     35   with DocumentColumn stuff
     36
     37   Revision 1.35  2000/03/31 03:04:31  nzdl
     38   tidied up some of the browsing code - replaced DocumentImages,
     39   DocumentTitles and DocumentHeading with DocumentIcon
    3640
    3741   Revision 1.34  2000/02/15 22:53:49  kjm18
    … …  
    292296
    293297documentaction::~documentaction () {
     298}
     299
     300
     301// output_controls displays the detach, expand/contract contents,
     302// expand/contract text and highlighting/no highlighting buttons
     303void documentaction::output_controls (cgiargsclass &args, const text_tarray &ibuttons,
     304                      recptproto * /*collectproto*/, displayclass &disp,
     305                      outconvertclass &outconvert, ostream &textout,
     306                      ostream &/*logout*/) {
     307
     308  if (args["u"] != "1") {
     309   
     310    FilterResponse_t response;
     311    text_tarray metadata;
     312    text_tarray buttons;
     313   
     314    text_tarray::const_iterator here = ibuttons.begin();
     315    text_tarray::const_iterator end = ibuttons.end();
     316   
     317    while (here != end) {
     318     
     319      if (*here == "Detach")
     320    buttons.push_back ("_document:imagedetach_");
     321      else if (*here == "Highlight") {
     322    if (args["hl"] == "1")
     323      buttons.push_back ("_document:imagenohighlight_");
     324    else
     325      buttons.push_back ("_document:imagehighlight_");
     326      } else if (*here == "Expand Contents") {
     327    if (args["gc"] == "1")
     328      buttons.push_back ("_document:imagecontracttoc_");
     329    else
     330      buttons.push_back ("_document:imageexpandtoc_");
     331      } else if (*here == "Expand Text") {
     332    if (args.getintarg("gt"))
     333      buttons.push_back ("_document:imagecontracttext_");
     334    else
     335      buttons.push_back ("_document:imageexpandtext_");
     336      }
     337      here ++;
     338    }
     339   
     340    here = buttons.begin();
     341    end = buttons.end();
     342    int count = 0;
     343    while (here != end) {
     344      if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
     345      textout << outconvert << disp << *here;
     346      count ++;
     347      here ++;
     348    }
     349  }
     350}
     351
     352void documentaction::output_formatstring (const text_t &OID, const text_t &collection,
     353                      recptproto *collectproto, const text_t &formatstring,
     354                      displayclass &disp, outconvertclass &outconvert,
     355                      ostream &textout, ostream &logout) {
     356
     357  if (OID.empty()) return;
     358 
     359  text_tset metadata;
     360  bool getParents;
     361  FilterResponse_t response;
     362
     363  format_t *formatlistptr = new format_t();
     364  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
     365
     366  if (!get_info (OID, collection, metadata, getParents, collectproto, response, logout))
     367    return;
     368
     369  textout << outconvert << disp << get_formatted_string (response.docInfo[0], formatlistptr);
     370}
     371
     372// output_headerstring outputs a formatstring that may contain the
     373// [Buttons] and [TOC] elements. It separates these elements out,
     374// calling output_controls and output_toc respectively to process
     375// the special elements. Calls output_formatstring to process the
     376// remaining bits of formatstring
     377void documentaction::output_headerstring (cgiargsclass &args, recptproto *collectproto,
     378                      const text_t &formatstring, browsermapclass *browsers,
     379                      displayclass &disp, outconvertclass &outconvert,
     380                      ostream &textout, ostream &logout) {
     381
     382  text_t &OID = args["d"];
     383  if (OID.empty()) OID = args["cl"];
     384  text_t &collection = args["c"];
     385
     386  text_t::const_iterator here = formatstring.begin();
     387  text_t::const_iterator end = formatstring.end();
     388
     389  text_t currentstring;
     390  while (here != end) {
     391    if ((*here == '[') && (*(here+1) == 'B') && (*(here+2) == 'u') &&
     392    (*(here+3) == 't') && (*(here+4) == 't') && (*(here+5) == 'o') &&
     393    (*(here+6) == 'n') && (*(here+7) == 's') && (*(here+8) == ']')) {
     394      here += 8;
     395      if (!currentstring.empty()) {
     396    output_formatstring (OID, collection, collectproto, currentstring,
     397                 disp, outconvert, textout, logout);
     398    currentstring.clear();
     399      }
     400     
     401      output_controls (args, formatinfo.DocumentButtons, collectproto,
     402               disp, outconvert, textout, logout);
     403
     404    } else if ((*here == '[') && (*(here+1) == 'T') && (*(here+2) == 'O') &&
     405    (*(here+3) == 'C') && (*(here+4) == ']')) {
     406      here += 4;
     407      if (!currentstring.empty()) {
     408    output_formatstring (OID, collection, collectproto, currentstring,
     409                 disp, outconvert, textout, logout);
     410    currentstring.clear();
     411      }
     412
     413      output_toc (args, browsers, formatinfo.formatstrings, collectproto,
     414          disp, outconvert, textout, logout);
     415
     416    } else {
     417      currentstring.push_back (*here);
     418    }
     419
     420    here ++;
     421  }
     422
     423  if (!currentstring.empty())
     424    output_formatstring (OID, collection, collectproto, currentstring,
     425             disp, outconvert, textout, logout);
    294426}
    295427
    … …  
    611743
    612744  while (format_here != format_end) {
    613     if (((*format_here).first == "DocumentImages") &&
    614     ((*format_here).second == "true"))
    615       formatinfo.DocumentImages = true;
    616     else if (((*format_here).first == "DocumentTitles") &&
    617          ((*format_here).second == "false"))
    618       formatinfo.DocumentTitles = false;
    619     else if ((*format_here).first == "DocumentHeading")
    620       formatinfo.DocumentHeading = (*format_here).second;
    621     else if (((*format_here).first == "DocumentContents") &&
    622          ((*format_here).second == "false"))
    623       formatinfo.DocumentContents = false;
     745    if ((*format_here).first == "DocumentColumns")
     746      formatinfo.DocumentColumns = (*format_here).second;
     747    else if ((*format_here).first == "DocumentColumnsTotalWidth")
     748      formatinfo.DocumentColumnsTotalWidth = (*format_here).second;
     749    else if ((*format_here).first == "DocumentColumnLeft")
     750      formatinfo.DocumentColumnLeft = (*format_here).second;
     751    else if ((*format_here).first == "DocumentColumnLeftWidth")
     752      formatinfo.DocumentColumnLeftWidth = (*format_here).second;
     753    else if ((*format_here).first == "DocumentColumnRight")
     754      formatinfo.DocumentColumnRight = (*format_here).second;
    624755    else if (((*format_here).first == "DocumentArrowsBottom") &&
    625756         ((*format_here).second == "false"))
    … …  
    849980    textout << outconvert << disp << "_document:header_\n"
    850981        << "_document:content_\n";
    851      
    852     // output the table of contents
    853     output_toc (args, browsers, formatinfo, collectproto,
    854         disp, outconvert, textout, logout);
     982
     983    // currently only display header information at document level,
     984    // this should probably be changed to handle stuff like CL1Columns
     985    if (!args["d"].empty()) {
     986      textout << outconvert << disp
     987          << "<p><center><table width=_pagewidth_><tr>\n"
     988          << "<td valign=top";
     989      if (formatinfo.DocumentColumns == "2") {
     990    textout << outconvert << disp
     991        << " width=" << formatinfo.DocumentColumnLeftWidth << ">\n";
     992    output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft,
     993                 browsers, disp, outconvert, textout, logout);
     994    textout << "\n</td><td valign=top>\n";
     995    output_headerstring (args, collectproto, formatinfo.DocumentColumnRight,
     996                 browsers, disp, outconvert, textout, logout);
     997      } else {
     998    textout << " width=100%>\n";
     999    output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft,
     1000                 browsers, disp, outconvert, textout, logout);
     1001      }
     1002      textout << "\n</td></tr></table></center>\n";
     1003    } else {
     1004      // classification level
     1005      output_toc (args, browsers, formatinfo.formatstrings, collectproto,
     1006          disp, outconvert, textout, logout);
     1007    }
    8551008   
    8561009    // output the document text
    … …  
    10981251  textout << outconvert << disp << buffer;
    10991252}
    1100 
    1101 
    1102 
    1103 
    1104 
    1105 
    1106 
    1107 
    1108 
    1109 
    1110 

  • branches/New_Config_Format-branch/gsdl/src/recpt/documentaction.h

    r1079 r1084  
    4040
    4141  receptionist *recpt;
     42
     43  void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
     44            recptproto *collectproto, displayclass &disp,
     45            outconvertclass &outconvert, ostream &textout,
     46            ostream &logout);
     47
     48  void output_formatstring (const text_t &OID, const text_t &collection,
     49                recptproto *collectproto, const text_t &formatstring,
     50                displayclass &disp, outconvertclass &outconvert,
     51                ostream &textout, ostream &logout);
     52
     53  void output_headerstring (cgiargsclass &args, recptproto *collectproto,
     54                const text_t &formatstring, browsermapclass *browsers,
     55                displayclass &disp, outconvertclass &outconvert,
     56                ostream &textout, ostream &logout);
    4257
    4358  bool get_link (cgiargsclass &args, recptprotolistclass *protos,

  • branches/New_Config_Format-branch/gsdl/src/recpt/formattools.cpp

    r1079 r1084  
    2828/*
    2929   $Log$
    30    Revision 1.20  2000/04/07 04:40:44  sjboddie
    31    Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
    32    from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
    33    separate development branch (New_Config_Format-branch) for now. The plan
    34    is to redesign the configuration file format a bit and limit the number of
    35    distributions floating around that take different configuration formats).
     30   Revision 1.20.2.1  2000/04/09 23:16:48  sjboddie
     31   Added DocumentColumns stuff to New_Config_Format-branch branch
     32
     33   Revision 1.19  2000/04/03 07:28:24  sjboddie
     34   replaced old DocumentIcon and DocumentContents format options
     35   with DocumentColumn stuff
     36
     37   Revision 1.18  2000/03/31 03:04:31  nzdl
     38   tidied up some of the browsing code - replaced DocumentImages,
     39   DocumentTitles and DocumentHeading with DocumentIcon
    3640
    3741   Revision 1.17  2000/01/26 20:10:31  sjboddie
    … …  
    131135
    132136void formatinfo_t::clear() {
    133   DocumentImages = false;
    134   DocumentTitles = true;
    135   DocumentHeading = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
    136   DocumentContents = true;
     137  DocumentColumns = "2";
     138  DocumentColumnsTotalWidth = "_pagewidth_";
     139  DocumentColumnLeft = "[Title]<br>[Buttons]";
     140  DocumentColumnLeftWidth = "200";
     141  DocumentColumnRight = "[TOC]";
    137142  DocumentArrowsBottom = true;
    138143  DocumentButtons.erase (DocumentButtons.begin(), DocumentButtons.end());

  • branches/New_Config_Format-branch/gsdl/src/recpt/formattools.h

    r1079 r1084  
    7676  formatinfo_t () {clear();}
    7777
    78   bool DocumentImages;
    79   bool DocumentTitles;
    80   text_t DocumentHeading;
    81   bool DocumentContents;
     78  text_t DocumentColumns;
     79  text_t DocumentColumnsTotalWidth;
     80  text_t DocumentColumnLeft;
     81  text_t DocumentColumnLeftWidth;
     82  text_t DocumentColumnRight;
    8283  bool DocumentArrowsBottom;
    8384  text_tarray DocumentButtons;
Note: See TracChangeset for help on using the changeset viewer.