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

r547 - testGitSynchro/trunk
by ymartel＠users.nuiton.org 30 May '12

30 May '12

Author: ymartel Date: 2012-05-30 19:31:50 +0200 (Wed, 30 May 2012) New Revision: 547 Url: http://nuiton.org/repositories/revision/sandbox/547 Log: add the pouet Added: testGitSynchro/trunk/pouet Added: testGitSynchro/trunk/pouet =================================================================== --- testGitSynchro/trunk/pouet (rev 0) +++ testGitSynchro/trunk/pouet 2012-05-30 17:31:50 UTC (rev 547) @@ -0,0 +1 @@ +i'm the pouetator

1 0

r546 - testGitSynchro/trunk
by fdesbois＠users.nuiton.org 30 May '12

30 May '12

Author: fdesbois Date: 2012-05-30 18:20:34 +0200 (Wed, 30 May 2012) New Revision: 546 Url: http://nuiton.org/repositories/revision/sandbox/546 Log: TestGit Modified: testGitSynchro/trunk/plan Modified: testGitSynchro/trunk/plan =================================================================== --- testGitSynchro/trunk/plan 2012-05-30 13:49:25 UTC (rev 545) +++ testGitSynchro/trunk/plan 2012-05-30 16:20:34 UTC (rev 546) @@ -16,7 +16,12 @@ 50% Théorie, 50% Pratique TestSVN +TestUndo +TestGitCloned + +TestGitCloned + Public : Architecte, Développeur, Chef de projet, Administrateur système

1 0

r545 - testGitSynchro/trunk
by fdesbois＠users.nuiton.org 30 May '12

30 May '12

Author: fdesbois Date: 2012-05-30 15:49:25 +0200 (Wed, 30 May 2012) New Revision: 545 Url: http://nuiton.org/repositories/revision/sandbox/545 Log: TestSVN Modified: testGitSynchro/trunk/plan Modified: testGitSynchro/trunk/plan =================================================================== --- testGitSynchro/trunk/plan 2012-05-24 16:05:32 UTC (rev 544) +++ testGitSynchro/trunk/plan 2012-05-30 13:49:25 UTC (rev 545) @@ -15,6 +15,8 @@ Répartition : 50% Théorie, 50% Pratique +TestSVN + Public : Architecte, Développeur, Chef de projet, Administrateur système

1 0

r544 - in scripts: . generateSQL4Perfdb
by ymartel＠users.nuiton.org 24 May '12

24 May '12

