Get basisOfrecord with suffix

Remove the need for hard-coded fix. Part of #4
sharkdata · Dec 9, 2024 · c709d75 · c709d75
1 parent 66413cc
commit c709d75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/dwca_config/dwca_phytoplankton_ifcb.yaml b/dwca_config/dwca_phytoplankton_ifcb.yaml
@@ -41,7 +41,8 @@ fieldMapping:
     files:
         -   - dwca_terms_event.yaml
             - _IFCB
-        - dwca_terms_occurrence.yaml
+        -   - dwca_terms_occurrence.yaml
+            - _IFCB
         - dwca_terms_emof.yaml
 
 taxaWorms:

diff --git a/dwca_config/field_mapping/dwca_terms_occurrence.yaml b/dwca_config/field_mapping/dwca_terms_occurrence.yaml
@@ -110,6 +110,8 @@ dwcaOccurrenceContent:
               sourceKey: worms_genus
           basisOfRecord:
               text: MaterialSample
+          basisOfRecord_IFCB:
+              text: MachineObservation
           recordedBy:
               sourceKey: taxonomist
           occurrenceRemarks:

diff --git a/dwca_generator/dwca_format_standard.py b/dwca_generator/dwca_format_standard.py
@@ -333,10 +333,6 @@ def create_dwca_occurrence(self):
                                 if occurrence_dict.get("scientificName","") == missing_taxa_id:
                                     occurrence_dict["scientificNameID"] = ID
 
-                        # IFCB fix
-                        if "IFCB" in occurrence_dict.get("dynamicProperties") and occurrence_dict.get("basisOfRecord", "") == "MaterialSample":
-                            occurrence_dict["basisOfRecord"] = "MachineObservation"
-
                        # Phytoplankton fix
                         if all(
                             key in occurrence_dict and "SHARK_Phytoplankton" in occurrence_dict.get("dynamicProperties", "")