Git

• 

  Rafal Korytkowski 18 Jul 2014 4c8b0f2e95449c173f18bf188184fd3fb82bc01b

  Merge branch 'hibernate-search'
• 

  Rafal Korytkowski 18 Jul 2014 14c3557ac151ba04dcec1650f2361f889572ed8d

  TRUNK-2999 Removed update concept index task

  • api/src/main/resources/liquibase-update-to-latest.xml (version 14c3557ac151ba04dcec1650f2361f889572ed8d)
• 

  Rafal Korytkowski 18 Jul 2014 2d28a621105d69188a286d0b560e0993fdfdf887

  TRUNK-2999 Post review fixes

  • api/src/main/java/org/openmrs/api/ConceptService.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • web/src/main/java/org/openmrs/web/Listener.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
  • web/src/main/java/org/openmrs/web/filter/initialization/TestInstallUtil.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
• 

  Rafal Korytkowski 15 Jul 2014 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9

  TRUNK-2999 Removed ConceptWord class and table

  • api/src/main/java/org/openmrs/ConceptWord.java (version 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9)
  • api/src/main/resources/liquibase-update-to-latest.xml (version 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9)
• 

  Rafal Korytkowski 15 Jul 2014 bbf8d5e5d4a570c04f288f8984b59a21091d28bf

  TRUNK-2999 Updated since to 1.11

  • api/src/main/java/org/openmrs/api/ConceptService.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/api/context/Context.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/collection/CollectionPart.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
  • api/src/main/java/org/openmrs/collection/ListPart.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
• 

  Rafal Korytkowski 15 Jul 2014 93d60c17438361cff4445f48af7b273cff93a162

  TRUNK-4425 Preferred name matches should be sorted above synonym matches

  • api/src/main/java/org/openmrs/ConceptName.java (version 93d60c17438361cff4445f48af7b273cff93a162)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version 93d60c17438361cff4445f48af7b273cff93a162)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 93d60c17438361cff4445f48af7b273cff93a162)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 93d60c17438361cff4445f48af7b273cff93a162)
  • api/src/test/java/org/openmrs/test/OpenmrsMatchers.java (version 93d60c17438361cff4445f48af7b273cff93a162)
• 

  Rafal Korytkowski 15 Jul 2014 ba5d4636896e1f651821c0096f8bf48eb2ffef42

  TRUNK-4424 Added missing class

  • api/src/main/java/org/openmrs/api/db/hibernate/search/ConceptNameSimilarity.java (version ba5d4636896e1f651821c0096f8bf48eb2ffef42)
• 

  Rafal Korytkowski 15 Jul 2014 4b24bd0ff12a20b9ca459ad11937621512061cd3

  TRUNK-4424 Score shorter matches higher

  • api/src/main/java/org/openmrs/ConceptName.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
  • api/src/test/java/org/openmrs/api/ConceptServicePT.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
• 

  Rafal Korytkowski 14 Jul 2014 adccb94b51697edf0374ecbaaec5b9ff99c4c4b5

  TRUNK-4422 Store index version

  • api/src/main/java/org/openmrs/api/db/ContextDAO.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
