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

Examine v1.0.0 integration, it now builds! now to run tests and fixup

Browse Source
This commit is contained in:
Shannon
2018-03-27 18:14:21 +11:00
parent e5c7c5eb2d
commit 88d66cfb53
69 changed files with 1473 additions and 2771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web/Models/Mapping/EntityMapperProfile.cs
View File

@@ -122,22 +122,22 @@ namespace Umbraco.Web.Models.Mapping
.AfterMap((src, dest) =>
{
//get the icon if there is one
dest.Icon = src.Fields.ContainsKey(BaseUmbracoIndexer.IconFieldName)
? src.Fields[BaseUmbracoIndexer.IconFieldName]
dest.Icon = src.Fields.ContainsKey(UmbracoExamineIndexer.IconFieldName)
? src.Fields[UmbracoExamineIndexer.IconFieldName]
: "icon-document";
dest.Name = src.Fields.ContainsKey("nodeName") ? src.Fields["nodeName"] : "[no name]";
if (src.Fields.ContainsKey(UmbracoContentIndexer.NodeKeyFieldName))
if (src.Fields.ContainsKey(UmbracoExamineIndexer.NodeKeyFieldName))
{
Guid key;
if (Guid.TryParse(src.Fields[UmbracoContentIndexer.NodeKeyFieldName], out key))
if (Guid.TryParse(src.Fields[UmbracoExamineIndexer.NodeKeyFieldName], out key))
{
dest.Key = key;
//need to set the UDI
if (src.Fields.ContainsKey(LuceneIndexer.IndexTypeFieldName))
if (src.Fields.ContainsKey(LuceneIndexer.CategoryFieldName))
{
switch (src.Fields[LuceneIndexer.IndexTypeFieldName])
switch (src.Fields[LuceneIndexer.CategoryFieldName])
{
case IndexTypes.Member:
dest.Udi = new GuidUdi(Constants.UdiEntityType.Member, dest.Key);
@@ -165,15 +165,15 @@ namespace Umbraco.Web.Models.Mapping
dest.ParentId = -1;
}
}
dest.Path = src.Fields.ContainsKey(UmbracoContentIndexer.IndexPathFieldName) ? src.Fields[UmbracoContentIndexer.IndexPathFieldName] : "";
dest.Path = src.Fields.ContainsKey(UmbracoExamineIndexer.IndexPathFieldName) ? src.Fields[UmbracoExamineIndexer.IndexPathFieldName] : "";
if (src.Fields.ContainsKey(LuceneIndexer.NodeTypeAliasFieldName))
if (src.Fields.ContainsKey(LuceneIndexer.ItemTypeFieldName))
{
dest.AdditionalData.Add("contentType", src.Fields[LuceneIndexer.NodeTypeAliasFieldName]);
dest.AdditionalData.Add("contentType", src.Fields[LuceneIndexer.ItemTypeFieldName]);
}
});
CreateMap<ILuceneSearchResults, IEnumerable<SearchResultItem>>()
CreateMap<ISearchResults, IEnumerable<SearchResultItem>>()
.ConvertUsing(results => results.Select(Mapper.Map<SearchResultItem>).ToList());
CreateMap<IEnumerable<SearchResult>, IEnumerable<SearchResultItem>>()