Merge pull request #75 from OHDSI/central_cdm_source

Move vendor specific cdm_source values to CSV file

Author: bradanton

cdm_source/cdm_source.csv

@@ -12,16 +12,16 @@ public class CdmSourceDataReader : IDataReader
         private readonly IEnumerator<CdmSource> _enumerator;
 
         // A custom DataReader is implemented to prevent the need for the HashSet to be transformed to a DataTable for loading by SqlBulkCopy
-        public CdmSourceDataReader(Vendors vendor)
+        public CdmSourceDataReader()
         {
-            _enumerator = new List<CdmSource> { new(vendor) }.GetEnumerator();
+            _enumerator = new List<CdmSource> { new() }.GetEnumerator();
         }
 
-        public CdmSourceDataReader(Vendors vendor, DateTime sourceReleaseDate, string vocabularyVersion)
+        public CdmSourceDataReader(DateTime sourceReleaseDate, string vocabularyVersion)
         {
             _enumerator = new List<CdmSource>
             {
-                new(vendor) {SourceReleaseDate = sourceReleaseDate, VocabularyVersion = vocabularyVersion}
+                new() {SourceReleaseDate = sourceReleaseDate, VocabularyVersion = vocabularyVersion}
             }.GetEnumerator();
         }
 

sources/Framework/org.ohdsi.cdm.framework.common3/DataReaders/v5/CdmSourceDataReader.cs

@@ -12,16 +12,16 @@ public class CdmSourceDataReader54 : IDataReader
         private readonly IEnumerator<CdmSource> _enumerator;
 
         // A custom DataReader is implemented to prevent the need for the HashSet to be transformed to a DataTable for loading by SqlBulkCopy
-        public CdmSourceDataReader54(Vendors vendor)
+        public CdmSourceDataReader54()
         {
-            _enumerator = new List<CdmSource> { new(vendor) }.GetEnumerator();
+            _enumerator = new List<CdmSource> { new() }.GetEnumerator();
         }
 
-        public CdmSourceDataReader54(Vendors vendor, DateTime sourceReleaseDate, string vocabularyVersion)
+        public CdmSourceDataReader54(DateTime sourceReleaseDate, string vocabularyVersion)
         {
             _enumerator = new List<CdmSource>
             {
-                new(vendor) {SourceReleaseDate = sourceReleaseDate, VocabularyVersion = vocabularyVersion}
+                new() {SourceReleaseDate = sourceReleaseDate, VocabularyVersion = vocabularyVersion}
             }.GetEnumerator();
         }