From 7b89d27810162cd991cec8a984a42cf241d36195 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Dec 2010 17:48:35 +0000 Subject: [PATCH] some final changes for Cyprus activator --- .../cdm/app/cyprus/CyprusActivator.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) 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 a32ffbfa..d5c5331d 100644 --- 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(); static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql(); // static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev(); -// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev_tunnel(); +// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_production(); //feature tree uuid @@ -87,11 +87,12 @@ public class CyprusActivator { System.out.println("Start import from ("+ source.toString() + ") ..."); config.setSourceReference(getSourceReference(config.getSourceReferenceTitle())); myImport.invoke(config); + FeatureTree tree = makeFeatureNodes(myImport.getCdmAppController().getTermService()); + myImport.getCdmAppController().getFeatureTreeService().saveOrUpdate(tree); + System.out.println("End import from ("+ source.toString() + ")..."); } - FeatureTree tree = makeFeatureNodes(myImport.getCdmAppController().getTermService()); - myImport.getCdmAppController().getFeatureTreeService().saveOrUpdate(tree); //deduplicate @@ -99,8 +100,8 @@ public class CyprusActivator { CdmApplicationController app = myImport.getCdmAppController(); int count = app.getAgentService().deduplicate(Person.class, null, null); logger.warn("Deduplicated " + count + " persons."); - count = app.getAgentService().deduplicate(Team.class, null, null); - logger.warn("Deduplicated " + count + " teams."); +// count = app.getAgentService().deduplicate(Team.class, null, null); +// logger.warn("Deduplicated " + count + " teams."); count = app.getReferenceService().deduplicate(Reference.class, null, null); logger.warn("Deduplicated " + count + " references."); } @@ -120,6 +121,9 @@ public class CyprusActivator { result.setTitleCache("Cyprus Feature Tree"); FeatureNode root = result.getRoot(); FeatureNode newNode; + + newNode = FeatureNode.NewInstance(Feature.STATUS()); + root.addChild(newNode); newNode = FeatureNode.NewInstance(Feature.DISTRIBUTION()); root.addChild(newNode); @@ -127,11 +131,8 @@ public class CyprusActivator { newNode = FeatureNode.NewInstance(Feature.SYSTEMATICS()); root.addChild(newNode); - newNode = FeatureNode.NewInstance(Feature.STATUS()); - root.addChild(newNode); - - //red data book category - String [] featureList = new String[]{"Red Book"}; + //user defined features + String [] featureList = new String[]{"Red Book", "Endemism"}; addFeataureNodesByStringList(featureList, root, transformer, service); return result; -- 2.34.1