fixing location handling

Author: gtfierro

Cargo.lock

@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.3.0"
+version = "0.3.1-a1"
 authors = ["Gabe Fierro <[email protected]>"]
 license = "BSD-3-Clause"
 edition = "2021"
@@ -35,7 +35,7 @@ clap = { version = "4.4.18", features = ["derive"] }
 derive_builder = "0.20"
 oxigraph = "0.4.11"
 
-ontoenv = { version = "0.3.0", path = "lib" }
+ontoenv = { version = "0.3.1-a1", path = "lib" }
 
 [profile.profiling]
 inherits = "release"

Cargo.toml

@@ -58,14 +58,8 @@ fn add_ontology_to_store(
         location.as_str(),
         now.elapsed()
     );
-    let temp_graph_id = GraphIdentifier::new(temp_graph_name.as_ref());
-    let ontology = Ontology::from_store(store, &temp_graph_id, strict)?;
-
-    // The location is incorrectly parsed from the temp graph id, so we set it from the original
-    // location here by round-tripping through JSON.
-    let mut ont_json = serde_json::to_value(&ontology)?;
-    ont_json["location"] = serde_json::to_value(&location)?;
-    let mut ontology: Ontology = serde_json::from_value(ont_json)?;
+    let temp_graph_id = GraphIdentifier::new_with_location(temp_graph_name.as_ref(), location);
+    let mut ontology = Ontology::from_store(store, &temp_graph_id, strict)?;
 
     debug!("Adding ontology: {}", ontology.id());
     ontology.with_last_updated(Utc::now());

lib/src/io.rs

@@ -80,6 +80,15 @@ impl GraphIdentifier {
             name: name.into(),
         }
     }
+    pub fn new_with_location(
+        name: NamedNodeRef,
+        location: OntologyLocation,
+    ) -> Self {
+        GraphIdentifier {
+            location,
+            name: name.into(),
+        }
+    }
     pub fn location(&self) -> &OntologyLocation {
         &self.location
     }
@@ -456,7 +465,7 @@ impl Ontology {
         }
 
         info!(
-            "1Fetched graph {ontology_subject} from location: {location:?}"
+            "Fetched graph {ontology_subject} from location: {location:?}"
         );
 
         let ontology_name: NamedNode = match ontology_subject {