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

Added the Examine Search methods to DynamicDocument as extension methods.

Browse Source 
Renamed a few things.
This commit is contained in:
Shannon Deminick
2012-09-08 11:59:01 +07:00
parent d83887e314
commit ce9be79ec6
14 changed files with 168 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Dynamics/DynamicBackingItem.cs
View File

@@ -113,7 +113,7 @@ namespace Umbraco.Core.Dynamics
return prop == null
? null
: new PropertyResult(prop)
: new PropertyResult(prop, PropertyResultType.UserProperty)
{
DocumentTypeAlias = content.DocumentTypeAlias,
DocumentId = content.Id

34
src/Umbraco.Core/Dynamics/DynamicDocument.cs
View File

@@ -13,7 +13,7 @@ using System.Xml.Linq;
namespace Umbraco.Core.Dynamics
{
/// <summary>
/// The dynamic model for views
/// </summary>
@@ -105,7 +105,7 @@ namespace Umbraco.Core.Dynamics
return DynamicDocumentWalker.Sibling(this, nodeTypeAlias);
}
//public DynamicNodeList XPath(string xPath)
//public DynamicDocumentList XPath(string xPath)
//{
// //if this DN was initialized with an underlying NodeFactory.Node
// if (n != null && n.Type == DynamicBackingItemType.Content)
@@ -122,7 +122,7 @@ namespace Umbraco.Core.Dynamics
// if (n.Id == 0)
// {
// List<DynamicNode> selfList = new List<DynamicNode>() { this };
// return new DynamicNodeList(selfList);
// return new DynamicDocumentList(selfList);
// }
// XmlNode node = doc.SelectSingleNode(string.Format("//*[@id='{0}']", n.Id));
// if (node != null)
@@ -142,7 +142,7 @@ namespace Umbraco.Core.Dynamics
// }
// catch (Exception) { } //swallow the exceptions - the returned nodes might not be full nodes, e.g. property
// }
// //Wanted to do this, but because we return DynamicNodeList here, the only
// //Wanted to do this, but because we return DynamicDocumentList here, the only
// //common parent class is DynamicObject
// //maybe some future refactoring will solve this?
// //if (nodeFactoryNodeList.Count == 0)
@@ -152,13 +152,13 @@ namespace Umbraco.Core.Dynamics
// // //return
// // return new DynamicXml(xElement);
// //}
// //convert the NodeFactory nodelist to IEnumerable<DynamicNode> and return it as a DynamicNodeList
// return new DynamicNodeList(nodeFactoryNodeList.ConvertAll(nfNode => new DynamicNode((INode)nfNode)));
// //convert the NodeFactory nodelist to IEnumerable<DynamicNode> and return it as a DynamicDocumentList
// return new DynamicDocumentList(nodeFactoryNodeList.ConvertAll(nfNode => new DynamicNode((INode)nfNode)));
// }
// else
// {
// // XPath returned no nodes, return an empty DynamicNodeList
// return new DynamicNodeList();
// // XPath returned no nodes, return an empty DynamicDocumentList
// return new DynamicDocumentList();
// }
// }
// else
@@ -178,7 +178,7 @@ namespace Umbraco.Core.Dynamics
//}
//public DynamicNodeList Search(string term, bool useWildCards = true, string searchProvider = null)
//public DynamicDocumentList Search(string term, bool useWildCards = true, string searchProvider = null)
//{
// var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider;
// if(!string.IsNullOrEmpty(searchProvider))
@@ -194,12 +194,12 @@ namespace Umbraco.Core.Dynamics
// return Search(crit, searcher);
//}
//public DynamicNodeList SearchDescendants(string term, bool useWildCards = true, string searchProvider = null)
//public DynamicDocumentList SearchDescendants(string term, bool useWildCards = true, string searchProvider = null)
//{
// return Search(term, useWildCards, searchProvider);
//}
//public DynamicNodeList SearchChildren(string term, bool useWildCards = true, string searchProvider = null)
//public DynamicDocumentList SearchChildren(string term, bool useWildCards = true, string searchProvider = null)
//{
// var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider;
// if (!string.IsNullOrEmpty(searchProvider))
@@ -216,7 +216,7 @@ namespace Umbraco.Core.Dynamics
//}
//public DynamicNodeList Search(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
//public DynamicDocumentList Search(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
//{
// var s = Examine.ExamineManager.Instance.DefaultSearchProvider;
// if (searchProvider != null)
@@ -1147,12 +1147,12 @@ namespace Umbraco.Core.Dynamics
}
else
{
throw new IndexOutOfRangeException(string.Format("Node {0} belongs to a DynamicNodeList but could not retrieve the index for it's position in the list", this.Id));
throw new IndexOutOfRangeException(string.Format("Node {0} belongs to a DynamicDocumentList but could not retrieve the index for it's position in the list", this.Id));
}
}
else
{
throw new ArgumentNullException(string.Format("Node {0} has been orphaned and doesn't belong to a DynamicNodeList", this.Id));
throw new ArgumentNullException(string.Format("Node {0} has been orphaned and doesn't belong to a DynamicDocumentList", this.Id));
}
}
public bool IsFirst()
@@ -1465,9 +1465,9 @@ namespace Umbraco.Core.Dynamics
public bool Where(string predicate)
{
//Totally gonna cheat here
var dynamicNodeList = new DynamicDocumentList();
dynamicNodeList.Add(this);
var filtered = dynamicNodeList.Where<DynamicDocument>(predicate);
var dynamicDocumentList = new DynamicDocumentList();
dynamicDocumentList.Add(this);
var filtered = dynamicDocumentList.Where<DynamicDocument>(predicate);
if (Queryable.Count(filtered) == 1)
{
//this node matches the predicate

17
src/Umbraco.Core/Dynamics/PropertyResult.cs
View File

@@ -5,29 +5,16 @@ using System.Web;
namespace Umbraco.Core.Dynamics
{
internal enum PropertyResultType
{
/// <summary>
/// The property resolved was a normal document property
/// </summary>
NormalProperty,
/// <summary>
/// The property resolved was a property defined as a member on the document object (IDocument) itself
/// </summary>
ReflectedProperty
}
internal class PropertyResult : IDocumentProperty, IHtmlString
{
public PropertyResult(IDocumentProperty source)
public PropertyResult(IDocumentProperty source, PropertyResultType type)
{
if (source == null) throw new ArgumentNullException("source");
Alias = source.Alias;
Value = source.Value;
Version = source.Version;
PropertyType = PropertyResultType.NormalProperty;
PropertyType = type;
}
public PropertyResult(string alias, object value, Guid version, PropertyResultType type)
{

23
src/Umbraco.Core/Dynamics/PropertyResultType.cs Normal file
View File

@@ -0,0 +1,23 @@
namespace Umbraco.Core.Dynamics
{
/// <summary>
/// Currently just used for informational purposes as to where a PropertyResult object was created from.
/// </summary>
internal enum PropertyResultType
{
/// <summary>
/// The property resolved was a normal document property
/// </summary>
UserProperty,
/// <summary>
/// The property resolved was a property defined as a member on the document object (IDocument) itself
/// </summary>
ReflectedProperty,
/// <summary>
/// The property was created manually for a custom purpose
/// </summary>
CustomProperty
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -84,6 +84,7 @@
<Compile Include="Dynamics\ExtensionMethodFinder.cs" />
<Compile Include="Dynamics\ExtensionMethods.cs" />
<Compile Include="Dynamics\Grouping.cs" />
<Compile Include="Dynamics\PropertyResultType.cs" />
<Compile Include="DynamicWrapper.cs" />
<Compile Include="IO\FileSystemProviderAttribute.cs" />
<Compile Include="IO\IFileSystemExtensions.cs" />