diff options
author | Adam Frisby | 2008-04-30 23:11:07 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-30 23:11:07 +0000 |
commit | 25a49ac4de056f43d6c5803fcd34804fcea96ae2 (patch) | |
tree | 3b3f24601da9ebdcc8818b86fe201da2c63d7dda /OpenSim/Data | |
parent | * Fix #3 (diff) | |
download | opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.zip opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.gz opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.bz2 opensim-SC-25a49ac4de056f43d6c5803fcd34804fcea96ae2.tar.xz |
* Spring cleaned a bunch of '//TODO: unused' marked functions.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLDataStore.cs | 42 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteManager.cs | 69 |
3 files changed, 0 insertions, 119 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 6b3b8ef..dd3d20e 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
@@ -1350,14 +1350,6 @@ namespace OpenSim.Data.MSSQL | |||
1350 | return param; | 1350 | return param; |
1351 | } | 1351 | } |
1352 | 1352 | ||
1353 | // TODO: unused | ||
1354 | // private SqlParameter createParamWithValue(string name, Type type, Object o) | ||
1355 | // { | ||
1356 | // SqlParameter param = createSqlParameter(name, type); | ||
1357 | // param.Value = o; | ||
1358 | // return param; | ||
1359 | // } | ||
1360 | |||
1361 | private void setupPrimCommands(SqlDataAdapter da, SqlConnection conn) | 1353 | private void setupPrimCommands(SqlDataAdapter da, SqlConnection conn) |
1362 | { | 1354 | { |
1363 | da.InsertCommand = createInsertCommand("prims", m_dataSet.Tables["prims"]); | 1355 | da.InsertCommand = createInsertCommand("prims", m_dataSet.Tables["prims"]); |
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs index d438064..1f9ea70 100644 --- a/OpenSim/Data/MySQL/MySQLDataStore.cs +++ b/OpenSim/Data/MySQL/MySQLDataStore.cs | |||
@@ -586,40 +586,6 @@ namespace OpenSim.Data.MySQL | |||
586 | return landDataForRegion; | 586 | return landDataForRegion; |
587 | } | 587 | } |
588 | 588 | ||
589 | // TODO: unused | ||
590 | // private void DisplayDataSet(DataSet ds, string title) | ||
591 | // { | ||
592 | // Debug.WriteLine(title); | ||
593 | // //--- Loop through the DataTables | ||
594 | // foreach (DataTable table in ds.Tables) | ||
595 | // { | ||
596 | // Debug.WriteLine("*** DataTable: " + table.TableName + "***"); | ||
597 | // //--- Loop through each DataTable's DataRows | ||
598 | // foreach (DataRow row in table.Rows) | ||
599 | // { | ||
600 | // //--- Display the original values, if there are any. | ||
601 | // if (row.HasVersion(DataRowVersion.Original)) | ||
602 | // { | ||
603 | // Debug.Write("Original Row Values ===> "); | ||
604 | // foreach (DataColumn column in table.Columns) | ||
605 | // Debug.Write(column.ColumnName + " = " + | ||
606 | // row[column, DataRowVersion.Original] + ", "); | ||
607 | // Debug.WriteLine(String.Empty); | ||
608 | // } | ||
609 | // //--- Display the current values, if there are any. | ||
610 | // if (row.HasVersion(DataRowVersion.Current)) | ||
611 | // { | ||
612 | // Debug.Write("Current Row Values ====> "); | ||
613 | // foreach (DataColumn column in table.Columns) | ||
614 | // Debug.Write(column.ColumnName + " = " + | ||
615 | // row[column, DataRowVersion.Current] + ", "); | ||
616 | // Debug.WriteLine(String.Empty); | ||
617 | // } | ||
618 | // Debug.WriteLine(String.Empty); | ||
619 | // } | ||
620 | // } | ||
621 | // } | ||
622 | |||
623 | public void Commit() | 589 | public void Commit() |
624 | { | 590 | { |
625 | if (m_connection.State != ConnectionState.Open) | 591 | if (m_connection.State != ConnectionState.Open) |
@@ -1515,14 +1481,6 @@ namespace OpenSim.Data.MySQL | |||
1515 | return param; | 1481 | return param; |
1516 | } | 1482 | } |
1517 | 1483 | ||
1518 | // TODO: unused | ||
1519 | // private MySqlParameter createParamWithValue(string name, Type type, Object o) | ||
1520 | // { | ||
1521 | // MySqlParameter param = createMySqlParameter(name, type); | ||
1522 | // param.Value = o; | ||
1523 | // return param; | ||
1524 | // } | ||
1525 | |||
1526 | private void SetupPrimCommands(MySqlDataAdapter da, MySqlConnection conn) | 1484 | private void SetupPrimCommands(MySqlDataAdapter da, MySqlConnection conn) |
1527 | { | 1485 | { |
1528 | MySqlCommand insertCommand = createInsertCommand("prims", m_primTable); | 1486 | MySqlCommand insertCommand = createInsertCommand("prims", m_primTable); |
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs index 66ce6ab..e1d2cdf 100644 --- a/OpenSim/Data/SQLite/SQLiteManager.cs +++ b/OpenSim/Data/SQLite/SQLiteManager.cs | |||
@@ -92,75 +92,6 @@ namespace OpenSim.Data.SQLite | |||
92 | return (IDbCommand) dbcommand; | 92 | return (IDbCommand) dbcommand; |
93 | } | 93 | } |
94 | 94 | ||
95 | // TODO: unused | ||
96 | // private bool TestTables(SQLiteConnection conn) | ||
97 | // { | ||
98 | // SQLiteCommand cmd = new SQLiteCommand("SELECT * FROM regions", conn); | ||
99 | // SQLiteDataAdapter pDa = new SQLiteDataAdapter(cmd); | ||
100 | // DataSet tmpDS = new DataSet(); | ||
101 | // try | ||
102 | // { | ||
103 | // pDa.Fill(tmpDS, "regions"); | ||
104 | // } | ||
105 | // catch (SqliteSyntaxException) | ||
106 | // { | ||
107 | // m_log.Info("[DATASTORE]: SQLite Database doesn't exist... creating"); | ||
108 | // InitDB(conn); | ||
109 | // } | ||
110 | // return true; | ||
111 | // } | ||
112 | |||
113 | // TODO: unused | ||
114 | // private DataTable createRegionsTable() | ||
115 | // { | ||
116 | // DataTable regions = new DataTable("regions"); | ||
117 | |||
118 | // createCol(regions, "regionHandle", typeof (ulong)); | ||
119 | // createCol(regions, "regionName", typeof (String)); | ||
120 | // createCol(regions, "uuid", typeof (String)); | ||
121 | |||
122 | // createCol(regions, "regionRecvKey", typeof (String)); | ||
123 | // createCol(regions, "regionSecret", typeof (String)); | ||
124 | // createCol(regions, "regionSendKey", typeof (String)); | ||
125 | |||
126 | // createCol(regions, "regionDataURI", typeof (String)); | ||
127 | // createCol(regions, "serverIP", typeof (String)); | ||
128 | // createCol(regions, "serverPort", typeof (String)); | ||
129 | // createCol(regions, "serverURI", typeof (String)); | ||
130 | |||
131 | |||
132 | // createCol(regions, "locX", typeof (uint)); | ||
133 | // createCol(regions, "locY", typeof (uint)); | ||
134 | // createCol(regions, "locZ", typeof (uint)); | ||
135 | |||
136 | // createCol(regions, "eastOverrideHandle", typeof (ulong)); | ||
137 | // createCol(regions, "westOverrideHandle", typeof (ulong)); | ||
138 | // createCol(regions, "southOverrideHandle", typeof (ulong)); | ||
139 | // createCol(regions, "northOverrideHandle", typeof (ulong)); | ||
140 | |||
141 | // createCol(regions, "regionAssetURI", typeof (String)); | ||
142 | // createCol(regions, "regionAssetRecvKey", typeof (String)); | ||
143 | // createCol(regions, "regionAssetSendKey", typeof (String)); | ||
144 | |||
145 | // createCol(regions, "regionUserURI", typeof (String)); | ||
146 | // createCol(regions, "regionUserRecvKey", typeof (String)); | ||
147 | // createCol(regions, "regionUserSendKey", typeof (String)); | ||
148 | |||
149 | // // Add in contraints | ||
150 | // regions.PrimaryKey = new DataColumn[] {regions.Columns["UUID"]}; | ||
151 | // return regions; | ||
152 | // } | ||
153 | |||
154 | // TODO: unused | ||
155 | // private void InitDB(SQLiteConnection conn) | ||
156 | // { | ||
157 | // string createUsers = defineTable(createRegionsTable()); | ||
158 | // SQLiteCommand pcmd = new SQLiteCommand(createUsers, conn); | ||
159 | // conn.Open(); | ||
160 | // pcmd.ExecuteNonQuery(); | ||
161 | // conn.Close(); | ||
162 | // } | ||
163 | |||
164 | /// <summary> | 95 | /// <summary> |
165 | /// Reads a region row from a database reader | 96 | /// Reads a region row from a database reader |
166 | /// </summary> | 97 | /// </summary> |