Changeset 122 for branches/XmlTextReaderBranch/HeuristicLab.Core/PersistenceManager.cs

Timestamp:

04/15/08 14:17:26 (16 years ago)

Author:

gkronber

Message:

bug fixes to make loading of OSGA-TSP work. Some non-working code remains

File:

• branches/XmlTextReaderBranch/HeuristicLab.Core/PersistenceManager.cs (modified) (3 diffs)

branches/XmlTextReaderBranch/HeuristicLab.Core/PersistenceManager.cs

@@ -51 +51 @@
 
     public static IStorable Restore(XmlReader reader, string elementName, IDictionary<Guid, IStorable> restoredObjects) {
-      reader.ReadToDescendant(elementName);
-      return RestoreElement(reader, restoredObjects);
+      reader = reader.ReadSubtree();
+      reader.Read();
+      if(reader.Name != elementName) throw new XmlException("Expected: \"" + elementName + "\" found: \"" + reader.Name+"\"");
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
     }
 
     public static IStorable Restore(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      reader = reader.ReadSubtree();
       reader.Read();
-      return RestoreElement(reader, restoredObjects);
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
     }
     private static IStorable RestoreElement(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       Guid guid = new Guid(reader["GUID"]);
-      if(restoredObjects.ContainsKey(guid)) {
-        reader.ReadEndElement();
+      if(restoredObjects.ContainsKey(guid)) {        
         return restoredObjects[guid];
       } else {
@@ -69 +77 @@
         restoredObjects.Add(guid, instance);
         instance.Populate(reader, restoredObjects);
-        reader.ReadEndElement();
         return instance;
       }
@@ -90 +97 @@
     }
     public static IStorable Load(Stream stream) {
-      XmlDocument doc = new XmlDocument();
-      XmlTextReader reader = new XmlTextReader(stream);
-      reader.WhitespaceHandling = WhitespaceHandling.None;
+      XmlReaderSettings settings = new XmlReaderSettings();
+      settings.IgnoreComments = true;
+      settings.IgnoreWhitespace = true;
+      XmlReader reader = XmlReader.Create(stream, settings);
       reader.MoveToContent(); // read "<?xml version="1.0"?/>
       return PersistenceManager.RestoreElement(reader, new Dictionary<Guid, IStorable>());