From bbb19f42c9168f39765661dff3369052caae1574 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 2 Mar 2012 13:39:05 +0000
Subject: [PATCH] add hasNoLastAction

---
 .../mapping/out/DbLastActionMapper.java       | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbLastActionMapper.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbLastActionMapper.java
index 14d52ee8eb..b43f13e910 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbLastActionMapper.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbLastActionMapper.java
@@ -10,12 +10,17 @@
 
 package eu.etaxonomy.cdm.io.common.mapping.out;
 
+import java.util.UUID;
+
 import org.apache.log4j.Logger;
 import org.hsqldb.Types;
 import org.joda.time.DateTime;
 
 import eu.etaxonomy.cdm.io.common.DbExportStateBase;
+import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
+import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 
 /**
@@ -27,6 +32,7 @@ public class DbLastActionMapper extends DbSingleAttributeExportMapperBase<DbExpo
 	@SuppressWarnings("unused")
 	private static final Logger logger = Logger.getLogger(DbLastActionMapper.class);
 	
+	public static final UUID uuidMarkerTypeHasNoLastAction = UUID.fromString("99652d5a-bc92-4251-b57d-0fec4d258ab7");
 	boolean isActionType;
 	
 	public static DbLastActionMapper NewInstance(String dbAttributeString, boolean isActionType){
@@ -50,15 +56,35 @@ public class DbLastActionMapper extends DbSingleAttributeExportMapperBase<DbExpo
 	@Override
 	protected Object getValue(CdmBase cdmBase) {
 		if (cdmBase.isInstanceOf(VersionableEntity.class)){
+			//exclude objects marked as 'hasNoM
+			if (cdmBase.isInstanceOf(AnnotatableEntity.class)){
+				IAnnotatableEntity annoEnti = cdmBase.deproxy(cdmBase, AnnotatableEntity.class);
+				if (annoEnti.hasMarker(uuidMarkerTypeHasNoLastAction, true)){
+					return null;
+				}
+			}
+			//return updated or created	
 			VersionableEntity versionable = CdmBase.deproxy(cdmBase, VersionableEntity.class);
 			if (versionable.getUpdated() != null){
-				if (isActionType){
-					return "changed";
-				}else{
-					return versionable.getUpdated();
-				}
+				return makeChanged(versionable);
+			}else{
+				return makeCreated(cdmBase);
 			}
+		}else{
+			//return created
+			return makeCreated(cdmBase);
+		}
+	}
+
+	private Object makeChanged(VersionableEntity versionable) {
+		if (isActionType){
+			return "changed";
+		}else{
+			return versionable.getUpdated();
 		}
+	}
+
+	private Object makeCreated(CdmBase cdmBase) {
 		if (isActionType){
 			return "created";
 		}else{
-- 
2.34.1