diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Data/PGSQL/PGSQLAssetData.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLAssetData.cs')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLAssetData.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLAssetData.cs b/OpenSim/Data/PGSQL/PGSQLAssetData.cs index 81adb03..7b79521 100644 --- a/OpenSim/Data/PGSQL/PGSQLAssetData.cs +++ b/OpenSim/Data/PGSQL/PGSQLAssetData.cs | |||
@@ -151,35 +151,35 @@ namespace OpenSim.Data.PGSQL | |||
151 | /// <param name="asset">the asset</param> | 151 | /// <param name="asset">the asset</param> |
152 | override public bool StoreAsset(AssetBase asset) | 152 | override public bool StoreAsset(AssetBase asset) |
153 | { | 153 | { |
154 | 154 | ||
155 | string sql = | 155 | string sql = |
156 | @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType, | 156 | @"UPDATE assets set name = :name, description = :description, " + "\"assetType\" " + @" = :assetType, |
157 | local = :local, temporary = :temporary, creatorid = :creatorid, data = :data | 157 | local = :local, temporary = :temporary, creatorid = :creatorid, data = :data |
158 | WHERE id=:id; | 158 | WHERE id=:id; |
159 | 159 | ||
160 | INSERT INTO assets | 160 | INSERT INTO assets |
161 | (id, name, description, " + "\"assetType\" " + @", local, | 161 | (id, name, description, " + "\"assetType\" " + @", local, |
162 | temporary, create_time, access_time, creatorid, asset_flags, data) | 162 | temporary, create_time, access_time, creatorid, asset_flags, data) |
163 | Select :id, :name, :description, :assetType, :local, | 163 | Select :id, :name, :description, :assetType, :local, |
164 | :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data | 164 | :temporary, :create_time, :access_time, :creatorid, :asset_flags, :data |
165 | Where not EXISTS(SELECT * FROM assets WHERE id=:id) | 165 | Where not EXISTS(SELECT * FROM assets WHERE id=:id) |
166 | "; | 166 | "; |
167 | 167 | ||
168 | string assetName = asset.Name; | 168 | string assetName = asset.Name; |
169 | if (asset.Name.Length > AssetBase.MAX_ASSET_NAME) | 169 | if (asset.Name.Length > AssetBase.MAX_ASSET_NAME) |
170 | { | 170 | { |
171 | assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME); | 171 | assetName = asset.Name.Substring(0, AssetBase.MAX_ASSET_NAME); |
172 | m_log.WarnFormat( | 172 | m_log.WarnFormat( |
173 | "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", | 173 | "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", |
174 | asset.Name, asset.ID, asset.Name.Length, assetName.Length); | 174 | asset.Name, asset.ID, asset.Name.Length, assetName.Length); |
175 | } | 175 | } |
176 | 176 | ||
177 | string assetDescription = asset.Description; | 177 | string assetDescription = asset.Description; |
178 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) | 178 | if (asset.Description.Length > AssetBase.MAX_ASSET_DESC) |
179 | { | 179 | { |
180 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); | 180 | assetDescription = asset.Description.Substring(0, AssetBase.MAX_ASSET_DESC); |
181 | m_log.WarnFormat( | 181 | m_log.WarnFormat( |
182 | "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", | 182 | "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", |
183 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); | 183 | asset.Description, asset.ID, asset.Description.Length, assetDescription.Length); |
184 | } | 184 | } |
185 | 185 | ||
@@ -278,7 +278,7 @@ namespace OpenSim.Data.PGSQL | |||
278 | { | 278 | { |
279 | List<AssetMetadata> retList = new List<AssetMetadata>(count); | 279 | List<AssetMetadata> retList = new List<AssetMetadata>(count); |
280 | string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid | 280 | string sql = @" SELECT id, name, description, " + "\"assetType\"" + @", temporary, creatorid |
281 | FROM assets | 281 | FROM assets |
282 | order by id | 282 | order by id |
283 | limit :stop | 283 | limit :stop |
284 | offset :start;"; | 284 | offset :start;"; |