Adjust for 'groupBy' views attr must now be an expression

Add 'access' attribute to links that are geograpical restricted. Use
this attr for the grouping for a new 'Geograpical restricted' view.

diff --git a/data/WorldTV99.xml b/data/WorldTV99.xml
index 511c4e3..077324f 100644 (file)
--- a/data/WorldTV99.xml
+++ b/data/WorldTV99.xml
@@ -32,8 +32,9 @@
       </smil>
     </item>
     <views>
-      <view title="View by Categories" show="/link[@category]" groupBy="category"/>
-      <view title="View by Countries" show="/link[@country]" groupBy="country"/>
+      <view title="View by Categories" show="/link[@category and not(@access)]" groupBy="@category"/>
+      <view title="View by Countries" show="/link[@country and not(@access)]" groupBy="@country"/>
+      <view title="Geographical restricted" show="/link[@access]" groupBy="string-join(@country | @access, ' accessible from ')"/>
     </views>
   </meta>
   <!--test-->
@@ -105,9 +106,9 @@
   <link title="TA3" aspectRatio="15:9" url="mms://wmsta3.the.sk/ta3live?MSWMExt=.asf" country="Czech" category="news"/>
   <link url="http://feeds.feedburner.com/Travelvlog" aspectRatio="15:9" title="Czech Travelvlog" country="Czech" category="travel"/>
   <!--Denmark Local-->
-  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786405" aspectRatio="15:9" title="Denmark DR1" country="Denmark Local" category="tv1"/>
-  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786410" aspectRatio="15:9" title="Denmark DR2" country="Denmark Local" category="tv1"/>
-  <link url="http://www.dr.dk/tjenester/podcast/update.asx?qid=288417" aspectRatio="15:9" title="Denmark DR Update" country="Denmark Local" category="tv1"/>
+  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786405" aspectRatio="15:9" title="Denmark DR1" country="Denmark" access="Denmark" category="tv1"/>
+  <link url="http://www.dr.dk/Forms/Published/PlaylistGen.aspx?qid=786410" aspectRatio="15:9" title="Denmark DR2" country="Denmark" access="Denmark" category="tv1"/>
+  <link url="http://www.dr.dk/tjenester/podcast/update.asx?qid=288417" aspectRatio="15:9" title="Denmark DR Update" country="Denmark" access="Denmark" category="tv1"/>
   <!--Egypt-->
   <link title="Egypt NileTV" aspectRatio="15:9" url="http://live.sis.gov.eg/tv" country="Egypt" category="news"/>
   <link title="Egypt Sat 7 Kids" aspectRatio="15:9" url="http://energy10.egihosting.com/859238" country="Egypt" category="kid"/>
@@ -212,10 +213,10 @@
   <link url="http://rss.mac.com/oasen/iWeb/Websted/Podcast/rss.xml" aspectRatio="15:9" title="Norway Oasen Studio" country="Norway" category="arts"/>
   <link url="http://yogababy.blip.tv/rss" aspectRatio="15:9" title="Norway Yogababy" country="Norway" category="health"/>
   <!--Norway Local-->
-  <link url="mms://straumV.nrk.no/nrk_tv_svisj24_mbr" aspectRatio="15:9" title="Norway NRK Svisj" country="Norway Local" category="tv2"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk1_m" aspectRatio="15:9" title="Norway NRK1" country="Norway Local" category="tv2"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk2_m" aspectRatio="15:9" title="Norway NRK2" country="Norway Local" category="tv2"/>
-  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk3_m" aspectRatio="15:9" title="Norway NRK3" country="Norway Local" category="tv2"/>
+  <link url="mms://straumV.nrk.no/nrk_tv_svisj24_mbr" aspectRatio="15:9" title="Norway NRK Svisj" country="Norway" access="Norway" category="tv2"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk1_m" aspectRatio="15:9" title="Norway NRK1" country="Norway" access="Norway" category="tv2"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk2_m" aspectRatio="15:9" title="Norway NRK2" country="Norway" access="Norway" category="tv2"/>
+  <link url="mms://straumv.nrk.no/nrk_tv_direkte_nrk3_m" aspectRatio="15:9" title="Norway NRK3" country="Norway" access="Norway" category="tv2"/>
   <!--Pakistan-->
   <link title="Pakistan International Express News" aspectRatio="15:9" url="mms://ams01.egihosting.com/ExpressEnglish?MSWMExt=.asf" country="Pakistan" category="news"/>
   <link url="http://jeff.wm-live.abacast.com/dawnmedia-live-300" aspectRatio="15:9" title="Pakistan TV" country="Pakistan" category="news"/>