X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FZipFileLoader.java;h=ba9407c8063c9ea9beb44c213c3da53a099af6dd;hp=cf3801c3053fd34f8b7322b35f764a9add4e73c3;hb=112bb0c9b46894adca9a33ed8c99ea712b253185;hpb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index cf3801c..ba9407c 100644
--- a/tim/prune/load/xml/ZipFileLoader.java
+++ b/tim/prune/load/xml/ZipFileLoader.java
@@ -1,9 +1,11 @@
 package tim.prune.load.xml;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -33,7 +35,7 @@ public class ZipFileLoader
 	}
 
 	/**
-	 * Open the selected file and show the GUI dialog to select load options
+	 * Open the selected file and select appropriate xml loader
 	 * @param inFile File to open
 	 */
 	public void openFile(File inFile)
@@ -75,8 +77,52 @@ public class ZipFileLoader
 			}
 		}
 		catch (Exception e) {
-			System.err.println("Error: " + e.getMessage());
+			System.err.println("Error: " + e.getClass().getName() + " -message= " + e.getMessage());
 		}
 	}
 
+	/**
+	 * Use the given stream to access a remote zip file
+	 * @param inStream stream to use to access file
+	 */
+	public void openStream(InputStream inStream)
+	{
+		try
+		{
+			ZipInputStream zis = new ZipInputStream(inStream);
+			boolean xmlFound = false;
+			while (!xmlFound && zis.available() > 0)
+			{
+				ZipEntry entry = zis.getNextEntry();
+				String entryName = entry.toString();
+				if (entryName != null && entryName.length() > 4)
+				{
+					String suffix = entryName.substring(entryName.length()-4).toLowerCase();
+					if (suffix.equals(".kml") || suffix.equals(".gpx") || suffix.equals(".xml"))
+					{
+						_xmlLoader.reset();
+						SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
+						saxParser.parse(zis, _xmlLoader);
+						XmlHandler handler = _xmlLoader.getHandler();
+						if (handler == null) {
+							_app.showErrorMessage("error.load.dialogtitle", "error.load.othererror");
+						}
+						else {
+							// Send back to app
+							_app.informDataLoaded(handler.getFieldArray(), handler.getDataArray(),
+								Altitude.Format.METRES, "gpsies");
+							xmlFound = true;
+						}
+					}
+				}
+			}
+			// Check whether there was an xml file inside
+			if (!xmlFound) {
+				_app.showErrorMessage("error.load.dialogtitle", "error.load.noxmlinzip");
+			}
+		}
+		catch (Exception e) {
+			System.err.println("Error: " + e.getClass().getName() + " -message= " + e.getMessage());
+		}
+	}
 }