Check for better cmdline params

Author: adamburkegh

src/main/haskell/Main.hs

@@ -17,7 +17,7 @@ import Data.Map (Map,lookup)
 import Data.Maybe (fromJust)
 import qualified Data.Text as T
 import System.Console.CmdArgs
-import System.Console.CmdArgs.Explicit
+import System.Exit
 import System.IO
 
 data ToothpasteArgs = 
@@ -51,8 +51,8 @@ toothpasteArgs = cmdArgsMode $ ToothpasteArgs{
     modeltype = "stoch" &= 
         help "Output model type. Valid values stoch or cflow", 
     eventlog  = def &= help "Event log file name. Required.",
-    pnetfile  = def &= help "Output Petri Net PNML file",
-    ptreefile = def &= help "Output PPTree file",
+    pnetfile  = def &= help "Output Petri Net PNML file. Required.",
+    ptreefile = def &= help "Output PPTree file. Required.",
     ptreeformat = "ptree" 
             &= help "Output PPT format. Valid values ptree or latex",
     impl      = "mnode" &= help "Discovery algo. Valid values binary, incr, or mnode. Default mnode.",
@@ -208,27 +208,19 @@ mineWithProb tpargs logtext =
           pptformatter | pptf == PTree = ProbProcessTree.formatPPTree
                        | pptf == LaTeX = ProbProcessTree.latexPPTree
 
-helpAndExit :: (Data a) => String -> a -> IO (a)
-helpAndExit msg args = 
-    do
-    let cm = cmdArgsMode args
-    let ht = msg ++ "\n\n" 
-             -- ++  (show $ helpText [] HelpFormatDefault cm )
-             ++ show cm
-    cmdArgsApply (CmdArgs{cmdArgsValue=args,
-                          cmdArgsHelp = Just ht,
-                          cmdArgsVersion = Nothing,
-                          cmdArgsVerbosity = Nothing } )
 
 main :: IO ()
 main = 
     withGlobalLogging (LogConfig Nothing True) $
     do
     tpargs <- cmdArgsRun toothpasteArgs
-    if (null $ eventlog tpargs) 
+    if ((null $ eventlog tpargs)  
+     || (null $ pnetfile tpargs)
+     || (null $ ptreefile tpargs) )
         then do 
-            helpAndExit "--eventlog is a required argument" tpargs 
-        else do
+            putStr "--eventlog, --pnetfile and --ptreefile are required arguments\n" 
+            exitFailure
+        else do 
             return tpargs
     if (verbose tpargs)
         then do