[Exist-commits] SF.net SVN: exist:[14352] branches/dizzzz/non-xml-indexing

[<di...@us...>]

Revision: 14352
          http://exist.svn.sourceforge.net/exist/?rev=14352&view=rev
Author:   dizzzz
Date:     2011-04-30 15:45:11 +0000 (Sat, 30 Apr 2011)

Log Message:
-----------
[ignore] Search seems to work, not to figure out how to relate documentIds to real documents

Modified Paths:
--------------
    branches/dizzzz/non-xml-indexing/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java
    branches/dizzzz/non-xml-indexing/nbproject/project.properties
    branches/dizzzz/non-xml-indexing/test/src/xquery/indexing/solr.xml

Modified: branches/dizzzz/non-xml-indexing/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java
===================================================================
--- branches/dizzzz/non-xml-indexing/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java	2011-04-30 15:12:08 UTC (rev 14351)
+++ branches/dizzzz/non-xml-indexing/extensions/indexes/lucene/src/org/exist/indexing/lucene/LuceneIndexWorker.java	2011-04-30 15:45:11 UTC (rev 14352)
@@ -15,6 +15,7 @@
 
 import org.apache.log4j.Logger;
 import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldSelector;
@@ -38,6 +39,7 @@
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.NumericUtils;
 import org.apache.lucene.util.OpenBitSet;
+import org.apache.lucene.util.Version;
 
 import org.exist.collections.Collection;
 import org.exist.dom.AttrImpl;
@@ -754,8 +756,54 @@
      * @param query
      * @return
      */
-    public NodeSet search(XQueryContext context, DocumentSet docs, String query) {
+    public List<String> search(XQueryContext context, DocumentSet docs, String query) throws XPathException {
         //throw new UnsupportedOperationException("Not yet implemented yet");
+        
+        IndexSearcher searcher = null;
+        try {
+            searcher = index.getSearcher();
+
+            // index.getDefaultAnalyzer()
+//                analyzer = getAnalyzer(null, qname, context.getBroker(), docs);
+
+//                Query query = queryTranslator.parse(field, queryRoot, analyzer, options);
+            Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_20);
+
+
+            QueryParser parser = new QueryParser(Version.LUCENE_20, query, analyzer);
+            Query q = parser.parse(query);
+
+            LuceneHitCollector collector = new LuceneHitCollector();
+            searcher.search(q, collector);
+
+            List<ScoreDoc> results = collector.getDocs();
+            for (ScoreDoc sd : results) {
+                System.out.println(sd.toString());
+//                    sd.
+                Document doc = searcher.doc(sd.doc, NODE_FIELD_SELECTOR);
+                String fDocId = doc.get(FIELD_DOC_ID);
+                int docId = Integer.parseInt(fDocId);
+                
+                
+                
+//                DocumentImpl storedDocument = docs.getDoc(docId);
+//                
+//                
+//                if (storedDocument == null) {
+//                    continue;
+//                }
+//                System.out.println(storedDocument.getURI().toString());
+            }
+
+
+        } catch (Exception ex){
+            throw new XPathException(ex);
+        
+        } finally {
+            index.releaseSearcher(searcher);
+        }
+        
+        
         return null;
     }
 

Modified: branches/dizzzz/non-xml-indexing/nbproject/project.properties
===================================================================
--- branches/dizzzz/non-xml-indexing/nbproject/project.properties	2011-04-30 15:12:08 UTC (rev 14351)
+++ branches/dizzzz/non-xml-indexing/nbproject/project.properties	2011-04-30 15:45:11 UTC (rev 14352)
@@ -3,6 +3,7 @@
 file.reference.mina-core-2.0.2.jar=extensions/debuggee/lib/mina-core-2.0.2.jar
 file.reference.objenesis-1.2.jar=lib/test/objenesis-1.2.jar
 file.reference.saxonhe-9.2.1.5.jar=lib/endorsed/saxonhe-9.2.1.5.jar
+mkdist.disabled=false
 src.src14.dir=extensions/exiftool/src
 #Sun Nov 28 15:12:31 CET 2010
 src.src9.dir=extensions/indexes/sort/src

Modified: branches/dizzzz/non-xml-indexing/test/src/xquery/indexing/solr.xml
===================================================================
--- branches/dizzzz/non-xml-indexing/test/src/xquery/indexing/solr.xml	2011-04-30 15:12:08 UTC (rev 14351)
+++ branches/dizzzz/non-xml-indexing/test/src/xquery/indexing/solr.xml	2011-04-30 15:45:11 UTC (rev 14352)
@@ -73,7 +73,7 @@
     </test>
     <test output="xml" > <!-- trace="yes" -->
         <task>Test 2</task>
-        <code><![CDATA[ft:search("/db/test/", "title=text")]]>
+        <code><![CDATA[ft:search("/db/test/", "title:text")]]>
         </code>
         <!--xpath xmlns:prof="http://exist-db.org/xquery/profiling">
             //prof:index[@type = 'range'][@optimization = 2]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.