Add FromString, FromStringWithNumber for OntologyAnnotation, Factor, …

…MaterialAttribute (Issue #24)

src/ISADotnet/DataModel/Factor.fs

@@ -34,6 +34,15 @@ type Factor =
             FactorType = oa
         )
 
+    /// Create a ISAJson Ontology Annotation value from ISATab string entries
+    static member fromStringWithNumber (name:string) (term:string) (accession:string) (source:string) =
+        let oa =
+            OntologyAnnotation.fromStringWithNumber term accession source
+        Factor.create(
+            Name = name,
+            FactorType = oa
+        )
+
     /// Get ISATab string entries from an ISAJson Factor object
     static member toString (factor : Factor) =
         factor.FactorType |> Option.map OntologyAnnotation.toString |> Option.defaultValue ("","","")  

src/ISADotnet/DataModel/Material.fs

@@ -20,12 +20,16 @@ type MaterialAttribute =
     static member empty =
         MaterialAttribute.create()
 
-
     /// Create a ISAJson MaterialAttribute from ISATab string entries
     static member fromString (term:string) (accession:string) (source:string) =
         let oa = OntologyAnnotation.fromString term accession source
         MaterialAttribute.create (CharacteristicType = oa)
 
+    /// Create a ISAJson MaterialAttribute from ISATab string entries
+    static member fromStringWithNumber (term:string) (accession:string) (source:string) =
+        let oa = OntologyAnnotation.fromStringWithNumber term accession source
+        MaterialAttribute.create (CharacteristicType = oa)
+
     /// Get ISATab string entries from an ISAJson MaterialAttribute object
     static member toString (ma : MaterialAttribute) =
         ma.CharacteristicType |> Option.map OntologyAnnotation.toString |> Option.defaultValue ("","","")    

src/ISADotnet/DataModel/Ontology.fs

@@ -99,6 +99,18 @@ type OntologyAnnotation =
             TermAccessionNumber = (source |> URI.fromString)
         )
 
+    /// Create a ISAJson Ontology Annotation value from ISATab string entries
+    static member fromStringWithNumber (term:string) (accession:string) (source:string) =
+        let t,number = 
+            let lastIndex = term.LastIndexOf '#'
+            term.Remove(lastIndex).Trim(), term.Substring(lastIndex+1).Trim()
+        OntologyAnnotation.create (
+            Name = AnnotationValue.fromString t,
+            TermSourceREF = accession, 
+            TermAccessionNumber = (source |> URI.fromString),
+            Comments = [ Comment.create(Name = "Number", Value = number) ]
+        )
+
     /// Get a ISATab string entries from an ISAJson Ontology Annotation object (name,accession,source)
     static member toString (oa : OntologyAnnotation) =
         oa.Name |> Option.map AnnotationValue.toString |> Option.defaultValue "",