X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fgpsies%2FGpsiesXmlHandler.java;h=3d801be5bc845c5e449c486626ef0837d89ba4d6;hp=e63916029450a4ae0f5c3159cc65e26405e127a5;hb=f35b6d628f68e3b5ef19965ad8988d0dd1eb8efa;hpb=3745d70b1427bb8ac1a085e47cbdc566936784e1

diff --git a/tim/prune/function/gpsies/GpsiesXmlHandler.java b/tim/prune/function/gpsies/GpsiesXmlHandler.java
index e639160..3d801be 100644
--- a/tim/prune/function/gpsies/GpsiesXmlHandler.java
+++ b/tim/prune/function/gpsies/GpsiesXmlHandler.java
@@ -11,13 +11,6 @@ import org.xml.sax.helpers.DefaultHandler;
  */
 public class GpsiesXmlHandler extends DefaultHandler
 {
-	private boolean _inTracks = false;
-	private boolean _inTrack = false;
-	private boolean _inTrackName = false;
-	private boolean _inDescription = false;
-	private boolean _inFileId = false;
-	private boolean _inTrackLength = false;
-	private boolean _inLink = false;
 	private String _value = null;
 	private ArrayList<GpsiesTrack> _trackList = null;
 	private GpsiesTrack _track = null;
@@ -30,18 +23,12 @@ public class GpsiesXmlHandler extends DefaultHandler
 		Attributes inAttributes) throws SAXException
 	{
 		if (inTagName.equals("tracks")) {
-			_inTracks = true;
 			_trackList = new ArrayList<GpsiesTrack>();
 		}
-		else if (_inTracks && inTagName.equals("track")) {
-			_inTrack = true;
+		else if (inTagName.equals("track")) {
 			_track = new GpsiesTrack();
 		}
-		else if (_inTrack && inTagName.equals("title")) {_inTrackName = true;}
-		else if (_inTrack && inTagName.equals("description")) {_inDescription = true;}
-		else if (_inTrack && inTagName.equals("fileId")) {_inFileId = true;}
-		else if (_inTrack && inTagName.equals("trackLengthM")) {_inTrackLength = true;}
-		else if (_inTrack && inTagName.equals("downloadLink")) {_inLink = true;}
+		_value = null;
 		super.startElement(inUri, inLocalName, inTagName, inAttributes);
 	}
 
@@ -51,33 +38,26 @@ public class GpsiesXmlHandler extends DefaultHandler
 	public void endElement(String inUri, String inLocalName, String inTagName)
 	throws SAXException
 	{
-		if (inTagName.equals("tracks")) {_inTracks = false;}
-		else if (_inTrack && inTagName.equals("track")) {
+		if (inTagName.equals("track")) {
 			_trackList.add(_track);
-			_inTrack = false;
 		}
-		else if (_inTrackName && inTagName.equals("title")) {
+		else if (inTagName.equals("title")) {
 			_track.setTrackName(_value);
-			_inTrackName = false;
 		}
-		else if (_inDescription && inTagName.equals("description")) {
+		else if (inTagName.equals("description")) {
 			_track.setDescription(_value);
-			_inDescription = false;
 		}
-		else if (_inFileId && inTagName.equals("fileId")) {
-			_track.setFileId(_value);
-			_inFileId = false;
+		else if (inTagName.equals("fileId")) {
+			_track.setWebUrl("http://gpsies.com/map.do?fileId=" + _value);
 		}
-		else if (_inTrackLength && inTagName.equals("trackLengthM")) {
+		else if (inTagName.equals("trackLengthM")) {
 			try {
 				_track.setLength(Double.parseDouble(_value));
 			}
 			catch (NumberFormatException nfe) {}
-			_inTrackLength = false;
 		}
-		else if (_inLink && inTagName.equals("downloadLink")) {
+		else if (inTagName.equals("downloadLink")) {
 			_track.setDownloadLink(_value);
-			_inLink = false;
 		}
 		super.endElement(inUri, inLocalName, inTagName);
 	}
@@ -88,9 +68,8 @@ public class GpsiesXmlHandler extends DefaultHandler
 	public void characters(char[] inCh, int inStart, int inLength)
 	throws SAXException
 	{
-		_value = new String(inCh, inStart, inLength);
-		// System.out.println("Value: '" + value + "'");
-		// TODO: Note, this doesn't cope well with split characters for really long descriptions etc
+		String value = new String(inCh, inStart, inLength);
+		_value = (_value==null?value:_value+value);
 		super.characters(inCh, inStart, inLength);
 	}