First results servlet OK

Author: glorieux-f

common/src/java/com/github/oeuvres/alix/lucene/DocHilite.java

@@ -37,7 +37,7 @@ public class HtmlResults extends ResultsListener
     /** Stored field providing the one-line title rendered as a document heading. */
     private String doclineFieldName = "docline";
     /** Number of words of context to show on each side of a span match. */
-    private int wordsAround = 10;
+    private int ctx = 10;
     /** Maximum number of spans to emit per document; {@code -1} = unlimited. */
     private int spanLimit = -1;
     /** Maximum number of documents to emit; {@code -1} = unlimited. */
@@ -57,6 +57,9 @@ public class HtmlResults extends ResultsListener
     private int lastDocId = -1;
     /** Reusable buffer for assembling each concordance line. */
     private final Detagger detagger = new Detagger(Set.of("i", "em"));
+    private String hrefBase = "";
+    private String hrefExt = "";
+    private String hrefSearch = "";
 
 
     /**
@@ -66,7 +69,7 @@ public class HtmlResults extends ResultsListener
      * @param storedFields  access to stored document fields
      * @param contentField  name of the stored field holding the document HTML content
      */
-    HtmlResults(
+    public HtmlResults(
         final Writer writer,
         final StoredFields storedFields,
         final String contentField
@@ -77,6 +80,29 @@ public class HtmlResults extends ResultsListener
         this.contentFieldName = contentField; 
     }
 
+    public int ctx()
+    {
+        return ctx;
+    }
+
+    public HtmlResults ctx(final int ctx)
+    {
+        this.ctx = ctx;
+        return this;
+    }
+
+    public int docLimit()
+    {
+        return this.docLimit;
+    }
+
+    /** Sets the maximum number of documents to emit; {@code -1} = unlimited. */
+    public HtmlResults docLimit(final int docLimit)
+    {
+        this.docLimit = docLimit;
+        return this;
+    }
+
     /** Sets the name of the stored field used as document heading. */
     public HtmlResults doclineFieldName(final String doclineFieldName)
     {
@@ -88,37 +114,52 @@ public String doclineFieldName()
     {
         return this.doclineFieldName;
     }
+    
+    public String hrefBase()
+    {
+        return this.hrefBase;
+    }
 
-    /** Sets the maximum number of spans emitted per document; {@code -1} = unlimited. */
-    public HtmlResults spanLimit(final int spanLimit)
+    public HtmlResults hrefBase(final String hrefBase)
     {
-        this.spanLimit = spanLimit;
+        this.hrefBase = hrefBase;
         return this;
     }
-
-    public int spanLimit()
+    
+    public String hrefExt()
     {
-        return this.spanLimit;
+        return this.hrefExt;
     }
 
-    /** Sets the maximum number of documents to emit; {@code -1} = unlimited. */
-    public HtmlResults docLimit(final int docLimit)
+    public HtmlResults hrefExt(final String hrefExt)
     {
-        this.docLimit = docLimit;
+        this.hrefExt = hrefExt;
         return this;
     }
 
-    public int docLimit()
+    public String hrefSearch()
     {
-        return this.docLimit;
+        return this.hrefSearch;
     }
-    
-    public HtmlResults wordsAround(final int wordsAround)
+
+    public HtmlResults hrefSearch(final String hrefSearch)
     {
-        this.wordsAround = wordsAround;
+        this.hrefSearch = hrefSearch;
         return this;
     }
 
+    /** Sets the maximum number of spans emitted per document; {@code -1} = unlimited. */
+    public HtmlResults spanLimit(final int spanLimit)
+    {
+        this.spanLimit = spanLimit;
+        return this;
+    }
+
+    public int spanLimit()
+    {
+        return this.spanLimit;
+    }
+
     @Override
     public boolean wantsMoreDocs()
     {
@@ -143,8 +184,15 @@ public void startDoc(int docId) throws IOException
         if (doclineFieldName != null) {
             final String docline = doc.get(doclineFieldName);
             if (docline != null) {
-                writer.append("<h2><a href=\"").append(id).append("\">")
-                      .append(docline).append("</a></h2>\n");
+                writer
+                    .append("<h2><a href=\"")
+                    .append(hrefBase)
+                    .append(id)
+                    .append(hrefExt)
+                    .append(hrefSearch)
+                    .append("\">")
+                    .append(docline)
+                    .append("</a></h2>\n");
             }
         }
     }
@@ -161,10 +209,16 @@ public boolean span(OffsetsCollector collector) throws IOException
 
         // Opening tag written first: no buffer needed, no prepend.
         writer.append("<li class=\"hit span\"><a href=\"")
-              .append(id).append("#span").append(String.valueOf(spanCount)).append("\">");
+            .append(hrefBase)
+            .append(id)
+            .append(hrefExt)
+            .append(hrefSearch)
+            .append("#span")
+            .append(String.valueOf(spanCount))
+            .append("\">");
 
         // Left context: locate boundary, then detag forward directly into writer.
-        final int left = Markup.leftBoundary(content, collector.startOffset(0) - 1, wordsAround, -1);
+        final int left = Markup.leftBoundary(content, collector.startOffset(0) - 1, ctx, -1);
         detagger.detag(content, left, collector.startOffset(0), writer);
 
         // Pivot terms with inter-term text between them.
@@ -179,7 +233,7 @@ public boolean span(OffsetsCollector collector) throws IOException
         }
 
         // Right context.
-        final int right = Markup.rightBoundary(content, collector.endOffset(termCount - 1), wordsAround, -1);
+        final int right = Markup.rightBoundary(content, collector.endOffset(termCount - 1), ctx, -1);
         detagger.detag(content, collector.endOffset(termCount - 1), right, writer); 
         writer.append("</a></li>\n");
         return spanLimit < 0 || spanCount < spanLimit;

common/src/java/com/github/oeuvres/alix/lucene/HtmlResults.java

@@ -61,6 +61,11 @@
             <version>${jmh.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+        	<groupId>com.github.oeuvres</groupId>
+        	<artifactId>alix-web</artifactId>
+        	<version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

test/pom.xml

@@ -126,7 +126,7 @@ public static void main(final String[] args) throws IOException {
                         .doclineFieldName("docline")
                         .docLimit(20)
                         .spanLimit(5)
-                        .wordsAround(20);
+                        .ctx(20);
                     SpanWalker walker = new SpanWalker(searcher, query, null, results);
                     writer.append(String.valueOf(walker.hits())).append(" hits " + (System.currentTimeMillis() - t0) + "ms \n");
                     int nextDoc = walker.walk(0);

test/src/main/java/com/github/oeuvres/alix/lucene/SpanDemo.java

@@ -0,0 +1,11 @@
+package com.github.oeuvres.alix.web.util;
+
+import java.io.IOException;
+
+public class HttpParsTest
+{
+    public static void main(final String[] args) throws IOException
+    {
+        System.out.println(HttpPars.encodeQueryComponent("ab\nab"));
+    }
+}

test/src/test/java/com/github/oeuvres/alix/lucene/search/LocutionTest.java

@@ -97,7 +97,7 @@ public void destroy()
     private void registerOps()
     {
         // register(new OpSearch());
-        // register(new OpKwic());
+        register(new OpConc());
         // register(new OpCooc());
         // register(new OpFreqs());
         register(new OpTerms());
@@ -128,7 +128,7 @@ protected void doGet(
         final String indexName = segments[1];
         final LuceneIndex index = indices.get(indexName);
         if (index == null) {
-            sendError(resp, 404, "Unknown index: " + indexName);
+            jsonError(resp, 404, "Unknown index: " + indexName);
             return;
         }
 
@@ -144,7 +144,7 @@ protected void doGet(
 
         final Op op = ops.get(opName);
         if (op == null) {
-            sendError(resp, 404, "Unknown operation: " + opName);
+            jsonError(resp, 404, "Unknown operation: " + opName);
             return;
         }
 
@@ -385,7 +385,7 @@ private Path resolveConfigDir(final ServletConfig config) throws ServletExceptio
      * each carrying {@code status} and {@code message}.
      * </p>
      */
-    static void sendError(
+    static void jsonError(
         final HttpServletResponse resp,
         final int status,
         final String message