Author: echatellier Date: 2011-09-15 10:53:37 +0200 (Thu, 15 Sep 2011) New Revision: 504 Url: http://nuiton.org/repositories/revision/sandbox/504 Log: Update to lucene 3.4, update bobo, add result sorting. Modified: bobobrowselucenefacets/pom.xml bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java Modified: bobobrowselucenefacets/pom.xml =================================================================== --- bobobrowselucenefacets/pom.xml 2011-08-29 14:32:31 UTC (rev 503) +++ bobobrowselucenefacets/pom.xml 2011-09-15 08:53:37 UTC (rev 504) @@ -8,12 +8,12 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.3.0</version> + <version>3.4.0</version> </dependency> <dependency> <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> - <version>3.0.0-20110826</version> + <version>3.0.0-20110830</version> </dependency> <dependency> <groupId>log4j</groupId> Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2011-08-29 14:32:31 UTC (rev 503) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2011-09-15 08:53:37 UTC (rev 504) @@ -44,8 +44,8 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Query; +import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.store.NIOFSDirectory; import org.apache.lucene.util.Version; @@ -58,7 +58,6 @@ import com.browseengine.bobo.api.BrowseHit; import com.browseengine.bobo.api.BrowseRequest; import com.browseengine.bobo.api.BrowseResult; -import com.browseengine.bobo.api.BrowseSelection; import com.browseengine.bobo.api.FacetAccessible; import com.browseengine.bobo.api.FacetSpec; import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; @@ -155,7 +154,10 @@ QueryParser parser = new QueryParser(Version.LUCENE_33, "content", analyser); Query q = parser.parse("name:tutu"); br.setQuery(q); - + + // test sort + br.addSortField(new SortField("name", SortField.STRING, false)); + // add the facet output specs FacetSpec colorSpec = new FacetSpec(); colorSpec.setOrderBy(FacetSortSpec.OrderHitsDesc); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2011-08-29 14:32:31 UTC (rev 503) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2011-09-15 08:53:37 UTC (rev 504) @@ -28,7 +28,6 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -58,13 +57,11 @@ import com.browseengine.bobo.api.BrowseHit; import com.browseengine.bobo.api.BrowseRequest; import com.browseengine.bobo.api.BrowseResult; -import com.browseengine.bobo.api.BrowseSelection; import com.browseengine.bobo.api.FacetAccessible; import com.browseengine.bobo.api.FacetSpec; import com.browseengine.bobo.api.FacetSpec.FacetSortSpec; import com.browseengine.bobo.facets.FacetHandler; import com.browseengine.bobo.facets.impl.SimpleFacetHandler; -import com.browseengine.bobo.facets.impl.SimpleGroupbyFacetHandler; /** * Test les facets sur les range le collecteurs basé sur les groupes, en lien @@ -147,9 +144,9 @@ public static void search() throws IOException, ParseException, BrowseException { // subject facet handler - //LinkedHashSet<String> subjectFields = new LinkedHashSet<String>(); - //subjectFields.add("subject"); - //SimpleGroupbyFacetHandler groupByFacet = new SimpleGroupbyFacetHandler("groupby", subjectFields); + /*LinkedHashSet<String> subjectFields = new LinkedHashSet<String>(); + subjectFields.add("subject"); + SimpleGroupbyFacetHandler groupByFacet = new SimpleGroupbyFacetHandler("groupby", subjectFields);*/ SimpleFacetHandler colorFacet = new SimpleFacetHandler("color"); SimpleFacetHandler subjectFacet = new SimpleFacetHandler("subject"); @@ -185,10 +182,10 @@ //subjectSpec.setMinHitCount(2); //br.setFacetSpec("groupby", groupBySpec); - FacetSpec subject2Spec = new FacetSpec(); + //FacetSpec subject2Spec = new FacetSpec(); //subjectSpec.setOrderBy(FacetSortSpec.OrderHitsDesc); //subjectSpec.setExpandSelection(true); - br.setFacetSpec("subject", subject2Spec); + //br.setFacetSpec("subject", subject2Spec); /*BrowseSelection sel = new BrowseSelection("groupby"); sel.addValue("s1"); @@ -205,6 +202,7 @@ BrowseHit[] hits = result.getHits(); for (BrowseHit hit : hits) { + hit.getDocid(); System.out.println("Group value : " + hit.getGroupValue() + " : " + hit.getGroupHitsCount()); }