Changeset 1079 for trunk


Ignore:
Timestamp:
2000-04-07T16:40:45+12:00 (24 years ago)
Author:
sjboddie
Message:

Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
separate development branch (New_Config_Format-branch) for now. The plan
is to redesign the configuration file format a bit and limit the number of
distributions floating around that take different configuration formats).

Location:
trunk/gsdl/src/recpt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/recpt/browsetools.cpp

    r1059 r1079  
    2929/*
    3030   $Log$
    31    Revision 1.41  2000/04/03 07:25:02  sjboddie
    32    replaced old DocumentIcon and DocumentContents format options
    33    with DocumentColumn stuff
    34 
    35    Revision 1.40  2000/03/31 03:04:30  nzdl
    36    tidied up some of the browsing code - replaced DocumentImages,
    37    DocumentTitles and DocumentHeading with DocumentIcon
     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).
    3837
    3938   Revision 1.39  2000/02/25 02:28:43  sjboddie
    … …  
    186185
    187186
     187// output_controls displays the detach, expand/contract contents,
     188// expand/contract text and highlighting/no highlighting buttons
     189
     190void 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
     245void 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
     255void 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
    188276static void recurse_contents (ResultDocInfo_t &section, cgiargsclass &args, bool fulltoc,
    189277                  browserclass *bptr, text_tset &metadata, bool &getParents,
    190278                  format_t *formatlistptr, format_tmap &formatlistmap,
    191                   text_tmap &formatstrings, browsermapclass *browsermap,
     279                  formatinfo_t &formatinfo, browsermapclass *browsermap,
    192280                  int tabcount, recptproto *collectproto, displayclass &disp,
    193281                  outconvertclass &outconvert, ostream &textout, ostream &logout) {
    … …  
    223311
    224312    // get the formatstring if there is one
    225     if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
     313    if (!get_formatstring (classification, classifytype,
     314               formatinfo.formatstrings, formatstring))
    226315      formatstring = bptr->get_default_formatstring();
    227316
    … …  
    242331    while (thisdoc != lastdoc) {
    243332      recurse_contents (*thisdoc, args, fulltoc, bptr, metadata, getParents,
    244             formatlistptr, formatlistmap, formatstrings, browsermap,
     333            formatlistptr, formatlistmap, formatinfo, browsermap,
    245334            tabcount, collectproto, disp, outconvert, textout, logout);
    246335      thisdoc ++;
    … …  
    257346// the current one
    258347
    259 static void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    260                    browsermapclass *browsermap, text_tmap &formatstrings,
    261                    recptproto *collectproto, displayclass &disp,
    262                    outconvertclass &outconvert, ostream &textout,
    263                    ostream &logout) {
     348void 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) {
    264353 
    265354  if (args["d"].empty() && args["cl"].empty()) return;
    … …  
    333422
    334423  // get the formatstring if there is one or use the browsers default
    335   if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
     424  if (!get_formatstring (classification, classifytype,
     425             formatinfo.formatstrings, formatstring))
    336426    formatstring = bptr->get_default_formatstring();
    337427
    … …  
    347437
    348438  recurse_contents (response.docInfo[0], args, fulltoc, bptr, metadata,
    349             getParents, formatlistptr, formatlistmap, formatstrings, browsermap,
     439            getParents, formatlistptr, formatlistmap, formatinfo, browsermap,
    350440            tabcount, collectproto, disp, outconvert, textout, logout);
    351441
    … …  
    362452static void load_formatstring (const text_t &classifytype, text_tset &metadata,
    363453                   bool &getParents, const text_t &classification,
    364                    browsermapclass *browsermap, text_tmap &formatstrings,
     454                   browsermapclass *browsermap, formatinfo_t &formatinfo,
    365455                   format_tmap &formatlistmap) {
    366456  text_t formatstring;
    … …  
    371461
    372462  // get the formatstring if there is one or use the browsers default
    373   if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
     463  if (!get_formatstring (classification, classifytype,
     464             formatinfo.formatstrings, formatstring))
    374465    formatstring = bptr->get_default_formatstring();
    375466
    … …  
    385476static void load_formatstrings (FilterResponse_t &response, text_tset &metadata,
    386477                bool &getParents, const text_t &classification,
    387                 browsermapclass *browsermap, text_tmap &formatstrings,
     478                browsermapclass *browsermap, formatinfo_t &formatinfo,
    388479                format_tmap &formatlistmap) {
    389480
    … …  
    397488    if (is_top ((*thisdoc).OID))
    398489      load_formatstring ((*thisdoc).metadata["thistype"].values[0], metadata,
    399              getParents, classification, browsermap, formatstrings,
     490             getParents, classification, browsermap, formatinfo,
    400491             formatlistmap);
    401492
    … …  
    404495    if (it == cache.end()) {
    405496      load_formatstring (childtype, metadata, getParents, classification,
    406              browsermap, formatstrings, formatlistmap);
     497             browsermap, formatinfo, formatlistmap);
    407498      cache.insert (childtype);
    408499    }
    … …  
    412503
    413504static void output_parents (FilterResponse_t &response, cgiargsclass &args,
    414                 browsermapclass *browsermap, text_tmap &formatstrings,
     505                browsermapclass *browsermap, formatinfo_t &formatinfo,
    415506                format_tmap &formatlistmap, const text_t &classification,
    416507                int &tabcount, text_tset &metadata, bool &getParents,
    … …  
    439530
    440531    // get the formatstring if there is one or use the browsers default
    441     if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
     532    if (!get_formatstring (classification, classifytype,
     533               formatinfo.formatstrings, formatstring))
    442534      formatstring = bptr->get_default_formatstring();
    443535   
    … …  
    459551}
    460552
    461 static void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc,
    462                  browsermapclass *browsermap, text_tmap &formatstrings,
    463                 recptproto *collectproto, displayclass &disp,
    464                 outconvertclass &outconvert, ostream &textout,
    465                 ostream &logout) {
     553void 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) {
    466558
    467559  FilterResponse_t response;
    … …  
    496588    format_tmap formatlistmap; 
    497589    load_formatstrings (response, metadata, getParents, classification,
    498             browsermap, formatstrings, formatlistmap);
     590            browsermap, formatinfo, formatlistmap);
    499591
    500592    if (!get_info (parents, args["c"], metadata, getParents, collectproto, response, logout))
    … …  
    502594   
    503595    // display each parent
    504     output_parents (response, args, browsermap, formatstrings, formatlistmap,
     596    output_parents (response, args, browsermap, formatinfo, formatlistmap,
    505597            classification, tabcount, metadata, getParents,
    506598            collectproto, disp, outconvert, textout, logout);
    … …  
    533625
    534626  // get the formatstring if there is one or use the browsers default
    535   if (!get_formatstring (classification, classifytype, formatstrings, formatstring))
     627  if (!get_formatstring (classification, classifytype,
     628             formatinfo.formatstrings, formatstring))
    536629    formatstring = bptr->get_default_formatstring();
    537630
    … …  
    560653
    561654void output_toc (cgiargsclass &args, browsermapclass *browsermap,
    562                  text_tmap &formatstrings, recptproto *collectproto,
     655                 formatinfo_t &formatinfo, recptproto *collectproto,
    563656                 displayclass &disp, outconvertclass &outconvert,
    564657                 ostream &textout, ostream &logout) {
    565658
    566659  int tabcount = 0;
     660  bool havecontrols = false;
    567661  bool fulltoc = false;
    568662
    … …  
    571665    text_t cl_top, full_toc;
    572666    get_top (args["cl"], cl_top);
    573     if (get_formatstring (cl_top, "FullTOC", formatstrings, full_toc))
     667    if (get_formatstring (cl_top, "FullTOC", formatinfo.formatstrings, full_toc))
    574668      if (full_toc == "true") fulltoc = true;
    575669  }
    576 
    577   if (args["gc"] == 1) {
     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) {
    578690     
    579     // expanded table of contents
    580     expanded_contents (args, tabcount, fulltoc, browsermap, formatstrings,
    581               collectproto, disp, outconvert, textout, logout);
    582   } else {
     691      // expanded table of contents
     692      expanded_contents (args, tabcount, fulltoc, browsermap, formatinfo,
     693            collectproto, disp, outconvert, textout, logout);
     694    } else {
    583695     
    584     // contracted table of contents
    585     contracted_contents (args, tabcount, fulltoc, browsermap, formatstrings,
    586              collectproto, disp, outconvert, textout, logout);
    587   }
    588 }
     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

  • trunk/gsdl/src/recpt/browsetools.h

    r1059 r1079  
    4040typedef map<text_t, format_t*, lttext_t> format_tmap;
    4141
     42void 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
     48void 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
    4254void output_toc (cgiargsclass &args, browsermapclass *browsermap,
    43                  text_tmap &formatstrings, recptproto *collectproto,
     55                 formatinfo_t &formatinfo, recptproto *collectproto,
    4456                 displayclass &disp, outconvertclass &outconvert,
    4557                 ostream &textout, ostream &logout);
    4658
     59void output_titles (cgiargsclass &args, recptproto *collectproto,
     60            formatinfo_t &formatinfo, displayclass &disp,
     61            outconvertclass &outconvert, ostream &textout,
     62            ostream &logout);
     63
     64void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
     65              recptproto *collectproto, displayclass &disp,
     66              outconvertclass &outconvert, ostream &textout,
     67              ostream &logout);
     68   
     69void output_cover_image (cgiargsclass &args, recptproto *collectproto,
     70             displayclass &disp, outconvertclass &outconvert,
     71             ostream &textout, ostream &logout);
     72
     73
    4774#endif

  • trunk/gsdl/src/recpt/documentaction.cpp

    r1059 r1079  
    2828/*
    2929   $Log$
    30    Revision 1.36  2000/04/03 07:26:28  sjboddie
    31    replaced old DocumentIcon and DocumentContents format options
    32    with DocumentColumn stuff
    33 
    34    Revision 1.35  2000/03/31 03:04:31  nzdl
    35    tidied up some of the browsing code - replaced DocumentImages,
    36    DocumentTitles and DocumentHeading with DocumentIcon
     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).
    3736
    3837   Revision 1.34  2000/02/15 22:53:49  kjm18
    … …  
    293292
    294293documentaction::~documentaction () {
    295 }
    296 
    297 
    298 // output_controls displays the detach, expand/contract contents,
    299 // expand/contract text and highlighting/no highlighting buttons
    300 void documentaction::output_controls (cgiargsclass &args, const text_tarray &ibuttons,
    301                       recptproto * /*collectproto*/, displayclass &disp,
    302                       outconvertclass &outconvert, ostream &textout,
    303                       ostream &/*logout*/) {
    304 
    305   if (args["u"] != "1") {
    306    
    307     FilterResponse_t response;
    308     text_tarray metadata;
    309     text_tarray buttons;
    310    
    311     text_tarray::const_iterator here = ibuttons.begin();
    312     text_tarray::const_iterator end = ibuttons.end();
    313    
    314     while (here != end) {
    315      
    316       if (*here == "Detach")
    317     buttons.push_back ("_document:imagedetach_");
    318       else if (*here == "Highlight") {
    319     if (args["hl"] == "1")
    320       buttons.push_back ("_document:imagenohighlight_");
    321     else
    322       buttons.push_back ("_document:imagehighlight_");
    323       } else if (*here == "Expand Contents") {
    324     if (args["gc"] == "1")
    325       buttons.push_back ("_document:imagecontracttoc_");
    326     else
    327       buttons.push_back ("_document:imageexpandtoc_");
    328       } else if (*here == "Expand Text") {
    329     if (args.getintarg("gt"))
    330       buttons.push_back ("_document:imagecontracttext_");
    331     else
    332       buttons.push_back ("_document:imageexpandtext_");
    333       }
    334       here ++;
    335     }
    336    
    337     here = buttons.begin();
    338     end = buttons.end();
    339     int count = 0;
    340     while (here != end) {
    341       if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
    342       textout << outconvert << disp << *here;
    343       count ++;
    344       here ++;
    345     }
    346   }
    347 }
    348 
    349 void documentaction::output_formatstring (const text_t &OID, const text_t &collection,
    350                       recptproto *collectproto, const text_t &formatstring,
    351                       displayclass &disp, outconvertclass &outconvert,
    352                       ostream &textout, ostream &logout) {
    353 
    354   if (OID.empty()) return;
    355  
    356   text_tset metadata;
    357   bool getParents;
    358   FilterResponse_t response;
    359 
    360   format_t *formatlistptr = new format_t();
    361   parse_formatstring (formatstring, formatlistptr, metadata, getParents);
    362 
    363   if (!get_info (OID, collection, metadata, getParents, collectproto, response, logout))
    364     return;
    365 
    366   textout << outconvert << disp << get_formatted_string (response.docInfo[0], formatlistptr);
    367 }
    368 
    369 // output_headerstring outputs a formatstring that may contain the
    370 // [Buttons] and [TOC] elements. It separates these elements out,
    371 // calling output_controls and output_toc respectively to process
    372 // the special elements. Calls output_formatstring to process the
    373 // remaining bits of formatstring
    374 void documentaction::output_headerstring (cgiargsclass &args, recptproto *collectproto,
    375                       const text_t &formatstring, browsermapclass *browsers,
    376                       displayclass &disp, outconvertclass &outconvert,
    377                       ostream &textout, ostream &logout) {
    378 
    379   text_t &OID = args["d"];
    380   if (OID.empty()) OID = args["cl"];
    381   text_t &collection = args["c"];
    382 
    383   text_t::const_iterator here = formatstring.begin();
    384   text_t::const_iterator end = formatstring.end();
    385 
    386   text_t currentstring;
    387   while (here != end) {
    388     if ((*here == '[') && (*(here+1) == 'B') && (*(here+2) == 'u') &&
    389     (*(here+3) == 't') && (*(here+4) == 't') && (*(here+5) == 'o') &&
    390     (*(here+6) == 'n') && (*(here+7) == 's') && (*(here+8) == ']')) {
    391       here += 8;
    392       if (!currentstring.empty()) {
    393     output_formatstring (OID, collection, collectproto, currentstring,
    394                  disp, outconvert, textout, logout);
    395     currentstring.clear();
    396       }
    397      
    398       output_controls (args, formatinfo.DocumentButtons, collectproto,
    399                disp, outconvert, textout, logout);
    400 
    401     } else if ((*here == '[') && (*(here+1) == 'T') && (*(here+2) == 'O') &&
    402     (*(here+3) == 'C') && (*(here+4) == ']')) {
    403       here += 4;
    404       if (!currentstring.empty()) {
    405     output_formatstring (OID, collection, collectproto, currentstring,
    406                  disp, outconvert, textout, logout);
    407     currentstring.clear();
    408       }
    409 
    410       output_toc (args, browsers, formatinfo.formatstrings, collectproto,
    411           disp, outconvert, textout, logout);
    412 
    413     } else {
    414       currentstring.push_back (*here);
    415     }
    416 
    417     here ++;
    418   }
    419 
    420   if (!currentstring.empty())
    421     output_formatstring (OID, collection, collectproto, currentstring,
    422              disp, outconvert, textout, logout);
    423294}
    424295
    … …  
    740611
    741612  while (format_here != format_end) {
    742     if ((*format_here).first == "DocumentColumns")
    743       formatinfo.DocumentColumns = (*format_here).second;
    744     else if ((*format_here).first == "DocumentColumnsTotalWidth")
    745       formatinfo.DocumentColumnsTotalWidth = (*format_here).second;
    746     else if ((*format_here).first == "DocumentColumnLeft")
    747       formatinfo.DocumentColumnLeft = (*format_here).second;
    748     else if ((*format_here).first == "DocumentColumnLeftWidth")
    749       formatinfo.DocumentColumnLeftWidth = (*format_here).second;
    750     else if ((*format_here).first == "DocumentColumnRight")
    751       formatinfo.DocumentColumnRight = (*format_here).second;
     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;
    752624    else if (((*format_here).first == "DocumentArrowsBottom") &&
    753625         ((*format_here).second == "false"))
    … …  
    977849    textout << outconvert << disp << "_document:header_\n"
    978850        << "_document:content_\n";
    979 
    980     // currently only display header information at document level,
    981     // this should probably be changed to handle stuff like CL1Columns
    982     if (!args["d"].empty()) {
    983       textout << outconvert << disp
    984           << "<p><center><table width=_pagewidth_><tr>\n"
    985           << "<td valign=top";
    986       if (formatinfo.DocumentColumns == "2") {
    987     textout << outconvert << disp
    988         << " width=" << formatinfo.DocumentColumnLeftWidth << ">\n";
    989     output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft,
    990                  browsers, disp, outconvert, textout, logout);
    991     textout << "\n</td><td valign=top>\n";
    992     output_headerstring (args, collectproto, formatinfo.DocumentColumnRight,
    993                  browsers, disp, outconvert, textout, logout);
    994       } else {
    995     textout << " width=100%>\n";
    996     output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft,
    997                  browsers, disp, outconvert, textout, logout);
    998       }
    999       textout << "\n</td></tr></table></center>\n";
    1000     } else {
    1001       // classification level
    1002       output_toc (args, browsers, formatinfo.formatstrings, collectproto,
    1003           disp, outconvert, textout, logout);
    1004     }
     851     
     852    // output the table of contents
     853    output_toc (args, browsers, formatinfo, collectproto,
     854        disp, outconvert, textout, logout);
    1005855   
    1006856    // output the document text
    … …  
    12481098  textout << outconvert << disp << buffer;
    12491099}
     1100
     1101
     1102
     1103
     1104
     1105
     1106
     1107
     1108
     1109
     1110

  • trunk/gsdl/src/recpt/documentaction.h

    r1059 r1079  
    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);
    5742
    5843  bool get_link (cgiargsclass &args, recptprotolistclass *protos,

  • trunk/gsdl/src/recpt/formattools.cpp

    r1059 r1079  
    2828/*
    2929   $Log$
    30    Revision 1.19  2000/04/03 07:28:24  sjboddie
    31    replaced old DocumentIcon and DocumentContents format options
    32    with DocumentColumn stuff
    33 
    34    Revision 1.18  2000/03/31 03:04:31  nzdl
    35    tidied up some of the browsing code - replaced DocumentImages,
    36    DocumentTitles and DocumentHeading with DocumentIcon
     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).
    3736
    3837   Revision 1.17  2000/01/26 20:10:31  sjboddie
    … …  
    132131
    133132void formatinfo_t::clear() {
    134   DocumentColumns = "2";
    135   DocumentColumnsTotalWidth = "_pagewidth_";
    136   DocumentColumnLeft = "[Title]<br>[Buttons]";
    137   DocumentColumnLeftWidth = "200";
    138   DocumentColumnRight = "[TOC]";
     133  DocumentImages = false;
     134  DocumentTitles = true;
     135  DocumentHeading = "{Or}{[parent(Top):Title],[Title],untitled}<br>";
     136  DocumentContents = true;
    139137  DocumentArrowsBottom = true;
    140138  DocumentButtons.erase (DocumentButtons.begin(), DocumentButtons.end());

  • trunk/gsdl/src/recpt/formattools.h

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