svn commit: r1072688 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/contrib/demo/src/java/org/apache/lucene/demo/ lucene/src/site/src/documentation/content/xdocs/ solr/

[sa...@apache.org]

Author: sarowe
Date: Sun Feb 20 19:11:37 2011
New Revision: 1072688

URL: http://svn.apache.org/viewvc?rev=1072688&view=rev
Log:
LUCENE-2923: fixed docs; interactive SearchFiles now directly asks for another query when there are zero results

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
    lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
    lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo.xml
    lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo2.xml
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1072688&r1=1072687&r2=1072688&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sun Feb 20 19:11:37 2011
@@ -45,7 +45,7 @@ public class IndexFiles {
 
   /** Index all text files under a directory. */
   public static void main(String[] args) {
-    String usage = "java org.apache.lucene.demo.IndexFiles <root_directory>"
+    String usage = "java org.apache.lucene.demo.IndexFiles"
                  + " [-index INDEX_PATH] [-docs DOCS_PATH] [-update]\n\n"
                    // TODO: Change the link with every release (or: fill in some less error-prone alternative here...)
                  + "See http://lucene.apache.org/java/3_1/demo.html for details.";

Modified: lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1072688&r1=1072687&r2=1072688&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Sun Feb 20 19:11:37 2011
@@ -190,7 +190,7 @@ public class SearchFiles {
                   
       }
 
-      if (!interactive) {
+      if (!interactive || end == 0) {
         break;
       }
 

Modified: lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo.xml?rev=1072688&r1=1072687&r2=1072688&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo.xml Sun Feb 20 19:11:37 2011
@@ -56,7 +56,7 @@ Once you've gotten this far you're proba
 you've set your CLASSPATH correctly, just type:
 
 <pre>
-    java org.apache.lucene.demo.IndexFiles {full-path-to-lucene}/src
+    java org.apache.lucene.demo.IndexFiles -docs {path-to-lucene}/src
 </pre>
 
 This will produce a subdirectory called <code>index</code> which will contain an index of all of the

Modified: lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo2.xml?rev=1072688&r1=1072687&r2=1072688&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo2.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/demo2.xml Sun Feb 20 19:11:37 2011
@@ -136,17 +136,14 @@ to the searcher.  Note that it's also po
 <a href="api/core/org/apache/lucene/search/Query.html">Query</a> object without using the query
 parser.  The query parser just enables decoding the <a href="queryparsersyntax.html">Lucene query
 syntax</a> into the corresponding <a href="api/core/org/apache/lucene/search/Query.html">Query</a>
-object. Search can be executed in two different ways:
+object.
 </p>
 
-<ul>
-<li>Streaming: A <a href="api/core/org/apache/lucene/search/Collector.html">Collector</a> subclass
-simply prints out the document ID and score for each matching document.</li>
-<li>Paging: Using the <code>IndexSearcher.search(query,n)</code> method that returns 
-<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <code>n</code> hits,
-the search results are printed in pages, sorted by score (i.e. relevance).</li>
-</ul>
-
+<p>
+<code>SearchFiles</code> uses the <code>IndexSearcher.search(query,n)</code> method that returns
+<a href="api/core/org/apache/lucene/search/TopDocs.html">TopDocs</a> with max <code>n</code> hits.
+The results are printed in pages, sorted by score (i.e. relevance).
+</p>
 </section>
 </body>
 </document>