# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1351053208 -10800
# Node ID 3d9e4247736775065238890304f227adbf4a18a4
# Parent  b51ad733b624e12e941221f45761175732378531
More improvements in the parsing and XML output.

diff -r b51ad733b624 -r 3d9e42477367 parsedata.pl
--- a/parsedata.pl	Wed Oct 24 07:28:06 2012 +0300
+++ b/parsedata.pl	Wed Oct 24 07:33:28 2012 +0300
@@ -520,8 +520,8 @@
   print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".
   "<timetable>\n".
   " <class>\n".
-  "  <general>".join("", map { "<node>".encode_entities($_)."</node>"; } @{$class{"info"}})."</general>\n".
-  "  <info>".join("", map { "<node>".encode_entities(html_collapse($_, 1))."</node>"; } @{$class{"data"}})."</info>\n".
+  "  <general>".join("", map { "<node>".$_."</node>"; } @{$class{"info"}})."</general>\n".
+  "  <info>".join("", map { "<node>".html_collapse($_, 1)."</node>"; } @{$class{"data"}})."</info>\n".
   "  <maxdays>$maxDays</maxdays>\n".
   "  <firsthour>$firstHour</firsthour>\n".
   "  <lasthour>$lastHour</lasthour>\n".
@@ -529,13 +529,15 @@
   " </class>\n";
 
   print " <hours>\n";
+  my $cid = 0;
   foreach my $chour (@$hourTimes) {
-    print "  <hour><start>".$$chour{"start"}."</start><end>".$$chour{"end"}."</end></hour>\n";
+    print "  <hour id=\"".$cid."\"><start>".$$chour{"start"}."</start><end>".$$chour{"end"}."</end></hour>\n";
+    $cid++;
   }
   print " </hours>\n\n";
 
   print " <classes>\n";
-  foreach my $cid (sort { $a <=> $b } keys %{$hourDefs}) {
+  foreach $cid (sort { $a <=> $b } keys %{$hourDefs}) {
     print "  <class id=\"$cid\">".getDataStruct($$hourDefs{$cid}, 0)."</class>\n";
   }
   print " </classes>\n\n";
diff -r b51ad733b624 -r 3d9e42477367 update.sh
--- a/update.sh	Wed Oct 24 07:28:06 2012 +0300
+++ b/update.sh	Wed Oct 24 07:33:28 2012 +0300
@@ -64,6 +64,7 @@
 		fi
 		echo "Parsing $i"
 		perl parsedata.pl -php "$INFILE" -o "${CACHEDIR}${DATAFILE}"
+		perl parsedata.pl -xml "$INFILE" -o "${CACHEDIR}${i}.xml"
 	fi
 done
 fi