some bugfixes for E+M import (occurrences, occ sources, webmarker) - activator

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 402cd748a1afa2d6a15b03c565d13f4a50dc39e4..be8a1a79b7aa4fa284a09223195d3b929a0b0921 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
@@ -86,7 +86,9 @@ public class EuroMedActivator {
        static String referenceIdTable = " v_cdm_exp_refAll ";\r
        static String factFilter = " factId IN ( SELECT factId FROM v_cdm_exp_factsAll )";\r
        static String occurrenceFilter = " occurrenceId IN ( SELECT occurrenceId FROM v_cdm_exp_occurrenceAll )";\r
+       static String occurrenceSourceFilter = " occurrenceFk IN ( SELECT occurrenceId FROM v_cdm_exp_occurrenceAll )"; \r
        static String commonNameFilter = " commonNameId IN ( SELECT commonNameId FROM v_cdm_exp_commonNamesAll )";\r
+       static String webMarkerFilter = " TableNameFk <> 500 OR ( RIdentifierFk IN (SELECT RIdentifier FROM v_cdm_exp_taxaAll)) ";\r
        \r
        \r
        \r
@@ -190,8 +192,10 @@ public class EuroMedActivator {
                config.setNameIdTable(nameIdTable);\r
                config.setReferenceIdTable(referenceIdTable);\r
                config.setFactFilter(factFilter);\r
-               config.setOccurrenceFilter(occurrenceFilter);\r
                config.setCommonNameFilter(commonNameFilter);\r
+               config.setOccurrenceFilter(occurrenceFilter);\r
+               config.setOccurrenceSourceFilter(occurrenceSourceFilter);\r
+               config.setWebMarkerFilter(webMarkerFilter);\r
                \r
                \r
                config.setCheck(check);\r