ref #9771 adapt OntologyExportActivator to server-client export

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/additivity/OntologyExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/additivity/OntologyExportActivator.java
index b7c35051f9461a97a023f930390460ea23553b26..937fb2f245cebae0c9b0748e3c616b94cb271ed2 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/additivity/OntologyExportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/additivity/OntologyExportActivator.java
@@ -8,6 +8,7 @@
 */
 package eu.etaxonomy.cdm.app.additivity;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 
@@ -15,7 +16,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import eu.etaxonomy.cdm.app.common.CdmDestinations;
-import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.filter.VocabularyFilter;
@@ -34,12 +34,12 @@ public class OntologyExportActivator {
     @SuppressWarnings("unused")
     private static final Logger logger = LogManager.getLogger();
 
-    static final ICdmDataSource source = CdmDestinations.cdm_local_greece_bupleurum();
-//    static final ICdmDataSource source = CdmDestinations.cdm_production_greece_bupleurum();
-
-    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_terms();
+    static final ICdmDataSource source = CdmDestinations.cdm_local_terms();
 //    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_cdmterms();
 
+    static final ICdmDataSource destination = CdmDestinations.cdm_local_greece();
+//    static final ICdmDataSource source = CdmDestinations.cdm_production_greece_bupleurum();
+
 //    static final UUID sourceRefUuid = UUID.fromString("f88e33e5-1f6a-463e-b6fd-220d5e93d810");
 
     static final DbSchemaValidation schemaValidation = DbSchemaValidation.VALIDATE;
@@ -59,6 +59,11 @@ public class OntologyExportActivator {
     static final boolean doConcurrent = false;
     static final boolean registerAuditing = true;
 
+
+    static final UUID uuidStructuresTree = UUID.fromString("17941710-059e-4e0b-a617-6439d66a39a6");
+    static final UUID uuidPropertiesTree = UUID.fromString("a4598d3f-0acf-4ad1-a6c9-0c31485da535");
+    static final UUID uuidStatesTree = UUID.fromString("fa9e8602-65b8-4f29-89f3-79132df994ca");
+
 // ***************** ALL ************************************************//
 
 //    UUID uuidBupleurumTaxonNodeFilter = UUID.fromString("51e768cf-321b-4108-8bee-46143996b033");
@@ -70,12 +75,15 @@ public class OntologyExportActivator {
 
         Cdm2CdmImportConfigurator config = Cdm2CdmImportConfigurator.NewInstace(source, destination);
         VocabularyFilter vocFilter = VocabularyFilter.NewInstance();
-        addVocFilters(vocFilter, VocabularyEnum.ontologyStructureVocabularyUuids());
-        addVocFilters(vocFilter, VocabularyEnum.ontologyPropertyVocabularyUuids());
-        addVocFilters(vocFilter, VocabularyEnum.ontologyStateVocabularyUuids());
+//        addVocFilters(vocFilter, VocabularyEnum.ontologyStructureVocabularyUuids());
+//        addVocFilters(vocFilter, VocabularyEnum.ontologyPropertyVocabularyUuids());
+//        addVocFilters(vocFilter, VocabularyEnum.ontologyStateVocabularyUuids());
         addVocFilters(vocFilter, VocabularyEnum.ontologyModifierVocabularyUuids());
         config.setVocabularyFilter(vocFilter);
 
+        Collection<UUID> graphFilter = getGraphFilter();
+        config.setGraphFilter(graphFilter);
+
         config.setDoTaxa(doTaxa);
         config.setDoDescriptions(doDescriptions);
         config.setDoVocabularies(doVocabularies);
@@ -84,14 +92,11 @@ public class OntologyExportActivator {
         config.setSourceReference(getSourceRefNull());
         config.setRemoveImportSources(removeImportSources);
 
-        IProgressMonitor monitor = config.getProgressMonitor();
-
         config.setDbSchemaValidation(hbm2dll);
 //        config.getTaxonNodeFilter().orSubtree(uuidBupleurumTaxonNodeFilter);
 //        config.getTaxonNodeFilter().setOrder(ORDER.TREEINDEX);
 
         config.setCheck(check);
-//        config.setRecordsPerTransaction(partitionSize);
 
         config.setRegisterAuditing(registerAuditing);
 
@@ -102,6 +107,10 @@ public class OntologyExportActivator {
         System.out.println("End" + importFrom);
     }
 
+    private List<UUID> getGraphFilter() {
+        return VocabularyEnum.ontologyTreeUuids();
+    }
+
     private void addVocFilters(VocabularyFilter vocFilter, List<UUID> vocUuids) {
         for (UUID vocUuid : vocUuids) {
             vocFilter.orVocabulary(vocUuid);
@@ -109,7 +118,6 @@ public class OntologyExportActivator {
     }
 
 
-
     private Reference getSourceRefNull() {
         return null;
     }
@@ -122,9 +130,9 @@ public class OntologyExportActivator {
 //    }
 
     public static void main(String[] args) {
-        ICdmDataSource cdmDB = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination;
+        ICdmDataSource cdmDB = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : destination;
         OntologyExportActivator myImport = new OntologyExportActivator();
         myImport.doImport(source, cdmDB, schemaValidation);
         System.exit(0);
     }
-}
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
index 97cd2fefd4f9459f0784b12203bf06c1b9d1ed08..85477b6a75cf1e867731fde8c47d19330d9cc8ad 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
@@ -166,7 +166,7 @@ public class CdmDestinations {
     public static ICdmDataSource cdm_local_greece(){
         DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
         String cdmServer = "127.0.0.1";
-        String cdmDB = "cdm_test_greece";
+        String cdmDB = "cdm_local_greece";
         String cdmUserName = "edit";
         return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
     }