From: Andreas Müller <a.mueller@bgbm.org>
Date: Wed, 9 Jul 2014 22:13:50 +0000 (+0000)
Subject: Remove ". " from year only nom-refs
X-Git-Tag: cdmlib-parent-3.3.7~113
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/f9b2e056dfaab83ada5d1db4cf22c85009eabcd6

Remove ". " from year only nom-refs
---

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
index 5198f0a82a..fa1e79908e 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
@@ -129,6 +129,9 @@ public abstract class NomRefDefaultCacheStrategyBase extends StrategyBase implem
 			microReference = getBeforeMicroReference() + microReference;
 		}
 		result = result.replaceAll(INomenclaturalReference.MICRO_REFERENCE_TOKEN, microReference);
+		if (result.startsWith(". ")){
+			result = result.substring(2);
+		}
 		return result;
 	}
 
diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategyTest.java
index 1e386389ef..edd6fc19ad 100644
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategyTest.java
@@ -110,6 +110,7 @@ public class GenericDefaultCacheStrategyTest {
 		generic1.setAuthorTeam(team1);
 		generic1.setTitleCache(null);  //reset cache in case aspectJ is not enabled
 		Assert.assertEquals("Unexpected title cache.", "Authorteam", generic1.getTitleCache());
+		Assert.assertEquals("", generic1.getNomenclaturalCitation(null));
 	}
 	
 	@Test
@@ -117,7 +118,8 @@ public class GenericDefaultCacheStrategyTest {
 		generic1.setAuthorTeam(team1);
 		generic1.setDatePublished(TimePeriodParser.parseString("1792"));
 		generic1.setTitleCache(null);  //reset cache in case aspectJ is not enabled
-		Assert.assertEquals("Unexpected title cache.", "Authorteam, 1792", generic1.getTitleCache());
+		Assert.assertEquals("Unexpected title cache.", "Authorteam, 1792", generic1.getTitleCache());	
+		Assert.assertEquals("1792", generic1.getNomenclaturalCitation(null));
 	}