Binary file dist/jars/luan-core-trunk.jar has changed

Binary file dist/jars/luan-logging-trunk.jar has changed

Binary file dist/jars/luan-lucene-trunk.jar has changed

Binary file dist/jars/luan-mail-trunk.jar has changed

Binary file dist/jars/luan-web-trunk.jar has changed

--- a/lucene/src/luan/modules/lucene/Lucene.luan	Tue Oct 28 01:59:35 2014 +0000
+++ b/lucene/src/luan/modules/lucene/Lucene.luan	Tue Oct 28 03:05:37 2014 +0000
@@ -17,15 +17,25 @@
 		end )
 	end
 
-	function index.get_document(query)
+	function index.get_first(query, sort)
 		return index.Searcher( function(searcher)
-			local results, _, total_hits = searcher.search(query,1)
-			if total_hits == 0 then
-				return nil
-			elseif total_hits > 1 then
-				error( "found " .. total_hits .. " documents" )
-			end
-			return results()
+			local results, _, total_hits = searcher.search(query,1,sort)
+			return results(), total_hits
+		end )
+	end
+
+	function index.get_document(query)
+		local doc, total_hits = index.get_first(query);
+		if total_hits > 1 then
+			error( "found " .. total_hits .. " documents" )
+		end
+		return doc
+	end
+
+	function index.count(query)
+		return index.Searcher( function(searcher)
+			local _, _, total_hits = searcher.search(query,0)
+			return total_hits
 		end )
 	end
 

--- a/lucene/src/luan/modules/lucene/LuceneSearcher.java	Tue Oct 28 01:59:35 2014 +0000
+++ b/lucene/src/luan/modules/lucene/LuceneSearcher.java	Tue Oct 28 03:05:37 2014 +0000
@@ -16,6 +16,7 @@
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.TotalHitCountCollector;
 import luan.Luan;
 import luan.LuanState;
 import luan.LuanTable;
@@ -159,10 +160,21 @@
 		return new Sort(flds);
 	}
 
+	private static final LuanFunction nothingFn = new LuanFunction() {
+		@Override public Object call(LuanState luan,Object[] args) {
+			return LuanFunction.NOTHING;
+		}
+	};
+
 	public Object[] search( LuanState luan, LuanTable queryTbl, int n, LuanTable sortTbl ) throws LuanException, IOException {
 		Query query = query(queryTbl);
 		if( query == null )
 			throw luan.exception("invalid query");
+		if( n==0 ) {
+			TotalHitCountCollector thcc = new TotalHitCountCollector();
+			searcher.search(query,thcc);
+			return new Object[]{ nothingFn, 0, thcc.getTotalHits() };
+		}
 		TopDocs td = sortTbl==null ? searcher.search(query,n) : searcher.search(query,n,sort(luan,sortTbl));
 		final ScoreDoc[] scoreDocs = td.scoreDocs;
 		LuanFunction results = new LuanFunction() {