• 

  Rafal Korytkowski 14 Jul 2014 0272020d89fc0975c6547a7f4743c0a6ff6b0264

  TRUNK-4421 Update performance test

  • api/src/test/java/org/openmrs/api/ConceptServicePT.java (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
  • api/src/test/java/org/openmrs/test/CreateConceptDictionaryDataSet.java (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
  • pom.xml (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
• 

  Rafal Korytkowski 14 Jul 2014 5a9ecce3b7078f4c00ee34c1bf5c54b210c98acb

  Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
  Conflicts:
          api/pom.xml
          api/src/main/java/org/openmrs/api/ConceptService.java
          api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
          api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
          api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
• 

  Rafal Korytkowski 01 Jul 2014 58c47c80486fc891faf206b81a7cba4986c3b139

  TRUNK-2999 Removed remaining deprecated ConceptWord methods

  • api/src/main/java/org/openmrs/api/ConceptService.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
  • api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
  • api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
• 

  Rafal Korytkowski 30 Jun 2014 824428c6ea49b2b0b477fbfbd18fe31344419288

  TRUNK-2999 Post review fixes

  • api/src/main/java/org/openmrs/ConceptName.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/context/Context.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/ContextDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/ConceptNameClassBridge.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/collection/CollectionPart.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/collection/ListPart.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
  • web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
• 

  Rafal Korytkowski 24 Jun 2014 1d1ccf9c2b3dd112881d42ffc70d664084e9f77a

  Merge branch 'master' into hibernate-search
  Conflicts:
          api/src/main/java/org/openmrs/util/OpenmrsUtil.java
• 

  Rafal Korytkowski 23 Jun 2014 19e972e773ab84eae58bbdc694988ff2193ff12c

  Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
  Conflicts:
          api/src/main/java/org/openmrs/Drug.java
          api/src/main/java/org/openmrs/api/ConceptService.java
          api/src/main/java/org/openmrs/api/db/ConceptDAO.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
          api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
          api/src/test/java/org/openmrs/api/ConceptServiceTest.java
          api/src/test/java/org/openmrs/api/OrderServiceTest.java
• 

  Rafal Korytkowski 23 Jun 2014 8f783541e684f5411ee3368426d77caa2d492a09

  TRUNK-4375 Follow up changes

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 8f783541e684f5411ee3368426d77caa2d492a09)
• 

  Rafal Korytkowski 23 Jun 2014 b17c387807b58d100c5106f14661b0deae8fbee2

  TRUNK-4375 Remove stop words from query

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version b17c387807b58d100c5106f14661b0deae8fbee2)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version b17c387807b58d100c5106f14661b0deae8fbee2)
• 

  Rafal Korytkowski 23 Jun 2014 51e2dae3b462bbff406522118ce3a0375138fee0

  TRUNK-4367 Post review fixes

  • api/src/main/java/org/openmrs/api/ConceptService.java (version 51e2dae3b462bbff406522118ce3a0375138fee0)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 51e2dae3b462bbff406522118ce3a0375138fee0)
• 

  Rafal Korytkowski 23 Jun 2014 27423e4969a818284b4f6ac03126871efc09ea1b

  TRUNK 4367: Change getConceptByName not to delegate to getConcepts

  • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version 27423e4969a818284b4f6ac03126871efc09ea1b)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 27423e4969a818284b4f6ac03126871efc09ea1b)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 27423e4969a818284b4f6ac03126871efc09ea1b)
• 

  Rafal Korytkowski 20 Jun 2014 95e388ff8535ffef49475ea57ccb66566a74cb03

  TRUNK-4366 Follow up changes

  • api/src/main/java/org/openmrs/Concept.java (version 95e388ff8535ffef49475ea57ccb66566a74cb03)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 95e388ff8535ffef49475ea57ccb66566a74cb03)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/FilterFactory.java (version 95e388ff8535ffef49475ea57ccb66566a74cb03)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 95e388ff8535ffef49475ea57ccb66566a74cb03)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/TermsFilterFactory.java (version 95e388ff8535ffef49475ea57ccb66566a74cb03)
• 

  Rafal Korytkowski 20 Jun 2014 ccbd1df7adc75c3f2386d252949398228dd2776d

  TRUNK-4366 Add filter method to LuceneQuery

  • api/src/main/java/org/openmrs/Concept.java (version ccbd1df7adc75c3f2386d252949398228dd2776d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version ccbd1df7adc75c3f2386d252949398228dd2776d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/FilterFactory.java (version ccbd1df7adc75c3f2386d252949398228dd2776d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version ccbd1df7adc75c3f2386d252949398228dd2776d)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version ccbd1df7adc75c3f2386d252949398228dd2776d)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-names.xml (version ccbd1df7adc75c3f2386d252949398228dd2776d)
