Changeset 16975

Timestamp:

2008-08-22T17:44:22+12:00 (16 years ago)

Author:

davidb

Message:

support for /collect in URL pointing to area designated by 'collecthome'

File:

• gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp (modified) (9 diffs)

gsdl/trunk/runtime-src/src/w32server/cgiwrapper.cpp

@@ -336 +336 @@
 DWORD baseavailvirtual;
 text_t current_gsdlhome;
+text_t current_collecthome;
 colinfo_tmap translated_collectinfo;
   
@@ -383 +384 @@
   text_t collection = "";
   text_tset dbhomes;
+  text_tset clhomes; // collecthome companion for dbhome
   text_tset collections;
 
@@ -408 +410 @@
     collections.insert (collection);
     dbhomes.insert (gsdl_dbhome);
+    clhomes.insert (gsdl_collecthome);
     collectioninfo_t tmp;
     tmp.gsdl_gsdlhome = gsdl_gsdlhome;
@@ -449 +452 @@
     }
     dbhomes.insert ((*this_info).second.gsdl_dbhome);
+    clhomes.insert ((*this_info).second.gsdl_collecthome);
       }
       ++this_info;
@@ -470 +474 @@
       }
       dbhomes.insert (gsdl_dbhome);
+      clhomes.insert (gsdl_collecthome);
     }
   }
@@ -656 +661 @@
   text_tset::const_iterator thome = dbhomes.begin();
   text_tset::const_iterator ehome = dbhomes.end();
+  text_tset::const_iterator tchome = clhomes.begin(); // collecthome companion for dbhome
+
   while (thome != ehome) {
-    if (!main_cfg_read (recpt, *thome, collection)) {
+    if (!main_cfg_read (recpt, *thome, *tchome, collection)) {
       // couldn't find the main configuration file
       page_errormaincfg (*thome, collection);
@@ -663 +670 @@
     }
     ++thome;
+    ++tchome;
   }
 
@@ -768 +776 @@
     
   // try to open the file
-  filename = filename_cat (current_gsdlhome, filename);
+  //cerr << "*** filename = " << filename.getcstr() << endl;
+  //cerr << "**** collect_home = " << current_collecthome.getcstr() << endl;
+
+  if (filename.size()>=9) {
+    text_t prefix = substr(filename.begin(),filename.begin()+9);
+    //cerr << "**** prefix = " << prefix.getcstr() << endl;
+
+    text_t tail = substr(filename.begin()+9,filename.end());
+    //cerr << "**** tail = " << tail.getcstr() << endl;
+
+    if (prefix == "/collect/") {
+      filename = filename_cat (current_collecthome, tail);
+    }
+    else {
+      filename = filename_cat (current_gsdlhome, filename);
+    }
+  }
+
+  cerr << "#### filename = " << filename.getcstr() << endl;
+
   /* Feb 2002 - handle files with spaces in their name. */
   text_t::iterator space_start;
@@ -827 +854 @@
   if (it != translated_collectinfo.end()) {
     current_gsdlhome = (*it).second.gsdl_gsdlhome;
+    current_collecthome = (*it).second.gsdl_collecthome;
   } else {
     current_gsdlhome = gsdl_gsdlhome;
+    current_collecthome = gsdl_collecthome;
   }