Build namespace map of ontology on initialization

Author: gtfierro

lib/src/api.rs

@@ -685,7 +685,12 @@ impl OntoEnv {
         let mut namespace_map = HashMap::new();
         for graph_id in graph_ids {
             let ontology = self.get_ontology(graph_id)?;
-            namespace_map.extend(ontology.get_namespace_map()?);
+            namespace_map.extend(
+                ontology
+                    .namespace_map()
+                    .iter()
+                    .map(|(k, v)| (k.clone(), v.clone())),
+            );
         }
 
         // Rewrite sh:prefixes

lib/src/doctor.rs

@@ -134,13 +134,13 @@ impl EnvironmentCheck for ConflictingPrefixes {
 
             for graph_id in &closure_ids {
                 let ontology = env.get_ontology(graph_id)?;
-                let ns_map = ontology.get_namespace_map()?;
+                let ns_map = ontology.namespace_map();
                 if let Some(location) = ontology.location() {
                     for (prefix, namespace) in ns_map {
                         closure_prefix_map
-                            .entry(prefix)
+                            .entry(prefix.to_string())
                             .or_default()
-                            .entry(namespace)
+                            .entry(namespace.to_string())
                             .or_default()
                             .push(location.clone());
                     }

lib/src/ontology.rs

@@ -216,6 +216,7 @@ pub struct Ontology {
     pub last_updated: Option<DateTime<Utc>>,
     #[serde_as(as = "HashMap<LocalType, _>")]
     version_properties: HashMap<NamedNode, String>,
+    namespace_map: HashMap<String, String>,
 }
 
 // impl display; name + location + last updated, then indented version properties
@@ -247,6 +248,7 @@ impl Default for Ontology {
             location: None,
             last_updated: None,
             version_properties: HashMap::new(),
+            namespace_map: HashMap::new(),
         }
     }
 }
@@ -310,40 +312,8 @@ impl Ontology {
         serde_json::to_string_pretty(self).unwrap()
     }
 
-    pub fn get_namespace_map(&self) -> Result<HashMap<String, String>> {
-        let graph = self.graph()?;
-        let mut namespace_map = HashMap::new();
-
-        let declare_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#declare");
-        let prefix_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#prefix");
-        let namespace_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#namespace");
-
-        let ontology_name_subject: Subject = self.name().into();
-
-        for decl_obj_ref in
-            graph.objects_for_subject_predicate(ontology_name_subject.as_ref(), declare_prop.as_ref())
-        {
-            let decl_subj: SubjectRef = match decl_obj_ref {
-                TermRef::NamedNode(n) => n.into(),
-                TermRef::BlankNode(b) => b.into(),
-                _ => continue,
-            };
-
-            let prefix_term = graph.object_for_subject_predicate(decl_subj, prefix_prop.as_ref());
-            let namespace_term =
-                graph.object_for_subject_predicate(decl_subj, namespace_prop.as_ref());
-
-            if let (Some(TermRef::Literal(prefix_lit)), Some(TermRef::Literal(namespace_lit))) =
-                (prefix_term, namespace_term)
-            {
-                namespace_map.insert(
-                    prefix_lit.value().to_string(),
-                    namespace_lit.value().to_string(),
-                );
-            }
-        }
-
-        Ok(namespace_map)
+    pub fn namespace_map(&self) -> &HashMap<String, String> {
+        &self.namespace_map
     }
 
     pub fn from_graph(
@@ -377,6 +347,36 @@ impl Ontology {
             }
         };
         debug!("got ontology name: {}", ontology_name);
+
+        let mut namespace_map = HashMap::new();
+
+        let declare_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#declare");
+        let prefix_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#prefix");
+        let namespace_prop = NamedNode::new_unchecked("http://www.w3.org/ns/shacl#namespace");
+
+        for decl_obj_ref in
+            graph.objects_for_subject_predicate(ontology_name.as_ref(), declare_prop.as_ref())
+        {
+            let decl_subj: SubjectRef = match decl_obj_ref {
+                TermRef::NamedNode(n) => n.into(),
+                TermRef::BlankNode(b) => b.into(),
+                _ => continue,
+            };
+
+            let prefix_term = graph.object_for_subject_predicate(decl_subj, prefix_prop.as_ref());
+            let namespace_term =
+                graph.object_for_subject_predicate(decl_subj, namespace_prop.as_ref());
+
+            if let (Some(TermRef::Literal(prefix_lit)), Some(TermRef::Literal(namespace_lit))) =
+                (prefix_term, namespace_term)
+            {
+                namespace_map.insert(
+                    prefix_lit.value().to_string(),
+                    namespace_lit.value().to_string(),
+                );
+            }
+        }
+
         let imports: Vec<TermRef> = graph
             .objects_for_subject_predicate(ontology_name.as_ref(), IMPORTS)
             .collect::<Vec<_>>();
@@ -458,6 +458,7 @@ impl Ontology {
             location: Some(location),
             version_properties,
             last_updated: None,
+            namespace_map,
         })
     }