• 

  Rafal Korytkowski 16 Jun 2014 b984cd16ca248d484aa8cbb617653220d12ec4a0

  Merge pull request #898 from rpuzdrowski/TRUNK-4374
  TRUNK 4374: Improve performance of getCountOfConcepts
• 

  Rafal Korytkowski 16 Jun 2014 ba086e4a229005d53f5de1e761f81e2a096054d8

  Merge pull request #904 from rpuzdrowski/TRUNK-3834
  TRUNK-3834: Reduce delay when searching for Concepts with less than 3 characters
• 

  Radek Puzdrowski <radek@radek-ThinkPad-SL510.(none)> 13 May 2014 e0795d40d130d05dc060487c767c8a1304532977

  TRUNK-3834: Reduce delay when searching for Concepts with less than 3 characters

  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version e0795d40d130d05dc060487c767c8a1304532977)
  • webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js (version e0795d40d130d05dc060487c767c8a1304532977)
  • webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl (version e0795d40d130d05dc060487c767c8a1304532977)
• 

  Radek Puzdrowski <radek@radek-ThinkPad-SL510.(none)> 09 May 2014 fc5c2120ddc56cc04aadd5e7c9a07cf9ae7e2835

  TRUNK 4374: Improve performance of getCountOfConcepts

  • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version fc5c2120ddc56cc04aadd5e7c9a07cf9ae7e2835)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version fc5c2120ddc56cc04aadd5e7c9a07cf9ae7e2835)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version fc5c2120ddc56cc04aadd5e7c9a07cf9ae7e2835)
• 

  Rafal Korytkowski 08 May 2014 cd27f7a5ad6ad99565f93f9ac1e67b54213f5bff

  TRUNK-2999 Further tuning of fuzzy search

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version cd27f7a5ad6ad99565f93f9ac1e67b54213f5bff)
• 

  Rafal Korytkowski 08 May 2014 95b5d0242fa9a060d40f1a303d7d0a462ba6469f

  Merge remote-tracking branch 'upstream/master' into hibernate-search
• 

  Rafal Korytkowski 08 May 2014 082f8f535bc800c5e1b2c6f7e69741ae6f997782

  TRUNK-2999 Further tunning of fuzzy search

  • api/src/main/java/org/openmrs/ConceptName.java (version 082f8f535bc800c5e1b2c6f7e69741ae6f997782)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 082f8f535bc800c5e1b2c6f7e69741ae6f997782)
• 

  Rafal Korytkowski 07 May 2014 8ae3ebe6134e6697feb09db140b1d24e8409d725

  TRUNK-2999 Removed StopFilter from ConceptNameAnalyzer as it ignores locale

  • api/src/main/java/org/openmrs/ConceptName.java (version 8ae3ebe6134e6697feb09db140b1d24e8409d725)
• 

  Rafal Korytkowski 07 May 2014 d7a152dd6088ae3fdb232150b0de49399f15d5cf

  TRUNK-2999 Tweaked queries to do AND for similar words

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version d7a152dd6088ae3fdb232150b0de49399f15d5cf)
• 

  Rafal Korytkowski 06 May 2014 9de8c13543f941d103c4e24212935111e31bdf39

  TRUNK-3835 Fixed concept query after changing default operator to AND

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 9de8c13543f941d103c4e24212935111e31bdf39)
• 

  Rafal Korytkowski 06 May 2014 c0958e4a4d8b5e15450ef66449c0ef24817042a0

  TRUNK-2999 Added some javadocs

  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version c0958e4a4d8b5e15450ef66449c0ef24817042a0)
