From eeba57bcea80d20374f24b3bcaecc1b4ed3205ea Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Mon, 6 Jan 2014 17:10:30 +0000
Subject: [PATCH 1/1] fix WebMarker import for BerlinModel

---
 .../in/BerlinModelWebMarkerImport.java        | 35 ++++---------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
index 3f57537d..c9344c55 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java
@@ -49,10 +49,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 		super(dbTableName, pluralString);
 	}
 	
-	
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getIdQuery()
-	 */
 	@Override
 	protected String getIdQuery(BerlinModelImportState state) {
 		String result = " SELECT markerId FROM " + getTableName();
@@ -62,9 +58,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportBase#getRecordQuery(eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator)
-	 */
 	@Override
 	protected String getRecordQuery(BerlinModelImportConfigurator config) {
 		String strQuery = 
@@ -72,16 +65,13 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
             " FROM webMarker INNER JOIN webTableName ON webMarker.TableNameFk = webTableName.TableNameId " +
             " WHERE (markerId IN ("+ ID_LIST_TOKEN + ") )";
 		return strQuery;
-
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#doPartition(eu.etaxonomy.cdm.io.berlinModel.in.ResultSetPartitioner, eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState)
-	 */
+	@Override
 	public boolean doPartition(ResultSetPartitioner partitioner, BerlinModelImportState state) {
 		boolean success = true ;
 	
-		MapWrapper<Taxon> taxonMap = (MapWrapper<Taxon>)state.getStore(ICdmIO.TAXON_STORE);
+		Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) partitioner.getObjectMap(BerlinModelTaxonImport.NAMESPACE);
 		Set<TaxonBase> taxaToBeSaved = new HashSet<TaxonBase>(); 
 		
 		Map<String, DefinedTermBase> definedTermMap = state.getDbCdmDefinedTermMap();
@@ -132,13 +122,10 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 		return success;
 	}
 		
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)
-	 */
+	@Override
 	public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {
 		String nameSpace;
-		Class cdmClass;
+		Class<?> cdmClass;
 		Set<String> idSet;
 		Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
 		
@@ -151,7 +138,7 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 					logger.warn("A marker is not related to table PTaxon. This case is not handled yet!");
 				}else{
 					handleForeignKey(rs, taxonIdSet, "RIdentifierFk");
-	}
+				}
 			}
 	
 			//taxon map
@@ -167,7 +154,6 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 		return result;
 	}
 
-	
 	private boolean addMarker(AnnotatableEntity annotatableEntity, boolean activeFlag, int markerCategoryFk, Map<String, DefinedTermBase> map ){
 		MarkerType markerType = (MarkerType)map.get("webMarkerCategory_" + markerCategoryFk);
 		if (markerType == null){
@@ -179,23 +165,14 @@ public class BerlinModelWebMarkerImport extends BerlinModelImportBase {
 
 	}
 	
-	
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#doCheck(eu.etaxonomy.cdm.io.common.IoStateBase)
-	 */
 	@Override
 	protected boolean doCheck(BerlinModelImportState state){
 		IOValidator<BerlinModelImportState> validator = new BerlinModelWebMarkerImportValidator();
 		return validator.validate(state);
 	}
 	
-	
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.io.common.CdmIoBase#isIgnore(eu.etaxonomy.cdm.io.common.IImportConfigurator)
-	 */
+	@Override
 	protected boolean isIgnore(BerlinModelImportState state){
 		return ! state.getConfig().isDoMarker();
 	}
-
-
 }
-- 
2.34.1