From d5e8272ad44e87a4ac1a7b142ca36b5c5978fca7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 26 Jul 2010 21:09:54 +0100
Subject: relocate serialization code from SQLiteRegionData to MoapModule using
 load and save events.

This is better modularity.  It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields.  MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
---
 OpenSim/Data/SQLite/SQLiteRegionData.cs | 55 ++-------------------------------
 1 file changed, 2 insertions(+), 53 deletions(-)

(limited to 'OpenSim/Data/SQLite')

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b564419..f63d35e 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -31,7 +31,6 @@ using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using Mono.Data.Sqlite;
 using OpenMetaverse;
@@ -1862,28 +1861,7 @@ namespace OpenSim.Data.SQLite
             s.ExtraParams = (byte[]) row["ExtraParams"];
             
             if (!(row["Media"] is System.DBNull))
-            {
-                using (StringReader sr = new StringReader((string)row["Media"]))
-                {
-                    using (XmlTextReader xtr = new XmlTextReader(sr))
-                    {            
-                        xtr.ReadStartElement("osmedia");     
-                        
-                        OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
-                        
-                        List<MediaEntry> mediaEntries = new List<MediaEntry>();
-                        foreach (OSD osdMe in osdMeArray)
-                        {
-                            MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
-                            mediaEntries.Add(me);
-                        }
-                        
-                        s.Media = mediaEntries;               
-                        
-                        xtr.ReadEndElement();
-                    }
-                }
-            }
+                s.MediaRaw = (string)row["Media"];
                         
             return s;
         }
@@ -1928,36 +1906,7 @@ namespace OpenSim.Data.SQLite
 
             row["Texture"] = s.TextureEntry;
             row["ExtraParams"] = s.ExtraParams;
-            
-            if (null != s.Media)
-            {
-                using (StringWriter sw = new StringWriter())
-                {
-                    using (XmlTextWriter xtw = new XmlTextWriter(sw))
-                    {                
-                        xtw.WriteStartElement("osmedia");
-                        xtw.WriteAttributeString("type", "sl");
-                        xtw.WriteAttributeString("major_version", "0");
-                        xtw.WriteAttributeString("minor_version", "1");
-                        
-                        OSDArray meArray = new OSDArray();
-                        foreach (MediaEntry me in s.Media)
-                        {
-                            OSD osd = (null == me ? new OSD() : me.GetOSD());
-                            meArray.Add(osd);
-                        }              
-                        
-                        xtw.WriteStartElement("osdata");
-                        xtw.WriteRaw(OSDParser.SerializeLLSDXmlString(meArray));
-                        xtw.WriteEndElement();
-                        
-                        xtw.WriteEndElement();
-                        
-                        xtw.Flush();   
-                        row["Media"] = sw.ToString();                
-                    }
-                }
-            }
+            row["Media"] = s.MediaRaw;
         }
 
         /// <summary>
-- 
cgit v1.1