Author: ymartel Date: 2012-05-24 18:05:32 +0200 (Thu, 24 May 2012) New Revision: 544 Url: http://nuiton.org/repositories/revision/sandbox/544 Log: Add folder for scripts around DataBase SQL generation and perf test Added: scripts/generateSQL4Perfdb/ scripts/generateSQL4Perfdb/dbTableGenerator.py Removed: scripts/dbTableGenerator.py Deleted: scripts/dbTableGenerator.py =================================================================== --- scripts/dbTableGenerator.py 2012-05-24 15:26:37 UTC (rev 543) +++ scripts/dbTableGenerator.py 2012-05-24 16:05:32 UTC (rev 544) @@ -1,103 +0,0 @@ -# Generate a SQL file with 1.000.000 entries for a (not yet) customized table -# This program should ask user to have number of String/Test Column, Date Column -# or Numeric column -#!/usr/bin/python -# -*- coding: utf-8 -*- -from datetime import date, datetime -import random, string, sys, time - -#maybe manage String as a table of max lenght ? stringColumns = [50, 10, 23] ? -stringColumns = 13 -textColumns = 0 -#think about bigint ? -integerColumns = 5 -floatColumns = 1 -dateColumns = 2 -#have you seen blob ? - -#prepare the SQL file -filename = "perfotest1M.sql" -file = open(filename, "w") - -#Create the table -database_name = "PerfoTest" -createStatement = "create table " + database_name + " (\n" -createStatement += "\tid\t\tvarchar(255)" -create_index = "\nCREATE INDEX id_idx ON " + database_name + " (id);" - -for n in range (stringColumns) : - column_name = "stringcol" + str(n + 1) - createStatement += ",\n\t" + column_name + "\t\tvarchar(255)" - create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ - + " (" + column_name + ");" - -for n in range (textColumns) : - column_name = "textcol" + str(n + 1) - createStatement += ",\n\t" + column_name + "\t\ttext" - create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ - + " (" + column_name + ");" - -for n in range (integerColumns) : - column_name = "integercol" + str(n + 1) - createStatement += ",\n\t" + column_name + "\t\tinteger" - create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ - + " (" + column_name + ");" - -for n in range (floatColumns) : - column_name = "numericcol" + str(n + 1) - createStatement += ",\n\t" + column_name + "\t\tnumeric" - create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ - + " (" + column_name + ");" - -for n in range (dateColumns) : - column_name = "datecol" + str(n + 1) - createStatement += ",\n\t" + column_name + "\t\ttimestamp" - create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ - + " (" + column_name + ");" - -createStatement += "\n);" - -#print createStatement -file.writelines("START TRANSACTION;\n") -file.writelines(createStatement) -file.writelines(create_index) - -#Add entries now! Groovy baby -print "c'est parti mon kiki! " + str(time.strftime("%H:%M:%S")) -query = "\n\n" -for row in range(1000000): - #ready ? - query_row = "INSERT INTO PerfoTest VALUES (" + "'monsuperIdOfTheDead" + str(row) +"'" - - for n in range (stringColumns) : - query_row += ", '" + ''.join(random.choice(string.digits + \ - string.letters) for i in xrange(random.randint(1, 255))) + "'" - - for n in range (textColumns) : - query_row += ", '" + ''.join(random.choice(string.letters) for i in \ - xrange(random.randint(1, 700))) + "'" - - for n in range (integerColumns) : - query_row += ", " + str(random.randint(1, 2147483647)) - - for n in range (floatColumns) : - query_row += ", " + str(random.uniform(1, 10) * random.randint(1, 10000)) - - for n in range (dateColumns) : - start_date = date.today().replace(day=1, month=1).toordinal() - end_date = date.today().toordinal() - random_day = date.fromordinal(random.randint(start_date, end_date)) - query_row += ", '" + str(datetime(*(random_day.timetuple())[:6])) + "'" - - query += query_row + ");\n" - - #A little commit! - if (row % 100000 == 0) : - query += "COMMIT;\nSTART TRANSACTION;\n" - -#print query -file.writelines(query) -file.writelines("COMMIT;\n") - -file.close() -print "Generation effectuee, finie a " + str(time.strftime("%H:%M:%S")) Copied: scripts/generateSQL4Perfdb/dbTableGenerator.py (from rev 543, scripts/dbTableGenerator.py) =================================================================== --- scripts/generateSQL4Perfdb/dbTableGenerator.py (rev 0) +++ scripts/generateSQL4Perfdb/dbTableGenerator.py 2012-05-24 16:05:32 UTC (rev 544) @@ -0,0 +1,103 @@ +# Generate a SQL file with 1.000.000 entries for a (not yet) customized table +# This program should ask user to have number of String/Test Column, Date Column +# or Numeric column +#!/usr/bin/python +# -*- coding: utf-8 -*- +from datetime import date, datetime +import random, string, sys, time + +#maybe manage String as a table of max lenght ? stringColumns = [50, 10, 23] ? +stringColumns = 13 +textColumns = 0 +#think about bigint ? +integerColumns = 5 +floatColumns = 1 +dateColumns = 2 +#have you seen blob ? + +#prepare the SQL file +filename = "perfotest1M.sql" +file = open(filename, "w") + +#Create the table +database_name = "PerfoTest" +createStatement = "create table " + database_name + " (\n" +createStatement += "\tid\t\tvarchar(255)" +create_index = "\nCREATE INDEX id_idx ON " + database_name + " (id);" + +for n in range (stringColumns) : + column_name = "stringcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tvarchar(255)" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (textColumns) : + column_name = "textcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\ttext" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (integerColumns) : + column_name = "integercol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tinteger" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (floatColumns) : + column_name = "numericcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tnumeric" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (dateColumns) : + column_name = "datecol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\ttimestamp" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +createStatement += "\n);" + +#print createStatement +file.writelines("START TRANSACTION;\n") +file.writelines(createStatement) +file.writelines(create_index) + +#Add entries now! Groovy baby +print "c'est parti mon kiki! " + str(time.strftime("%H:%M:%S")) +query = "\n\n" +for row in range(1000000): + #ready ? + query_row = "INSERT INTO PerfoTest VALUES (" + "'monsuperIdOfTheDead" + str(row) +"'" + + for n in range (stringColumns) : + query_row += ", '" + ''.join(random.choice(string.digits + \ + string.letters) for i in xrange(random.randint(1, 255))) + "'" + + for n in range (textColumns) : + query_row += ", '" + ''.join(random.choice(string.letters) for i in \ + xrange(random.randint(1, 700))) + "'" + + for n in range (integerColumns) : + query_row += ", " + str(random.randint(1, 2147483647)) + + for n in range (floatColumns) : + query_row += ", " + str(random.uniform(1, 10) * random.randint(1, 10000)) + + for n in range (dateColumns) : + start_date = date.today().replace(day=1, month=1).toordinal() + end_date = date.today().toordinal() + random_day = date.fromordinal(random.randint(start_date, end_date)) + query_row += ", '" + str(datetime(*(random_day.timetuple())[:6])) + "'" + + query += query_row + ");\n" + + #A little commit! + if (row % 100000 == 0) : + query += "COMMIT;\nSTART TRANSACTION;\n" + +#print query +file.writelines(query) +file.writelines("COMMIT;\n") + +file.close() +print "Generation effectuee, finie a " + str(time.strftime("%H:%M:%S"))

