May 2012 - Sandbox-commits - mailman.cloud.codelutin.com

r540 - bobobrowselucenefacets/src/main/java/org/bobo
by echatellier＠users.nuiton.org May 10, 2012

May 10, 2012

Author: echatellier Date: 2012-05-10 12:00:14 +0200 (Thu, 10 May 2012) New Revision: 540 Url: http://nuiton.org/repositories/revision/sandbox/540 Log: Facetisation en lucene pur Added: bobobrowselucenefacets/src/main/java/org/bobo/TestOnlyLuceneFacets.java Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 09:34:06 UTC (rev 539) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 10:00:14 UTC (rev 540) @@ -184,15 +184,15 @@ doc11.add(new Field("model", "500", Store.YES, Index.ANALYZED)); doc11.add(new Field("color", "blanc", Store.YES, Index.ANALYZED)); writer.addDocument(doc11); - - writer.optimize(); + writer.close(); } public static void searchLucene() throws IOException, ParseException, BrowseException { // opening a lucene index - IndexSearcher searcher = new IndexSearcher(getIndexDirectory(), true); + IndexReader indexReader = IndexReader.open(getIndexDirectory()); + IndexSearcher searcher = new IndexSearcher(indexReader); // parse a query QueryParser parser = new QueryParser(Version.LUCENE_35, "text", analyser); Added: bobobrowselucenefacets/src/main/java/org/bobo/TestOnlyLuceneFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestOnlyLuceneFacets.java (rev 0) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestOnlyLuceneFacets.java 2012-05-10 10:00:14 UTC (rev 540) @@ -0,0 +1,191 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.bobo; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.Field.Index; +import org.apache.lucene.document.Field.Store; +import org.apache.lucene.facet.index.CategoryDocumentBuilder; +import org.apache.lucene.facet.search.DrillDown; +import org.apache.lucene.facet.search.FacetsCollector; +import org.apache.lucene.facet.search.params.CountFacetRequest; +import org.apache.lucene.facet.search.params.FacetSearchParams; +import org.apache.lucene.facet.search.results.FacetResult; +import org.apache.lucene.facet.search.results.FacetResultNode; +import org.apache.lucene.facet.taxonomy.CategoryPath; +import org.apache.lucene.facet.taxonomy.TaxonomyReader; +import org.apache.lucene.facet.taxonomy.TaxonomyWriter; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.MultiCollector; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TopScoreDocCollector; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.LockObtainFailedException; +import org.apache.lucene.store.NIOFSDirectory; +import org.apache.lucene.util.Version; + +/** + * See http://lucene.apache.org/core/old_versioned_docs/versions/3_5_0/api/contrib… + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TestOnlyLuceneFacets { + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_35); + + public static void main(String... args) throws IOException, ParseException { + create(); + search(); + } + + /** + * Get lucene index directory. + * + * @return lucene index directory + * @throws IOException + */ + protected static Directory getIndexDirectory() throws IOException { + File path = new File("/tmp/lucene/index"); + Directory directory = new NIOFSDirectory(path); + return directory; + } + + /** + * Get lucene taxo directory. + * + * @return lucene index directory + * @throws IOException + */ + protected static Directory getTaxoDirectory() throws IOException { + File path = new File("/tmp/lucene/taxo"); + Directory directory = new NIOFSDirectory(path); + return directory; + } + + public static void create() throws CorruptIndexException, LockObtainFailedException, IOException { + + IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_35, analyser)); + TaxonomyWriter taxo = new DirectoryTaxonomyWriter(getTaxoDirectory(), OpenMode.CREATE); + + writer.deleteAll(); + + Document doc1 = new Document(); + doc1.add(new Field("name", "tutu is red", Store.YES, Index.ANALYZED)); + doc1.add(new Field("color", "red", Store.YES, Index.ANALYZED)); //nsa + doc1.add(new Field("category", "truc", Store.NO, Index.ANALYZED)); //nsa + addDocumentInIndex(writer, taxo, doc1); + + Document doc2 = new Document(); + doc2.add(new Field("name", "tutu is blue 2", Store.YES, Index.ANALYZED)); + doc2.add(new Field("color", "blue", Store.YES, Index.ANALYZED)); //nsa + doc2.add(new Field("category", "machin", Store.NO, Index.ANALYZED)); //nsa + addDocumentInIndex(writer, taxo, doc2); + + Document doc3 = new Document(); + doc3.add(new Field("name", "tutu is blue", Store.YES, Index.ANALYZED)); + doc3.add(new Field("color", "blue", Store.YES, Index.ANALYZED)); //nsa + doc3.add(new Field("category", "bidule", Store.NO, Index.ANALYZED)); //nsa + addDocumentInIndex(writer, taxo, doc3); + + writer.close(); + taxo.close(); + } + + protected static void addDocumentInIndex(IndexWriter writer, TaxonomyWriter taxo, Document doc) throws IOException { + + // declare facets + List<CategoryPath> categories = new ArrayList<CategoryPath>(); + categories.add(new CategoryPath("color", doc.get("color"))); + categories.add(new CategoryPath("category", doc.get("category"))); + + // link facet to doc + CategoryDocumentBuilder categoryDocBuilder = new CategoryDocumentBuilder(taxo); + categoryDocBuilder.setCategoryPaths(categories); + categoryDocBuilder.build(doc); + + // add to to index + writer.addDocument(doc); + } + + public static void search() throws IOException, ParseException { + + // opening a lucene index + IndexReader indexReader = IndexReader.open(getIndexDirectory()); + IndexSearcher searcher = new IndexSearcher(indexReader); + TaxonomyReader taxo = new DirectoryTaxonomyReader(getTaxoDirectory()); + + // create query + QueryParser parser = new QueryParser(Version.LUCENE_35, "content", analyser); + Query q = parser.parse("name:tutu"); + + // navigation par facette + //q = DrillDown.query(q, new CategoryPath("color", "red")); + + // declare result facets + FacetSearchParams facetSearchParams = new FacetSearchParams(); + facetSearchParams.addFacetRequest(new CountFacetRequest(new CategoryPath("color"), 2)); + facetSearchParams.addFacetRequest(new CountFacetRequest(new CategoryPath("category"), 2)); + + // perform search + TopScoreDocCollector topDocsCollector = TopScoreDocCollector.create(10, true); + FacetsCollector facetsCollector = new FacetsCollector(facetSearchParams, indexReader, taxo); + searcher.search(q, MultiCollector.wrap(topDocsCollector, facetsCollector)); + List<FacetResult> res = facetsCollector.getFacetResults(); + + for (FacetResult facetResult : res) { + System.out.println("Facet : " + facetResult.getFacetResultNode().getLabel(taxo) + + " (total " + facetResult.getFacetResultNode().getValue() + ")"); + for (FacetResultNode subNode : facetResult.getFacetResultNode().getSubResults()) { + System.out.println(" - " + subNode.getLabel(taxo) + " : " + subNode.getValue()); + } + } + + taxo.close(); + searcher.close(); + indexReader.close(); + } + +} Property changes on: bobobrowselucenefacets/src/main/java/org/bobo/TestOnlyLuceneFacets.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r539 - in bobobrowselucenefacets: . src/main/java/org/bobo
by echatellier＠users.nuiton.org May 10, 2012

