From b8e3646e91358ff6db7b37abff0c85c3c4a20d42 Mon Sep 17 00:00:00 2001 From: "a.babadshanjan" Date: Mon, 20 Apr 2009 15:22:13 +0000 Subject: [PATCH] TypeDesignationStatus renamed to SpecimenTypeDesignationStatus --- .../database/PersistentTermInitializer.java | 1 - .../hibernate/common/IdentifiableDaoBase.java | 3 +- .../name/TaxonNameDaoHibernateImpl.java | 6 +-- .../persistence/dao/name/ITaxonNameDao.java | 6 +-- .../cdm/persistence/query/MatchMode.java | 6 +-- .../eu/etaxonomy/cdm/hibernate.cfg.xml | 2 +- .../cdm/database/TestingTermInitializer.java | 4 +- .../taxon/TaxonDaoHibernateImplTest.java | 6 +++ .../etaxonomy/cdm/applicationContext-test.xml | 3 +- .../TermsDataSet-with_auditing_info.xml | Bin 2133499 -> 2133803 bytes .../etaxonomy/cdm/database/TermsDataSet.xml | 36 +++++++++--------- .../common/DefinedTermDaoImplTest.xml | Bin 1110041 -> 1110193 bytes .../common/TermVocabularyDaoImplTest.xml | Bin 1110041 -> 1110193 bytes 13 files changed, 40 insertions(+), 33 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java index d2e663291f..4a98bcfeb6 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java @@ -27,7 +27,6 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import eu.etaxonomy.cdm.model.common.DefaultTermInitializer; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TermVocabulary; -import eu.etaxonomy.cdm.model.common.init.IVocabularyStore; import eu.etaxonomy.cdm.model.common.init.TermLoader; import eu.etaxonomy.cdm.persistence.dao.common.IDefinedTermDao; import eu.etaxonomy.cdm.persistence.dao.common.ITermVocabularyDao; diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java index c36ce92340..227746093c 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java @@ -86,7 +86,8 @@ public class IdentifiableDaoBase extends Annotatab if (matchmode == MatchMode.EXACT) { crit.add(Restrictions.eq("titleCache", matchmode.queryStringFrom(queryString))); } else { - crit.add(Restrictions.ilike("titleCache", matchmode.queryStringFrom(queryString))); +// crit.add(Restrictions.ilike("titleCache", matchmode.queryStringFrom(queryString))); + crit.add(Restrictions.like("titleCache", matchmode.queryStringFrom(queryString))); } if (pagesize >= 0) { crit.setMaxResults(pagesize); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java index 0bcc81ea5f..b2635bbd6f 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java @@ -32,7 +32,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.name.TypeDesignationBase; -import eu.etaxonomy.cdm.model.name.TypeDesignationStatus; +import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; import eu.etaxonomy.cdm.model.view.AuditEvent; import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase; import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao; @@ -191,7 +191,7 @@ extends IdentifiableDaoBase implements ITaxonNameDao { } } - public int countTypeDesignations(TaxonNameBase name, TypeDesignationStatus status) { + public int countTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status) { AuditEvent auditEvent = getAuditEventFromContext(); if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) { Query query = null; @@ -300,7 +300,7 @@ extends IdentifiableDaoBase implements ITaxonNameDao { } } - public List getTypeDesignations(TaxonNameBase name, TypeDesignationStatus status, Integer pageSize, Integer pageNumber) { + public List getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber) { AuditEvent auditEvent = getAuditEventFromContext(); if(auditEvent.equals(AuditEvent.CURRENT_VIEW)) { Query query = null; diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java index 9a7a6b9a3b..154ae8b93f 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java @@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.name.TypeDesignationBase; -import eu.etaxonomy.cdm.model.name.TypeDesignationStatus; +import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; import eu.etaxonomy.cdm.persistence.dao.common.IIdentifiableDao; import eu.etaxonomy.cdm.persistence.query.MatchMode; @@ -82,7 +82,7 @@ public interface ITaxonNameDao extends IIdentifiableDao { * @param status the type designation status (or null to return all types) * @return a count of TypeDesignationBase instances */ - public int countTypeDesignations(TaxonNameBase name, TypeDesignationStatus status); + public int countTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status); /** * Return a List of types related to this name, optionally filtered @@ -94,7 +94,7 @@ public interface ITaxonNameDao extends IIdentifiableDao { * @param pageNumber The offset (in pageSize chunks) from the start of the result set (0 - based) * @return a List of TypeDesignationBase instances */ - public List getTypeDesignations(TaxonNameBase name, TypeDesignationStatus status, Integer pageSize, Integer pageNumber); + public List getTypeDesignations(TaxonNameBase name, SpecimenTypeDesignationStatus status, Integer pageSize, Integer pageNumber); /** * Returns a List of TaxonNameBase instances that match the properties passed diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java index 6a955ba524..d4241cc752 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java @@ -22,11 +22,11 @@ public enum MatchMode { queryString = queryString.replace('*', '%'); switch(this){ case BEGINNING: - return queryString+"%"; + return "'" + queryString + "%'"; case ANYWHERE: - return "%"+queryString+"%"; + return "'%" + queryString + "%'"; default: - return queryString; + return "'" + queryString + "'"; } } } diff --git a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml index 2a35a4b27e..09ce6856f1 100644 --- a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml +++ b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml @@ -115,9 +115,9 @@ + - diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java index 083c3ffa8c..3dd388da3b 100644 --- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java +++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/TestingTermInitializer.java @@ -36,8 +36,7 @@ public class TestingTermInitializer extends PersistentTermInitializer { UUID.fromString("e72cbcb6-58f8-4201-9774-15d0c6abc128"), // Continent.class UUID.fromString("006b1870-7347-4624-990f-e5ed78484a1a"), // WaterbodyOrCountry.class UUID.fromString("ef0d1ce1-26e3-4e83-b47b-ca74eed40b1b"), // Rank.class - UUID.fromString("ab177bd7-d3c8-4e58-a388-226fff6ba3c2"), // TypeDesignationStatus.class -// UUID.fromString("ab60e738-4d09-4c24-a1b3-9466b01f9f55"), // NameTypeDesignationStatus.class + UUID.fromString("ab177bd7-d3c8-4e58-a388-226fff6ba3c2"), // SpecimenTypeDesignationStatus.class UUID.fromString("bb28cdca-2f8a-4f11-9c21-517e9ae87f1f"), // NomenclaturalStatusType.class UUID.fromString("48917fde-d083-4659-b07d-413db843bd50"), // SynonymRelationshipType.class UUID.fromString("fc4abe52-9c25-4cfa-a682-8615bf4bbf07"), // HybridRelationshipType.class @@ -58,6 +57,7 @@ public class TestingTermInitializer extends PersistentTermInitializer { UUID.fromString("fe87ea8d-6e0a-4e5d-b0da-0ab8ea67ca77"), // DeterminationModifier.class UUID.fromString("066cc62e-7213-495e-a020-97a1233bc037"), // StatisticalMeasure.class UUID.fromString("8627c526-73af-44d9-902c-11c1f11b60b4") //RightsTerm.class +// UUID.fromString("ab60e738-4d09-4c24-a1b3-9466b01f9f55") // NameTypeDesignationStatus.class }; public void setTermsDataSet(Resource termsDataSet) { diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java index 0aa7e32d55..8973f371d9 100644 --- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java +++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java @@ -76,6 +76,12 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest { AuditEventContextHolder.clearContext(); } +// @Test +// @DataSet +// public final void testPrintDataSet() { +// printDataSet(System.out); +// } + /** * Test method for {@link eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImpl#TaxonDaoHibernateImpl()}. */ diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml index 7e090e2da6..dd96dfba09 100644 --- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml +++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml @@ -49,10 +49,11 @@ - + + diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index a808e4c57e02cdcba750fdc9e13e6b39cabc34de..2120286a1838bd2d75968528ce4aa1742c78509f 100644 GIT binary patch delta 887 zcmex8yNPl2ye7tm7RD`1Sq>b*1*yrIxv6>67q)ZAOmA~wnuaE1;fNvh3R7r~6Pha7 z>Hf}4Q&G&4ogV%}RCBtP3sVl7_+}S0r3%wCT$v`KsSD98;*m9a+`IE)Iq1 zIvyBi-SR+I1@yb@^lndNA;vzSkc}6bkV5+hFD4*n24WTD&j|_@^&u<1j%}@v#j} z(-|}cT^$_j(S*V}F@%)5kcEIjif+uVZe#`E&}{2L76ON6P%n~DJ5UISIf0l9h`E87 z2Z(urm=B2gfmi^D1%X%yh=qYzWIJP@=$A|s_looTI6Ard*eW5XWAS#aAEH1k2E-t? z1Q1ICvD9|0AJRv4h%jI}&;Ye*b~0S;A*wP!EDOYPKrFvKL{%X~AH@W*?fXI$R76n4 UrUS)9r#loVsBbsPR5-2z0Hy~>h5!Hn delta 557 zcmZ9HIZFdU7>3#L8smLz;;|bS#3iD^MiB&YjZt$n7QwZ|3?etrSkv%0@=HXGx1jCzwY27CVs^ z87`2<1 zu)7>8yAfH@$^5}Bi&42qr$Q7J<$&vSACqR-%W(!uKq)8#<)Fe@j&tvzxLKpCGgR%3 z<0HSRRk&skpw StkLQCr;U#$cj#bP()9=Ep}XS% diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml index 1156c5d6ba..34b4e098f1 100644 --- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml +++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml @@ -805,22 +805,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -5127,7 +5127,7 @@ - + @@ -6407,7 +6407,7 @@ - + diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml index f5078f3a688aacbc101d7b2b6cc1eab18366bc4e..c771599ba12521f28f99b23e3148be9f7ec4663e 100644 GIT binary patch delta 439 zcmbRFzEleL~a|9QpCTHfR=1pI?j7erX&m5-hXhQcfg*MH_P_=9kkJj|{ z^O$;3bjwbUoX@lkO-N?}hR}aZp^BwEn$v$TWa>fFy<`#7Ry3iq#TY^!OE83_mSPCK zK^MA&VzSKi{^e*+m6@)#nn$a>dj%5^GXpUT5VHa?8xXStF~|1q6`ZsCQOpsaZfn8C njw;k1ZNUY^+(66&#JoVv2gLl_qb&qh&qYxywq53$z+XuKWn-_R delta 281 zcmdn^(0S$q=Y|%>EleL~PZwOyBr{!nA&=H{yE#m~5bpaqOxq!>Q*&V~v&BFq=jTC` z$WAZn;L@7DdOlMRNS*BTm<3GRAT0BRFc!x$9?j|2i(pFLEMnRUQF3fCjJ041j8(N1 z#tK;mVO@f_fPDqTJeld+R`Y1JbFX9qVrC#_0b*7lW&>h&Am-T4y^?cwKS-B2yN{!j qtBEleL~a|9QpCTHfR=1pI?j7erX&m5-hXhQcfg*MH_P_=9kkJj|{ z^O$;3bjwbUoX@lkO-N?}hR}aZp^BwEn$v$TWa>fFy<`#7Ry3iq#TY^!OE83_mSPCK zK^MA&VzSKi{^e*+m6@)#nn$a>dj%5^GXpUT5VHa?8xXStF~|1q6`ZsCQOpsaZfn8C njw;k1ZNUY^+(66&#JoVv2gLl_qb&qh&qYxywq53$z+XuKWn-_R delta 281 zcmdn^(0S$q=Y|%>EleL~PZwOyBr{!nA&=H{yE#m~5bpaqOxq!>Q*&V~v&BFq=jTC` z$WAZn;L@7DdOlMRNS*BTm<3GRAT0BRFc!x$9?j|2i(pFLEMnRUQF3fCjJ041j8(N1 z#tK;mVO@f_fPDqTJeld+R`Y1JbFX9qVrC#_0b*7lW&>h&Am-T4y^?cwKS-B2yN{!j qtB