1 0

r543 - scripts
by ymartel＠users.nuiton.org 24 May '12

24 May '12

Author: ymartel Date: 2012-05-24 17:26:37 +0200 (Thu, 24 May 2012) New Revision: 543 Url: http://nuiton.org/repositories/revision/sandbox/543 Log: add a generator for table example SQL instructions Added: scripts/dbTableGenerator.py Added: scripts/dbTableGenerator.py =================================================================== --- scripts/dbTableGenerator.py (rev 0) +++ scripts/dbTableGenerator.py 2012-05-24 15:26:37 UTC (rev 543) @@ -0,0 +1,103 @@ +# Generate a SQL file with 1.000.000 entries for a (not yet) customized table +# This program should ask user to have number of String/Test Column, Date Column +# or Numeric column +#!/usr/bin/python +# -*- coding: utf-8 -*- +from datetime import date, datetime +import random, string, sys, time + +#maybe manage String as a table of max lenght ? stringColumns = [50, 10, 23] ? +stringColumns = 13 +textColumns = 0 +#think about bigint ? +integerColumns = 5 +floatColumns = 1 +dateColumns = 2 +#have you seen blob ? + +#prepare the SQL file +filename = "perfotest1M.sql" +file = open(filename, "w") + +#Create the table +database_name = "PerfoTest" +createStatement = "create table " + database_name + " (\n" +createStatement += "\tid\t\tvarchar(255)" +create_index = "\nCREATE INDEX id_idx ON " + database_name + " (id);" + +for n in range (stringColumns) : + column_name = "stringcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tvarchar(255)" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (textColumns) : + column_name = "textcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\ttext" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (integerColumns) : + column_name = "integercol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tinteger" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (floatColumns) : + column_name = "numericcol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\tnumeric" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +for n in range (dateColumns) : + column_name = "datecol" + str(n + 1) + createStatement += ",\n\t" + column_name + "\t\ttimestamp" + create_index += "\nCREATE INDEX " + column_name + "_idx ON " + database_name \ + + " (" + column_name + ");" + +createStatement += "\n);" + +#print createStatement +file.writelines("START TRANSACTION;\n") +file.writelines(createStatement) +file.writelines(create_index) + +#Add entries now! Groovy baby +print "c'est parti mon kiki! " + str(time.strftime("%H:%M:%S")) +query = "\n\n" +for row in range(1000000): + #ready ? + query_row = "INSERT INTO PerfoTest VALUES (" + "'monsuperIdOfTheDead" + str(row) +"'" + + for n in range (stringColumns) : + query_row += ", '" + ''.join(random.choice(string.digits + \ + string.letters) for i in xrange(random.randint(1, 255))) + "'" + + for n in range (textColumns) : + query_row += ", '" + ''.join(random.choice(string.letters) for i in \ + xrange(random.randint(1, 700))) + "'" + + for n in range (integerColumns) : + query_row += ", " + str(random.randint(1, 2147483647)) + + for n in range (floatColumns) : + query_row += ", " + str(random.uniform(1, 10) * random.randint(1, 10000)) + + for n in range (dateColumns) : + start_date = date.today().replace(day=1, month=1).toordinal() + end_date = date.today().toordinal() + random_day = date.fromordinal(random.randint(start_date, end_date)) + query_row += ", '" + str(datetime(*(random_day.timetuple())[:6])) + "'" + + query += query_row + ");\n" + + #A little commit! + if (row % 100000 == 0) : + query += "COMMIT;\nSTART TRANSACTION;\n" + +#print query +file.writelines(query) +file.writelines("COMMIT;\n") + +file.close() +print "Generation effectuee, finie a " + str(time.strftime("%H:%M:%S"))

