Removed mysql dependency; fix for Java6; added some internal documentation

diff --git a/.gitignore b/.gitignore
index e40871abe4b109491c6c13237ce1dd056e9911b4..a1a0d4a47c7493400243ee80c5d239dd66c61b93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /testdb.*
 /cachedb.*
 /tv_grab_nl_java.db.properties
+*.orig

diff --git a/pom.xml b/pom.xml
index 46a350e00de971039f04b7dcde8fd139b25a11d8..74dc9b15ad0084be744c2f573551e0f5c36a3519 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,11 +31,6 @@
                        <artifactId>hsqldb</artifactId>
                        <version>2.2.8</version>
                </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>5.1.18</version>
-               </dependency>
        </dependencies>
        <build>
                <plugins>

diff --git a/src/main/java/org/vanbest/xmltv/EPGSource.java b/src/main/java/org/vanbest/xmltv/EPGSource.java
index 2c53e553cf56ca68dbab05001846bfc803a61a57..f8fbb549df1e6a24718b84e2d84772636f53e553 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/EPGSource.java
+++ b/src/main/java/org/vanbest/xmltv/EPGSource.java
@@ -14,7 +14,9 @@ public interface EPGSource {
 
        public int getId();
        public void setId(int id);
-    public String getName(); // must be static
+    public String getName(); 
+       // All implementing class must declare a
+    // public static final String NAME (e.g tvgids.nl or rtl.nl)
 
        public List<Channel> getChannels();
        // Convenience method

diff --git a/src/main/java/org/vanbest/xmltv/EPGSourceFactory.java b/src/main/java/org/vanbest/xmltv/EPGSourceFactory.java
index 31e8acdb082567a84187b3793e5037585f4f2b4d..bafde354b05e9525dd6a9b7f9d8f19c2d97857a3 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/EPGSourceFactory.java
+++ b/src/main/java/org/vanbest/xmltv/EPGSourceFactory.java
@@ -46,10 +46,16 @@ public class EPGSourceFactory {
                        } catch (ClassNotFoundException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
-                       } catch (ReflectiveOperationException e) {
+                       } catch (SecurityException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
-                       } catch (SecurityException e) {
+                       } catch (NoSuchFieldException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       } catch (IllegalArgumentException e) {
+                               // TODO Auto-generated catch block
+                               e.printStackTrace();
+                       } catch (IllegalAccessException e) {
                                // TODO Auto-generated catch block
                                e.printStackTrace();
                        }

diff --git a/src/main/java/org/vanbest/xmltv/RTL.java b/src/main/java/org/vanbest/xmltv/RTL.java
index fcf2583c60f69a7a339129120af61ede57b2d21d..164a1960c755b472a073003776d64d79f78d59d5 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/RTL.java
+++ b/src/main/java/org/vanbest/xmltv/RTL.java
@@ -65,8 +65,6 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
        String[] xmlKeys = {"zendernr", "pgmsoort", "genre", "bijvnwlanden", "ondertiteling", "begintijd", "titel", \r
                        "site_path", "wwwadres", "presentatie", "omroep", "eindtijd", "inhoud", "tt_inhoud", "alginhoud", "afl_titel", "kijkwijzer" };\r
                \r
-       //Map<String,Integer> xmlKeyMap = new HashMap<String,Integer>();\r
-       \r
        class RTLException extends Exception {\r
                public RTLException(String s) {\r
                        super(s);\r
@@ -215,6 +213,7 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
                        prog.endTime = parseTime(date, e.getTextContent());\r
                } else if (tag.equals("omroep")) {\r
                } else if (tag.equals("kijkwijzer")) {\r
+                       System.out.println("Kijkwijzer: \"" + e.getTextContent() + "\"");\r
                } else if (tag.equals("presentatie")) {\r
                        // A; A en B; A, B, C en D\r
                        String[] presentatoren = e.getTextContent().split(", | en ");\r
@@ -228,6 +227,7 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
                } else if (tag.equals("inhoud")) {\r
                        prog.addDescription(e.getTextContent());\r
                } else if (tag.equals("tt_inhoud")) {\r
+                       prog.addDescription(e.getTextContent());\r
                        // ignore, is summary of other fields\r
                } else if (tag.equals("zendernr")) {\r
                } else if (tag.equals("titel")) {\r
@@ -307,6 +307,8 @@ public class RTL extends AbstractEPGSource implements EPGSource  {
                super.close();\r
        }\r
 \r
+       // FIXME probably not correct in all cases, maybe make use \r
+       // of the order of the programmes?\r
        private Date parseTime(Date date, String time) {\r
                Calendar result = Calendar.getInstance();\r
                result.setTime(date);\r