]> www.vanbest.org Git - tv_grab_nl_java/commitdiff
Alle kijkwijzer 'alle leeftijden' rating
authorJP <jp@here>
Tue, 20 Mar 2012 16:46:11 +0000 (17:46 +0100)
committerJP <jp@here>
Tue, 20 Mar 2012 16:46:11 +0000 (17:46 +0100)
tv_grab_nl_java/src/org/vanbest/xmltv/ProgrammeDetails.java
tv_grab_nl_java/src/org/vanbest/xmltv/TvGids.java
tv_grab_nl_java/src/org/vanbest/xmltv/XmlTvWriter.java

index a4852c35c6eadff935ea2b16724c1cac6b734e34..32550d38ee09d71717b43dbcf3eede214e595735 100644 (file)
@@ -38,12 +38,12 @@ public class ProgrammeDetails implements Serializable {
                if ((synop == null || synop.isEmpty()) && ( genre == null || (!genre.toLowerCase().equals("movies") && !genre.toLowerCase().equals("film")))) {
                        String[] parts = p.titel.split("[[:space:]]*:[[:space:]]*", 2);
                        if (parts.length >= 2 ) {
+                               if (!quiet) {
+                                       System.out.println("Splitting title from \"" + p.titel + "\" to: \"" + parts[0].trim() + "\"; synop: \"" + parts[1].trim() + "\"");
+                               }
                                titel = parts[0].trim();
                                p.titel = titel;
                                synop = parts[1].trim();
-                               if (!quiet) {
-                                       System.out.println("Splitting title to : \"" + p.titel + "\"; synop: \"" + synop + "\"");
-                               }
                        }
                }
                this.presentatie = org.apache.commons.lang.StringEscapeUtils.unescapeHtml(presentatie);
index c75b1691acef604a65a3cd0ca00e6c5c5cd6e40e..412760bf6f13839f0a85bb343d5b9ce8046b34b9 100644 (file)
@@ -265,13 +265,13 @@ public class TvGids {
                                                break;
                                        }
                                        Matcher m3 = kijkwijzerPattern.matcher(progInfo);
-                                       boolean first=true;
+                                       List<String> kijkwijzer = new ArrayList<String>();
                                        while (m3.find()) {
-                                               if (first) {
-                                                       //System.out.println("  (kijkwijzer): " + p.details.kijkwijzer);
-                                                       first = false;
-                                               }
-                                               //System.out.println("    kijkwijzer: " + m3.group(1));
+                                               kijkwijzer.add(m3.group(1));
+                                       }
+                                       if (!kijkwijzer.isEmpty()) {
+                                               System.out.println("  (kijkwijzer): " + p.details.kijkwijzer);
+                                               System.out.println("    kijkwijzer: " + kijkwijzer);
                                        }
                                }
                        }
index 631e3eec29a1a8ae0d6e7aee1d8a202621b40374..3fc5f979e242cb6efefc8eb35ba36174948881e1 100644 (file)
@@ -197,11 +197,15 @@ public class XmlTvWriter {
                                                                case 's':writer.writeCharacters("Seks"); break;
                                                                case 'g':writer.writeCharacters("Geweld"); break;
                                                                case 't':writer.writeCharacters("Grof taalgebruik"); break;
+                                                               case '1':writer.writeCharacters("Voor alle leeftijden"); 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: if (!config.quiet) System.out.println("Unknown kijkwijzer character: " + p.details.kijkwijzer);
+                                                               default: if (!config.quiet) {
+                                                                       System.out.println("Unknown kijkwijzer character: " + p.details.kijkwijzer);
+                                                                       System.out.println("    for show " + p.titel + " at channel " + p.channel.name + " at " + p.datum_start);
+                                                               }
                                                                }
                                                        }
                                                        //writer.writeStartElement("value");