Fix for Horizon programme title

diff --git a/README b/README
index 5050962bd469650d7912c7870dbdbc2beed05f26..eba822f56fa9d8cdc7e289a09dec443b3171d53a 100644 (file)
--- a/README
+++ b/README
@@ -4,12 +4,12 @@ README for tv_grab_nl_java
 English Summary
 ---------------
 tv_grab_nl_java is an XMLTV-compatible grabber for Dutch television that uses
-TVGids.nl, rtl.nl and/or horizon.nl (UPC) as sources.
+TVGids.nl, rtl.nl and/or horizon.tv (UPC) as sources.
 
 Algemeen
 --------
 tv_grab_nl_java is een XMLTV-compatibele grabber voor Nederlandse televisie 
-die TVGids.nl, rtl.nl en horizon.nl (UPC) als bron kan gebruiken. tv_grab_nl_java is geschreven 
+die TVGids.nl, rtl.nl en horizon.tv (UPC) als bron kan gebruiken. tv_grab_nl_java is geschreven 
 in Java en gebruikt o.a. de JSON-interface van TVGids.nl.
 
 Kenmerken van tv_grab_nl_java:
@@ -158,5 +158,5 @@ The full license text can be found in the LICENSE file.
 
 Laatste aanpassing
 ------------------
-24/4/2012 (versie 0.9.2)
+5/3/2013 (versie 1.1.0)
 

diff --git a/pom.xml b/pom.xml
index 8b4af3b5b37491035f6d55db09c9aa7045603c92..d3c396d8933cb9160069a2ecc62c74b15cccbfe3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.vanbest.xmltv.tv_grab_nl_java</groupId>
        <artifactId>tv_grab_nl_java</artifactId>
-       <version>1.2.0</version>
+       <version>1.2.1-SNAPSHOT</version>
        <scm>
                <connection>scm:git:git://github.com/janpascal/tv_grab_nl_java.git</connection>
                <developerConnection>scm:git:https://janpascal@github.com/janpascal/tv_grab_nl_java.git</developerConnection>

diff --git a/src/main/java/org/vanbest/xmltv/Horizon.java b/src/main/java/org/vanbest/xmltv/Horizon.java
index 6d012e34fe929ab089a88e59e6496a323b62db8e..9a3306850a37323ab57cb46b33d3b4aadd03ad63 100644 (file)
--- a/src/main/java/org/vanbest/xmltv/Horizon.java
+++ b/src/main/java/org/vanbest/xmltv/Horizon.java
@@ -218,17 +218,28 @@ public class Horizon extends AbstractEPGSource implements EPGSource {
                        result.endTime = new Date(json.getLong("endTime"));
                        JSONObject prog = json.getJSONObject("program");
                        String title = null;
-                       if (prog.has("secondaryTitle")){
-                               title = prog.getString("secondaryTitle");
-                               if (title.contains("Zal snel bekend")) title = null;
-                       } 
-                       if ((title==null || title.isEmpty()) && prog.has("title")) {
+                       if (prog.has("title")){
                                title = prog.getString("title");
+                       } 
+                       String secondary = null;
+                       if (prog.has("secondaryTitle")) {
+                secondary = prog.getString("secondaryTitle");
+                if (secondary.contains("Zal snel bekend")) secondary = null;
+                       }
+                       if (title != null && secondary!=null && title.contains(secondary)) {
+                           title=secondary;
+                           secondary=null;
                        }
             if (title != null && !title.isEmpty()) {
                 result.addTitle(title);
+                if (secondary!=null && !secondary.isEmpty()) {
+                    result.addSecondaryTitle(secondary);
+                }
             } else {
                 doNotCache = true;
+                if (secondary!=null && !secondary.isEmpty()) {
+                    result.addTitle(secondary);
+                }
             }
             String description = null;
             if (prog.has("longDescription")) description = prog.getString("longDescription");
@@ -317,9 +328,11 @@ public class Horizon extends AbstractEPGSource implements EPGSource {
                                c.serialize(writer);
                        }
                        writer.flush();
-                       List<Programme> programmes = horizon.getProgrammes(my_channels, 3);
-                       for (Programme p : programmes) {
-                               p.serialize(writer);
+                       for(int day=0; day<5; day++) {
+                       List<Programme> programmes = horizon.getProgrammes(my_channels, day);
+                       for (Programme p : programmes) {
+                               p.serialize(writer);
+                       }
                        }
                        writer.writeEndElement();
                        writer.writeEndDocument();