From a373d599db9e47d2db8e72285556a1a62bea8fed Mon Sep 17 00:00:00 2001
From: "andreas.schildbach@gmail.com"
 <andreas.schildbach@gmail.com@0924bc21-9374-b0fa-ee44-9ff1593b38f0>
Date: Wed, 25 May 2011 15:26:27 +0000
Subject: [PATCH] parse disableTrainInfo attribute in xmlQueryDepartures

git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@659 0924bc21-9374-b0fa-ee44-9ff1593b38f0
---
 .../schildbach/pte/AbstractHafasProvider.java | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index 64264ab1..bbdf8d4c 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -421,15 +421,16 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			+ "(?:e_delay\\s*=\"\\d+\"\\s*)?" // (???)
 			+ "(?:newpl\\s*=\"([^\"]*)\"\\s*)?" //
 			+ "(?:platform\\s*=\"([^\"]*)\"\\s*)?" // position
-			+ "targetLoc\\s*=\"([^\"]*)\"\\s*" // destination
+			+ "(?:targetLoc\\s*=\"([^\"]*)\"\\s*)?" // destination
 			+ "(?:hafasname\\s*=\"([^\"]*)\"\\s*)?" // line
 			+ "prod\\s*=\"([^\"]*)\"\\s*" // line
 			+ "(?:class\\s*=\"([^\"]*)\"\\s*)?" // class
-			+ "(?:dir\\s*=\"[^\"]*\"\\s*)?" // (destination)
+			+ "(?:dir\\s*=\"([^\"]*)\"\\s*)?" // destination
 			+ "(?:capacity\\s*=\"[^\"]*\"\\s*)?" // (???)
 			+ "(?:depStation\\s*=\"(.*?)\"\\s*)?" //
 			+ "(?:delayReason\\s*=\"([^\"]*)\"\\s*)?" // message
-			+ "(?:is_reachable\\s*=\"([^\"]*)\"\\s*)?" // (???)
+			+ "(?:is_reachable\\s*=\"[^\"]*\"\\s*)?" // (???)
+			+ "(?:disableTrainInfo\\s*=\"[^\"]*\"\\s*)?" // (???)
 	);
 	private static final Pattern P_XML_QUERY_DEPARTURES_MESSAGES = Pattern.compile("<Err code=\"([^\"]*)\" text=\"([^\"]*)\"");
 
@@ -468,7 +469,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			final Matcher mFine = P_XML_QUERY_DEPARTURES_FINE.matcher(mCoarse.group(1));
 			if (mFine.matches())
 			{
-				if (mFine.group(10) == null)
+				if (mFine.group(11) == null)
 				{
 					final Calendar plannedTime = new GregorianCalendar(timeZone());
 					plannedTime.clear();
@@ -495,7 +496,13 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 
 					final String position = mFine.group(5) != null ? "Gl. " + ParserUtils.resolveEntities(mFine.group(5)) : null;
 
-					final String destination = ParserUtils.resolveEntities(mFine.group(6)).trim();
+					final String destination;
+					if (mFine.group(10) != null)
+						destination = ParserUtils.resolveEntities(mFine.group(10)).trim();
+					else if (mFine.group(6) != null)
+						destination = ParserUtils.resolveEntities(mFine.group(6)).trim();
+					else
+						destination = null;
 
 					final String hafasName = ParserUtils.resolveEntities(mFine.group(7));
 
@@ -509,9 +516,9 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 					final String line = product != 0 ? product + prod : normalizeLine(prod);
 
 					final String message;
-					if (mFine.group(11) != null)
+					if (mFine.group(12) != null)
 					{
-						final String msg = ParserUtils.resolveEntities(mFine.group(11)).trim();
+						final String msg = ParserUtils.resolveEntities(mFine.group(12)).trim();
 						message = msg.length() > 0 ? msg : null;
 					}
 					else