Merge branch 'develop'

Author: Hendy

build/Package.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Our.Umbraco.Look</id>
-    <version>0.3.0</version>
+    <version>0.4.0</version>
     <authors>Hendy Racher</authors>
     <owners>Hendy Racher</owners>
     <licenseUrl>https://github.com/Hendy/umbraco-look/blob/master/LICENSE</licenseUrl>

src/Our.Umbraco.Look/Interfaces/IEnumerableWithTotal.cs

@@ -15,10 +15,10 @@ public class LookQuery
         /// </summary>
         public TagQuery TagQuery { get; set; } = new TagQuery();
 
-        ///// <summary>
-        ///// 
-        ///// </summary>
-        //public DateQuery DateQuery { get; set; } = new DateQuery();
+        /// <summary>
+        /// Set a before and/or an after date
+        /// </summary>
+        public DateQuery DateQuery { get; set; } = new DateQuery();
 
         ///// <summary>
         ///// 

src/Our.Umbraco.Look/Models/EnumerableWithTotal.cs

@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Our.Umbraco.Look.Models
+{
+    public class LookResult : IEnumerable<LookMatch>
+    {
+        private IEnumerable<LookMatch> _lookMatches;
+
+        /// <summary>
+        /// Expected total number of LookMatch objects in the enumerable
+        /// </summary>
+        public int Total { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="lookMatches"></param>
+        /// <param name="total"></param>
+        internal LookResult(IEnumerable<LookMatch> lookMatches, int total)
+        {
+            this._lookMatches = lookMatches;
+            this.Total = total;
+        }
+
+        public IEnumerator<LookMatch> GetEnumerator()
+        {
+            return this._lookMatches.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}

src/Our.Umbraco.Look/Models/LookQuery.cs

@@ -5,21 +5,26 @@ public enum SortOn
         /// <summary>
         /// The Lucene result score (default)
         /// </summary>
-        Score,
+        Score = 0,
 
         /// <summary>
         /// A Custom Name field (alpha-numeric sorting)
         /// </summary>
-        Name,
+        Name = 1,
 
         /// <summary>
-        /// A Custom Date field
+        /// A Custom Date field - Old to New
         /// </summary>
-        Date,
+        DateAscending = 2,
+
+        /// <summary>
+        /// A Custom Date field - New to Old
+        /// </summary>
+        DateDescending = 3,
 
         /// <summary>
         /// Orders by distance (only if distance data avaialble, otherwise reverts back to score)
         /// </summary>
-        Distance
+        Distance = 4
     }
 }

src/Our.Umbraco.Look/Models/LookResult.cs

@@ -16,10 +16,5 @@ public class TagQuery
         ///// 
         ///// </summary>
         //public string[] NotTags { get; set; } = null;
-
-        /// <summary>
-        /// Flag to indicate whether to return the tag colection for each result
-        /// </summary>
-        public bool GetTags { get; set; } = false;
     }
 }

src/Our.Umbraco.Look/Models/SortOn.cs

@@ -207,14 +207,13 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Events\Indexing.cs" />
-    <Compile Include="Interfaces\IEnumerableWithTotal.cs" />
     <Compile Include="LookConstants.cs" />
     <Compile Include="Models\DateQuery.cs" />
     <Compile Include="Models\Distance.cs" />
     <Compile Include="Models\DistanceUnit.cs" />
-    <Compile Include="Models\EnumerableWithTotal.cs" />
     <Compile Include="Models\Location.cs" />
     <Compile Include="Models\LocationQuery.cs" />
+    <Compile Include="Models\LookResult.cs" />
     <Compile Include="Models\NodeQuery.cs" />
     <Compile Include="Models\LookMatch.cs" />
     <Compile Include="Models\LookQuery.cs" />

src/Our.Umbraco.Look/Models/TagQuery.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.0.0")]
-[assembly: AssemblyFileVersion("0.3.0.0")]
+[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyFileVersion("0.4.0.0")]

src/Our.Umbraco.Look/Our.Umbraco.Look.csproj

@@ -187,20 +187,35 @@ internal static void Index(IPublishedContent publishedContent, Document document
 
                 if (date != null)
                 {
-                    // TODO: change to storing date type
-                    var ticks = date.Value.Ticks;
-
-                    var dateField = new NumericField(
-                                               LookConstants.DateField,
-                                               Field.Store.YES,
-                                               false)
-                                           .SetLongValue(ticks);
-
-                    var dateSortedField = new NumericField(
-                                                    LuceneIndexer.SortedFieldNamePrefix + LookConstants.DateField,
-                                                    Field.Store.NO, //we don't want to store the field because we're only using it to sort, not return data
-                                                    true)
-                                                .SetLongValue(ticks);
+                    var dateValue = DateTools.DateToString(date.Value, DateTools.Resolution.SECOND);
+
+                    var dateField = new Field(
+                                            LookConstants.DateField,
+                                            dateValue,
+                                            Field.Store.YES,
+                                            Field.Index.ANALYZED,
+                                            Field.TermVector.YES);
+
+                    var dateSortedField = new Field(
+                                                LuceneIndexer.SortedFieldNamePrefix + LookConstants.DateField,
+                                                dateValue,
+                                                Field.Store.NO,
+                                                Field.Index.NOT_ANALYZED,
+                                                Field.TermVector.NO);
+
+                    //var ticks = date.Value.Ticks;
+
+                    //var dateField = new NumericField(
+                    //                           LookConstants.DateField,
+                    //                           Field.Store.YES,
+                    //                           false)
+                    //                       .SetLongValue(ticks);
+
+                    //var dateSortedField = new NumericField(
+                    //                                LuceneIndexer.SortedFieldNamePrefix + LookConstants.DateField,
+                    //                                Field.Store.NO, //we don't want to store the field because we're only using it to sort, not return data
+                    //                                true)
+                    //                            .SetLongValue(ticks);
 
                     document.Add(dateField);
                     document.Add(dateSortedField);