Improve ETLs to filter non-SIV data

Author: bbimber

IDR/resources/queries/bimber_data/idrAnchorDateSource.sql

@@ -7,6 +7,7 @@ PID0 as date,
 
 FROM bimber_data.subjects
 WHERE PID0 IS NOT NULL
+AND Cohort NOT IN ('PC549', 'PC585') AND Cohort NOT LIKE 'W%'
 
 UNION ALL
 
@@ -18,4 +19,5 @@ D0 as date,
 'Hansen/IDR' as dataSource
 
 FROM bimber_data.subjects
-WHERE D0 IS NOT NULL
+WHERE D0 IS NOT NULL
+  AND Cohort NOT IN ('PC549', 'PC585') AND Cohort NOT LIKE 'W%'

IDR/resources/queries/bimber_data/idrOutcomeSource.sql

@@ -12,4 +12,5 @@ END as outcome,
 'Hansen/IDR' as dataSource
 
 FROM bimber_data.subjects
-WHERE contprog IS NOT NULL AND contprog != ''
+WHERE contprog IS NOT NULL AND contprog != ''
+AND Cohort NOT IN ('PC549', 'PC585') AND Cohort NOT LIKE 'W%'

SivStudies/resources/etls/idr-data.xml

@@ -125,7 +125,7 @@
                     <setting name="dataSourceColumns" value="Rh,PID0"/>
                     <setting name="dataSourceColumnMapping" value="Rh=Id,PID0=date"/>
                     <setting name="dataSourceColumnDefaults" value="dataSource=Hansen/IDR;category=SIV Infection;treatment=SIV - Unknown"/>
-                    <setting name="dataSourceAdditionalFilters" value="PID0~isnonblank="/>
+                    <setting name="dataSourceAdditionalFilters" value="PID0~isnonblank=;Cohort~neqornull=PC549;Cohort~neqornull=PC585;Cohort~neqornull=W1170;Cohort~neqornull=W1173"/>
 
                     <setting name="targetSchema" value="study"/>
                     <setting name="targetQuery" value="treatments"/>