Changeset 1466 for trunk/sources

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)

Location:

trunk/sources

Files:

• HeuristicLab.Persistence.Test/NewSerializationTest.cs (modified) (4 diffs)
• HeuristicLab.Persistence/Default/Xml/XmlGenerator.cs (modified) (8 diffs)
• HeuristicLab.Persistence/Default/Xml/XmlParser.cs (modified) (2 diffs)
• HeuristicLab.Persistence/HeuristicLab.Persistence.csproj (modified) (1 diff)

trunk/sources/HeuristicLab.Persistence.Test/NewSerializationTest.cs

@@ -166 +166 @@
       r.dict.Add("three", 3);
       r.myEnum = TestEnum.va1;
-      XmlGenerator.Serialize(r, "test");      
-      object o = XmlParser.DeSerialize("test");
+      XmlGenerator.Serialize(r, "test.zip");      
+      object o = XmlParser.DeSerialize("test.zip");
       Console.Out.WriteLine(Util.AutoFormat(o, true));
       Console.WriteLine(ViewOnlyGenerator.Serialize(r));
@@ -180 +180 @@
       c.allCs = cs;
       c.kvpList = new KeyValuePair<List<C>, C>(new List<C> { c }, c);
-      XmlGenerator.Serialize(cs, "test3");
-      object o = XmlParser.DeSerialize("test3");
+      XmlGenerator.Serialize(cs, "test3.zip");
+      object o = XmlParser.DeSerialize("test3.zip");
       Console.Out.WriteLine(Util.AutoFormat(o, true));
       Console.WriteLine(ViewOnlyGenerator.Serialize(cs));
@@ -201 +201 @@
                               new[] { 1, 2 }, new[] { 3, 4 });
       arrayListArray[2].Add(a);
-      XmlGenerator.Serialize(arrayListArray, "test4");
-      object o = XmlParser.DeSerialize("test4");
+      XmlGenerator.Serialize(arrayListArray, "test4.zip");
+      object o = XmlParser.DeSerialize("test4.zip");
       Console.Out.WriteLine(Util.AutoFormat(o, true));
       Console.WriteLine(ViewOnlyGenerator.Serialize(arrayListArray));
@@ -210 +210 @@
     public static void Test2() {
       Manager m = new Manager();      
-      Serializer s = new Serializer(m,
-        ConfigurationService.Instance.GetDefaultConfig(XmlFormat.Instance));
-      XmlGenerator xmlGenerator = new XmlGenerator();
-      StreamWriter writer = new StreamWriter("test2.xml");
-      foreach (ISerializationToken token in s) {
-        string line = xmlGenerator.Format(token);
-        writer.Write(line);
-        Console.Out.Write(line);
-      }
-      writer.Close();
-      XmlParser parser = new XmlParser(new StreamReader("test2.xml"));
-      DeSerializer deSerializer = new DeSerializer(
-        XmlParser.ParseTypeCache(new StreamReader("test-types.xml")));        
-      object o = deSerializer.DeSerialize(parser);      
+      XmlGenerator.Serialize(m, "test2.zip");
+      object o = XmlParser.DeSerialize("test2.zip");
       Console.Out.WriteLine(Util.AutoFormat(o, true));      
     }    

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

@@ -5 +5 @@
 using HeuristicLab.Persistence.Core;
 using System.IO;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Persistence.Default.Xml {
@@ -88 +89 @@
         {"id", beginToken.Id}};
       string result = Prefix +
-                      FormatNode(XmlStrings.COMPOSITE, attributes, NodeType.Start) + "\n";
+                      FormatNode(XmlStrings.COMPOSITE, attributes, NodeType.Start) + "\r\n";
       depth += 1;
       return result;
@@ -95 +96 @@
     protected override string Format(EndToken endToken) {      
       depth -= 1;
-      return Prefix + "</" + XmlStrings.COMPOSITE + ">\n";
+      return Prefix + "</" + XmlStrings.COMPOSITE + ">\r\n";
     }
 
@@ -106 +107 @@
       return Prefix +
         FormatNode(XmlStrings.PRIMITIVE, attributes, NodeType.Start) +
-        dataToken.SerialData + "</" + XmlStrings.PRIMITIVE + ">\n";      
+        dataToken.SerialData + "</" + XmlStrings.PRIMITIVE + ">\r\n";      
     }
 
@@ -113 +114 @@
         {"ref", refToken.Id},
         {"name", refToken.Name}};                                       
-      return Prefix + FormatNode(XmlStrings.REFERENCE, attributes, NodeType.Inline) + "\n";  
+      return Prefix + FormatNode(XmlStrings.REFERENCE, attributes, NodeType.Inline) + "\r\n";  
     }
 
@@ -119 +120 @@
       var attributes = new Dictionary<string, object>{
         {"name", nullRefToken.Name}};      
-      return Prefix + FormatNode(XmlStrings.NULL, attributes, NodeType.Inline) + "\n";
+      return Prefix + FormatNode(XmlStrings.NULL, attributes, NodeType.Inline) + "\r\n";
     }
 
@@ -129 +130 @@
           mapping.GetDict(),
           NodeType.Inline,
-          "\n    ");
+          "\r\n    ");
       yield return "</" + XmlStrings.TYPECACHE + ">";
     }
@@ -137 +138 @@
     }
 
-    public static void Serialize(object o, string basename, Configuration configuration) {
-      Serializer s = new Serializer(o, configuration);
-      XmlGenerator xmlGenerator = new XmlGenerator();
-      StreamWriter writer = new StreamWriter(basename + ".xml");
-      foreach (ISerializationToken token in s) {
-        string line = xmlGenerator.Format(token);
-        writer.Write(line);
-        Console.Out.Write(line);
-      }
-      writer.Close();
-      writer = new StreamWriter(basename + "-types.xml");
-      foreach (string line in xmlGenerator.Format(s.TypeCache)) {
+    public static void Serialize(object obj, string filename, Configuration config) {
+      Serializer serializer = new Serializer(obj, config);
+      XmlGenerator generator = new XmlGenerator();
+      ZipOutputStream zipStream = new ZipOutputStream(File.Create(filename));
+      zipStream.SetLevel(9);      
+      zipStream.PutNextEntry(new ZipEntry("data.xml"));      
+      StreamWriter writer = new StreamWriter(zipStream);
+      foreach ( ISerializationToken token in serializer )
+        writer.Write(generator.Format(token));
+      writer.Flush();
+      zipStream.PutNextEntry(new ZipEntry("typecache.xml"));
+      writer = new StreamWriter(zipStream);
+      foreach ( string line in generator.Format(serializer.TypeCache))
         writer.WriteLine(line);
-        Console.Out.WriteLine(line);
-      }
-      writer.Close();      
+      writer.Flush();            
+      zipStream.Close();      
     }
 

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);      
     }

trunk/sources/HeuristicLab.Persistence/HeuristicLab.Persistence.csproj

@@ -44 +44 @@
   -->
   <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\HeuristicLab.PluginInfrastructure.GUI\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />