diff --git a/foreign dlls/..svnbridge/ClientDependency.Core.dll b/foreign dlls/..svnbridge/ClientDependency.Core.dll deleted file mode 100644 index 08149303fe..0000000000 --- a/foreign dlls/..svnbridge/ClientDependency.Core.dll +++ /dev/null @@ -1 +0,0 @@ -svn:mime-typeapplication/octet-stream \ No newline at end of file diff --git a/foreign dlls/Examine.dll b/foreign dlls/Examine.dll index ad8e90eba9..3afdd2497b 100644 Binary files a/foreign dlls/Examine.dll and b/foreign dlls/Examine.dll differ diff --git a/foreign dlls/Examine.xml b/foreign dlls/Examine.xml index c31bd5b51f..9d30f45cf2 100644 --- a/foreign dlls/Examine.xml +++ b/foreign dlls/Examine.xml @@ -41,7 +41,6 @@ Searches the specified search text in all fields of the index The search text. - The max number of results. if set to true the search will use wildcards. Search Results @@ -52,11 +51,16 @@ The search parameters. Search Results + + + Creates a search criteria instance as required by the implementation + + + Creates a search criteria instance as required by the implementation - The max number of results. The type of data in the index. An instance of @@ -64,7 +68,6 @@ Creates a search criteria instance as required by the implementation - The max number of results. The type of data in the index. The default operation. @@ -135,7 +138,7 @@ Deletes index for node for the specified providers - + @@ -151,6 +154,12 @@ + + + Creates search criteria that defaults to IndexType.Any and BooleanOperation.And + + + Singleton diff --git a/foreign dlls/UmbracoExamine.XML b/foreign dlls/UmbracoExamine.XML index e59cebd68e..a83eed4626 100644 --- a/foreign dlls/UmbracoExamine.XML +++ b/foreign dlls/UmbracoExamine.XML @@ -252,6 +252,12 @@ The fluent API search. + + + Creates search criteria that defaults to IndexType.Any and BooleanOperation.And + + + Creates an instance of SearchCriteria for the provider @@ -496,35 +502,6 @@ - - - Methods to support Umbraco XSLT extensions - - - - - Uses the default provider specified to search, returning an XPathNodeIterator - - The search query - A node-set of the search results - - - - Uses the provider specified to search, returning an XPathNodeIterator - - - - - - - - - Uses the default provider specified to search, returning an XPathNodeIterator - - The search query - Enable a wildcard search query - A node-set of the search results - Adds a single character wildcard to the string for Lucene wildcard matching @@ -671,8 +648,17 @@ file declaring the computer name that is part taking in the indexing. This file will then be used to determine the master indexer machine in a load balanced environment (if one exists). - - + The friendly name of the provider. + A collection of the name/value pairs representing the provider-specific attributes specified in the configuration for this provider. + + The name of the provider is null. + + + The name of the provider has a length of zero. + + + An attempt is made to call on a provider after the provider has already been initialized. + @@ -1093,6 +1079,7 @@ The folder path of where the lucene index is stored + The index path. This can be set at runtime but will not be persisted to the configuration file @@ -1101,6 +1088,7 @@ Returns the DirectoryInfo object for the index path. + The index directory. diff --git a/foreign dlls/UmbracoExamine.dll b/foreign dlls/UmbracoExamine.dll index 24cb2448ce..c86f3ad354 100644 Binary files a/foreign dlls/UmbracoExamine.dll and b/foreign dlls/UmbracoExamine.dll differ diff --git a/umbraco/presentation/library.cs b/umbraco/presentation/library.cs index a340397485..f85ea83950 100644 --- a/umbraco/presentation/library.cs +++ b/umbraco/presentation/library.cs @@ -41,6 +41,14 @@ namespace umbraco /// public class library { + internal static void ClearNiceUrlCache() + { + lock (locker) + { + niceUrlCache.Clear(); + } + } + private static object locker = new object(); #region Declarations @@ -2269,6 +2277,13 @@ namespace umbraco Media.AfterSave += new Media.SaveEventHandler(Media_AfterSave); Media.BeforeDelete += new Media.DeleteEventHandler(Media_BeforeDelete); } + + content.AfterUpdateDocumentCache += new content.DocumentCacheEventHandler(content_AfterUpdateDocumentCache); + } + + void content_AfterUpdateDocumentCache(Document sender, DocumentCacheEventArgs e) + { + library.ClearNiceUrlCache(); } void Member_BeforeDelete(Member sender, DeleteEventArgs e) diff --git a/umbraco/presentation/web.config.Az-VAIO.xslt b/umbraco/presentation/web.config.Az-VAIO.xslt index 54ce7715de..b04e3b4625 100644 --- a/umbraco/presentation/web.config.Az-VAIO.xslt +++ b/umbraco/presentation/web.config.Az-VAIO.xslt @@ -8,7 +8,7 @@ - 4.1.0.betaII + 4.1.0.RC