1 0

r542 - /
by ymartel＠users.nuiton.org 24 May '12

24 May '12

Author: ymartel Date: 2012-05-24 17:16:14 +0200 (Thu, 24 May 2012) New Revision: 542 Url: http://nuiton.org/repositories/revision/sandbox/542 Log: Add a folder for scripts tests Added: scripts/

1 0

r541 - in textjfx/src/main: java/org/codelutin/jfx resources resources/img
by echatellier＠users.nuiton.org 16 May '12

16 May '12

Author: echatellier Date: 2012-05-16 22:17:18 +0200 (Wed, 16 May 2012) New Revision: 541 Url: http://nuiton.org/repositories/revision/sandbox/541 Log: Improve visual UI Added: textjfx/src/main/resources/img/ textjfx/src/main/resources/img/bell.png textjfx/src/main/resources/img/bookmark-new.png textjfx/src/main/resources/img/document-new.png textjfx/src/main/resources/img/go-next.png textjfx/src/main/resources/img/notes.png textjfx/src/main/resources/img/process-stop.png Modified: textjfx/src/main/java/org/codelutin/jfx/MainView.java textjfx/src/main/resources/MainView.fxml Modified: textjfx/src/main/java/org/codelutin/jfx/MainView.java =================================================================== --- textjfx/src/main/java/org/codelutin/jfx/MainView.java 2012-05-10 10:00:14 UTC (rev 540) +++ textjfx/src/main/java/org/codelutin/jfx/MainView.java 2012-05-16 20:17:18 UTC (rev 541) @@ -46,13 +46,13 @@ launch(args); } - /* (non-Javadoc) + /* * @see javafx.application.Application#start(javafx.stage.Stage) */ @Override public void start(Stage primaryStage) throws Exception { - primaryStage.setTitle("FXTimer"); + primaryStage.setTitle("fxTimer"); Scene scene = (Scene)FXMLLoader.load(getClass().getResource("/MainView.fxml")); primaryStage.setScene(scene); @@ -61,6 +61,11 @@ } @FXML + protected void quit() { + System.exit(0); + } + + @FXML protected void loadTree(ActionEvent event) { final TreeItem<String> treeRoot = new TreeItem<String>("Root node"); treeRoot.getChildren().addAll(Arrays.asList( Modified: textjfx/src/main/resources/MainView.fxml =================================================================== --- textjfx/src/main/resources/MainView.fxml 2012-05-10 10:00:14 UTC (rev 540) +++ textjfx/src/main/resources/MainView.fxml 2012-05-16 20:17:18 UTC (rev 541) @@ -5,64 +5,159 @@ <?import javafx.scene.layout.*?> <?import javafx.scene.paint.*?> <?import javafx.scene.text.*?> +<?import javafx.scene.image.*?> <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> + <BorderPane> + <center> + <MenuBar fx:id="menuBar"> + <menus> + <Menu text="File"> + <items> + <MenuItem text="Quit" onAction="#quit" /> + </items> + </Menu> + <Menu text="Project"> + <items> + <MenuItem text="New _project" onAction="#loadTree"/> + <MenuItem text="Edit project" onAction="#loadTree"/> + <MenuItem text="Open/Close project" onAction="#loadTree"/> + <MenuItem text="Delete project" onAction="#loadTree"/> + </items> + </Menu> + <Menu text="Task"> + <items> + <MenuItem text="_New task" mnemonicParsing="true" /> + <MenuItem text="Edit task"/> + <MenuItem text="Open/Close task"/> + <MenuItem text="Delete task"/> + <MenuItem text="Start"/> + <MenuItem text="Stop"/> + <MenuItem text="Add annotation"/> + <MenuItem text="Edit alerts"/> + <MenuItem text="Increment 1 minute"/> + <MenuItem text="Increment 5 minute"/> + <MenuItem text="Increment 30 minute"/> + <MenuItem text="Decrement 1 minute"/> + <MenuItem text="Decrement 5 minute"/> + <MenuItem text="Decrement 30 minute"/> + <MenuItem text="Set to zero"/> + <MenuItem text="Merge"/> + </items> + </Menu> + <Menu text="Report"> + <items> + <MenuItem text="Report..." onAction="#showReport" /> + </items> + </Menu> + <Menu text="Options"> + <items> + <CheckMenuItem text="Show closed"/> + <CheckMenuItem text="Close to systray"/> + <fx:define> + <ToggleGroup fx:id="dayToggleGroup"/> + </fx:define> + <Menu text="Report - First day of week"> + <RadioMenuItem text="Sunday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Monday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Thuesday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Wednesday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Thursday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Friday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Saturday" toggleGroup="$dayToggleGroup" /> + </Menu> + </items> + </Menu> + <Menu text="Help"> + <items> + <MenuItem text="About..."/> + </items> + </Menu> + </menus> + </MenuBar> + </center> + <bottom> + <ToolBar> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/go-next.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/process-stop.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/bookmark-new.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/document-new.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Separator /> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/notes.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/bell.png" /> + </image> + </ImageView> + </graphic> + </Button> + </ToolBar> + </bottom> + </BorderPane> </top> <center> - <TreeView fx:id="treeView"> </TreeView> - </center> + + <bottom> + <GridPane> + <columnConstraints> + <ColumnConstraints percentWidth="50"/> + <ColumnConstraints percentWidth="50" /> + </columnConstraints> + <Label text="No task running" GridPane.rowIndex="0" GridPane.columnIndex="0" /> + <Label text="Today : 00:00:00" + GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.columnIndex="1" /> + </GridPane> + </bottom> </BorderPane> </Scene> Added: textjfx/src/main/resources/img/bell.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/bell.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/bookmark-new.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/bookmark-new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/document-new.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/document-new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/go-next.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/go-next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/notes.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/notes.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/process-stop.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/process-stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

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

10 May '12

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 10 May '12

10 May '12

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 10 May '12

10 May '12

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