* minor: make inventory item deserialization code easier to read

0.6.5-rc1
Justin Clarke Casey 2009-04-24 15:44:22 +00:00
parent d69a018ba8
commit 170cea5088
1 changed files with 26 additions and 52 deletions

View File

@ -64,59 +64,33 @@ namespace OpenSim.Framework.Serialization.External
InventoryItemBase item = new InventoryItemBase(); InventoryItemBase item = new InventoryItemBase();
StringReader sr = new StringReader(serialization); StringReader sr = new StringReader(serialization);
XmlTextReader reader = new XmlTextReader(sr); XmlTextReader xtr = new XmlTextReader(sr);
reader.ReadStartElement("InventoryItem"); xtr.ReadStartElement("InventoryItem");
reader.ReadStartElement("Name");
item.Name = reader.ReadString(); item.Name = xtr.ReadElementString("Name");
reader.ReadEndElement(); item.ID = UUID.Parse( xtr.ReadElementString("ID"));
reader.ReadStartElement("ID"); item.InvType = Convert.ToInt32( xtr.ReadElementString("InvType"));
item.ID = UUID.Parse(reader.ReadString()); item.CreatorId = xtr.ReadElementString("CreatorUUID");
reader.ReadEndElement(); item.CreationDate = Convert.ToInt32( xtr.ReadElementString("CreationDate"));
reader.ReadStartElement("InvType"); item.Owner = UUID.Parse( xtr.ReadElementString("Owner"));
item.InvType = Convert.ToInt32(reader.ReadString()); item.Description = xtr.ReadElementString("Description");
reader.ReadEndElement(); item.AssetType = Convert.ToInt32( xtr.ReadElementString("AssetType"));
item.CreatorId = reader.ReadElementString("CreatorUUID"); item.AssetID = UUID.Parse( xtr.ReadElementString("AssetID"));
reader.ReadStartElement("CreationDate"); item.SaleType = Convert.ToByte( xtr.ReadElementString("SaleType"));
item.CreationDate = Convert.ToInt32(reader.ReadString()); item.SalePrice = Convert.ToInt32( xtr.ReadElementString("SalePrice"));
reader.ReadEndElement(); item.BasePermissions = Convert.ToUInt32( xtr.ReadElementString("BasePermissions"));
reader.ReadStartElement("Owner"); item.CurrentPermissions = Convert.ToUInt32( xtr.ReadElementString("CurrentPermissions"));
item.Owner = UUID.Parse(reader.ReadString()); item.EveryOnePermissions = Convert.ToUInt32( xtr.ReadElementString("EveryOnePermssions"));
reader.ReadEndElement(); item.NextPermissions = Convert.ToUInt32( xtr.ReadElementString("NextPermissions"));
reader.ReadElementString("Description"); item.Flags = Convert.ToUInt32( xtr.ReadElementString("Flags"));
reader.ReadStartElement("AssetType"); item.GroupID = UUID.Parse( xtr.ReadElementString("GroupID"));
item.AssetType = Convert.ToInt32(reader.ReadString()); item.GroupOwned = Convert.ToBoolean(xtr.ReadElementString("GroupOwned"));
reader.ReadEndElement();
reader.ReadStartElement("AssetID"); xtr.ReadEndElement();
item.AssetID = UUID.Parse(reader.ReadString());
reader.ReadEndElement(); xtr.Close();
reader.ReadStartElement("SaleType"); sr.Close();
item.SaleType = Convert.ToByte(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("SalePrice");
item.SalePrice = Convert.ToInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("BasePermissions");
item.BasePermissions = Convert.ToUInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("CurrentPermissions");
item.CurrentPermissions = Convert.ToUInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("EveryOnePermssions");
item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("NextPermissions");
item.NextPermissions = Convert.ToUInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("Flags");
item.Flags = Convert.ToUInt32(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("GroupID");
item.GroupID = UUID.Parse(reader.ReadString());
reader.ReadEndElement();
reader.ReadStartElement("GroupOwned");
item.GroupOwned = Convert.ToBoolean(reader.ReadString());
reader.ReadEndElement();
return item; return item;
} }