remove old term parser match cases

nfdi4plants · Jul 27, 2023 · 76fc7b4 · 76fc7b4
1 parent bd06096
commit 76fc7b4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/src/ArcGraphModel/ISA/KeyParser.fs b/src/ArcGraphModel/ISA/KeyParser.fs
@@ -157,24 +157,29 @@ module KeyParser =
         | Term InvestigationMetadata.cvTerms term ->
             fun (pv) -> CvParam(term,pv,attributes)
 
-        | Token TokenBase.identifier term
-        | Token TokenBase.name term
-        | Token TokenBase.title term
-        | Token TokenBase.description term
-        | Token TokenBase.familyName term
-        | Token TokenBase.givenName term
-        | Token TokenBase.midInitials term
-        | Token TokenBase.email term
-        | Token TokenBase.factorType term
-        | Token TokenBase.designType term
-        | Token TokenBase.data term
-        | Token TokenBase.source term
-        | Token TokenBase.sample term
-        | Token TokenBase.annotationID term
-        | Token TokenBase.termSourceRef term
-        | Token TokenBase.phone term -> 
+        | Term StudyMetadata.cvTerms term ->
             fun (pv) -> CvParam(term,pv,attributes)
 
+        | Term AssayMetadata.cvTerms term ->
+            fun (pv) -> CvParam(term,pv,attributes)
+
+        //| Token TokenBase.identifier term
+        //| Token TokenBase.name term
+        //| Token TokenBase.title term
+        //| Token TokenBase.description term
+        //| Token TokenBase.familyName term
+        //| Token TokenBase.givenName term
+        //| Token TokenBase.midInitials term
+        //| Token TokenBase.email term
+        //| Token TokenBase.factorType term
+        //| Token TokenBase.designType term
+        //| Token TokenBase.data term
+        //| Token TokenBase.source term
+        //| Token TokenBase.sample term
+        //| Token TokenBase.annotationID term
+        //| Token TokenBase.termSourceRef term
+        //| Token TokenBase.phone term -> 
+        //    fun (pv) -> CvParam(term,pv,attributes)
         //| Attribute AttributeBase.person (attribute,key) 
         //| Attribute AttributeBase.investigation (attribute,key) 
         //| Attribute AttributeBase.study (attribute,key) 

diff --git a/src/ArcGraphModel/ISA/Terms.fs b/src/ArcGraphModel/ISA/Terms.fs
@@ -26,7 +26,7 @@ module InvestigationMetadata =
         ontology.Terms
         |> List.map (fun t -> CvTerm(t.Id,t.Name,"INVMSO"))
 
-module Study =
+module StudyMetadata =
 
     let internal obo = (EmbeddedResource.load "structural_ontologies.study_metadata_structural_ontology.obo").Replace("\r\n", "\n").Split('\n')
 
@@ -36,7 +36,7 @@ module Study =
         ontology.Terms
         |> List.map (fun t -> CvTerm(t.Id,t.Name,"STDMSO"))    
 
-module Assay = 
+module AssayMetadata = 
 
     let internal obo = (EmbeddedResource.load "structural_ontologies.assay_metadata_structural_ontology.obo").Replace("\r\n", "\n").Split('\n')