X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FXmlFileLoader.java;h=5af471a2119e2e839589ec1af042d479d75f6016;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=3f1b2eb6fed19246785cf41a883e75a5c4b7f476;hpb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;p=GpsPrune.git

diff --git a/tim/prune/load/xml/XmlFileLoader.java b/tim/prune/load/xml/XmlFileLoader.java
index 3f1b2eb..5af471a 100644
--- a/tim/prune/load/xml/XmlFileLoader.java
+++ b/tim/prune/load/xml/XmlFileLoader.java
@@ -1,15 +1,25 @@
 package tim.prune.load.xml;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
+
 import tim.prune.App;
 import tim.prune.I18nManager;
-import tim.prune.data.Altitude;
+import tim.prune.data.SourceInfo;
+import tim.prune.load.MediaLinkInfo;
 
 /**
  * Class for handling loading of Xml files, and passing the
@@ -60,12 +70,20 @@ public class XmlFileLoader extends DefaultHandler implements Runnable
 	 */
 	public void run()
 	{
+		FileInputStream inStream = null;
+		boolean success = false;
 		try
 		{
-			// Construct a SAXParser and use this as a default handler
-			SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-			saxParser.parse(_file, this);
+			inStream = new FileInputStream(_file);
+			success = parseXmlStream(inStream);
+		}
+		catch (FileNotFoundException fnfe) {}
 
+		// Clean up the stream, don't need it any more
+		try {inStream.close();} catch (IOException e2) {}
+
+		if (success)
+		{
 			// Check whether handler was properly instantiated
 			if (_handler == null)
 			{
@@ -76,18 +94,53 @@ public class XmlFileLoader extends DefaultHandler implements Runnable
 			else
 			{
 				// Pass information back to app
+				SourceInfo sourceInfo = new SourceInfo(_file,
+					(_handler instanceof GpxHandler?SourceInfo.FILE_TYPE.GPX:SourceInfo.FILE_TYPE.KML));
 				_app.informDataLoaded(_handler.getFieldArray(), _handler.getDataArray(),
-					Altitude.Format.METRES, _file.getName());
+					null, sourceInfo, _handler.getTrackNameList(),
+					new MediaLinkInfo(_handler.getLinkArray()));
 			}
 		}
-		catch (Exception e)
+	}
+
+
+	/**
+	 * Try both Xerces and the built-in java classes to parse the given xml stream
+	 * @param inStream input stream from file / zip / gzip
+	 * @return true on success, false if both xerces and built-in parser failed
+	 */
+	public boolean parseXmlStream(InputStream inStream)
+	{
+		boolean success = false;
+		// Firstly, try to use xerces to parse the xml (will throw an exception if not available)
+		try
 		{
-			// Show error dialog
-			_app.showErrorMessageNoLookup("error.load.dialogtitle",
-				I18nManager.getText("error.load.othererror") + " " + e.getMessage());
+			XMLReader xmlReader = XMLReaderFactory.createXMLReader("org.apache.xerces.parsers.SAXParser");
+			xmlReader.setContentHandler(this);
+			xmlReader.parse(new InputSource(inStream));
+			success = true; // worked
 		}
-	}
+		catch (Exception e) {} // don't care too much if it didn't work, there's a backup
 
+		// If that didn't work, try the built-in classes (which work for xml1.0 but handling for 1.1 contains bugs)
+		if (!success)
+		{
+			try
+			{
+				// Construct a SAXParser and use this as a default handler
+				SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
+				saxParser.parse(inStream, this);
+				success = true;
+			}
+			catch (Exception e)
+			{
+				// Show error dialog
+				_app.showErrorMessageNoLookup("error.load.dialogtitle",
+					I18nManager.getText("error.load.othererror") + " " + e.getMessage());
+			}
+		}
+		return success;
+	}
 
 	/**
 	 * Receive a tag