some final changes for Cyprus activator

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
index a32ffbfa82378e4bf0c86e5bb7df29bb6019197a..d5c5331da2df5762b7911e1493da0c46664421ae 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
@@ -51,7 +51,7 @@ public class CyprusActivator {
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();\r
        static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev_tunnel();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_production();\r
 \r
        \r
        //feature tree uuid\r
@@ -87,11 +87,12 @@ public class CyprusActivator {
                        System.out.println("Start import from ("+ source.toString() + ") ...");\r
                        config.setSourceReference(getSourceReference(config.getSourceReferenceTitle()));\r
                        myImport.invoke(config);\r
+                       FeatureTree tree = makeFeatureNodes(myImport.getCdmAppController().getTermService());\r
+                       myImport.getCdmAppController().getFeatureTreeService().saveOrUpdate(tree);\r
+\r
                        System.out.println("End import from ("+ source.toString() + ")...");\r
                }\r
                \r
-               FeatureTree tree = makeFeatureNodes(myImport.getCdmAppController().getTermService());\r
-               myImport.getCdmAppController().getFeatureTreeService().saveOrUpdate(tree);\r
                \r
                \r
                //deduplicate\r
@@ -99,8 +100,8 @@ public class CyprusActivator {
                        CdmApplicationController app = myImport.getCdmAppController();\r
                        int count = app.getAgentService().deduplicate(Person.class, null, null);\r
                        logger.warn("Deduplicated " + count + " persons.");\r
-                       count = app.getAgentService().deduplicate(Team.class, null, null);\r
-                       logger.warn("Deduplicated " + count + " teams.");\r
+//                     count = app.getAgentService().deduplicate(Team.class, null, null);\r
+//                     logger.warn("Deduplicated " + count + " teams.");\r
                        count = app.getReferenceService().deduplicate(Reference.class, null, null);\r
                        logger.warn("Deduplicated " + count + " references.");\r
                }\r
@@ -120,6 +121,9 @@ public class CyprusActivator {
                result.setTitleCache("Cyprus Feature Tree");\r
                FeatureNode root = result.getRoot();\r
                FeatureNode newNode;\r
+\r
+               newNode = FeatureNode.NewInstance(Feature.STATUS());\r
+               root.addChild(newNode);\r
                \r
                newNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());\r
                root.addChild(newNode);\r
@@ -127,11 +131,8 @@ public class CyprusActivator {
                newNode = FeatureNode.NewInstance(Feature.SYSTEMATICS());\r
                root.addChild(newNode);\r
 \r
-               newNode = FeatureNode.NewInstance(Feature.STATUS());\r
-               root.addChild(newNode);\r
-\r
-               //red data book category\r
-               String [] featureList = new String[]{"Red Book"};\r
+               //user defined features\r
+               String [] featureList = new String[]{"Red Book", "Endemism"};\r
                addFeataureNodesByStringList(featureList, root, transformer, service);\r
                \r
                return result;\r