Convert Kijkwijzer characters to proper (Dutch) strings

diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
index 6c86d09ae2976ea4bc32061595e834899bc3ff21..1d7e55408dbdbf2979eb0c63c3f38427c1741cd9 100644 (file)
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/Main.java
@@ -180,7 +180,7 @@ public class Main {
                if (line.hasOption("o")) {
                        this.outputWriter = new PrintStream( new FileOutputStream(line.getOptionValue("o")));
                }
-               if (line.hasOption("o")) {
+               if (line.hasOption("l")) {
                        config.logLevel = Integer.parseInt(line.getOptionValue("l"));
                }
                if (line.hasOption("h")) {

diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
index bbc5728d6fc859ca2e102e2d1fb0518f0acacd99..9e998dc962e42e8fcf9102f520287a6d685f878a 100644 (file)
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
@@ -15,7 +15,10 @@ public class ProgrammeDetails implements Serializable {
        String acteursnamen_rolverdeling;
        String regisseur;
        String zender_id;
-       public boolean teletekst = false;
+       public boolean subtitle_teletekst = false;
+       public boolean stereo = false;
+       public boolean blacknwhite;
+       public boolean breedbeeld;
        
        public void fixup(Programme p, boolean quiet) {
                this.titel = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(titel);

diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
index bb53ea3286f166e8c5e827490b901a21088df1d2..77466e61bd38de6bd82ab0f7f9180412ebc7799e 100644 (file)
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
@@ -238,12 +238,30 @@ public class TvGids {
                                        String value = m2.group(2);
                                        switch(key.toLowerCase()) {
                                        case "bijzonderheden":
-                                               if (value.toLowerCase().contains("teletekst")) {
-                                                       p.details.teletekst = true;
+                                               if (value.toLowerCase().contains("subtitle_teletekst")) {
+                                                       p.details.subtitle_teletekst = true;
+                                               }
+                                               if (value.toLowerCase().contains("breedbeeld")) {
+                                                       p.details.breedbeeld = true;
+                                               }
+                                               if (value.toLowerCase().contains("zwart")) {
+                                                       p.details.blacknwhite = true;
+                                               }
+                                               if (value.toLowerCase().contains("stereo")) {
+                                                       p.details.stereo = true;
                                                }
                                                break;
                                        }
-                                       
+                                       Pattern kijkwijzerPattern = Pattern.compile("<img src=\"http://tvgidsassets.nl/img/kijkwijzer/.*?\" alt=\"(.*?)\" />");
+                                       Matcher m3 = kijkwijzerPattern.matcher(progInfo);
+                                       boolean first=true;
+                                       while (m3.find()) {
+                                               if (first) {
+                                                       System.out.println("  (kijkwijzer): " + p.details.kijkwijzer);
+                                                       first = false;
+                                               }
+                                               System.out.println("    kijkwijzer: " + m3.group(1));
+                                       }
                                }
                        }
                        

diff --git a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
index 7cb94867afb2576609e19deb5487f0ecb26132c0..6363eb98fec8654e73720d28900e445be23c1085 100644 (file)
--- a/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
+++ b/tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java
@@ -62,6 +62,11 @@ public class XmlTvWriter {
         *    String highlight_content;
         *    soort
         *    artikel_id ???
+        *                                      p.details.subtitle_teletekst = true;
+                                                       p.details.breedbeeld = true;
+                                                       p.details.blacknwhite = true;
+                                                       p.details.stereo = true;
+                               
         */
        public void writePrograms(Collection<Programme> programs) throws XMLStreamException {
                DateFormat df = new SimpleDateFormat("yyyyMMddHHmmss Z");
@@ -133,16 +138,33 @@ public class XmlTvWriter {
                                        }
                                        writer.writeStartElement("category");
                                                writer.writeAttribute("lang", "en");
-                                               writer.writeCharacters(p.genre); // soort? FIXME translation to mythtv categories
+                                               writer.writeCharacters(p.genre); 
                                        writer.writeEndElement();
                                        writeln();
 
                                        if (p.details.kijkwijzer != null && !p.details.kijkwijzer.isEmpty()) {
                                                writer.writeStartElement("rating");
                                                        writer.writeAttribute("system", "kijkwijzer");
-                                                       writer.writeStartElement("value");
-                                                               writer.writeCharacters(p.details.kijkwijzer);
-                                                       writer.writeEndElement();
+                                                       for (int i=0; i<p.details.kijkwijzer.length(); i++) {
+                                                               char c = p.details.kijkwijzer.charAt(i);
+                                                               writer.writeStartElement("value");
+                                                               switch(c) {
+                                                               case 'a':writer.writeCharacters("Angst"); break;
+                                                               case 'd':writer.writeCharacters("Discriminatie"); break;
+                                                               case 's':writer.writeCharacters("Seks"); break;
+                                                               case 'g':writer.writeCharacters("Geweld"); break;
+                                                               case 't':writer.writeCharacters("Grof taalgebruik"); break;
+                                                               case '2':writer.writeCharacters("Afgeraden voor kinderen jonger dan 6 jaar"); break;
+                                                               case '9':writer.writeCharacters("Afgeraden voor kinderen jonger dan 9 jaar"); break;
+                                                               case '3':writer.writeCharacters("Afgeraden voor kinderen jonger dan 12 jaar"); break;
+                                                               case '4':writer.writeCharacters("Afgeraden voor kinderen jonger dan 16 jaar"); break;
+                                                               default: System.out.println("Unknown kijkwijzer character: " + p.details.kijkwijzer);
+                                                               }
+                                                               writer.writeEndElement();
+                                                       }
+                                                       //writer.writeStartElement("value");
+                                                       //      writer.writeCharacters(p.details.kijkwijzer);
+                                                       //writer.writeEndElement();
                                                writer.writeEndElement();
                                                writeln();
                                        }