May 10, 2012

Author: echatellier Date: 2012-05-10 11:34:06 +0200 (Thu, 10 May 2012) New Revision: 539 Url: http://nuiton.org/repositories/revision/sandbox/539 Log: Bobo is not compatible with 3.6 Modified: bobobrowselucenefacets/pom.xml bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java Modified: bobobrowselucenefacets/pom.xml =================================================================== --- bobobrowselucenefacets/pom.xml 2012-05-10 08:52:23 UTC (rev 538) +++ bobobrowselucenefacets/pom.xml 2012-05-10 09:34:06 UTC (rev 539) @@ -8,9 +8,14 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.6.0</version> + <version>3.5.0</version> </dependency> <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-facet</artifactId> + <version>3.5.0</version> + </dependency> + <dependency> <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> <version>3.0.1</version> Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-10 08:52:23 UTC (rev 538) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-10 09:34:06 UTC (rev 539) @@ -87,7 +87,7 @@ */ public class TestLuceneDateFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_35); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); @@ -108,7 +108,7 @@ public static void create() throws CorruptIndexException, LockObtainFailedException, IOException { - IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_36, analyser)); + IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_35, analyser)); writer.deleteAll(); // get dates @@ -189,7 +189,7 @@ br.addSelection(sel); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_36, "content", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_35, "content", analyser); Query q = parser.parse("*:*"); br.setQuery(q); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-10 08:52:23 UTC (rev 538) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-10 09:34:06 UTC (rev 539) @@ -75,7 +75,7 @@ */ public class TestLuceneFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_35); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); @@ -96,7 +96,7 @@ public static void create() throws CorruptIndexException, LockObtainFailedException, IOException { - IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_36, analyser)); + IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_35, analyser)); writer.deleteAll(); Document doc1 = new Document(); @@ -151,7 +151,7 @@ //br.addSelection(sel); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_36, "content", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_35, "content", analyser); Query q = parser.parse("name:tutu"); br.setQuery(q); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 08:52:23 UTC (rev 538) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 09:34:06 UTC (rev 539) @@ -81,7 +81,7 @@ */ public class TestLuceneGroupsFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_35); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); @@ -195,7 +195,7 @@ IndexSearcher searcher = new IndexSearcher(getIndexDirectory(), true); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_35, "text", analyser); Query q = parser.parse("*:*"); // perform @@ -229,7 +229,7 @@ br.setOffset(0); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_35, "text", analyser); Query q = parser.parse("*:*"); br.setQuery(q); @@ -286,7 +286,7 @@ br.setGroupBy("brand"); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_35, "text", analyser); Query q = parser.parse("*:*"); br.setQuery(q);

