Changeset 2518

Timestamp:

2001-06-11T15:24:15+12:00 (23 years ago)

Author:

sjboddie

Message:

the collector no longer uses the image of the original collection for a
cloned collection

Location:

trunk/gsdl/src/recpt

Files:

• collectoraction.cpp (modified) (5 diffs)
• collectoraction.h (modified) (1 diff)

trunk/gsdl/src/recpt/collectoraction.cpp

@@ -402 +402 @@
       // "collection information" has been changed after collection already exists
       // so we'll need to update the cfg file.
-      update_cfgfile_partial (args, logout);
+      update_cfgfile_partial (args, false, logout);
     }
   }
@@ -515 +515 @@
       }
       // update the new cfg file
-      update_cfgfile_partial (args, logout);
+      update_cfgfile_partial (args, true, logout);
       
     } else {
@@ -529 +529 @@
       // copy original back again and update it with any recent changes
       if (file_copy (cfgfile_org, cfgfile)) {
-    update_cfgfile_partial (args, logout);
+    update_cfgfile_partial (args, false, logout);
       } else {
     message = "tmpfail";
@@ -538 +538 @@
 
 // update configuration file on disk to match bc1 arguments
-void collectoraction::update_cfgfile_partial (cgiargsclass &args, ostream &logout) {
+// there's a special case if the clone option is true as certain parts of a
+// config file should not be cloned (e.g. the iconcollection stuff)
+void collectoraction::update_cfgfile_partial (cgiargsclass &args, bool clone, ostream &logout) {
 
   text_t cfgfile = filename_cat(get_collectdir(args), args["bc1dirname"], "etc", "collect.cfg");
@@ -563 +565 @@
       } else if (cfgline[1] == "collectionextra") {
         cfgline[2] = carriage_replace (args["bc1aboutdesc"], 0);
+      } else if (clone && (cfgline[1] == "iconcollection" ||
+                   cfgline[1] == "iconcollectionsmall")) {
+        cfgline[2] = "";
       }
     }

trunk/gsdl/src/recpt/collectoraction.h

@@ -66 +66 @@
   void update_cfgfile_clone (cgiargsclass &args, ostream &logout);
 
-  void update_cfgfile_partial (cgiargsclass &args, ostream &logout);
+  void update_cfgfile_partial (cgiargsclass &args, bool clone, ostream &logout);
 
   void update_cfgfile_complete (cgiargsclass &args, ostream &logout);