renamed pesi destinations and renamed filters

[cdmlib-apps.git] / cdm-pesi / src / main / java / eu / etaxonomy / cdm / app / pesi / EuroMedActivator.java

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
index 4b5669414db648d4e33a9680bee80c7688c183bd..3d324564fc8ac44a0fd6268c7e24d24fb7e00252 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
@@ -49,7 +49,7 @@ public class EuroMedActivator {
        static final Source berlinModelSource = BerlinModelSources.euroMed();\r
 //     static final Source berlinModelSource = BerlinModelSources.EDIT_Diptera();\r
        \r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_euroMed_dev();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_pesi_euroMed();\r
        static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
        \r
        static final int sourceSecId = 7000000; //500000\r
@@ -78,16 +78,16 @@ public class EuroMedActivator {
        \r
        static boolean useClassification = true;\r
        \r
-       static String taxonTable = "v_cdm_exp_allTaxa";\r
+       static String taxonTable = "v_cdm_exp_taxaAll";\r
        \r
-       static String classificationQuery = " SELECT DISTINCT t.PTRefFk, r.RefCache FROM _EM_CDM_exp_accTaxa t INNER JOIN Reference r ON t.PTRefFk = r.RefId "; \r
+       static String classificationQuery = " SELECT DISTINCT t.PTRefFk, r.RefCache FROM _EM_CDM_exp_taxaDirect t INNER JOIN Reference r ON t.PTRefFk = r.RefId "; \r
 \r
        static String relPTaxonIdQuery = " SELECT r.RelPTaxonId " + \r
-                                       " FROM RelPTaxon AS r INNER JOIN v_cdm_exp_accTaxa AS a ON r.PTNameFk2 = a.PTNameFk AND r.PTRefFk2 = a.PTRefFk ";\r
+                                       " FROM RelPTaxon AS r INNER JOIN v_cdm_exp_taxaDirect AS a ON r.PTNameFk2 = a.PTNameFk AND r.PTRefFk2 = a.PTRefFk ";\r
 \r
-       static String nameIdTable = "v_cdm_exp_allNames";\r
+       static String nameIdTable = " v_cdm_exp_namesAll ";\r
        \r
-       static String referenceFilter = " ( Reference.RefId IN (SELECT refId FROM v_cdm_exp_allReferences) ) ";\r
+       static String referenceIdTable = " v_cdm_exp_refAll ";\r
        \r
        static String factFilter = " SELECT factId FROM v_cdm_exp_factsAll ";\r
        \r
@@ -192,7 +192,7 @@ public class EuroMedActivator {
                config.setClassificationQuery(classificationQuery);\r
                config.setRelTaxaIdQuery(relPTaxonIdQuery);\r
                config.setNameIdTable(nameIdTable);\r
-               config.setReferenceFilter(referenceFilter);\r
+               config.setReferenceIdTable(referenceIdTable);\r
                config.setFactFilter(factFilter);\r
                \r
                \r