1 0

r538 - bobobrowselucenefacets/src/main/java/org/bobo
by echatellier＠users.nuiton.org May 10, 2012

May 10, 2012

Author: echatellier Date: 2012-05-10 10:52:23 +0200 (Thu, 10 May 2012) New Revision: 538 Url: http://nuiton.org/repositories/revision/sandbox/538 Log: Remove deprecated stuff Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-10 08:50:17 UTC (rev 537) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-10 08:52:23 UTC (rev 538) @@ -141,9 +141,7 @@ doc2.add(new Field("body", "un body qui tue", Store.YES, Index.ANALYZED)); doc3.add(new Field("date", DateTools.timeToString(nowplus7.getTime(),MILLISECOND), Store.YES, Index.ANALYZED)); writer.addDocument(doc3); - - - writer.optimize(); + writer.close(); } @@ -175,7 +173,7 @@ List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[] { dateHandler, titleFacet }); // opening a lucene index - IndexReader reader = IndexReader.open(getIndexDirectory(), true); + IndexReader reader = IndexReader.open(getIndexDirectory()); // decorate it with a bobo index reader BoboIndexReader boboReader = BoboIndexReader.getInstance(reader, handlerList); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-10 08:50:17 UTC (rev 537) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-10 08:52:23 UTC (rev 538) @@ -135,7 +135,7 @@ colorHandler, categoryHandler }); // opening a lucene index - IndexReader reader = IndexReader.open(getIndexDirectory(), true); + IndexReader reader = IndexReader.open(getIndexDirectory()); // decorate it with a bobo index reader BoboIndexReader boboReader = BoboIndexReader.getInstance(reader, handlerList); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 08:50:17 UTC (rev 537) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 08:52:23 UTC (rev 538) @@ -219,7 +219,7 @@ List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[] { colorFacet }); // opening a lucene index - IndexReader reader = IndexReader.open(getIndexDirectory(), true); + IndexReader reader = IndexReader.open(getIndexDirectory()); // decorate it with a bobo index reader BoboIndexReader boboReader = BoboIndexReader.getInstance(reader, handlerList); @@ -275,7 +275,7 @@ List<FacetHandler<?>> handlerList = Arrays.asList(new FacetHandler<?>[] { colorFacet, brandFacet }); // opening a lucene index - IndexReader reader = IndexReader.open(getIndexDirectory(), true); + IndexReader reader = IndexReader.open(getIndexDirectory()); // decorate it with a bobo index reader BoboIndexReader boboReader = BoboIndexReader.getInstance(reader, handlerList);

