From 459b293afe1c752acbba1e9b06e72dd64fb84a3e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Tue, 1 Mar 2011 19:56:02 +0000
Subject: [PATCH] back to final version of cyprus distribution again

---
 .../io/cyprus/CyprusDistributionImport.java   | 52 +++++--------------
 1 file changed, 14 insertions(+), 38 deletions(-)

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
index 724c9c01..a3797067 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusDistributionImport.java
@@ -158,38 +158,14 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
 		}
 	}
 	
-	private TaxonDescription getNewDescription_OLD(CyprusImportState state, Taxon taxon) {
-		Reference excelRef = state.getConfig().getSourceReference();
-		TaxonDescription desc = TaxonDescription.NewInstance(taxon, false);
-		desc.setTitleCache(excelRef.getTitleCache() + " for " + taxon.getTitleCache(), true);
-		desc.addSource(null, null, excelRef, null);
-		return desc;
-	}
-
-	Reference excelRef = null; 
 	private TaxonDescription getNewDescription(CyprusImportState state, Taxon taxon) {
-		if (excelRef == null){
-			excelRef = getReferenceService().find(UUID.fromString("362c2360-4053-4189-9f53-9d8b1112612e"));
-		}
-//		Reference excelRef = state.getConfig().getSourceReference();
-		for (TaxonDescription desc : taxon.getDescriptions()){
-			if (desc.getSources().size() > 0){
-				Reference ref = desc.getSources().iterator().next().getCitation();
-				if (ref.equals(excelRef)){
-					return desc;
-				}
-			}
-		}
-		logger.warn("Description not found for taxon: " +  taxon.getTitleCache());
-		
-		
+		Reference excelRef = state.getConfig().getSourceReference();
 		TaxonDescription desc = TaxonDescription.NewInstance(taxon, false);
 		desc.setTitleCache(excelRef.getTitleCache() + " for " + taxon.getTitleCache(), true);
 		desc.addSource(null, null, excelRef, null);
 		return desc;
 	}
 
-	
 	private PresenceAbsenceTermBase<?> indigenousStatus;
 	private PresenceAbsenceTermBase<?> casualStatus;
 	private PresenceAbsenceTermBase<?> nonInvasiveStatus;
@@ -385,23 +361,23 @@ public class CyprusDistributionImport extends ExcelImporterBase<CyprusImportStat
 	private void makeNewDivisions(CyprusImportState state,
 			IInputTransformer transformer)
 			throws UndefinedTransformerMethodException {
-//		NamedAreaType areaType = NamedAreaType.NATURAL_AREA();
-//		NamedAreaLevel areaLevel = (NamedAreaLevel)getTermService().find(CyprusTransformer.uuidCyprusDivisionsAreaLevel);
-//		if (areaLevel == null){
-//			areaLevel = NamedAreaLevel.NewInstance("Cyprus Division", "Cyprus Division", null);
-//			getTermService().save(areaLevel);
-//		}
-//		
-//		TermVocabulary areaVocabulary = getVocabulary(CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true);
-//		TdwgArea tdwg4Cyprus = (TdwgArea)getTermService().find(UUID.fromString("9d447b51-e363-4dde-ae40-84c55679983c"));
-//		WaterbodyOrCountry isoCountryCyprus = (WaterbodyOrCountry)getTermService().find(UUID.fromString("4b13d6b8-7eca-4d42-8172-f2018051ca19"));
+		NamedAreaType areaType = NamedAreaType.NATURAL_AREA();
+		NamedAreaLevel areaLevel = (NamedAreaLevel)getTermService().find(CyprusTransformer.uuidCyprusDivisionsAreaLevel);
+		if (areaLevel == null){
+			areaLevel = NamedAreaLevel.NewInstance("Cyprus Division", "Cyprus Division", null);
+			getTermService().save(areaLevel);
+		}
+		
+		TermVocabulary areaVocabulary = getVocabulary(CyprusTransformer.uuidCyprusDivisionsVocabulary, "Cyprus devisions", "Cyprus divisions", null, null, true);
+		TdwgArea tdwg4Cyprus = (TdwgArea)getTermService().find(UUID.fromString("9d447b51-e363-4dde-ae40-84c55679983c"));
+		WaterbodyOrCountry isoCountryCyprus = (WaterbodyOrCountry)getTermService().find(UUID.fromString("4b13d6b8-7eca-4d42-8172-f2018051ca19"));
 		
 		for(int i = 1; i <= 8; i++){
 			UUID divisionUuid = transformer.getNamedAreaUuid(String.valueOf(i));
-			NamedArea division = this.getNamedArea(state, divisionUuid, "Division " + i, "Cyprus: Division " + i, String.valueOf(i), null, null, null);
+			NamedArea division = this.getNamedArea(state, divisionUuid, "Division " + i, "Cyprus: Division " + i, String.valueOf(i), areaType, areaLevel, areaVocabulary);
 			divisions.put(String.valueOf(i), division);
-//			tdwg4Cyprus.addIncludes(division);
-//			isoCountryCyprus.addIncludes(division);
+			tdwg4Cyprus.addIncludes(division);
+			isoCountryCyprus.addIncludes(division);
 			getTermService().save(division);
 		}
 	}
-- 
2.34.1