From 633370ca399f2650c462e7cbb17c86166a735ba1 Mon Sep 17 00:00:00 2001
From: Jan-Pascal van Best <janpascal@vanbest.org>
Date: Tue, 1 May 2012 13:27:59 +0200
Subject: [PATCH] Command line --log-level aangepast voor log4j log levels

---
 README                                      |  4 ++--
 src/main/java/org/vanbest/xmltv/Config.java | 16 +---------------
 src/main/java/org/vanbest/xmltv/Main.java   | 11 +++++------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/README b/README
index 750a596..63d074c 100644
--- a/README
+++ b/README
@@ -111,8 +111,8 @@ Beschikbare opties:
 --configure           Interactive configuration
 --output <arg>        Set xlmtv output filename
 --quiet               Be quiet
---log-level           Zet het logging-level. Defaultwaarde is 1; hogere waarde
-                      kan (veel) meer logging opleveren
+--log-level           Zet het logging-level. Defaultwaarde is INFO, andere mogelijkheden zijn
+					  ERROR,WARN,INFO,DEBUG en TRACE
 --offset <arg>        Start day for grabbing (0=today)
 --days <arg>          Number of days to grab
 
diff --git a/src/main/java/org/vanbest/xmltv/Config.java b/src/main/java/org/vanbest/xmltv/Config.java
index ce88358..3177e05 100644
--- a/src/main/java/org/vanbest/xmltv/Config.java
+++ b/src/main/java/org/vanbest/xmltv/Config.java
@@ -38,12 +38,7 @@ import org.apache.log4j.Logger;
 
 public class Config {
 	//constants
-	public static final int LOG_INFO = 0x0001;
-	public static final int LOG_DEBUG = 0x0005;
-	public static final int LOG_JSON = 0x0100;
-	private final static int LOG_PROGRAMME_INFO = 0x0200;
 	private final static int CURRENT_FILE_FORMAT=4;
-	public final static int LOG_DEFAULT = LOG_INFO;
 
 	// in config file
 	public int niceMilliseconds;
@@ -55,11 +50,10 @@ public class Config {
 	
 	// not stored (yet)
 	public boolean joinKijkwijzerRatings = true;
+	boolean fetchDetails = true;
 	
 	// command-line options
 	boolean quiet = false;
-	public int logLevel = LOG_DEFAULT;
-	boolean fetchDetails = true;
 	
 	String project_version;
 	String build_time;
@@ -301,14 +295,6 @@ public class Config {
 		}
 		return result;
 	}
-	
-	public boolean logJSON() {
-		return (logLevel & LOG_JSON) != 0;
-	}
-
-	public boolean logProgrammes() {
-		return (logLevel & LOG_PROGRAMME_INFO) != 0;
-	}
 
 	public void setCacheFile(String cacheFile) {
 		cacheDbHandle = "jdbc:hsqldb:file:"+cacheFile;
diff --git a/src/main/java/org/vanbest/xmltv/Main.java b/src/main/java/org/vanbest/xmltv/Main.java
index fc3dec2..a633079 100644
--- a/src/main/java/org/vanbest/xmltv/Main.java
+++ b/src/main/java/org/vanbest/xmltv/Main.java
@@ -344,7 +344,7 @@ public class Main {
 				.addOption(OptionBuilder
 						.withLongOpt("log-level")
 						.hasArg()
-						.withDescription("Set log level (0x0100=JSON)")
+						.withDescription("Set log level (ERROR,WARN,INFO,DEBUG,TRACE)")
 						.create())
 				.addOption(OptionBuilder
 						.withLongOpt("license")
@@ -387,11 +387,10 @@ public class Main {
 			this.outputWriter = new PrintStream( new FileOutputStream(line.getOptionValue("output")));
 		}
 		if (line.hasOption("log-level")) {
-			config.logLevel = Integer.parseInt(line.getOptionValue("log-level"));
-			if (config.quiet) config.logLevel = 0;
-                        // TODO: make distinction between levels for console and
-                        // file appenders
-                        logger.getRootLogger().setLevel(Level.toLevel(config.logLevel, Level.INFO));
+			String arg = line.getOptionValue("log-level");
+            // TODO: make distinction between levels for console and
+            // file appenders
+            Logger.getRootLogger().setLevel(Level.toLevel(arg, Level.INFO));
 		}
 		if (line.hasOption("cache")) {
 			config.setCacheFile(line.getOptionValue("cache"));
-- 
2.39.5