Changeset 3168 for trunk/protemix/src


Ignore:
Timestamp:
2002-06-23T22:58:30+12:00 (22 years ago)
Author:
sjboddie
Message:

* empty log message *

Location:
trunk/protemix/src/recpt
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/protemix/src/recpt/Makefile.in

    r3167 r3168  
    6565    $(COMPILE) $<
    6666
    67 HEADERS = ptmxqueryaction.h
     67HEADERS = ptmxqueryaction.h ptmxdocaction.h
    6868
    69 SOURCES = ptmxmain.cpp ptmxqueryaction.cpp browsetools.cpp
     69SOURCES = ptmxmain.cpp ptmxqueryaction.cpp ptmxdocaction.cpp browsetools.cpp
    7070
    71 OBJECTS = ptmxmain.o ptmxqueryaction.o browsetools.o
     71OBJECTS = ptmxmain.o ptmxqueryaction.o ptmxdocaction.o browsetools.o
    7272
    7373EXEC    = ptmx
  • trunk/protemix/src/recpt/browsetools.cpp

    r3167 r3168  
    2323 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2424 *
    25  * $Id$
    2625 *
    2726 *********************************************************************/
     
    3837              ostream &/*logout*/) {
    3938
    40   if (args["u"] != "1") {
    41    
    42     FilterResponse_t response;
    43     text_tarray metadata;
    44     text_tarray buttons;
    45    
    46     text_tarray::const_iterator here = ibuttons.begin();
    47     text_tarray::const_iterator end = ibuttons.end();
    48    
    49     while (here != end) {
    50      
    51       if (*here == "Detach")
    52     buttons.push_back ("_document:imagedetach_");
    53       else if (*here == "Highlight") {
    54     if (args["hl"] == "1")
    55       buttons.push_back ("_document:imagenohighlight_");
    56     else
    57       buttons.push_back ("_document:imagehighlight_");
    58       } else if (*here == "Expand Contents") {
    59     if (args["gc"] == "1")
    60       buttons.push_back ("_document:imagecontracttoc_");
    61     else
    62       buttons.push_back ("_document:imageexpandtoc_");
    63       } else if (*here == "Expand Text") {
    64     if (args.getintarg("gt"))
    65       buttons.push_back ("_document:imagecontracttext_");
    66     else
    67       buttons.push_back ("_document:imageexpandtext_");
    68       }
    69       here ++;
    70     }
    71    
    72     here = buttons.begin();
    73     end = buttons.end();
    74     int count = 0;
    75     while (here != end) {
    76       if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
    77       textout << outconvert << disp << *here;
    78       count ++;
    79       here ++;
    80     }
    81   }
    82 }
    83 
     39  textout << outconvert << disp
     40      << "_document:imagepagepdf_"
     41      << "_document:imagearticlepdf_"
     42      << "_document:imagedetach_";
     43  if (args["hl"] == "1") {
     44    textout << outconvert << disp << "_document:imagenohighlight_";
     45  } else {
     46    textout << outconvert << disp << "_document:imagehighlight_";
     47  }
     48}
    8449
    8550// at the moment this just writes out the html to display
     
    765730  if ((!fulltoc) && (!args["d"].empty())) {
    766731    textout << "<center>\n";
    767     textout << outconvert << disp << "<p><table width=_pagewidth_ cellpadding=0 cellspacing=0><tr>\n";
    768     textout << "<td valign=top align=left";
    769     if (formatinfo.DocumentContents) textout << " width=200>\n";
    770     else textout << " width=100%>\n";
    771     if (formatinfo.DocumentImages)
    772       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
    773     else if (formatinfo.DocumentTitles)
    774       output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
    775     if (args["u"] != "1") {
    776       output_controls (args, formatinfo.DocumentButtons, collectproto, disp,
    777                outconvert, textout, logout);
    778     }
    779     textout << "</td><td valign=top>\n"; 
     732    textout << outconvert << disp
     733        << "<p><table width=\"_pagewidth_\" cellpadding=\"0\" cellspacing=\"0\">\n"
     734        << "<tr valign=\"top\">\n"
     735        << "<td>\n";
     736    output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
     737    textout << "</td></tr>\n"
     738        << "<tr><td>\n";
    780739    havecontrols = true;
    781740  }
     
    800759  }
    801760
    802   if (havecontrols) textout << "</td></tr></table></center>\n";
    803 
    804   //if there is a format specified in the config file then
    805   //try to display the related documents (may not be displayed
    806   //if preference file does not indicate a wish to display
    807   //related documents.
    808   if (!formatinfo.RelatedDocuments.empty())
    809     output_related_docs(args, collectproto, formatinfo, disp, outconvert, textout, logout);
    810  
    811 }
    812 
     761  if (havecontrols) {
     762    textout << "</td></tr>\n"
     763        << "<tr><td>\n";
     764    output_controls (args, formatinfo.DocumentButtons, collectproto, disp,
     765             outconvert, textout, logout);
     766    textout << "</td></tr></table></center>\n";
     767  }
     768}
     769
  • trunk/protemix/src/recpt/ptmxmain.cpp

    r3167 r3168  
    4343#include "pageaction.h"
    4444#include "ptmxqueryaction.h"
    45 #include "documentaction.h"
     45#include "ptmxdocaction.h"
    4646#include "extlinkaction.h"
    4747#include "phindaction.h"
     
    8484  recpt.add_action (&aqueryaction);
    8585
    86   documentaction adocumentaction;
     86  ptmxdocaction adocumentaction;
    8787  adocumentaction.set_receptionist (&recpt);
    8888  recpt.add_action (&adocumentaction);
  • trunk/protemix/src/recpt/ptmxqueryaction.h

    r3162 r3168  
    2626
    2727
    28 #ifndef PTMXQUERYDOCACTION_H
     28#ifndef PTMXQUERYACTION_H
    2929#define PTMXQUERYACTION_H
    3030
Note: See TracChangeset for help on using the changeset viewer.