Upgrading Lucene dll

lib/lucene.net/patch.txt

@@ -1 +0,0 @@
-This is a modified version including a [assembly: SecutiryTransparent] attribute in AssemblyInfo.cs

src/Orchard.Web/Modules/Lucene/Models/LuceneDocumentIndex.cs

@@ -10,7 +10,7 @@ namespace Lucene.Models {
 
     public class LuceneDocumentIndex : IDocumentIndex {
 
-        public List<AbstractField> Fields { get; private set; }
+        public List<Field> Fields { get; private set; }
 
         private string _name;
         private string  _stringValue;
@@ -24,7 +24,7 @@ namespace Lucene.Models {
         public int ContentItemId { get; private set; }
 
         public LuceneDocumentIndex(int documentId, Localizer t) {
-            Fields = new List<AbstractField>();
+            Fields = new List<Field>();
             SetContentItemId(documentId);
             IsDirty = false;
             
@@ -92,7 +92,7 @@ namespace Lucene.Models {
 
         public IDocumentIndex SetContentItemId(int contentItemId) {
             ContentItemId = contentItemId;
-            Fields.Add(new Field("id", contentItemId.ToString(), Field.Store.YES, Field.Index.NOT_ANALYZED));
+            Fields.Add(new StringField("id", contentItemId.ToString(), Field.Store.YES));
             return this;
         }
 
@@ -102,19 +102,26 @@ namespace Lucene.Models {
                     if(_removeTags) {
                         _stringValue = _stringValue.RemoveTags(true);
                     }
-                    Fields.Add(new Field(_name, _stringValue ?? String.Empty, 
-                        _store ? Field.Store.YES : Field.Store.NO, 
-                        _analyze ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED));
+                    Fields.Add(new TextField(
+                        _name, 
+                        _stringValue ?? String.Empty,
+                        _store ? Field.Store.YES : Field.Store.NO
+                        //,_analyze ? Field.Index.ANALYZED : Field.Index.NOT_ANALYZED
+                        ));
                     break;
                 case TypeCode.Int32:
-                    Fields.Add(new NumericField(_name, 
-                        _store ? Field.Store.YES : Field.Store.NO,
-                        true).SetIntValue(_intValue));
+                    Fields.Add(new DoubleField(
+                        _name,
+                        _intValue,
+                        _store ? Field.Store.YES : Field.Store.NO
+                        ));
                     break;
                 case TypeCode.Single:
-                    Fields.Add(new NumericField(_name,
-                        _store ? Field.Store.YES : Field.Store.NO,
-                        true).SetDoubleValue(_doubleValue));
+                    Fields.Add(new DoubleField(
+                        _name,
+                        _doubleValue,
+                        _store ? Field.Store.YES : Field.Store.NO
+                        ));
                     break;
                 case TypeCode.Empty:
                     break;

src/Orchard.Web/Modules/Lucene/Services/LuceneSearchBuilder.cs

@@ -11,7 +11,7 @@ using Lucene.Net.Util;
 using Orchard.Indexing;
 using Orchard.Logging;
 using Lucene.Net.Documents;
-using Lucene.Net.QueryParsers;
+using Lucene.Net.Search.QueryParsers;
 using Lucene.Net.Analysis.Tokenattributes;
 
 namespace Lucene.Services {
@@ -33,7 +33,7 @@ namespace Lucene.Services {
         private bool _asFilter;
 
         // pending clause attributes
-        private Occur _occur;
+        private BooleanClause.Occur _occur;
         private bool _exactMatch;
         private bool _notAnalyzed;
         private float _boost;