Author: bbrossaud Date: 2010-07-21 21:59:57 +0200 (Wed, 21 Jul 2010) New Revision: 114 Url: http://chorem.org/repositories/revision/bonzoms/114 Log: fulltext search works Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul trunk/bonzoms-ui-zk/transaction.log Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/Model.java 2010-07-21 19:59:57 UTC (rev 114) @@ -32,8 +32,10 @@ import org.chorem.data.bonzoms.Person; import org.chorem.data.bonzoms.Service; import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -133,6 +135,9 @@ } public Service retrieveServiceById(String id) { + if (id == null || id.isEmpty()) { + return null; + } return proxy.restore(Service.class, id); } @@ -190,19 +195,25 @@ } public List<Wikitty> retrieveAllBySearch(String str) { + List<Wikitty> wikitties = new ArrayList<Wikitty>(); + Search search = Search.query().eq(Element.ELT_EXTENSION, Person.EXT_PERSON); search = search.or().eq(Element.ELT_EXTENSION, Company.EXT_COMPANY); - search = search.or().eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); - search = search.or().eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); - search = search.or().eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); - search = search.or().eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); - search = search.and().keyword(str); + search = search.eq(Element.ELT_EXTENSION, Employee.EXT_EMPLOYEE); + search = search.eq(Element.ELT_EXTENSION, Service.EXT_SERVICE); + search = search.eq(Element.ELT_EXTENSION, EmploymentContract.EXT_EMPLOYMENTCONTRACT); + search = search.eq(Element.ELT_EXTENSION, Address.EXT_ADDRESS); + if (str != null && !str.isEmpty()) { + search = search.and().keyword(str); + } Criteria criteria = search.criteria(); - - List<Wikitty> wikitties = proxy.findAllByCriteria(null, criteria).cast(null, proxy.getWikittyService()).getAll(); - wikitties = new ArrayList<Wikitty>(wikitties); - + WikittyService service = proxy.getWikittyService(); + PagedResult result = service.findAllByCriteria(null, criteria); + if (result != null) { + wikitties = result.cast(null, proxy.getWikittyService()).getAll(); + wikitties = new ArrayList<Wikitty>(wikitties); + } return wikitties; } Modified: trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java =================================================================== --- trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/java/org/chorem/bonzoms/ui/ResultController.java 2010-07-21 19:59:57 UTC (rev 114) @@ -217,6 +217,10 @@ createPageByWikitty(wikitty); } }); + item.appendChild(id); + item.appendChild(extensions); + item.appendChild(values); + item.appendChild(detailsCell); } }; } Modified: trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/addressFormPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -1,29 +1,29 @@ <?page id="AddressForm" title="Address form" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<window closable="true" maximizable="true" sizable="true" height="500px" width="400" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.AddressFormController"> +<window closable="true" maximizable="true" sizable="true" height="350px" width="200px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.AddressFormController"> <caption label="Address"/> <groupbox> <caption label="@{composer.address.name}" /> <vbox> <label value="Name" /> - <textbox value="@{composer.address.name, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.name, save-when='saveAddress.onClick'}" /> <label value="Adress1" /> - <textbox value="@{composer.address.address1, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.address1, save-when='saveAddress.onClick'}" /> <label value="Adress2" /> - <textbox value="@{composer.address.address2, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.address2, save-when='saveAddress.onClick'}" /> <label value="Zip code" /> - <textbox value="@{composer.address.zipCode, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.zipCode, save-when='saveAddress.onClick'}" /> <label value="City" /> - <textbox value="@{composer.address.city, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.city, save-when='saveAddress.onClick'}" /> <label value="Country" /> - <textbox value="@{composer.address.country, save-when='saveCompany.onClick'}" /> + <textbox value="@{composer.address.country, save-when='saveAddress.onClick'}" /> </vbox> </groupbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/contractFormPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -1,7 +1,8 @@ <?page id="ContractForm" title="Contract form" cacheable="false" language="xul/html" zscriptLanguage="Java"?> <?meta content="text/html; charset=UTF-8" pageEncoding="UTF-8"?> -<window closable="true" maximizable="true" sizable="true" height="400px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> +<window closable="true" maximizable="true" sizable="true" height="350px" width="450px" contentStyle="overflow:auto" apply="org.chorem.bonzoms.ui.ContractFormController"> + <caption label="Contract" /> <groupbox> <caption label="@{composer.contract.type}" /> @@ -10,16 +11,16 @@ <vbox> <label value="Type" /> - <textbox value="@{composer.contract.type, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.type, save-when='saveContract.onClick'}" /> <label value="Salary" /> - <doublebox value="@{composer.contract.salary, save-when='save.onClick'}" /> + <doublebox value="@{composer.contract.salary, save-when='saveContract.onClick'}" /> <label value="Working time" /> - <textbox value="@{composer.contract.workingTime, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.workingTime, save-when='saveContract.onClick'}" /> <label value="Advantages" /> - <textbox value="@{composer.contract.advantages, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.advantages, save-when='saveContract.onClick'}" /> </vbox> @@ -27,16 +28,16 @@ <vbox> <label value="Name" /> - <textbox value="@{composer.contract.name, save-when='save.onClick'}" /> + <textbox value="@{composer.contract.name, save-when='saveContract.onClick'}" /> <label value="Start" /> - <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='save.onClick'}" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.start, save-when='saveContract.onClick'}" /> <label value="End" /> - <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='save.onClick'}" /> + <datebox format="yyyy/MM/dd" value="@{composer.contract.end, save-when='saveContract.onClick'}" /> <label value="Description" /> - <textbox rows="5" value="@{composer.contract.description, save-when='save.onClick'}" /> + <textbox rows="5" value="@{composer.contract.description, save-when='saveContract.onClick'}" /> </vbox> Modified: trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul =================================================================== --- trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/src/main/webapp/resultPage.zul 2010-07-21 19:59:57 UTC (rev 114) @@ -3,7 +3,7 @@ <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" root="result"?> <window id="result" apply="org.chorem.bonzoms.ui.ResultController"> - <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="20" model="@{result$composer.wikittyModel}" + <listbox autopaging="true" mold="paging" id="wikittyListBox" rows="10" model="@{result$composer.wikittyModel}" itemRenderer="@{result$composer.wikittyRenderer}"> <listhead> <listheader label="id" /> Modified: trunk/bonzoms-ui-zk/transaction.log =================================================================== --- trunk/bonzoms-ui-zk/transaction.log 2010-07-21 15:27:32 UTC (rev 113) +++ trunk/bonzoms-ui-zk/transaction.log 2010-07-21 19:59:57 UTC (rev 114) @@ -585,3 +585,33 @@ 2010-07-21 11:51:38,357 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 39987 2010-07-21 11:51:38,360 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 39 987 2010-07-21 11:51:38,414 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 39987 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 17:28:02,662 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 55227 +2010-07-21 17:28:02,663 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 55 227 +2010-07-21 17:28:02,730 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 55227 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 17:29:27,385 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 49130 +2010-07-21 17:29:27,386 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 49 130 +2010-07-21 17:29:27,480 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 49130 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 17:38:45,133 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 35561 +2010-07-21 17:38:45,135 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 35 561 +2010-07-21 17:38:45,217 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 35561 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:03:06,992 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 37400 +2010-07-21 18:03:06,994 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 37 400 +2010-07-21 18:03:07,082 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 37400 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:07:11,061 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 47692 +2010-07-21 18:07:11,064 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 47 692 +2010-07-21 18:07:11,147 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 47692 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:11:33,531 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 38191 +2010-07-21 18:11:33,533 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 38 191 +2010-07-21 18:11:33,623 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 38191 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:13:53,101 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 56284 +2010-07-21 18:13:53,103 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 56 284 +2010-07-21 18:13:53,198 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 56284 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:20:31,222 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 45537 +2010-07-21 18:20:31,224 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 45 537 +2010-07-21 18:20:31,326 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 45537 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:28:35,266 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 42096 +2010-07-21 18:28:35,268 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 42 096 +2010-07-21 18:28:35,362 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 42096 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService +2010-07-21 18:32:02,125 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_1] - Starting service com.arjuna.ats.arjuna.recovery.ActionStatusService on port 58940 +2010-07-21 18:32:02,127 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.internal.arjuna.recovery.TransactionStatusManagerItem_5] - TransactionStatusManagerItem host: 127.0.0.1 port: 58 940 +2010-07-21 18:32:02,232 [http-8080-1] INFO com.arjuna.ats.arjuna.logging.arjLoggerI18N - [com.arjuna.ats.arjuna.recovery.TransactionStatusManager_3] - TransactionStatusManager started on port 58940 and host 127.0.0.1 with service com.arjuna.ats.arjuna.recovery.ActionStatusService