1 0

r537 - in bobobrowselucenefacets: . src/main/java/org/bobo
by echatellier＠users.nuiton.org May 10, 2012

May 10, 2012

Author: echatellier Date: 2012-05-10 10:50:17 +0200 (Thu, 10 May 2012) New Revision: 537 Url: http://nuiton.org/repositories/revision/sandbox/537 Log: Update lucene/bobo Modified: bobobrowselucenefacets/pom.xml bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java Modified: bobobrowselucenefacets/pom.xml =================================================================== --- bobobrowselucenefacets/pom.xml 2012-05-09 19:12:55 UTC (rev 536) +++ bobobrowselucenefacets/pom.xml 2012-05-10 08:50:17 UTC (rev 537) @@ -8,12 +8,12 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.4.0</version> + <version>3.6.0</version> </dependency> <dependency> <groupId>com.browseengine.bobo</groupId> <artifactId>bobo-browse</artifactId> - <version>3.0.0-20110830</version> + <version>3.0.1</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -24,7 +24,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.0.1</version> + <version>3.1</version> <scope>compile</scope> </dependency> </dependencies> Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-09 19:12:55 UTC (rev 536) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneDateFacets.java 2012-05-10 08:50:17 UTC (rev 537) @@ -87,13 +87,13 @@ */ public class TestLuceneDateFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_34); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); search(); } - + /** * Get lucene index directory. * @@ -108,7 +108,7 @@ public static void create() throws CorruptIndexException, LockObtainFailedException, IOException { - IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_34, analyser)); + IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_36, analyser)); writer.deleteAll(); // get dates @@ -191,7 +191,7 @@ br.addSelection(sel); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_34, "content", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_36, "content", analyser); Query q = parser.parse("*:*"); br.setQuery(q); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-09 19:12:55 UTC (rev 536) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneFacets.java 2012-05-10 08:50:17 UTC (rev 537) @@ -75,7 +75,7 @@ */ public class TestLuceneFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_34); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); @@ -96,7 +96,7 @@ public static void create() throws CorruptIndexException, LockObtainFailedException, IOException { - IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_34, analyser)); + IndexWriter writer = new IndexWriter(getIndexDirectory(), new IndexWriterConfig(Version.LUCENE_36, analyser)); writer.deleteAll(); Document doc1 = new Document(); @@ -151,7 +151,7 @@ //br.addSelection(sel); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_34, "content", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_36, "content", analyser); Query q = parser.parse("name:tutu"); br.setQuery(q); Modified: bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java =================================================================== --- bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-09 19:12:55 UTC (rev 536) +++ bobobrowselucenefacets/src/main/java/org/bobo/TestLuceneGroupsFacets.java 2012-05-10 08:50:17 UTC (rev 537) @@ -81,7 +81,7 @@ */ public class TestLuceneGroupsFacets { - protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_34); + protected static Analyzer analyser = new StandardAnalyzer(Version.LUCENE_36); public static void main(String... args) throws IOException, ParseException, BrowseException { create(); @@ -195,7 +195,7 @@ IndexSearcher searcher = new IndexSearcher(getIndexDirectory(), true); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_34, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); Query q = parser.parse("*:*"); // perform @@ -229,7 +229,7 @@ br.setOffset(0); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_34, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); Query q = parser.parse("*:*"); br.setQuery(q); @@ -238,9 +238,9 @@ dateSpec.setOrderBy(FacetSortSpec.OrderHitsDesc); br.setFacetSpec("color", dateSpec); - /*BrowseSelection sel = new BrowseSelection("color"); + BrowseSelection sel = new BrowseSelection("color"); sel.addValue("gris"); - br.addSelection(sel);*/ + br.addSelection(sel); // perform browse Browsable browser = new BoboBrowser(boboReader); @@ -286,7 +286,7 @@ br.setGroupBy("brand"); // parse a query - QueryParser parser = new QueryParser(Version.LUCENE_34, "text", analyser); + QueryParser parser = new QueryParser(Version.LUCENE_36, "text", analyser); Query q = parser.parse("*:*"); br.setQuery(q);