• 

  Rafal Korytkowski 06 May 2014 abe79804338a9b5ee0b27909a38a579eb7bd204d

  TRUNK-3860 Use filter instead of query parameters to eliminate duplicates

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version abe79804338a9b5ee0b27909a38a579eb7bd204d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version abe79804338a9b5ee0b27909a38a579eb7bd204d)
• 

  Rafal Korytkowski 05 May 2014 e59808ee4989dab8d1abd50131ddd972550577c5

  Merge pull request #885 from rpuzdrowski/TRUNK-3833
  TRUNK 3833: Limit preloading result pages when searching for Concepts
• 

  Rafal Korytkowski 02 May 2014 efc4d564063560c402f584173ec2982a24eed46b

  Merge branch 'TRUNK-3835' into hibernate-search
• 

  Rafal Korytkowski 02 May 2014 604f245e0cb12813820bdbc6cce14480376b4273

  TRUNK-3835 Fixed queries to skip stop words

  • api/src/main/java/org/openmrs/api/ConceptService.java (version 604f245e0cb12813820bdbc6cce14480376b4273)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 604f245e0cb12813820bdbc6cce14480376b4273)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 604f245e0cb12813820bdbc6cce14480376b4273)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 604f245e0cb12813820bdbc6cce14480376b4273)
• 

  Radek Puzdrowski <radek@radek-ThinkPad-SL510.(none)> 29 Apr 2014 45bb2beb8b5544664afefc6f34a4069ff3f377af

  TRUNK 3833: Limit preloading result pages when searching for Concepts

  • webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js (version 45bb2beb8b5544664afefc6f34a4069ff3f377af)
• 

  Rafal Korytkowski 24 Apr 2014 02d1db5e76d3088028d56fddc3c1d36742828278

  TRUNK-4352 Index is not getting created properly when using standalone

  • api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version 02d1db5e76d3088028d56fddc3c1d36742828278)
  • api/src/main/resources/hibernate.default.properties (version 02d1db5e76d3088028d56fddc3c1d36742828278)
• 

  Jakub Kondrat <jkondrat@soldevelo.com> 18 Apr 2014 e1604d9fef0c9a5dbadb067b5c31ce699d7ad8fe

  TRUNK-3835 Fix searching for 'of' in concept name

  • api/src/main/java/org/openmrs/ConceptName.java (version e1604d9fef0c9a5dbadb067b5c31ce699d7ad8fe)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version e1604d9fef0c9a5dbadb067b5c31ce699d7ad8fe)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version e1604d9fef0c9a5dbadb067b5c31ce699d7ad8fe)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-names.xml (version e1604d9fef0c9a5dbadb067b5c31ce699d7ad8fe)
• 

  Rafal Korytkowski 15 Apr 2014 0293e5bb553e7b593ca4ddb82134065aa764c0f3

  Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
  Conflicts:
          api/src/main/java/org/openmrs/ConceptNumeric.java
          api/src/main/java/org/openmrs/ConceptSearchResult.java
          api/src/main/java/org/openmrs/ConceptWord.java
          api/src/main/java/org/openmrs/api/ConceptService.java
          api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
          api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
          api/src/main/java/org/openmrs/scheduler/tasks/ConceptIndexUpdateTask.java
          api/src/main/java/org/openmrs/util/OpenmrsConstants.java
          api/src/main/java/org/openmrs/validator/ConceptValidator.java
          api/src/main/resources/hibernate.cfg.xml
          api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
          api/src/test/java/org/openmrs/api/ConceptServiceTest.java
          api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
          api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
          api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
          pom.xml
• 

  Rafal Korytkowski 06 Dec 2012 a1adcf609098eb1b224e259ea5d4f0aced9b520f

  Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
