OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add region to db

afrisby
Sean Dague 2007-08-23 19:48:21 +00:00
parent ff7164196d
commit f6e0791e04
1 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
View File

@ -21,12 +21,11 @@ using Mono.Data.SqliteClient;
namespace OpenSim.DataStore.MonoSqliteStorage namespace OpenSim.DataStore.MonoSqliteStorage
{ {
public class MonoSqliteDataStore : IRegionDataStore public class MonoSqliteDataStore : IRegionDataStore
{ {
private const string primSelect = "select * from prims"; private const string primSelect = "select * from prims";
private const string shapeSelect = "select * from primshapes"; private const string shapeSelect = "select * from primshapes";
private DataSet ds; private DataSet ds;
private SqliteDataAdapter primDa; private SqliteDataAdapter primDa;
private SqliteDataAdapter shapeDa; private SqliteDataAdapter shapeDa;
@ -76,7 +75,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
{ {
foreach (SceneObjectPart prim in obj.Children.Values) foreach (SceneObjectPart prim in obj.Children.Values)
{ {
addPrim(prim, obj.UUID); addPrim(prim, obj.UUID, regionUUID);
} }
// MainLog.Instance.Verbose("Attempting to do database update...."); // MainLog.Instance.Verbose("Attempting to do database update....");
@ -84,7 +83,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
shapeDa.Update(ds, "primshapes"); shapeDa.Update(ds, "primshapes");
// MainLog.Instance.Verbose("Dump of prims:", ds.GetXml()); // MainLog.Instance.Verbose("Dump of prims:", ds.GetXml());
} }
public void RemoveObject(LLUUID obj, LLUUID regionUUID) public void RemoveObject(LLUUID obj, LLUUID regionUUID)
{ {
DataTable prims = ds.Tables["prims"]; DataTable prims = ds.Tables["prims"];
@ -115,7 +114,8 @@ namespace OpenSim.DataStore.MonoSqliteStorage
DataTable prims = ds.Tables["prims"]; DataTable prims = ds.Tables["prims"];
DataTable shapes = ds.Tables["primshapes"]; DataTable shapes = ds.Tables["primshapes"];
foreach (DataRow primRow in prims.Rows) string byRegion = "RegionUUID = '" + regionUUID.ToString() + "'";
foreach (DataRow primRow in prims.Select(byRegion))
{ {
string uuid = (string)primRow["UUID"]; string uuid = (string)primRow["UUID"];
string objID = (string)primRow["SceneGroupID"]; string objID = (string)primRow["SceneGroupID"];
@ -191,42 +191,42 @@ namespace OpenSim.DataStore.MonoSqliteStorage
// TODO: DataSet commit // TODO: DataSet commit
} }
public class TextureBlock // public class TextureBlock
{ // {
public byte[] TextureData; // public byte[] TextureData;
public byte[] ExtraParams = new byte[1]; // public byte[] ExtraParams = new byte[1];
public TextureBlock(byte[] data) // public TextureBlock(byte[] data)
{ // {
TextureData = data; // TextureData = data;
} // }
public TextureBlock() // public TextureBlock()
{ // {
} // }
public string ToXMLString() // public string ToXMLString()
{ // {
StringWriter sw = new StringWriter(); // StringWriter sw = new StringWriter();
XmlTextWriter writer = new XmlTextWriter(sw); // XmlTextWriter writer = new XmlTextWriter(sw);
XmlSerializer serializer = new XmlSerializer(typeof(TextureBlock)); // XmlSerializer serializer = new XmlSerializer(typeof(TextureBlock));
serializer.Serialize(writer, this); // serializer.Serialize(writer, this);
return sw.ToString(); // return sw.ToString();
} // }
public static TextureBlock FromXmlString(string xmlData) // public static TextureBlock FromXmlString(string xmlData)
{ // {
TextureBlock textureEntry = null; // TextureBlock textureEntry = null;
StringReader sr = new StringReader(xmlData); // StringReader sr = new StringReader(xmlData);
XmlTextReader reader = new XmlTextReader(sr); // XmlTextReader reader = new XmlTextReader(sr);
XmlSerializer serializer = new XmlSerializer(typeof(TextureBlock)); // XmlSerializer serializer = new XmlSerializer(typeof(TextureBlock));
textureEntry = (TextureBlock)serializer.Deserialize(reader); // textureEntry = (TextureBlock)serializer.Deserialize(reader);
reader.Close(); // reader.Close();
sr.Close(); // sr.Close();
return textureEntry; // return textureEntry;
} // }
} // }
/*********************************************************************** /***********************************************************************
* *
@ -247,6 +247,7 @@ namespace OpenSim.DataStore.MonoSqliteStorage
DataTable prims = new DataTable("prims"); DataTable prims = new DataTable("prims");
createCol(prims, "UUID", typeof(System.String)); createCol(prims, "UUID", typeof(System.String));
createCol(prims, "RegionUUID", typeof(System.String));
createCol(prims, "ParentID", typeof(System.Int32)); createCol(prims, "ParentID", typeof(System.Int32));
createCol(prims, "CreationDate", typeof(System.Int32)); createCol(prims, "CreationDate", typeof(System.Int32));
createCol(prims, "Name", typeof(System.String)); createCol(prims, "Name", typeof(System.String));
@ -407,9 +408,10 @@ namespace OpenSim.DataStore.MonoSqliteStorage
return prim; return prim;
} }
private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID) private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
{ {
row["UUID"] = prim.UUID; row["UUID"] = prim.UUID;
row["RegionUUID"] = regionUUID;
row["ParentID"] = prim.ParentID; row["ParentID"] = prim.ParentID;
row["CreationDate"] = prim.CreationDate; row["CreationDate"] = prim.CreationDate;
row["Name"] = prim.Name; row["Name"] = prim.Name;
@ -500,10 +502,10 @@ namespace OpenSim.DataStore.MonoSqliteStorage
// s.TextureEntry = textureEntry.TextureData; // s.TextureEntry = textureEntry.TextureData;
// s.ExtraParams = textureEntry.ExtraParams; // s.ExtraParams = textureEntry.ExtraParams;
// } // }
return s; return s;
} }
private void fillShapeRow(DataRow row, SceneObjectPart prim) private void fillShapeRow(DataRow row, SceneObjectPart prim)
{ {
PrimitiveBaseShape s = prim.Shape; PrimitiveBaseShape s = prim.Shape;
@ -553,21 +555,21 @@ namespace OpenSim.DataStore.MonoSqliteStorage
// row["Texture"] = encoding.GetBytes(textureBlock.ToXMLString()); // row["Texture"] = encoding.GetBytes(textureBlock.ToXMLString());
} }
private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID) private void addPrim(SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
{ {
DataTable prims = ds.Tables["prims"]; DataTable prims = ds.Tables["prims"];
DataTable shapes = ds.Tables["primshapes"]; DataTable shapes = ds.Tables["primshapes"];
DataRow primRow = prims.Rows.Find(prim.UUID); DataRow primRow = prims.Rows.Find(prim.UUID);
if (primRow == null) if (primRow == null)
{ {
primRow = prims.NewRow(); primRow = prims.NewRow();
fillPrimRow(primRow, prim, sceneGroupID); fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
prims.Rows.Add(primRow); prims.Rows.Add(primRow);
} }
else else
{ {
fillPrimRow(primRow, prim, sceneGroupID); fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
} }
DataRow shapeRow = shapes.Rows.Find(prim.UUID); DataRow shapeRow = shapes.Rows.Find(prim.UUID);