Fix maxCardinality

Author: ckindermann

src/ldtab_2_ofn/class_translation.rs

@@ -312,14 +312,16 @@ pub fn translate_data_min_qualified_cardinality(exp: &owl::MinDataQualifiedCardi
 /// let max_cardinality_owl : owl::OWL = serde_json::from_str(max_cardinality).unwrap();
 ///
 /// let axiom : Value = translation::translate(&max_cardinality_owl);
-/// let axiom_expected_string = r#"["MaxCardinality","1","obo:IAO_0000120"]"#;
+/// let axiom_expected_string = r#"["MaxCardinality","\"1\"^^xsd:int","obo:IAO_0000120"]"#;
 /// let axiom_expected : Value = serde_json::from_str(axiom_expected_string).unwrap();
 ///
 /// assert_eq!(axiom, axiom_expected);
 /// ```
 pub fn translate_max_cardinality(exp: &owl::MaxCardinality) -> Value {
     let property = translate(&exp.owl_on_property[0].object);
     let cardinality = translate(&exp.owl_max_cardinality[0].object);
+    let datatype = exp.owl_max_cardinality[0].datatype.clone();
+    let cardinality = Value::String(format!("{}^^{}", cardinality, datatype));
 
     let operator = Value::String(String::from("MaxCardinality"));
     let v = vec![operator, cardinality, property];

src/ofn_2_ldtab/class_translation.rs

@@ -4,6 +4,7 @@ use serde_json::json;
 use serde_json::Value;
 
 pub fn translate(v: &Value) -> Value {
+
     match v[0].as_str() {
         Some("ObjectSomeValuesFrom") => translate_some_values_from(v),
         Some("ObjectAllValuesFrom") => translate_all_values_from(v),
@@ -83,10 +84,19 @@ pub fn get_object(v: &Value) -> Value {
 }
 
 pub fn get_cardinality_object(v: &Value) -> Value {
-    let o: Value = translate(&v);
-
-    json!({"object" : o,
-           "datatype" : "xsd:nonNegativeInteger"})
+    if let Some(s) = v.as_str() {
+        if let Some((literal, datatype)) = s.split_once("^^") {
+            let trimmed = literal.trim_matches('"');
+            json!({
+                "object": trimmed,
+                "datatype": datatype
+            })
+        } else {
+            json!({ "error": "Invalid format" })
+        }
+    } else {
+        json!({ "error": "Expected a string" })
+    }
 }
 
 pub fn translate_some_values_from(v: &Value) -> Value {
@@ -202,8 +212,8 @@ pub fn translate_min_qualified_cardinality(v: &Value) -> Value {
 }
 
 pub fn translate_max_cardinality(v: &Value) -> Value {
-    let property_o: Value = get_object(&v[1]);
-    let cardinality_o: Value = get_cardinality_object(&v[2]);
+    let cardinality_o: Value = get_cardinality_object(&v[1]);
+    let property_o: Value = get_object(&v[2]);
     let type_o: Value = get_object(&json!("owl:Restriction"));
 
     json!({"rdf:type" : vec![type_o],