Changeset 1466 for trunk/sources/HeuristicLab.Persistence/Default/Xml/XmlParser.cs

Timestamp:

03/30/09 15:06:13 (16 years ago)

Author:

epitzer

Message:

Produce only a single (zipped) file that contains data and type cache and normalize line breaks. (#562)

File:

• trunk/sources/HeuristicLab.Persistence/Default/Xml/XmlParser.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/Default/Xml/XmlParser.cs

@@ -6 +6 @@
 using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Interfaces;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Persistence.Default.Xml {
@@ -105 +106 @@
     }
 
-    public static object DeSerialize(string basename) {
+    public static object DeSerialize(string filename) {
+      ZipFile zipFile = new ZipFile(filename);      
       DeSerializer deSerializer = new DeSerializer(
-        ParseTypeCache(new StreamReader(basename + "-types.xml")));
-      XmlParser parser = new XmlParser(new StreamReader(basename + ".xml"));
+        ParseTypeCache(
+        new StreamReader(
+          zipFile.GetInputStream(zipFile.GetEntry("typecache.xml")))));
+      XmlParser parser = new XmlParser(
+        new StreamReader(zipFile.GetInputStream(zipFile.GetEntry("data.xml"))));
       return deSerializer.DeSerialize(parser);      
     }