back to final version of cyprus distribution again

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