aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to 'OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs')
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs13
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
index 5125709..992f931 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.DB4o/DB4oDataStore.cs
@@ -42,9 +42,10 @@ using Db4objects.Db4o.Query;
42 42
43namespace OpenSim.DataStore.DB4oStorage 43namespace OpenSim.DataStore.DB4oStorage
44{ 44{
45
46 public class SceneObjectQuery : Predicate 45 public class SceneObjectQuery : Predicate
47 { 46 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
48
48 private LLUUID globalIDSearch; 49 private LLUUID globalIDSearch;
49 50
50 public SceneObjectQuery(LLUUID find) 51 public SceneObjectQuery(LLUUID find)
@@ -58,17 +59,14 @@ namespace OpenSim.DataStore.DB4oStorage
58 } 59 }
59 } 60 }
60 61
61
62 public class DB4oDataStore : IRegionDataStore 62 public class DB4oDataStore : IRegionDataStore
63 { 63 {
64 private IObjectContainer db; 64 private IObjectContainer db;
65 65
66 public void Initialise(string dbfile, string dbname) 66 public void Initialise(string dbfile, string dbname)
67 { 67 {
68 MainLog.Instance.Verbose("DATASTORE", "DB4O - Opening " + dbfile); 68 m_log.Info("[DATASTORE]: DB4O - Opening " + dbfile);
69 db = Db4oFactory.OpenFile(dbfile); 69 db = Db4oFactory.OpenFile(dbfile);
70
71 return;
72 } 70 }
73 71
74 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 72 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
@@ -91,7 +89,7 @@ namespace OpenSim.DataStore.DB4oStorage
91 IObjectSet result = db.Get(typeof(SceneObjectGroup)); 89 IObjectSet result = db.Get(typeof(SceneObjectGroup));
92 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>(); 90 List<SceneObjectGroup> retvals = new List<SceneObjectGroup>();
93 91
94 MainLog.Instance.Verbose("DATASTORE", "DB4O - LoadObjects found " + result.Count.ToString() + " objects"); 92 m_log.Info("[DATASTORE]: DB4O - LoadObjects found " + result.Count.ToString() + " objects");
95 93
96 foreach (Object obj in result) 94 foreach (Object obj in result)
97 { 95 {
@@ -103,7 +101,6 @@ namespace OpenSim.DataStore.DB4oStorage
103 101
104 public void StoreTerrain(double[,] ter) 102 public void StoreTerrain(double[,] ter)
105 { 103 {
106
107 } 104 }
108 105
109 public double[,] LoadTerrain() 106 public double[,] LoadTerrain()
@@ -113,12 +110,10 @@ namespace OpenSim.DataStore.DB4oStorage
113 110
114 public void RemoveLandObject(uint id) 111 public void RemoveLandObject(uint id)
115 { 112 {
116
117 } 113 }
118 114
119 public void StoreParcel(Land parcel) 115 public void StoreParcel(Land parcel)
120 { 116 {
121
122 } 117 }
123 118
124 public List<Land> LoadLandObjects() 119 public List<Land> LoadLandObjects()