yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renormalize

Browse Source
This commit is contained in:
Stephan
2018-06-29 19:52:40 +02:00
parent c1f3de7e5c
commit 7a615133ff
1616 changed files with 273322 additions and 273322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

606
src/Umbraco.Web/PublishedContentQuery.cs
View File

@@ -1,303 +1,303 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Xml.XPath;
using Examine;
using Examine.LuceneEngine.Providers;
using Examine.LuceneEngine.SearchCriteria;
using Examine.SearchCriteria;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Services;
using Umbraco.Core.Xml;
using Umbraco.Web.PublishedCache;
namespace Umbraco.Web
{
using Examine = global::Examine;
/// <summary>
/// A class used to query for published content, media items
/// </summary>
public class PublishedContentQuery : IPublishedContentQuery
{
private readonly IPublishedContentQuery _query;
private readonly IPublishedContentCache _contentCache;
private readonly IPublishedMediaCache _mediaCache;
/// <summary>
/// Constructor used to return results from the caches
/// </summary>
/// <param name="contentCache"></param>
/// <param name="mediaCache"></param>
public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache)
{
_contentCache = contentCache ?? throw new ArgumentNullException(nameof(contentCache));
_mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
}
/// <summary>
/// Constructor used to wrap the ITypedPublishedContentQuery object passed in
/// </summary>
/// <param name="query"></param>
public PublishedContentQuery(IPublishedContentQuery query)
{
_query = query ?? throw new ArgumentNullException(nameof(query));
}
#region Content
public IPublishedContent Content(int id)
{
return _query == null
? ItemById(id, _contentCache)
: _query.Content(id);
}
public IPublishedContent Content(Guid id)
{
return _query == null
? ItemById(id, _contentCache)
: _query.Content(id);
}
public IPublishedContent Content(Udi id)
{
if (!(id is GuidUdi udi)) return null;
return _query == null
? ItemById(udi.Guid, _contentCache)
: _query.Content(udi.Guid);
}
public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
{
return _query == null
? ItemByXPath(xpath, vars, _contentCache)
: _query.ContentSingleAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
{
return _query == null
? ItemsByIds(_contentCache, ids)
: _query.Content(ids);
}
public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
{
return _query == null
? ItemsByIds(_contentCache, ids)
: _query.Content(ids);
}
public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
{
return _query == null
? ItemsByXPath(xpath, vars, _contentCache)
: _query.ContentAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
{
return _query == null
? ItemsByXPath(xpath, vars, _contentCache)
: _query.ContentAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> ContentAtRoot()
{
return _query == null
? ItemsAtRoot(_contentCache)
: _query.ContentAtRoot();
}
#endregion
#region Media
public IPublishedContent Media(int id)
{
return _query == null
? ItemById(id, _mediaCache)
: _query.Media(id);
}
public IPublishedContent Media(Guid id)
{
return _query == null
? ItemById(id, _mediaCache)
: _query.Media(id);
}
public IPublishedContent Media(Udi id)
{
if (!(id is GuidUdi udi)) return null;
return _query == null
? ItemById(udi.Guid, _mediaCache)
: _query.Media(udi.Guid);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
{
return _query == null
? ItemsByIds(_mediaCache, ids)
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
{
return _query == null
? ItemsByIds(_mediaCache, ids)
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> MediaAtRoot()
{
return _query == null
? ItemsAtRoot(_mediaCache)
: _query.MediaAtRoot();
}
#endregion
#region Used by Content/Media
private static IPublishedContent ItemById(int id, IPublishedCache cache)
{
var doc = cache.GetById(id);
return doc;
}
private static IPublishedContent ItemById(Guid id, IPublishedCache cache)
{
var doc = cache.GetById(id);
return doc;
}
private static IPublishedContent ItemByXPath(string xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetSingleByXPath(xpath, vars);
return doc;
}
//NOTE: Not used?
//private IPublishedContent ItemByXPath(XPathExpression xpath, XPathVariable[] vars, IPublishedCache cache)
//{
// var doc = cache.GetSingleByXPath(xpath, vars);
// return doc;
//}
private static IEnumerable<IPublishedContent> ItemsByIds(IPublishedCache cache, IEnumerable<int> ids)
{
return ids.Select(eachId => ItemById(eachId, cache)).WhereNotNull();
}
private IEnumerable<IPublishedContent> ItemsByIds(IPublishedCache cache, IEnumerable<Guid> ids)
{
return ids.Select(eachId => ItemById(eachId, cache)).WhereNotNull();
}
private static IEnumerable<IPublishedContent> ItemsByXPath(string xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetByXPath(xpath, vars);
return doc;
}
private static IEnumerable<IPublishedContent> ItemsByXPath(XPathExpression xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetByXPath(xpath, vars);
return doc;
}
private static IEnumerable<IPublishedContent> ItemsAtRoot(IPublishedCache cache)
{
return cache.GetAtRoot();
}
#endregion
#region Search
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(string term, bool useWildCards = true, string indexName = null)
{
return Search(0, 0, out _, term, useWildCards, indexName);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string indexName = null)
{
//TODO: Can we inject IExamineManager?
if (_query != null) return _query.Search(skip, take, out totalRecords, term, useWildCards, indexName);
var indexer = string.IsNullOrEmpty(indexName)
? Examine.ExamineManager.Instance.GetIndexer(Constants.Examine.ExternalIndexer)
: Examine.ExamineManager.Instance.GetIndexer(indexName);
if (indexer == null) throw new InvalidOperationException("No index found by name " + indexName);
var searcher = indexer.GetSearcher();
if (skip == 0 && take == 0)
{
var results = searcher.Search(term, useWildCards);
totalRecords = results.TotalItemCount;
return results.ToPublishedSearchResults(_contentCache);
}
var criteria = SearchAllFields(term, useWildCards, searcher, indexer);
return Search(skip, take, out totalRecords, criteria, searcher);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(ISearchCriteria criteria, Examine.ISearcher searchProvider = null)
{
return Search(0, 0, out _, criteria, searchProvider);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(int skip, int take, out int totalRecords, ISearchCriteria criteria, Examine.ISearcher searchProvider = null)
{
if (_query != null) return _query.Search(skip, take, out totalRecords, criteria, searchProvider);
//TODO: Can we inject IExamineManager?
var searcher = searchProvider ?? Examine.ExamineManager.Instance.GetSearcher(Constants.Examine.ExternalIndexer);
var results = skip == 0 && take == 0
? searcher.Search(criteria)
: searcher.Search(criteria, maxResults: skip + take);
totalRecords = results.TotalItemCount;
return results.ToPublishedSearchResults(_contentCache);
}
/// <summary>
/// Creates an ISearchCriteria for searching all fields in a <see cref="BaseLuceneSearcher"/>.
/// </summary>
private ISearchCriteria SearchAllFields(string searchText, bool useWildcards, Examine.ISearcher searcher, Examine.IIndexer indexer)
{
var sc = searcher.CreateCriteria();
//if we're dealing with a lucene searcher, we can get all of it's indexed fields,
//else we can get the defined fields for the index.
var searchFields = (searcher is BaseLuceneSearcher luceneSearcher)
? luceneSearcher.GetAllIndexedFields()
: indexer.FieldDefinitionCollection.Keys;
//this is what Examine does internally to create ISearchCriteria for searching all fields
var strArray = searchText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
sc = useWildcards == false
? sc.GroupedOr(searchFields, strArray).Compile()
: sc.GroupedOr(searchFields, strArray.Select(x => (IExamineValue)new ExamineValue(Examineness.ComplexWildcard, x.MultipleCharacterWildcard().Value)).ToArray()).Compile();
return sc;
}
#endregion
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Xml.XPath;
using Examine;
using Examine.LuceneEngine.Providers;
using Examine.LuceneEngine.SearchCriteria;
using Examine.SearchCriteria;
using Umbraco.Core;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Services;
using Umbraco.Core.Xml;
using Umbraco.Web.PublishedCache;
namespace Umbraco.Web
{
using Examine = global::Examine;
/// <summary>
/// A class used to query for published content, media items
/// </summary>
public class PublishedContentQuery : IPublishedContentQuery
{
private readonly IPublishedContentQuery _query;
private readonly IPublishedContentCache _contentCache;
private readonly IPublishedMediaCache _mediaCache;
/// <summary>
/// Constructor used to return results from the caches
/// </summary>
/// <param name="contentCache"></param>
/// <param name="mediaCache"></param>
public PublishedContentQuery(IPublishedContentCache contentCache, IPublishedMediaCache mediaCache)
{
_contentCache = contentCache ?? throw new ArgumentNullException(nameof(contentCache));
_mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
}
/// <summary>
/// Constructor used to wrap the ITypedPublishedContentQuery object passed in
/// </summary>
/// <param name="query"></param>
public PublishedContentQuery(IPublishedContentQuery query)
{
_query = query ?? throw new ArgumentNullException(nameof(query));
}
#region Content
public IPublishedContent Content(int id)
{
return _query == null
? ItemById(id, _contentCache)
: _query.Content(id);
}
public IPublishedContent Content(Guid id)
{
return _query == null
? ItemById(id, _contentCache)
: _query.Content(id);
}
public IPublishedContent Content(Udi id)
{
if (!(id is GuidUdi udi)) return null;
return _query == null
? ItemById(udi.Guid, _contentCache)
: _query.Content(udi.Guid);
}
public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
{
return _query == null
? ItemByXPath(xpath, vars, _contentCache)
: _query.ContentSingleAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
{
return _query == null
? ItemsByIds(_contentCache, ids)
: _query.Content(ids);
}
public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
{
return _query == null
? ItemsByIds(_contentCache, ids)
: _query.Content(ids);
}
public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
{
return _query == null
? ItemsByXPath(xpath, vars, _contentCache)
: _query.ContentAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
{
return _query == null
? ItemsByXPath(xpath, vars, _contentCache)
: _query.ContentAtXPath(xpath, vars);
}
public IEnumerable<IPublishedContent> ContentAtRoot()
{
return _query == null
? ItemsAtRoot(_contentCache)
: _query.ContentAtRoot();
}
#endregion
#region Media
public IPublishedContent Media(int id)
{
return _query == null
? ItemById(id, _mediaCache)
: _query.Media(id);
}
public IPublishedContent Media(Guid id)
{
return _query == null
? ItemById(id, _mediaCache)
: _query.Media(id);
}
public IPublishedContent Media(Udi id)
{
if (!(id is GuidUdi udi)) return null;
return _query == null
? ItemById(udi.Guid, _mediaCache)
: _query.Media(udi.Guid);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
{
return _query == null
? ItemsByIds(_mediaCache, ids)
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
{
return _query == null
? ItemsByIds(_mediaCache, ids)
: _query.Media(ids);
}
public IEnumerable<IPublishedContent> MediaAtRoot()
{
return _query == null
? ItemsAtRoot(_mediaCache)
: _query.MediaAtRoot();
}
#endregion
#region Used by Content/Media
private static IPublishedContent ItemById(int id, IPublishedCache cache)
{
var doc = cache.GetById(id);
return doc;
}
private static IPublishedContent ItemById(Guid id, IPublishedCache cache)
{
var doc = cache.GetById(id);
return doc;
}
private static IPublishedContent ItemByXPath(string xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetSingleByXPath(xpath, vars);
return doc;
}
//NOTE: Not used?
//private IPublishedContent ItemByXPath(XPathExpression xpath, XPathVariable[] vars, IPublishedCache cache)
//{
// var doc = cache.GetSingleByXPath(xpath, vars);
// return doc;
//}
private static IEnumerable<IPublishedContent> ItemsByIds(IPublishedCache cache, IEnumerable<int> ids)
{
return ids.Select(eachId => ItemById(eachId, cache)).WhereNotNull();
}
private IEnumerable<IPublishedContent> ItemsByIds(IPublishedCache cache, IEnumerable<Guid> ids)
{
return ids.Select(eachId => ItemById(eachId, cache)).WhereNotNull();
}
private static IEnumerable<IPublishedContent> ItemsByXPath(string xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetByXPath(xpath, vars);
return doc;
}
private static IEnumerable<IPublishedContent> ItemsByXPath(XPathExpression xpath, XPathVariable[] vars, IPublishedCache cache)
{
var doc = cache.GetByXPath(xpath, vars);
return doc;
}
private static IEnumerable<IPublishedContent> ItemsAtRoot(IPublishedCache cache)
{
return cache.GetAtRoot();
}
#endregion
#region Search
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(string term, bool useWildCards = true, string indexName = null)
{
return Search(0, 0, out _, term, useWildCards, indexName);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string indexName = null)
{
//TODO: Can we inject IExamineManager?
if (_query != null) return _query.Search(skip, take, out totalRecords, term, useWildCards, indexName);
var indexer = string.IsNullOrEmpty(indexName)
? Examine.ExamineManager.Instance.GetIndexer(Constants.Examine.ExternalIndexer)
: Examine.ExamineManager.Instance.GetIndexer(indexName);
if (indexer == null) throw new InvalidOperationException("No index found by name " + indexName);
var searcher = indexer.GetSearcher();
if (skip == 0 && take == 0)
{
var results = searcher.Search(term, useWildCards);
totalRecords = results.TotalItemCount;
return results.ToPublishedSearchResults(_contentCache);
}
var criteria = SearchAllFields(term, useWildCards, searcher, indexer);
return Search(skip, take, out totalRecords, criteria, searcher);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(ISearchCriteria criteria, Examine.ISearcher searchProvider = null)
{
return Search(0, 0, out _, criteria, searchProvider);
}
/// <inheritdoc />
public IEnumerable<PublishedSearchResult> Search(int skip, int take, out int totalRecords, ISearchCriteria criteria, Examine.ISearcher searchProvider = null)
{
if (_query != null) return _query.Search(skip, take, out totalRecords, criteria, searchProvider);
//TODO: Can we inject IExamineManager?
var searcher = searchProvider ?? Examine.ExamineManager.Instance.GetSearcher(Constants.Examine.ExternalIndexer);
var results = skip == 0 && take == 0
? searcher.Search(criteria)
: searcher.Search(criteria, maxResults: skip + take);
totalRecords = results.TotalItemCount;
return results.ToPublishedSearchResults(_contentCache);
}
/// <summary>
/// Creates an ISearchCriteria for searching all fields in a <see cref="BaseLuceneSearcher"/>.
/// </summary>
private ISearchCriteria SearchAllFields(string searchText, bool useWildcards, Examine.ISearcher searcher, Examine.IIndexer indexer)
{
var sc = searcher.CreateCriteria();
//if we're dealing with a lucene searcher, we can get all of it's indexed fields,
//else we can get the defined fields for the index.
var searchFields = (searcher is BaseLuceneSearcher luceneSearcher)
? luceneSearcher.GetAllIndexedFields()
: indexer.FieldDefinitionCollection.Keys;
//this is what Examine does internally to create ISearchCriteria for searching all fields
var strArray = searchText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
sc = useWildcards == false
? sc.GroupedOr(searchFields, strArray).Compile()
: sc.GroupedOr(searchFields, strArray.Select(x => (IExamineValue)new ExamineValue(Examineness.ComplexWildcard, x.MultipleCharacterWildcard().Value)).ToArray()).Compile();
return sc;
}
#endregion
}
}