• 

  Rafal Korytkowski 06 Dec 2012 a3be8ee9e18ec209d528172ad4a90dc251a8bb0c

  TRUNK-3838: Boost phrase search to rank exact matches higher

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version a3be8ee9e18ec209d528172ad4a90dc251a8bb0c)
• 

  Rafal Korytkowski 05 Dec 2012 8834817287603fd479b5a64480f2d6e4be020e70

  TRUNK-3832: Lowered boost

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 8834817287603fd479b5a64480f2d6e4be020e70)
• 

  Rafal Korytkowski 05 Dec 2012 8561a92134d227a118c2ef0ef3f26e976beaed69

  TRUNK-3832: Add proximity search for Concepts

  • api/src/main/java/org/openmrs/api/context/Context.java (version 8561a92134d227a118c2ef0ef3f26e976beaed69)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 8561a92134d227a118c2ef0ef3f26e976beaed69)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 8561a92134d227a118c2ef0ef3f26e976beaed69)
• 

  Rafal Korytkowski 04 Dec 2012 accf5c055755919d4aa5525084124c9bd25f47d3

  TRUNK-2999: Changed index locking strategy

  • api/src/main/resources/hibernate.default.properties (version accf5c055755919d4aa5525084124c9bd25f47d3)
• 

  Rafal Korytkowski 29 Nov 2012 f1f160b195baeafdbc88ebdb1f42187e032ffd07

  Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
  Conflicts:
          api/src/main/java/org/openmrs/api/context/Context.java
• 

  Rafal Korytkowski 29 Nov 2012 0225f7ed360e15d2fa451529b3c9d6f6123d4905

  TRUNK-2999: Simplified LuceneQuery API

  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQuery.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQueryBuilder.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/HibernateQuery.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQueryBuilder.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 0225f7ed360e15d2fa451529b3c9d6f6123d4905)
• 

  Rafal Korytkowski 28 Nov 2012 f1018a1b4b68b2b6bafa430c039cc1f40ec57169

  TRUNK-2999: Changed to searching by ConceptName not Concept

  • api/src/main/java/org/openmrs/Concept.java (version f1018a1b4b68b2b6bafa430c039cc1f40ec57169)
  • api/src/main/java/org/openmrs/ConceptName.java (version f1018a1b4b68b2b6bafa430c039cc1f40ec57169)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version f1018a1b4b68b2b6bafa430c039cc1f40ec57169)
• 

  Rafal Korytkowski 27 Nov 2012 e6ead755ff59fad3bbadf09be45759f21cf61b5d

  TRUNK-2999: Removed ConceptWord. Improved Concept search queries.

  • api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/ConceptName.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/ConceptSearchResult.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/ConceptWord.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/Drug.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/AdministrationService.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/context/Context.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/ContextDAO.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/ConceptNameClassBridge.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/OpenmrsObjectFieldBridge.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/scheduler/tasks/ConceptIndexUpdateTask.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/resources/hibernate.cfg.xml (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptWord.hbm.xml (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/ConceptWordTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-names.xml (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • web/src/main/java/org/openmrs/web/controller/concept/ConceptIndexFormController.java (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • web/src/main/resources/openmrs-servlet.xml (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptIndexForm.jsp (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
  • webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp (version e6ead755ff59fad3bbadf09be45759f21cf61b5d)
• 

  Rafal Korytkowski 27 Nov 2012 2f888dceb5bdb71589beaaddf47d66a20fda689d

  TRUNK-2999: Investigate replacing concept word with full text search

  • api/pom.xml (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/Concept.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/ConceptClass.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/ConceptComplex.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/ConceptDatatype.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/ConceptName.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/ConceptNumeric.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/ConceptService.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/context/Context.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/ContextDAO.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQueryBuilder.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/HibernateQuery.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQueryBuilder.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/ConceptNameClassBridge.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/LocaleFieldBridge.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/collection/CollectionPart.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/collection/ListPart.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/java/org/openmrs/validator/ConceptValidator.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/resources/hibernate.cfg.xml (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/main/resources/hibernate.default.properties (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/report/PatientSearchTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • pom.xml (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)
  • web/src/test/java/org/openmrs/web/dwr/DWRConceptServiceTest.java (version 2f888dceb5bdb71589beaaddf47d66a20fda689d)