Changeset 18978 for gsdl/trunk/runtime-src/src/colservr/collectset.cpp

Timestamp:

2009-04-15T15:49:50+12:00 (15 years ago)

Author:

kjdon

Message:

made group col use / instead of
- we check for this later. so now groups work on windows web library

File:

• gsdl/trunk/runtime-src/src/colservr/collectset.cpp (modified) (4 diffs)

gsdl/trunk/runtime-src/src/colservr/collectset.cpp

@@ -379 +379 @@
   text_tarray cfgline;
   text_t key;
-  text_t build_cfg = filename_cat(collect_group_dir, "etc", "collect.cfg");
-  char *collect_cfgc = build_cfg.getcstr();
+  text_t collect_cfg = filename_cat(collect_group_dir, "etc", "collect.cfg");
+  char *collect_cfgc = collect_cfg.getcstr();
   ifstream confin(collect_cfgc);
 
@@ -399 +399 @@
 
   if (is_collect_group == "true") {
-
     if (read_dir (collect_group_dir, group)) {
       
@@ -406 +405 @@
       
       while (thiscol != endcol) {
-    // ignore the modelcol
+    // ignore the etc directory
     if (*thiscol == "etc") {
       ++thiscol;
@@ -412 +411 @@
     }
     
-    text_t group_col = filename_cat(collection,*thiscol);
+    //text_t group_col = filename_cat(collection,*thiscol);
+    // later we check for / in the name. When this is used in a path (via fileanme_cat) the / will be converted  to \ on windows
+    text_t group_col = collection + "/" + *thiscol;
     this->add_collection (group_col, gsdlhome, collecthome);