Fix a few categories to comply with MythWeb colouring

diff --git a/release.properties b/release.properties
index cf5581eb57d1e7c71eb99ea295012b78cb821738..d6339210dff5bb52ce2498f253b12ad12c3ea695 100644 (file)
--- a/release.properties
+++ b/release.properties
@@ -1,13 +1,13 @@
 #release configuration
-#Thu Jan 03 15:24:32 CET 2013
+#Tue Mar 05 21:21:51 CET 2013
 project.scm.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java.tag=HEAD
-scm.tag=1.1.0
+scm.tag=1.2.1
 project.scm.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java.url=https\://github.com/janpascal/tv_grab_nl_java
 scm.url=scm\:git\:https\://janpascal@github.com/janpascal/tv_grab_nl_java.git
 preparationGoals=clean verify
 project.scm.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java.connection=scm\:git\:git\://github.com/janpascal/tv_grab_nl_java.git
 project.scm.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java.developerConnection=scm\:git\:https\://janpascal@github.com/janpascal/tv_grab_nl_java.git
 scm.commentPrefix=[maven-release-plugin] 
-project.dev.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java=1.1.1-SNAPSHOT
-project.rel.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java=1.1.0
+project.dev.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java=1.2.2-SNAPSHOT
+project.rel.org.vanbest.xmltv.tv_grab_nl_java\:tv_grab_nl_java=1.2.1
 completedPhase=scm-commit-release

diff --git a/src/main/java/org/vanbest/xmltv/Config.java b/src/main/java/org/vanbest/xmltv/Config.java
index 8a999dcbe5bed86f5419f3ed62eac828d4a080f4..09e583474d51ddf549c30701225489a04e1af6c5 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/Config.java
+++ b/src/main/java/org/vanbest/xmltv/Config.java
@@ -104,18 +104,39 @@ public class Config {
                return cattrans.get(category.toLowerCase());
        }
 
+        /*
+        MythWeb categories:
+          Action         Adult          
+          Animals        Art_Music      
+          Business       Children       
+          Comedy         Crime_Mystery  
+          Documentary    Drama          
+          Educational    Food           
+          Game           Health_Medical 
+          History        HowTo          
+          Horror         Misc           
+          News           Reality        
+          Romance        Science_Nature 
+          SciFi_Fantasy  Shopping       
+          Soaps          Spiritual      
+          Sports         Talk           
+          Travel         War            
+          Western        Movie
+          Unknown        
+        */
+
        static private Map<String, String> getDefaultCattrans() {
                Map<String, String> result = new HashMap<String, String>();
-               result.put("amusement", "Animated");
+               result.put("amusement", "Unknown");
                result.put("comedy", "Comedy");
                result.put("documentaire", "Documentary");
                result.put("educatief", "Educational");
                result.put("erotiek", "Adult");
-               result.put("film", "Film");
+               result.put("film", "Movie");
                result.put("muziek", "Art/Music");
                result.put("informatief", "Educational");
                result.put("jeugd", "Children");
-               result.put("kunst/cultuur", "Arts/Culture");
+               result.put("kunst/cultuur", "Art/Music");
                result.put("misdaad", "Crime/Mystery");
                result.put("muziek", "Music");
                result.put("natuur", "Science/Nature");
@@ -124,7 +145,7 @@ public class Config {
                result.put("religieus", "Religion");
                result.put("serie/soap", "Drama");
                result.put("sport", "Sports");
-               result.put("theater", "Arts/Culture");
+               result.put("theater", "Art/Music");
                result.put("wetenschap", "Science/Nature");
                result.put("news", "News");
                return result;