Different little bugs

Author: glorieux-f

analysis/src/resources/com/github/oeuvres/alix/xml/alix.xsl

@@ -416,7 +416,10 @@
         <xsl:call-template name="toclocal"/>
       </alix:field>
       <alix:field name="content" type="text">
-        <article class="chapter">
+        <xsl:variable name="hourglass">
+          <xsl:if test="/*/@cert and /*/@cert = 'low'"> hourglass</xsl:if>
+        </xsl:variable>
+        <article class="chapter{$hourglass}">
           <xsl:choose>
             <xsl:when test="descendant::*[key('split', generate-id())]">
               <!-- take content before sections -->

common/src/java/com/github/oeuvres/alix/lucene/spans/CoocListener.java

@@ -117,9 +117,6 @@ public CoocListener(
         if (left < 0 || right < 0) {
             throw new IllegalArgumentException("left and right must be >= 0; got left=" + left + ", right=" + right);
         }
-        if (left == 0 && right == 0) {
-            throw new IllegalArgumentException("left and right cannot both be 0");
-        }
         this.left = left;
         this.right = right;
         this.windowMask = new BitSet(fieldStats.maxWidth());

common/src/java/com/github/oeuvres/alix/lucene/spans/SpanQueryParser.java

@@ -113,7 +113,7 @@ else if (!orClauses.isEmpty()) {
         if (clauses.size() == 1) {
             return clauses.get(0);
         }
-        return new SpanNearQuery(clauses.toArray(new SpanQuery[0]), slop, true);
+        return new SpanNearQuery(clauses.toArray(new SpanQuery[0]), slop, false);
     }
 
 }

test/src/test/java/com/github/oeuvres/alix/lucene/analysis/LemmaFilterTest.java

@@ -28,9 +28,6 @@ public class LemmaFilterTest {
     void setUp() {
         lex = new LemmaLexicon(64);
 
-        // -------------------------
-        // POS-dependent homographs
-        // -------------------------
         // "saw": noun lemma == surface; verb lemma == "see"
         put(lex, "saw",  POS_NOUN, "saw");
         put(lex, "saw",  POS_VERB, "see");
@@ -51,9 +48,7 @@ void setUp() {
         put(lex, "left", POS_ADJ,  "left");
         put(lex, "left", POS_VERB, "leave");
 
-        // -------------------------
         // POS-agnostic (DEFAULT_POS) entries
-        // -------------------------
         put(lex, "children", LemmaLexicon.ANY_POS, "child");
         put(lex, "mice",     LemmaLexicon.ANY_POS, "mouse");
 

util/src/java/com/github/oeuvres/alix/util/Markup.java

@@ -47,6 +47,7 @@ private Markup()
     public static int leftBoundary(final String xml, int offset, final int words, final int chars)
     {
         if (offset < 0) return 0;
+        if (words == 0 || chars == 0) return offset + 1;
         int wc = 0;
         int cc = 0;
         boolean inTag = false; // scanning backward: '>' opens a tag, '<' closes it
@@ -122,6 +123,7 @@ public static int leftBoundary(final String xml, int offset, final int words, fi
      */
     public static int rightBoundary(final String xml, int offset, final int words, final int chars)
     {
+        if (words == 0 || chars == 0) return offset;
         final int length = xml.length();
         int wc = 0;
         int cc = 0;

web/src/main/java/com/github/oeuvres/alix/web/OpResults.java

@@ -225,13 +225,15 @@ protected void html(LuceneIndex index, HttpServletRequest request, HttpServletRe
         final String docline = pars.getString(DOCLINE, index.docline());
         final int docs = pars.getInt(DOCS, DOCS_RANGE, DOCS_DEFAULT, DOCS);
         final int spans = pars.getInt(SPANS, SPANS_RANGE, SPANS_DEFAULT, SPANS);
+        // transmit the slop parameter explicitly, cookie maybe not transmitted in some context
+        final int slop = pars.getInt(SLOP, SLOP_RANGE, SLOP_DEFAULT, SLOP);
 
         HtmlResults results = new HtmlResults(writer, index.reader().storedFields(), content)
             .doclineFieldName(docline)
             .docLimit(docs)
             .spanLimit(spans)
             .ctx(ctx)
-            .hrefSearch("?" + pars.queryString(CTX, F, Q, SLOP));
+            .hrefSearch("?" + pars.queryString(CTX, F, Q) + "&slop=" + slop);
         final int from = pars.getInt(FROM, 0);
 
         // final String q = pars.getString(Q, null);
@@ -268,7 +270,7 @@ protected void html(LuceneIndex index, HttpServletRequest request, HttpServletRe
                         .append("\" name=\"next-results\" href=\"")
                         .append("?")
                         .append(pars.queryString(DOCLINE, END, F, ROWS, START))
-                        .append("&from=" + docId)
+                        .append("&from=" + docId )
                         .append("\">…</a></p>\n");
                 ;
             }

web/src/main/java/com/github/oeuvres/alix/web/OpSuggest.java

@@ -18,7 +18,6 @@
 import com.github.oeuvres.alix.lucene.terms.TopTerms;
 import com.github.oeuvres.alix.lucene.terms.TopTerms.TermEntry;
 import com.github.oeuvres.alix.lucene.util.BitsCollectorManager;
-import com.github.oeuvres.alix.web.Op.OpMeta;
 import com.github.oeuvres.alix.web.util.HttpPars;
 
 import static com.github.oeuvres.alix.web.Pars.*;
@@ -67,14 +66,17 @@ else if (spanQuery == null) {
         }
         // coocs, with or without doc filter TODO
         else {
+            /*
             final int ctx = pars.getInt(CTX, CTX_RANGE, CTX_DEFAULT, CTX);
             final int left = pars.getInt(CTX_LEFT, CTX_RANGE, ctx, CTX_LEFT);
             final int right = pars.getInt(CTX_RIGHT, CTX_RANGE, ctx, CTX_RIGHT);
+            */
+            final int slop = pars.getInt(SLOP, SLOP_RANGE, SLOP_DEFAULT, SLOP);
             final CoocListener listener = new CoocListener(
                 textFluc.fieldStats(),
                 textFluc.termRail(),
-                left,
-                right);
+                slop,
+                slop);
             final SpanWalker walker = new SpanWalker(
                 index.searcher(),
                 textFluc.termLexicon(),
@@ -109,7 +111,7 @@ protected void json(
         if (topTerms != null) {
             String textField = pars.getString(F, index.content());
             final FlucText textFluc = index.flucText(textField);
-            final String infix = pars.getString(INFIX, "");
+            final String infix = pars.getString(INFIX, "").replace("(", "").replace(")", "");;
             final int topK = pars.getInt(TERMS, TERMS_RANGE, TERMS_DEFAULT, TERMS);
             meta.put("infix", infix);
             meta.put("limit", topK);

web/src/main/java/com/github/oeuvres/alix/web/OpTerms.java

@@ -22,7 +22,6 @@
 import com.github.oeuvres.alix.lucene.terms.PartScorer;
 import com.github.oeuvres.alix.lucene.terms.Partition;
 import com.github.oeuvres.alix.lucene.terms.PartitionScorer;
-import com.github.oeuvres.alix.lucene.terms.TermLexicon;
 import com.github.oeuvres.alix.lucene.terms.IdfTermScorer;
 import com.github.oeuvres.alix.lucene.terms.TopTerms;
 import com.github.oeuvres.alix.lucene.terms.TopTerms.TermEntry;