Changeset 16975 for gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp
- Timestamp:
- 2008-08-22T17:44:22+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp
r16320 r16975 336 336 DWORD baseavailvirtual; 337 337 text_t current_gsdlhome; 338 text_t current_collecthome; 338 339 colinfo_tmap translated_collectinfo; 339 340 … … 383 384 text_t collection = ""; 384 385 text_tset dbhomes; 386 text_tset clhomes; // collecthome companion for dbhome 385 387 text_tset collections; 386 388 … … 408 410 collections.insert (collection); 409 411 dbhomes.insert (gsdl_dbhome); 412 clhomes.insert (gsdl_collecthome); 410 413 collectioninfo_t tmp; 411 414 tmp.gsdl_gsdlhome = gsdl_gsdlhome; … … 449 452 } 450 453 dbhomes.insert ((*this_info).second.gsdl_dbhome); 454 clhomes.insert ((*this_info).second.gsdl_collecthome); 451 455 } 452 456 ++this_info; … … 470 474 } 471 475 dbhomes.insert (gsdl_dbhome); 476 clhomes.insert (gsdl_collecthome); 472 477 } 473 478 } … … 656 661 text_tset::const_iterator thome = dbhomes.begin(); 657 662 text_tset::const_iterator ehome = dbhomes.end(); 663 text_tset::const_iterator tchome = clhomes.begin(); // collecthome companion for dbhome 664 658 665 while (thome != ehome) { 659 if (!main_cfg_read (recpt, *thome, collection)) {666 if (!main_cfg_read (recpt, *thome, *tchome, collection)) { 660 667 // couldn't find the main configuration file 661 668 page_errormaincfg (*thome, collection); … … 663 670 } 664 671 ++thome; 672 ++tchome; 665 673 } 666 674 … … 768 776 769 777 // try to open the file 770 filename = filename_cat (current_gsdlhome, filename); 778 //cerr << "*** filename = " << filename.getcstr() << endl; 779 //cerr << "**** collect_home = " << current_collecthome.getcstr() << endl; 780 781 if (filename.size()>=9) { 782 text_t prefix = substr(filename.begin(),filename.begin()+9); 783 //cerr << "**** prefix = " << prefix.getcstr() << endl; 784 785 text_t tail = substr(filename.begin()+9,filename.end()); 786 //cerr << "**** tail = " << tail.getcstr() << endl; 787 788 if (prefix == "/collect/") { 789 filename = filename_cat (current_collecthome, tail); 790 } 791 else { 792 filename = filename_cat (current_gsdlhome, filename); 793 } 794 } 795 796 cerr << "#### filename = " << filename.getcstr() << endl; 797 771 798 /* Feb 2002 - handle files with spaces in their name. */ 772 799 text_t::iterator space_start; … … 827 854 if (it != translated_collectinfo.end()) { 828 855 current_gsdlhome = (*it).second.gsdl_gsdlhome; 856 current_collecthome = (*it).second.gsdl_collecthome; 829 857 } else { 830 858 current_gsdlhome = gsdl_gsdlhome; 859 current_collecthome = gsdl_collecthome; 831 860 } 832 861
Note:
See TracChangeset
for help on using the changeset viewer.