1 0

r536 - in textjfx: . src src/main src/main/java src/main/java/org src/main/java/org/codelutin src/main/java/org/codelutin/jfx src/main/resources
by echatellier＠users.nuiton.org May 9, 2012

May 9, 2012

Author: echatellier Date: 2012-05-09 21:12:55 +0200 (Wed, 09 May 2012) New Revision: 536 Url: http://nuiton.org/repositories/revision/sandbox/536 Log: Initial import. Added: textjfx/pom.xml textjfx/src/ textjfx/src/main/ textjfx/src/main/java/ textjfx/src/main/java/org/ textjfx/src/main/java/org/codelutin/ textjfx/src/main/java/org/codelutin/jfx/ textjfx/src/main/java/org/codelutin/jfx/MainView.java textjfx/src/main/java/org/codelutin/jfx/ReportView.java textjfx/src/main/resources/ textjfx/src/main/resources/MainView.fxml textjfx/src/main/resources/ReportView.fxml Modified: textjfx/ Property changes on: textjfx ___________________________________________________________________ Added: svn:ignore + .settings .classpath .project Added: textjfx/pom.xml =================================================================== --- textjfx/pom.xml (rev 0) +++ textjfx/pom.xml 2012-05-09 19:12:55 UTC (rev 536) @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.codelutin</groupId> + <artifactId>testjfx</artifactId> + <version>0.0.1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>1.6.4</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.0.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: textjfx/src/main/java/org/codelutin/jfx/MainView.java =================================================================== --- textjfx/src/main/java/org/codelutin/jfx/MainView.java (rev 0) +++ textjfx/src/main/java/org/codelutin/jfx/MainView.java 2012-05-09 19:12:55 UTC (rev 536) @@ -0,0 +1,91 @@ +/* * + * Copyright (C) 2012 ceric35 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + **/ +package org.codelutin.jfx; + +import java.io.IOException; +import java.util.Arrays; + +import javafx.application.Application; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.scene.control.TreeItem; +import javafx.scene.control.TreeView; +import javafx.stage.Stage; + +/** + * MainView + * + * TODO ADD COMMENT HERE ! + * + * @author ceric35 + * Date : 7 mai 2012 + */ +public class MainView extends Application { + + @FXML + protected TreeView treeView; + + public static void main(String[] args) { + launch(args); + } + + /* (non-Javadoc) + * @see javafx.application.Application#start(javafx.stage.Stage) + */ + @Override + public void start(Stage primaryStage) throws Exception { + + primaryStage.setTitle("FXTimer"); + + Scene scene = (Scene)FXMLLoader.load(getClass().getResource("/MainView.fxml")); + primaryStage.setScene(scene); + primaryStage.sizeToScene(); + primaryStage.show(); + } + + @FXML + protected void loadTree(ActionEvent event) { + final TreeItem<String> treeRoot = new TreeItem<String>("Root node"); + treeRoot.getChildren().addAll(Arrays.asList( + new TreeItem<String>("Child Node 1"), + new TreeItem<String>("Child Node 2"), + new TreeItem<String>("Child Node 3"))); + + treeRoot.getChildren().get(2).getChildren().addAll(Arrays.asList( + new TreeItem<String>("Child Node 4"), + new TreeItem<String>("Child Node 5"), + new TreeItem<String>("Child Node 6"), + new TreeItem<String>("Child Node 7"), + new TreeItem<String>("Child Node 8"), + new TreeItem<String>("Child Node 9"), + new TreeItem<String>("Child Node 10"), + new TreeItem<String>("Child Node 11"), + new TreeItem<String>("Child Node 12"))); + treeView.setRoot(treeRoot); + } + + @FXML + protected void showReport(ActionEvent event) throws IOException { + Stage newStage = new Stage(); + Scene scene = (Scene)FXMLLoader.load(getClass().getResource("/ReportView.fxml")); + newStage.setScene(scene); + newStage.show(); + } +} Added: textjfx/src/main/java/org/codelutin/jfx/ReportView.java =================================================================== --- textjfx/src/main/java/org/codelutin/jfx/ReportView.java (rev 0) +++ textjfx/src/main/java/org/codelutin/jfx/ReportView.java 2012-05-09 19:12:55 UTC (rev 536) @@ -0,0 +1,73 @@ +/* * + * Copyright (C) 2012 ceric35 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + **/ +package org.codelutin.jfx; + +import java.io.IOException; +import java.util.Arrays; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.TreeItem; +import javafx.scene.control.TreeView; +import javafx.stage.FileChooser; +import javafx.stage.Window; + +/** + * ReportView + * + * TODO ADD COMMENT HERE ! + * + * @author ceric35 + * Date : 8 mai 2012 + */ +public class ReportView extends Window { + + @FXML + protected TreeView treeView; + + @FXML + protected void close(ActionEvent event) throws IOException { + FileChooser chooser = new FileChooser(); + chooser.showOpenDialog(this); + } + + @FXML + protected void generate(ActionEvent event) throws IOException { + final TreeItem<String> treeRoot = new TreeItem<String>("Root node"); + treeRoot.getChildren().addAll(Arrays.asList( + new TreeItem<String>("Child Node 1"), + new TreeItem<String>("Child Node 2"), + new TreeItem<String>("Child Node 3"))); + + treeRoot.getChildren().get(2).getChildren().addAll(Arrays.asList( + new TreeItem<String>("Child Node 4"), + new TreeItem<String>("Child Node 5"), + new TreeItem<String>("Child Node 6"), + new TreeItem<String>("Child Node 7"), + new TreeItem<String>("Child Node 8"), + new TreeItem<String>("Child Node 9"), + new TreeItem<String>("Child Node 10"), + new TreeItem<String>("Child Node 11"), + new TreeItem<String>("Child Node 12"))); + treeView.setRoot(treeRoot); + + + } + + +} Added: textjfx/src/main/resources/MainView.fxml =================================================================== --- textjfx/src/main/resources/MainView.fxml (rev 0) +++ textjfx/src/main/resources/MainView.fxml 2012-05-09 19:12:55 UTC (rev 536) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?import javafx.collections.*?> +<?import javafx.scene.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.layout.*?> +<?import javafx.scene.paint.*?> +<?import javafx.scene.text.*?> + +<Scene width="400" height="800" fx:controller="org.codelutin.jfx.MainView" + xmlns:fx="http://javafx.com/fxml"> + + <BorderPane> + <top> + <MenuBar fx:id="menuBar"> + <menus> + <Menu fx:id="menuFile" text="File"> + <items> + <MenuItem text="Load" onAction="#loadTree" /> + <SeparatorMenuItem /> + <MenuItem text="Exit"/> + </items> + </Menu> + <Menu fx:id="menuFile" text="Project"> + <items> + <MenuItem text="New"/> + <SeparatorMenuItem /> + <MenuItem text="Exit"/> + </items> + </Menu> + <Menu fx:id="menuFile" text="Task"> + <items> + <MenuItem text="New"/> + <SeparatorMenuItem /> + <MenuItem text="Exit"/> + </items> + </Menu> + <Menu fx:id="menuFile" text="Report"> + <items> + <MenuItem text="Report" onAction="#showReport" /> + </items> + </Menu> + <Menu fx:id="menuFile" text="Options"> + <items> + <MenuItem text="New"/> + <SeparatorMenuItem /> + <MenuItem text="Exit"/> + </items> + </Menu> + <Menu fx:id="menuFile" text="Help"> + <items> + <MenuItem text="New"/> + <SeparatorMenuItem /> + <MenuItem text="Exit"/> + </items> + </Menu> + </menus> + </MenuBar> + </top> + + <center> + + <TreeView fx:id="treeView"> + + </TreeView> + + </center> + </BorderPane> +</Scene> Added: textjfx/src/main/resources/ReportView.fxml =================================================================== --- textjfx/src/main/resources/ReportView.fxml (rev 0) +++ textjfx/src/main/resources/ReportView.fxml 2012-05-09 19:12:55 UTC (rev 536) @@ -0,0 +1,51 @@ +<?import javafx.scene.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.layout.*?> +<?import org.codelutin.jfx.widget.*?> + +<Scene width="500" height="500" fx:controller="org.codelutin.jfx.ReportView" + xmlns:fx="http://javafx.com/fxml"> + +<SplitPane orientation="HORIZONTAL"> + + <BorderPane> + + <top> + <TitledPane text="Options" collapsible="false"> + <content> + <GridPane> + <Label text="De" GridPane.rowIndex="0" GridPane.columnIndex="0" /> + <Label text="13/23/2012" GridPane.rowIndex="0" GridPane.columnIndex="1" /> + <Label text="A:" GridPane.rowIndex="1" GridPane.columnIndex="0" /> + <Label text="13/23/2012" GridPane.rowIndex="1" GridPane.columnIndex="1" /> + </GridPane> + </content> + </TitledPane> + </top> + + <center> + <TitledPane text="Projects" collapsible="false"> + <TreeView fx:id="treeView" editable="true"> + + </TreeView> + </TitledPane> + </center> + </BorderPane> + + <BorderPane> + <center> + <TextArea fx:id="reportArea" text="truc" /> + </center> + <bottom> + <HBox> + <Button text="Generate" onAction="#generate" /> + <Button text="Send by email" /> + <Button text="Close" onAction="#close" /> + </HBox> + </bottom> + </BorderPane> + + +</SplitPane> + +</Scene> \ No newline at end of file

