From 1e882919b0739a00c99b2276d9b8b63c7c165777 Mon Sep 17 00:00:00 2001
From: maggiolo00 <enricorisa@Enricos-MacBook-Pro.local>
Date: Mon, 16 Jun 2014 09:24:49 +0200
Subject: [PATCH] switched to 1.7.4

---
 pom.xml                                                |  4 ++--
 .../com/orientechnologies/lucene/OLuceneIndexType.java |  1 -
 .../lucene/manager/OLuceneSpatialIndexManager.java     |  1 +
 .../lucene/operator/OLuceneTextOperator.java           | 10 ++--------
 .../java/com/orientechnologies/test/LuceneTest.java    |  7 +++++++
 5 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/com/orientechnologies/test/LuceneTest.java

diff --git a/pom.xml b/pom.xml
index 547d75d..5096e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.orientechnologies</groupId>
     <artifactId>orientdb-lucene</artifactId>
-    <version>1.7</version>
+    <version>1.7.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>lucene</name>
@@ -14,7 +14,7 @@
     <properties>
         <javac.src.version>1.6</javac.src.version>
         <javac.target.version>1.6</javac.target.version>
-        <orientdb.version>1.7</orientdb.version>
+        <orientdb.version>1.7.4-SNAPSHOT</orientdb.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java b/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java
index c769db6..55c331c 100644
--- a/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java
+++ b/src/main/java/com/orientechnologies/lucene/OLuceneIndexType.java
@@ -110,7 +110,6 @@ protected static Query getQueryParser(OIndexDefinition index, String key, Analyz
 
     } else {
       queryParser = new MultiFieldQueryParser(version, index.getFields().toArray(new String[index.getFields().size()]), analyzer);
-      key = QueryParser.escape(key);
     }
     return queryParser.parse(key);
   }
diff --git a/src/main/java/com/orientechnologies/lucene/manager/OLuceneSpatialIndexManager.java b/src/main/java/com/orientechnologies/lucene/manager/OLuceneSpatialIndexManager.java
index 3ef00aa..3a3c2cf 100644
--- a/src/main/java/com/orientechnologies/lucene/manager/OLuceneSpatialIndexManager.java
+++ b/src/main/java/com/orientechnologies/lucene/manager/OLuceneSpatialIndexManager.java
@@ -63,6 +63,7 @@ public OLuceneSpatialIndexManager(OShapeFactory factory) {
     super();
     this.ctx = SpatialContext.GEO;
     this.factory = factory;
+
     SpatialPrefixTree grid = new GeohashPrefixTree(ctx, 11);
     this.strategy = new RecursivePrefixTreeStrategy(grid, "location");
   }
diff --git a/src/main/java/com/orientechnologies/lucene/operator/OLuceneTextOperator.java b/src/main/java/com/orientechnologies/lucene/operator/OLuceneTextOperator.java
index ddf0b13..a257fd2 100644
--- a/src/main/java/com/orientechnologies/lucene/operator/OLuceneTextOperator.java
+++ b/src/main/java/com/orientechnologies/lucene/operator/OLuceneTextOperator.java
@@ -39,12 +39,6 @@ public OLuceneTextOperator() {
     super("LUCENE", 5, false);
   }
 
-  // @Override
-  // protected boolean evaluateExpression(OIdentifiable iRecord, OSQLFilterCondition iCondition, Object iLeft, Object iRight,
-  // OCommandContext iContext) {
-  // return false;
-  // }
-
   @Override
   public OIndexCursor executeIndexQuery(OCommandContext iContext, OIndex<?> index, List<Object> keyParams, boolean ascSortOrder) {
     OIndexCursor cursor;
@@ -52,8 +46,8 @@ public OIndexCursor executeIndexQuery(OCommandContext iContext, OIndex<?> index,
     if (indexResult == null || indexResult instanceof OIdentifiable)
       cursor = new OIndexCursorSingleValue((OIdentifiable) indexResult, new OSpatialCompositeKey(keyParams));
     else
-      cursor = new OIndexCursorCollectionValue(((Collection<OIdentifiable>) indexResult).iterator(),
-          new OSpatialCompositeKey(keyParams));
+      cursor = new OIndexCursorCollectionValue(((Collection<OIdentifiable>) indexResult).iterator(), new OSpatialCompositeKey(
+          keyParams));
     return cursor;
   }
 
diff --git a/src/test/java/com/orientechnologies/test/LuceneTest.java b/src/test/java/com/orientechnologies/test/LuceneTest.java
new file mode 100644
index 0000000..ef4ec60
--- /dev/null
+++ b/src/test/java/com/orientechnologies/test/LuceneTest.java
@@ -0,0 +1,7 @@
+package com.orientechnologies.test;
+
+/**
+ * Created by enricorisa on 29/05/14.
+ */
+public class LuceneTest {
+}