Don't remove imported files by default.

[dead/htsn-import.git] / src / OptionalConfiguration.hs

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 9013112f997ebcc5f389d1099c75edea1f67aa5c..213f20363ae6fe822fa097f0ca3103f94cb72266 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -55,6 +55,7 @@ data OptionalConfiguration =
     connection_string :: Maybe ConnectionString,
     log_file          :: Maybe FilePath,
     log_level         :: Maybe Priority,
+    remove            :: Maybe Bool,
     syslog            :: Maybe Bool,
     xml_files         :: [FilePath] }
     deriving (Show, Data, Typeable)
@@ -80,7 +81,14 @@ merge_maybes (Just _) (Just y) = Just y
 --
 instance Monoid OptionalConfiguration where
   -- | An empty OptionalConfiguration.
-  mempty = OptionalConfiguration Nothing Nothing Nothing Nothing Nothing []
+  mempty = OptionalConfiguration
+             Nothing
+             Nothing
+             Nothing
+             Nothing
+             Nothing
+             Nothing
+             []
 
 
   -- | Combine @cfg1@ and @cfg2@, giving precedence to @cfg2@.
@@ -92,6 +100,7 @@ instance Monoid OptionalConfiguration where
       (merge_maybes (connection_string cfg1) (connection_string cfg2))
       (merge_maybes (log_file cfg1) (log_file cfg2))
       (merge_maybes (log_level cfg1) (log_level cfg2))
+      (merge_maybes (remove cfg1) (remove cfg2))
       (merge_maybes (syslog cfg1) (syslog cfg2))
       ((xml_files cfg1) ++ (xml_files cfg2))
 
@@ -131,6 +140,7 @@ from_rc = do
   cfg_connection_string <- DC.lookup cfg "connection_string"
   cfg_log_file <- DC.lookup cfg "log_file"
   cfg_log_level <- DC.lookup cfg "log_level"
+  cfg_remove <- DC.lookup cfg "remove"
   cfg_syslog <- DC.lookup cfg "syslog"
   let cfg_xml_files = [] -- This won't be in the config file.
   return $ OptionalConfiguration
@@ -140,5 +150,6 @@ from_rc = do
              cfg_connection_string
              cfg_log_file
              cfg_log_level
+             cfg_remove
              cfg_syslog
              cfg_xml_files