1 0

r535 - /
by echatellier＠users.nuiton.org May 9, 2012

May 9, 2012

Author: echatellier Date: 2012-05-09 21:12:08 +0200 (Wed, 09 May 2012) New Revision: 535 Url: http://nuiton.org/repositories/revision/sandbox/535 Log: Initial import. Added: textjfx/

1 0

r534 - jnijnajntest
by echatellier＠users.nuiton.org May 2, 2012

May 2, 2012

Author: echatellier Date: 2012-05-02 11:24:34 +0200 (Wed, 02 May 2012) New Revision: 534 Url: http://nuiton.org/repositories/revision/sandbox/534 Log: svn:ignore Modified: jnijnajntest/ Property changes on: jnijnajntest ___________________________________________________________________ Modified: svn:ignore - .settings .classpath .project + .settings .classpath .project *.h

1 0

r533 - in jnijnajntest: . src/main/java/org/test/testjna src/main/java/org/test/testjni
by echatellier＠users.nuiton.org May 2, 2012

May 2, 2012

Author: echatellier Date: 2012-05-02 11:23:30 +0200 (Wed, 02 May 2012) New Revision: 533 Url: http://nuiton.org/repositories/revision/sandbox/533 Log: Update code Removed: jnijnajntest/org_test_testjni_IdleJNI.h Modified: jnijnajntest/compjni.sh jnijnajntest/src/main/java/org/test/testjna/TestIdleJNA.java jnijnajntest/src/main/java/org/test/testjna/TestNotifyJNA.java jnijnajntest/src/main/java/org/test/testjni/IdleJNI.java jnijnajntest/src/main/java/org/test/testjni/TestIdleJNI.java Modified: jnijnajntest/compjni.sh =================================================================== --- jnijnajntest/compjni.sh 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/compjni.sh 2012-05-02 09:23:30 UTC (rev 533) @@ -1,8 +1,16 @@ #/bin/bash +# generation .h pushd target/classes javah org.test.testjni.IdleJNI +mv *.h ../../ popd -gcc -I /usr/include -I $JAVA_HOME/include -I $JAVA_HOME/include/linux -c org_test_testjni_IdleJNI.c -fPIC -gcc -I /usr/include -I $JAVA_HOME/include -I $JAVA_HOME/include/linux -shared org_test_testjni_IdleJNI.o -o libtestidle.so -L/usr/lib -rdynamic -lX11 -lXss -lXext +# compilation +gcc -I /usr/include -I $JAVA_HOME/include -I $JAVA_HOME/include/linux \ + -c org_test_testjni_IdleJNI.c -fPIC + +# linkage lib "libtestidle.so" +gcc -I /usr/include -I $JAVA_HOME/include -I $JAVA_HOME/include/linux \ + -shared org_test_testjni_IdleJNI.o -o libtestidle.so -L/usr/lib -rdynamic \ + -lX11 -lXss -lXext Deleted: jnijnajntest/org_test_testjni_IdleJNI.h =================================================================== --- jnijnajntest/org_test_testjni_IdleJNI.h 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/org_test_testjni_IdleJNI.h 2012-05-02 09:23:30 UTC (rev 533) @@ -1,21 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class org_test_testjni_IdleJNI */ - -#ifndef _Included_org_test_testjni_IdleJNI -#define _Included_org_test_testjni_IdleJNI -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: org_test_testjni_IdleJNI - * Method: getIdleTime - * Signature: ()J - */ -JNIEXPORT jlong JNICALL Java_org_test_testjni_IdleJNI_getIdleTime - (JNIEnv *, jobject); - -#ifdef __cplusplus -} -#endif -#endif Modified: jnijnajntest/src/main/java/org/test/testjna/TestIdleJNA.java =================================================================== --- jnijnajntest/src/main/java/org/test/testjna/TestIdleJNA.java 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/src/main/java/org/test/testjna/TestIdleJNA.java 2012-05-02 09:23:30 UTC (rev 533) @@ -26,7 +26,6 @@ package org.test.testjna; import org.test.testjna.unix.UnixSystemInfo; -import org.test.testjni.IdleJNI; /** * TODO add comment here. Modified: jnijnajntest/src/main/java/org/test/testjna/TestNotifyJNA.java =================================================================== --- jnijnajntest/src/main/java/org/test/testjna/TestNotifyJNA.java 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/src/main/java/org/test/testjna/TestNotifyJNA.java 2012-05-02 09:23:30 UTC (rev 533) @@ -45,5 +45,10 @@ notify.notify_init("test"); NotifyNotification notif = notify.notify_notification_new("Test", "hello réunion dev", null, null); notify.notify_notification_show(notif, null); + + for (int i = 1; i < 8 ; ++i) { + NotifyNotification notif2 = notify.notify_notification_new("Test", "test notification " + i, null, null); + notify.notify_notification_show(notif2, null); + } } } Modified: jnijnajntest/src/main/java/org/test/testjni/IdleJNI.java =================================================================== --- jnijnajntest/src/main/java/org/test/testjni/IdleJNI.java 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/src/main/java/org/test/testjni/IdleJNI.java 2012-05-02 09:23:30 UTC (rev 533) @@ -36,14 +36,6 @@ */ public class IdleJNI { - /* Bloc static : le code est exécuté une seule fois - * lors du chargement de la classe - */ - static { - /* On charge la librairie en utilisant son nom de base : */ - System.loadLibrary("testidle"); - } - public native long getIdleTime(); } Modified: jnijnajntest/src/main/java/org/test/testjni/TestIdleJNI.java =================================================================== --- jnijnajntest/src/main/java/org/test/testjni/TestIdleJNI.java 2012-04-26 12:54:43 UTC (rev 532) +++ jnijnajntest/src/main/java/org/test/testjni/TestIdleJNI.java 2012-05-02 09:23:30 UTC (rev 533) @@ -36,6 +36,14 @@ */ public class TestIdleJNI { + /* Bloc static : le code est exécuté une seule fois + * lors du chargement de la classe + */ + static { + /* On charge la librairie en utilisant son nom de base : */ + System.loadLibrary("testidle"); + } + public static void main(String... args) throws InterruptedException { IdleJNI idleJNI = new IdleJNI();

1 0