X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=application%2Fresources%2Fstations%2Fgeneratelist.xq;h=2db253b9a3c75c9c05999b0b4b86f6fdf3d24429;hb=af110a23ebc3aec0702edae07a13e22804504792;hp=719c9d86ea1feaeb2ff2f91e65e703081d2ce05d;hpb=1bf3ea5834eb31496d3b4de1c84973c7066d5e69;p=quandoparte

diff --git a/application/resources/stations/generatelist.xq b/application/resources/stations/generatelist.xq
index 719c9d8..2db253b 100644
--- a/application/resources/stations/generatelist.xq
+++ b/application/resources/stations/generatelist.xq
@@ -1,17 +1,30 @@
 <stations>
 {
-for $doc in ('nord.osm',
-             'nordovest.osm',
-             'nordest.osm',
-             'liguria.osm',
-             'centronord.osm', 
-	     'centrosud.osm', 
-	     'sud.osm', 
-	     'sicilia.osm', 
-	     'puglia.osm', 
-	     'sardegna.osm')
+for $doc in (
+	'nord.osm',
+	'nordovest.osm',
+	'nordest.osm',
+	'liguria.osm',
+	'centronord.osm', 
+	'centrosud.osm', 
+	'sud.osm', 
+	'sicilia.osm', 
+	'puglia.osm', 
+	'sardegna.osm',
+	'h-nord.osm',
+	'h-nordovest.osm',
+	'h-nordest.osm',
+	'h-liguria.osm',
+	'h-centronord.osm', 
+	'h-centrosud.osm', 
+	'h-sud.osm', 
+	'h-sicilia.osm', 
+	'h-puglia.osm', 
+	'h-sardegna.osm')
 for $node in doc($doc)//node
 where $node/tag[@k='name'] and (
+fn:not(fn:exists($node//tag[@k='disused'])) or fn:contains($node//tag[@k='disused']/@v, 'no') 
+) and (
 $node/tag[@k='operator'] and (
 fn:contains($node//tag[@k='operator']/@v, 'RFI') or 
 fn:contains($node//tag[@k='operator']/@v, 'Centostazioni') or 
@@ -24,11 +37,14 @@ data($node/@lat)
 data($node/@lon)
 }
 </pos>
-<name>
-{
-data($node//tag[@k='name']/@v)
-}
-</name>
+<name>{
+if (fn:exists(data($node//tag[@k='name:rfi']))) then
+	data($node//tag[@k='name:rfi']/@v)
+else if (fn:exists(data($node//tag[@k='name:it']))) then
+	data($node//tag[@k='name:it']/@v)
+else
+	data($node//tag[@k='name']/@v)
+}</name>
 </station>
 }
 </stations>