Changeset 12044
- Timestamp:
- 2006-07-07T00:52:39+12:00 (18 years ago)
- Location:
- trunk/gsdl/src/recpt
- Files:
-
- 2 added
- 2 deleted
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/Makefile.in
r11998 r12044 149 149 150 150 COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \ 151 converter.h recptconfig.h cgiutils.h OIDtools.h browsetools .h \151 converter.h recptconfig.h cgiutils.h OIDtools.h browsetoolsclass.h \ 152 152 statusaction.h pageaction.h comtypes.h recptproto.h \ 153 153 pingaction.h queryaction.h documentaction.h \ … … 171 171 172 172 COMMONSOURCES = receptionist.cpp cgiwrapper.cpp cgiargs.cpp action.cpp browserclass.cpp \ 173 converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetools .cpp \173 converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \ 174 174 statusaction.cpp pageaction.cpp comtypes.cpp \ 175 175 recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \ … … 204 204 205 205 COMMONOBJECTS = receptionist.o cgiwrapper.o cgiargs.o action.o browserclass.o \ 206 converter.o recptconfig.o cgiutils.o OIDtools.o browsetools .o \206 converter.o recptconfig.o cgiutils.o OIDtools.o browsetoolsclass.o \ 207 207 statusaction.o pageaction.o comtypes.o \ 208 208 recptproto.o pingaction.o queryaction.o documentaction.o \ -
trunk/gsdl/src/recpt/documentaction.cpp
r11998 r12044 27 27 28 28 #include "documentaction.h" 29 #include "browsetools.h"30 29 #include "OIDtools.h" 31 30 #include "querytools.h" … … 33 32 #include "gsdltools.h" 34 33 #include "highlighttext.h" 34 #include "browsetoolsclass.h" 35 35 36 36 documentaction::documentaction () { 37 37 recpt = NULL; 38 39 38 40 39 // this action uses cgi variables "a", "d", "cl", … … 181 180 } 182 181 183 documentaction::~documentaction () { 182 documentaction::~documentaction() 183 { 184 184 } 185 185 … … 984 984 985 985 986 bool documentaction::do_action 987 988 989 ostream &logout) { 990 986 bool documentaction::do_action(cgiargsclass &args, recptprotolistclass *protos, 987 browsermapclass *browsers, displayclass &disp, 988 outconvertclass &outconvert, ostream &textout, 989 ostream &logout) 990 { 991 991 // must have a valid collection server 992 992 recptproto *collectproto = protos->getrecptproto (args["c"], logout); … … 1036 1036 1037 1037 // output the table of contents 1038 output_toc (args, browsers, formatinfo, collectproto, 1039 disp, outconvert, textout, logout); 1038 browsetoolsclass b; 1039 b.output_toc(args, browsers, formatinfo, collectproto, 1040 disp, outconvert, textout, logout); 1040 1041 1041 1042 if (formatinfo.DocumentArrowsTop && !args["d"].empty()) { … … 1091 1092 1092 1093 if (formatinfo.AllowExtendedOptions) { 1093 load_extended_options(options, args, browsers, formatinfo, 1094 collectproto, disp, outconvert, logout); 1094 browsetoolsclass b; 1095 b.load_extended_options(options, args, browsers, formatinfo, 1096 collectproto, disp, outconvert, logout); 1095 1097 } 1096 1098 -
trunk/gsdl/src/recpt/vlistbrowserclass.cpp
r12001 r12044 27 27 #include <assert.h> 28 28 #include "OIDtools.h" 29 #include "browsetools .h"29 #include "browsetoolsclass.h" 30 30 31 31 vlistbrowserclass::vlistbrowserclass () { … … 63 63 } 64 64 65 int vlistbrowserclass::output_section_group (ResultDocInfo_t §ion, cgiargsclass &args, 66 const text_t &collection, int colnumber, 67 format_t *formatlistptr, bool use_table, 68 text_tset &/*metadata*/, bool &/*getParents*/, 69 recptproto * collectproto, displayclass &disp, 70 outconvertclass &outconvert, ostream &textout, 71 ostream& logout) { 72 65 int vlistbrowserclass::output_section_group(ResultDocInfo_t §ion, cgiargsclass &args, 66 const text_t &collection, int colnumber, 67 format_t *formatlistptr, bool use_table, 68 text_tset &metadata, bool &getParents, 69 recptproto * collectproto, displayclass &disp, 70 outconvertclass &outconvert, ostream &textout, 71 ostream& logout) 72 { 73 browsetoolsclass btools; 73 74 text_t link, icon; 74 75 75 text_t collink = collection; 76 76 … … 106 106 if (highlight) options["highlight"] = "1"; 107 107 else options["highlight"] = "0"; 108 options["DocImage"] = get_cover_image();108 options["DocImage"] = btools.get_cover_image(); 109 109 textout << outconvert << disp 110 110 << get_formatted_string (collection, collectproto, … … 121 121 } 122 122 123 int vlistbrowserclass::output_section_group (FilterResponse_t §ions, cgiargsclass &args, 124 const text_t &collection, int colnumber, 125 format_t *formatlistptr, bool use_table, 126 text_tset &/*metadata*/, bool &/*getParents*/, 127 recptproto * collectproto, displayclass &disp, 128 outconvertclass &outconvert, ostream &textout, 129 ostream& logout) { 130 123 int vlistbrowserclass::output_section_group(FilterResponse_t §ions, cgiargsclass &args, 124 const text_t &collection, int colnumber, 125 format_t *formatlistptr, bool use_table, 126 text_tset &/*metadata*/, bool &/*getParents*/, 127 recptproto * collectproto, displayclass &disp, 128 outconvertclass &outconvert, ostream &textout, 129 ostream& logout) 130 { 131 browsetoolsclass btools; 131 132 text_t link, icon; 132 133 text_t &arg_d = args["d"]; … … 168 169 options["icon"] = icon; 169 170 options["highlight"] = "0"; 170 options["DocImage"] = get_cover_image();171 options["DocImage"] = btools.get_cover_image(); 171 172 172 173 if ( thissection != endsection ) { // only if there are results (else corrupts display) … … 198 199 if (highlight) options["highlight"] = "1"; 199 200 else options["highlight"] = "0"; 200 options["DocImage"] = get_cover_image();201 options["DocImage"] = btools.get_cover_image(); 201 202 202 203 textout << outconvert << disp -
trunk/gsdl/src/recpt/win32.mak
r11257 r12044 55 55 LDFLAGS = 56 56 57 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 57 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE 58 58 INCLUDES = -I"$(GSDLHOME)\src\recpt" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \ 59 59 -I"$(GSDLHOME)\packages\mg" -I"$(GSDLHOME)\packages\mg\lib" \ … … 107 107 108 108 COMMONHEADERS = receptionist.h cgiargs.h action.h browserclass.h \ 109 converter.h recptconfig.h cgiutils.h OIDtools.h browsetools .h \109 converter.h recptconfig.h cgiutils.h OIDtools.h browsetoolsclass.h \ 110 110 statusaction.h pageaction.h comtypes.h recptproto.h pingaction.h \ 111 111 queryaction.h documentaction.h extlinkaction.h htmlutils.h \ … … 123 123 124 124 COMMONSOURCES = receptionist.cpp cgiargs.cpp action.cpp browserclass.cpp \ 125 converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetools .cpp \125 converter.cpp recptconfig.cpp cgiutils.cpp OIDtools.cpp browsetoolsclass.cpp \ 126 126 statusaction.cpp pageaction.cpp comtypes.cpp \ 127 127 recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \ … … 140 140 141 141 COMMONOBJECTS = receptionist.obj cgiargs.obj action.obj browserclass.obj \ 142 converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetools .obj \142 converter.obj recptconfig.obj cgiutils.obj OIDtools.obj browsetoolsclass.obj \ 143 143 statusaction.obj pageaction.obj comtypes.obj recptproto.obj \ 144 144 pingaction.obj queryaction.obj documentaction.obj extlinkaction.obj \
Note:
See TracChangeset
for help on using the changeset viewer.