From 462716961d35c39b815a4c3dbe9e537f25e499e2 Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Sun, 18 Oct 2009 08:30:13 +0000 Subject: [PATCH] Fixed and closed #385: exceptions logged when migrating pages and copying categories (results unaffected). --- SqlProvidersCommon/SqlPagesStorageProviderBase.cs | 6 ++++-- SqlServerProviders/SqlServerPagesStorageProvider.cs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs index e9407c0..4b0b4d3 100644 --- a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs +++ b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs @@ -1126,8 +1126,10 @@ namespace ScrewTurn.Wiki.Plugins.SqlCommon { newCategories = new string[pageCategories.Count]; for(int i = 0; i < pageCategories.Count; i++) { - CategoryInfo added = AddCategory(tempName, pageCategories[i]); - newCategories[i] = added.FullName; + if(GetCategory(transaction, NameTools.GetFullName(tempName, pageCategories[i])) == null) { + CategoryInfo added = AddCategory(tempName, pageCategories[i]); + newCategories[i] = added.FullName; + } } } diff --git a/SqlServerProviders/SqlServerPagesStorageProvider.cs b/SqlServerProviders/SqlServerPagesStorageProvider.cs index 336a8fe..f47b584 100644 --- a/SqlServerProviders/SqlServerPagesStorageProvider.cs +++ b/SqlServerProviders/SqlServerPagesStorageProvider.cs @@ -13,7 +13,7 @@ namespace ScrewTurn.Wiki.Plugins.SqlServer { /// public class SqlServerPagesStorageProvider : SqlPagesStorageProviderBase, IPagesStorageProviderV30 { - private readonly ComponentInformation info = new ComponentInformation("SQL Server Pages Storage Provider", "ScrewTurn Software", "3.0.0.341", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/SQLServerProv/Pages.txt"); + private readonly ComponentInformation info = new ComponentInformation("SQL Server Pages Storage Provider", "ScrewTurn Software", "3.0.1.403", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/SQLServerProv/Pages.txt"); private readonly SqlServerCommandBuilder commandBuilder = new SqlServerCommandBuilder();