now uses the correct part of the file

diff --git a/crawler/kiss/conf/xml/channel-right-now-mobile-output.xml b/crawler/kiss/conf/xml/channel-right-now-mobile-output.xml
index caae2e950330f724b4e11b9895f6e322f4e76a95..eca47bcd79c223b7b2fd46b4c735e08f37a9abee 100644 (file)
--- a/crawler/kiss/conf/xml/channel-right-now-mobile-output.xml
+++ b/crawler/kiss/conf/xml/channel-right-now-mobile-output.xml
@@ -1,63 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?><channel-right-now><action name="KRO Filmtheater: Hollywood ending" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777728676&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 22:30 -00:15 </time></action>
+<?xml version="1.0" encoding="utf-8"?><channel-right-now><action name="" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvlist.php?reload=1&amp;channel=6&amp;tz=2&amp;progid=0&amp;page=0&amp;day=1&amp;back=$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> Monday 21st </time></action>
       
-    <action name="NOS-Tekst tv" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777728677&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 00:15 -06:45 </time></action>
+    <action name="NCRV Dokument: Het recht om te sterven" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787547&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 23:00 -23:45 </time></action>
       
-    <action name="Nederland in beweging" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787518&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 06:45 -07:00 </time></action>
+    <action name="Apocalyps Vietnam" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787548&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 23:45 -00:40 </time></action>
       
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787519&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 07:00 -09:00 </time></action>
+    <action name="Man beet hond" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787549&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 00:40 -01:10 </time></action>
       
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787520&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 09:00 -09:10 </time></action>
+    <action name="Nacht-tv: Netwerk herhaling" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787550&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 01:10 -06:45 </time></action>
       
-    <action name="Nederland in beweging" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787521&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 09:10 -09:30 </time></action>
+    <action name="" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvlist.php?reload=1&amp;channel=6&amp;tz=2&amp;progid=0&amp;page=0&amp;day=1&amp;back=$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> Monday 21st </time></action>
       
-    <action name="That's the question" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787522&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 09:30 -10:00 </time></action>
-      
-    <action name="TROS Muziekfeest in de ArenA 2004" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787523&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 10:00 -11:00 </time></action>
-      
-    <action name="Hello Goodbye" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787524&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 11:00 -11:25 </time></action>
-      
-    <action name="Wat Zou JIJ Doen?" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787525&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 11:25 -12:00 </time></action>
-      
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787526&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 12:00 -12:10 </time></action>
-      
-    <action name="Taxi" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787527&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 12:10 -12:40 </time></action>
-      
-    <action name="Lingo" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787528&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 12:40 -13:00 </time></action>
-      
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787529&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 13:00 -13:10 </time></action>
-      
-    <action name="NOS-Sportjournaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787530&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 13:10 -13:20 </time></action>
-      
-    <action name="Warzone: Zuid-Afrika" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787531&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 13:20 -14:05 </time></action>
-      
-    <action name="Tien maal Mozart" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787532&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 14:05 -15:20 </time></action>
-      
-    <action name="Kruispunt" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787533&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 15:20 -16:00 </time></action>
-      
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787534&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 16:00 -16:05 </time></action>
-      
-    <action name="Oppassen &amp; wegwezen" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787535&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 16:05 -17:00 </time></action>
-      
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787536&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 17:00 -17:05 </time></action>
-      
-    <action name="Schepper &amp; co" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787537&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 17:05 -17:30 </time></action>
-      
-    <action name="Himalaya with Michael Palin" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787538&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 17:30 -18:30 </time></action>
-      
-    <action name="That's the question" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787539&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 18:30 -18:55 </time></action>
-      
-    <action name="Man beet hond" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787540&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 18:55 -19:30 </time></action>
-      
-    <action name="Ingang Oost" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787541&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 19:30 -20:00 </time></action>
-      
-    <action name="NOS-Journaal" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787542&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 20:00 -20:30 </time></action>
-      
-    <action name="Netwerk" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787543&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 20:30 -21:00 </time></action>
-      
-    <action name="Memories Tour d'Amour" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787544&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 21:00 -22:00 </time></action>
-      
-    <action name="Hello Goodbye" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787545&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 22:00 -22:30 </time></action>
-      
-    <action name="Villa historica" type="program-info" reference="http://epg.kml.kiss-technology.com/tvhtml/tvinfo.php?id=1777787546&amp;back=$tvhtml$tvlist.php(channel)6~day)0~page)0~tz)2~progid)0~sel)0~back)$tvhtml$tvstation.php(mode)3~station)6~tz)2~sel)0~back)$tvhtml$tv.php(mode)3~page)0~station)0~tz)2~sel)0~back)$tvhtml$tvstart.php(tz)2"><time> 22:30 -23:00 </time></action>
+    <action name="" type="program-info" reference=""><time>    23:13, Monday 21st August</time></action>
       
     </channel-right-now>

diff --git a/crawler/kiss/src/channel-right-now-mobile.xsl b/crawler/kiss/src/channel-right-now-mobile.xsl
index 15b0c141cd35e99cf54eff06ffa4fb5061e55d79..ea5ba68023f286d03f6e307378a053d1e02f6bee 100644 (file)
--- a/crawler/kiss/src/channel-right-now-mobile.xsl
+++ b/crawler/kiss/src/channel-right-now-mobile.xsl
@@ -19,8 +19,7 @@
   
   <xsl:template match="/">
     <xsl:element name="channel-right-now">
-      <!-- [contains(@class,'listCell')] -->
-      <xsl:apply-templates select="//xhtml:tr[xhtml:td[contains(@class, 'listCell')]]"/>
+      <xsl:apply-templates select="//xhtml:tr[xhtml:td[not(contains(@class, 'listCell'))]]"/>
     </xsl:element>
   </xsl:template>
   
@@ -28,7 +27,7 @@
      <xsl:element name="action">
        <xsl:attribute name="name">
          <xsl:call-template name="string-replace">
-           <xsl:with-param name="src" select="xhtml:td[2]/xhtml:a"/>
+           <xsl:with-param name="src" select="xhtml:td[2]//xhtml:a"/>
            <xsl:with-param name="from" select="$newline"/>
            <xsl:with-param name="to" select="''"/>
          </xsl:call-template>
@@ -37,7 +36,7 @@
          <xsl:text>program-info</xsl:text>
        </xsl:attribute>
        <xsl:attribute name="reference">
-         <xsl:value-of select="xhtml:td[2]/xhtml:a/@href"/>
+         <xsl:value-of select="xhtml:td[2]//xhtml:a/@href"/>
        </xsl:attribute>
        <xsl:element name="time">
          <xsl:call-template name="string-replace">