Prepared for CoocListener

Author: glorieux-f

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

@@ -29,7 +29,7 @@
  * ({@link #lastDocId} + 1). The caller is responsible for turning that into a
  * full URL.</p>
  */
-public class HtmlResults extends SpanListener
+public class HtmlResults implements SpanListener
 {
     private final Writer writer;
     private final StoredFields storedFields;
@@ -116,6 +116,25 @@ public String doclineFieldName()
         return this.doclineFieldName;
     }
 
+    @Override
+    public void endDoc(final int spanTotal) throws IOException
+    {
+        if (spanCount > 0) {
+            writer.append("</ol>\n");
+        }
+        if (spanTotal == 0); //?
+        else if (spanTotal == spanCount);
+        else {
+            writer.append("<div class=\"span-count\">")
+                .append(String.valueOf(spanCount))
+                .append(" / ")
+                .append(String.valueOf(spanTotal))
+                .append("</div>");
+        }
+        writer.append("</article>\n\n");
+        writer.flush();
+    }
+
     public String hrefBase()
     {
         return this.hrefBase;
@@ -149,53 +168,16 @@ public HtmlResults hrefSearch(final String 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()
-    {
-        // docLimit < 0 means unlimited; otherwise stop once the limit is reached
-        return docLimit < 0 || docCount < docLimit;
-    }
-
-    @Override
-    public void startDoc(int docId) throws IOException
+    /** Sets the maximum number of spans emitted per document; {@code -1} = unlimited. */
+    public HtmlResults spanLimit(final int spanLimit)
     {
-        spanCount = 0;
-        docCount++;
-        lastDocId = docId;
-        doc = storedFields.document(docId);
-        content = doc.get(contentFieldName);
-        id = doc.get(ALIX_ID);
-
-        writer.append("<article id=\"").append(id)
-              .append("\" data-docid=\"").append(String.valueOf(docId))
-              .append("\" class=\"hit\">\n");
-
-        if (doclineFieldName != null) {
-            final String docline = doc.get(doclineFieldName);
-            if (docline != null) {
-                writer
-                    .append("<h2><a href=\"")
-                    .append(hrefBase)
-                    .append(id)
-                    .append(hrefExt)
-                    .append(hrefSearch)
-                    .append("\">")
-                    .append(docline)
-                    .append("</a></h2>\n");
-            }
-        }
+        this.spanLimit = spanLimit;
+        return this;
     }
 
     @Override
@@ -204,10 +186,10 @@ public boolean span(OffsetsCollector collector) throws IOException
         if (spanLimit == 0) return false;
         if (spanCount == 0) writer.append("<ol class=\"hit spans\">\n");
         spanCount++;
- 
+    
         final int termCount = collector.size();
         if (termCount < 1) return true;
- 
+    
         // Opening tag written first: no buffer needed, no prepend.
         writer.append("<li class=\"hit span\"><a href=\"")
             .append(hrefBase)
@@ -217,11 +199,11 @@ public boolean span(OffsetsCollector collector) throws IOException
             .append("#span")
             .append(String.valueOf(collector.ord() + 1))
             .append("\">");
- 
+    
         // Left context: locate boundary, then detag forward directly into writer.
         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.
         writer.append("<mark class=\"hit pivot\">");
         writer.append(content, collector.startOffset(0), collector.endOffset(0));
@@ -232,7 +214,7 @@ public boolean span(OffsetsCollector collector) throws IOException
             writer.append(content, collector.startOffset(termOrd), collector.endOffset(termOrd));
             writer.append("</mark>");
         }
- 
+    
         // Right context.
         final int right = Markup.rightBoundary(content, collector.endOffset(termCount - 1), ctx, -1);
         detagger.detag(content, collector.endOffset(termCount - 1), right, writer); 
@@ -241,22 +223,40 @@ public boolean span(OffsetsCollector collector) throws IOException
     }
 
     @Override
-    public void endDoc(final int spanTotal) throws IOException
+    public void startDoc(int docId) throws IOException
     {
-        if (spanCount > 0) {
-            writer.append("</ol>\n");
-        }
-        if (spanTotal == 0); //?
-        else if (spanTotal == spanCount);
-        else {
-            writer.append("<div class=\"span-count\">")
-                .append(String.valueOf(spanCount))
-                .append(" / ")
-                .append(String.valueOf(spanTotal))
-                .append("</div>");
+        spanCount = 0;
+        docCount++;
+        lastDocId = docId;
+        doc = storedFields.document(docId);
+        content = doc.get(contentFieldName);
+        id = doc.get(ALIX_ID);
+
+        writer.append("<article id=\"").append(id)
+              .append("\" data-docid=\"").append(String.valueOf(docId))
+              .append("\" class=\"hit\">\n");
+
+        if (doclineFieldName != null) {
+            final String docline = doc.get(doclineFieldName);
+            if (docline != null) {
+                writer
+                    .append("<h2><a href=\"")
+                    .append(hrefBase)
+                    .append(id)
+                    .append(hrefExt)
+                    .append(hrefSearch)
+                    .append("\">")
+                    .append(docline)
+                    .append("</a></h2>\n");
+            }
         }
-        writer.append("</article>\n\n");
-        writer.flush();
+    }
+
+    @Override
+    public boolean wantsMoreDocs()
+    {
+        // docLimit < 0 means unlimited; otherwise stop once the limit is reached
+        return docLimit < 0 || docCount < docLimit;
     }