From 9b53887a7c7c770f14d37fad028c03cf324136f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 11 Nov 2008 14:29:43 +0000 Subject: [PATCH] tcs --- .../cdm/app/tcs/PalmaeActivator.java | 30 ++++++++++--- .../app/tcs/PalmaeTaxonXImportActivator.java | 42 +++++++++++-------- .../eu/etaxonomy/cdm/app/tcs/TcsSources.java | 1 + .../cdm/app/tcs/TcsXmlTestActivator.java | 10 ++--- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeActivator.java index a16e2e22d5..8fc73957f8 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeActivator.java @@ -32,13 +32,15 @@ public class PalmaeActivator { //database validation status (create, update, validate ...) static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE; static final String tcsSource = TcsSources.arecaceae_local(); -// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2(); - static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); + static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2(); +// static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); // static final ICdmDataSource cdmDestination = CdmDestinations.cdm_portal_test_localhost(); static final UUID secUuid = UUID.fromString("5f32b8af-0c97-48ac-8d33-6099ed68c625"); static final String sourceSecId = "palm_pub_ed_999999"; + //should the taxonX import run as well? + static final boolean includeTaxonX = true; //check - import static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; @@ -61,7 +63,8 @@ public class PalmaeActivator { - private void doImport(){ + private boolean doImport(){ + boolean success = true; System.out.println("Start import from Tcs("+ tcsSource.toString() + ") ..."); //make BerlinModel Source @@ -91,18 +94,35 @@ public class PalmaeActivator { // invoke import CdmDefaultImport tcsImport = new CdmDefaultImport(); //new Test().invoke(tcsImportConfigurator); - tcsImport.invoke(tcsImportConfigurator); - + success &= tcsImport.invoke(tcsImportConfigurator); System.out.println("End import from TCS ("+ source.toString() + ")..."); + + return success; } /** * @param args */ public static void main(String[] args) { + boolean success = true; + + logger.debug("start"); PalmaeActivator me = new PalmaeActivator(); me.doImport(); + if (includeTaxonX){ + PalmaeTaxonXImportActivator taxonXimporter = new PalmaeTaxonXImportActivator(); + PalmaeTaxonXImportActivator.cdmDestination = cdmDestination; + PalmaeTaxonXImportActivator.secUuid = secUuid; + success &= taxonXimporter.runImport(); + } + + String strSuccess = ""; + if (success == false){ + strSuccess = "not "; + } + System.out.println("Import " + strSuccess + "successful"); + } } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeTaxonXImportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeTaxonXImportActivator.java index e240ffceed..59fbce7173 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeTaxonXImportActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/PalmaeTaxonXImportActivator.java @@ -31,29 +31,24 @@ import eu.etaxonomy.cdm.io.taxonx.TaxonXImportConfigurator; * @version 1.0 */ public class PalmaeTaxonXImportActivator { - private static Logger logger = Logger.getLogger(PalmaeTaxonXImportActivator.class); + private static final Logger logger = Logger.getLogger(PalmaeTaxonXImportActivator.class); //database validation status (create, update, validate ...) static DbSchemaValidation hbm2dll = DbSchemaValidation.UPDATE; //static final String tcsSource = TcsSources.taxonX_local(); - static final File source = TcsSources.taxonX_localDir(); - static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); + static File source = TcsSources.taxonX_localDir(); + static ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2(); - static final UUID secUuid = UUID.fromString("5f32b8af-0c97-48ac-8d33-6099ed68c625"); - static final int sourceSecId = 7800000; + static UUID secUuid = UUID.fromString("5f32b8af-0c97-48ac-8d33-6099ed68c625"); //check - import - static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; + static CHECK check = CHECK.IMPORT_WITHOUT_CHECK; - static final boolean doDescriptions = true; + static boolean doDescriptions = true; - /** - * @param args - */ - public static void main(String[] args) { - System.out.println("Start import from Source("+ source.toString() + ") ..."); - - //make BerlinModel Source + public boolean runImport(){ + boolean success = true; + //make destination ICdmDataSource destination = cdmDestination; TaxonXImportConfigurator taxonXImportConfigurator = TaxonXImportConfigurator.NewInstance("", destination); @@ -61,7 +56,6 @@ public class PalmaeTaxonXImportActivator { ICdmImport cdmImport = new CdmDefaultImport(); taxonXImportConfigurator.setSecUuid(secUuid); - taxonXImportConfigurator.setSourceSecId(sourceSecId); taxonXImportConfigurator.setDoFacts(doDescriptions); @@ -79,17 +73,29 @@ public class PalmaeTaxonXImportActivator { taxonXImportConfigurator.setSource(url.toString()); String originalSourceId = file.getName(); originalSourceId =originalSourceId.replace(".xml", ""); - originalSourceId =originalSourceId.replace("_tn_", "_tc_"); taxonXImportConfigurator.setOriginalSourceId(originalSourceId); - cdmImport.invoke(taxonXImportConfigurator); + success &= cdmImport.invoke(taxonXImportConfigurator); } catch (MalformedURLException e) { logger.warn(e); } } } }else{ - cdmImport.invoke(taxonXImportConfigurator); + success &= cdmImport.invoke(taxonXImportConfigurator); } + return success; + } + + + /** + * @param args + */ + public static void main(String[] args) { + System.out.println("Start import from Source("+ source.toString() + ") ..."); + + PalmaeTaxonXImportActivator importer = new PalmaeTaxonXImportActivator(); + importer.runImport(); + System.out.println("End import from Source ("+ source.toString() + ")..."); } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java index e651f7f0bf..3d9a75bd65 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java @@ -24,6 +24,7 @@ public class TcsSources { public static String arecaceae(){ // Monocots rdf String sourceUrl = "http://dev.e-taxonomy.eu/trac/attachment/wiki/SampleDataConversion/Monocotyledonae/arecaceae.rdf?format=raw"; + logger.debug("TcsSource " + sourceUrl); return sourceUrl; } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java index 1e70726da8..59daf09721 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java @@ -13,15 +13,13 @@ import java.util.UUID; import org.apache.log4j.Logger; -import tcsxml.TcsXmlImportConfigurator; - import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES; -import eu.etaxonomy.cdm.io.tcs.TcsImportConfigurator; +import eu.etaxonomy.cdm.io.tcsxml.TcsXmlImportConfigurator; /** * @author a.mueller @@ -46,10 +44,10 @@ public class TcsXmlTestActivator { //authors static final boolean doMetaData = true; //references - static final DO_REFERENCES doReferences = DO_REFERENCES.NONE; + static final DO_REFERENCES doReferences = DO_REFERENCES.ALL; //names - static final boolean doTaxonNames = false; - static final boolean doRelNames = false; + static final boolean doTaxonNames = true; + static final boolean doRelNames = true; //taxa static final boolean doTaxa = false; -- 2.34.1