Changeset 1419 for trunk/gsdl/src/recpt
- Timestamp:
- 2000-08-17T17:07:43+12:00 (24 years ago)
- Location:
- trunk/gsdl/src/recpt
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/Makefile.in
r1385 r1419 78 78 userdb.h usersaction.h vlistbrowserclass.h hlistbrowserclass.h \ 79 79 datelistbrowserclass.h invbrowserclass.h pagedbrowserclass.h \ 80 htmlbrowserclass.h delhistoryaction.h historydb.h 80 htmlbrowserclass.h delhistoryaction.h historydb.h collectoraction.h 81 81 82 82 RECEPTHEADERS = … … 95 95 vlistbrowserclass.cpp hlistbrowserclass.cpp datelistbrowserclass.cpp \ 96 96 invbrowserclass.cpp pagedbrowserclass.cpp htmlbrowserclass.cpp \ 97 delhistoryaction.cpp historydb.cpp 97 delhistoryaction.cpp historydb.cpp collectoraction.cpp 98 98 99 99 … … 115 115 hlistbrowserclass.o datelistbrowserclass.o invbrowserclass.o \ 116 116 pagedbrowserclass.o htmlbrowserclass.o delhistoryaction.o \ 117 historydb.o parse.yy.o 117 historydb.o parse.yy.o collectoraction.o 118 118 119 119 RECPTOBJECTS = recptmain.o -
trunk/gsdl/src/recpt/documentaction.cpp
r1348 r1419 256 256 } 257 257 258 // set_navbarmacros sets _navigationbar_ , _javaimagesnavbar_and _httpbrowseXXX_ macros258 // set_navbarmacros sets _navigationbar_ and _httpbrowseXXX_ macros 259 259 // reponse contains 1 metadata field (Title) 260 260 void documentaction::set_navbarmacros (displayclass &disp, FilterResponse_t &response, 261 261 cgiargsclass &args) { 262 262 263 text_t javaimagesnavbar,topparent;263 text_t topparent; 264 264 text_t &arg_d = args["d"]; 265 265 text_t navigationbar = "<!-- Navigation Bar -->\n"; … … 275 275 } else { 276 276 navigationbar += "_imagesearch_"; 277 javaimagesnavbar = "_javasearch_";278 277 } 279 278 … … 307 306 } 308 307 } 309 if (!unknown) javaimagesnavbar += "_java" + title + "_";310 308 dochere ++; 311 309 } … … 313 311 navigationbar += "<!-- End of Navigation Bar -->\n"; 314 312 disp.setmacro ("navigationbar", "Global", navigationbar); 315 if (args.getintarg("v") == 0)316 disp.setmacro ("javaimagesnavbar", "Global", javaimagesnavbar);317 313 } 318 314 … … 333 329 // are Title and Creator classifications _httpbrowseTitle_ 334 330 // and _httpbrowseCreator_ will be set 335 336 // _javaimagesnavbar_ this is the javascript code to shove in to make the337 // flashy images used by _navigationbar_ work338 331 339 332 // _widthtspace_ the width of the spacers between buttons in navigation … … 414 407 if (args.getintarg("v") == 0) set_spacemacro (disp, response); 415 408 416 // set _navigationbar_ and _javaimagesnavbar_ macros409 // set _navigationbar_ macro 417 410 set_navbarmacros (disp, response, args); 418 411 … … 511 504 } 512 505 513 void documentaction::set_java_macros (cgiargsclass &args, displayclass &disp) {514 515 text_t javaimagescontent = "_javaextras_";516 517 int arg_gt = args.getintarg("gt");518 int arg_gc = args.getintarg("gc");519 int arg_hl = args.getintarg("hl");520 521 text_tarray::const_iterator button_here = formatinfo.DocumentButtons.begin();522 text_tarray::const_iterator button_end = formatinfo.DocumentButtons.end();523 524 while (button_here != button_end) {525 if (*button_here == "Detach")526 javaimagescontent += "_javadetach_";527 else if (*button_here == "Expand Text") {528 if (arg_gt == 1)529 javaimagescontent += "_javacontracttext__javacontinue_";530 else if (arg_gt == 2)531 javaimagescontent += "_javacontracttext_";532 else533 javaimagescontent += "_javaexpandtext_";534 } else if (*button_here == "Expand Contents") {535 if (arg_gc == 1)536 javaimagescontent += "_javacontractcontents_";537 else538 javaimagescontent += "_javaexpandcontents_";539 } else if (*button_here == "Highlight") {540 if (arg_hl == 1)541 javaimagescontent += "_javanohighlighting_";542 else543 javaimagescontent += "_javahighlighting_";544 }545 button_here ++;546 }547 disp.setmacro ("javaimagescontent", "document", javaimagescontent);548 }549 550 506 551 507 // define all the macros which are related to pages generated … … 566 522 // _header_ the header macro is overridden if we're not at a top level 567 523 // classification to remove the title block 568 569 // _javaimagescontent_ this is the javascript code to shove in to make the570 // flashy buttons work571 524 572 525 // _thisOID_ the OID (directory) of the current document - this corresponds … … 645 598 disp.setmacro ("thisOID", "Global", dm_safe(thisOID)); 646 599 } 647 648 if (args["u"] != "1")649 set_java_macros (args, disp);650 651 600 } 652 601 } else { -
trunk/gsdl/src/recpt/documentaction.h
r1285 r1419 48 48 void set_navbarmacros (displayclass &disp, FilterResponse_t &response, 49 49 cgiargsclass &args); 50 51 virtual void set_java_macros (cgiargsclass &args, displayclass &disp);52 50 53 51 void get_classificationlinks (const text_t &arg_cl, const text_t &collection, -
trunk/gsdl/src/recpt/librarymain.cpp
r1391 r1419 53 53 #include "delhistoryaction.h" 54 54 #include "tipaction.h" 55 #include "collectoraction.h" 55 56 56 57 #include "browserclass.h" … … 264 265 recpt.add_action(&adelhistoryaction); 265 266 267 collectoraction acollectoraction; 268 acollectoraction.set_receptionist (&recpt); 269 recpt.add_action(&acollectoraction); 270 266 271 // list of browsers 267 272 vlistbrowserclass avlistbrowserclass;
Note:
See TracChangeset
for help on using the changeset viewer.