.

publish/src/rdf/language.rs

@@ -1,46 +0,0 @@
-use std::sync::LazyLock;
-use oxigraph::model::Term;
-use oxilangtag::LanguageTag;
-
-pub const ENGLISH_PRIMARY: &str = "en";
-
-pub static ENGLISH_OR_UNTAGGED: LazyLock<LanguageCondition> = LazyLock::new(|| {
-    LanguageCondition::ExactMatchOrUntagged(LanguageTag::parse(ENGLISH_PRIMARY.to_string()).unwrap())
-});
-
-pub enum LanguageCondition {
-    ExactMatchOnly(LanguageTag<String>),
-    ExactMatchOrUntagged(LanguageTag<String>),
-    UntaggedOnly,
-    AnyOrNone,
-}
-
-impl LanguageCondition {
-    pub fn primary_matches_term(&self, term: &Term) -> bool {
-        if let Term::Literal(literal) = term {
-            let tag = literal.language()
-                .map(LanguageTag::parse_and_normalize)
-                .and_then(Result::ok);
-
-            match (tag, self) {
-                (Some(language), LanguageCondition::ExactMatchOnly(expectation)) |
-                (Some(language), LanguageCondition::ExactMatchOrUntagged(expectation)) => language.primary_language() == expectation.primary_language(),
-                (None, LanguageCondition::ExactMatchOrUntagged(_)) => true,
-                (None, LanguageCondition::UntaggedOnly) => true,
-                (_, LanguageCondition::AnyOrNone) => true,
-                _ => false,
-            }
-        } else {
-            false
-        }
-    }
-
-    pub fn to_filter_expression(&self, var: &str) -> String {
-        match self {
-            LanguageCondition::ExactMatchOnly(language) => format!(r#"FILTER(langMATCHES(LANG(?{var}), "{language}"))"#),
-            LanguageCondition::ExactMatchOrUntagged(language) => format!(r#"FILTER(langMATCHES(LANG(?{var}), "{language}") || !hasLANG(?{var}))"#),
-            LanguageCondition::UntaggedOnly => format!("FILTER(!hasLANG(?{var}))"),
-            LanguageCondition::AnyOrNone => "".to_string(),
-        }
-    }
-}

publish/src/rdf/mod.rs

@@ -3,5 +3,4 @@ pub(crate) mod term_helper;
 pub mod vocab;
 pub(crate) mod materialize;
 pub(crate) mod conversion;
-pub(crate) mod language;
 pub(crate) mod curie;

publish/src/rdf/ontology.rs

@@ -1,17 +1,17 @@
 use crate::error;
 use crate::rdf::vocab::gl;
+use crate::rdf::{conversion, materialize};
+use gl_search::language::LanguageCondition;
+use iced::futures::TryFutureExt;
 use oxigraph::model::vocab::{rdf, rdfs, xsd};
 use oxigraph::model::{Dataset, Graph, GraphNameRef, LiteralRef, NamedNode, NamedNodeRef, NamedOrBlankNode, NamedOrBlankNodeRef, Term, TermRef, Triple, TripleRef};
 use oxigraph::sparql::{QueryResults, SparqlEvaluator};
+use oxigraph::store::Store;
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::fmt::Display;
 use std::path::{Path, PathBuf};
 use std::sync::LazyLock;
-use iced::futures::TryFutureExt;
-use oxigraph::store::Store;
 use tracing::{debug_span, field};
-use crate::rdf::{conversion, materialize};
-use crate::rdf::language::LanguageCondition;
 
 const ONTOLOGY_PREFIX: &str = "https://graphofliberty.org/2026/04/ont/";
 const ONTOLOGY_GRAPH_NAME: GraphNameRef = GraphNameRef::NamedNode(NamedNodeRef::new_unchecked("https://graphofliberty.org/2026/04/ont"));
@@ -50,6 +50,7 @@ static PREFIXES: LazyLock<BTreeMap<String, String>> = LazyLock::new(|| {
         ("rdax", "http://rdaregistry.info/Elements/x/"),
         ("rdaco", "http://rdaregistry.info/termList/RDAContentType/"),
         ("rdact", "http://rdaregistry.info/termList/RDACarrierType/"),
+        ("rdamt", "http://rdaregistry.info/termList/RDAMediaType/"),
         ("rdaft", "http://rdaregistry.info/termList/fileType/"),
         ("schema", "https://schema.org/"),
         ("gl", "http://fedora.quill.lan/rest/"),
@@ -179,6 +180,10 @@ impl Ontology {
             .collect::<Dataset>()
     }
 
+    pub fn store(&self) -> Store {
+        self.store.clone()
+    }
+
     pub fn query_for_indexable_triples(&self, language: &LanguageCondition, source: Option<Dataset>) -> impl Future<Output = error::Result<HashMap<NamedNode, IndexEntry>>> + 'static {
         let language_filter = language.to_filter_expression("fieldValue");
         let query = format!(r#"SELECT ?individual ?categoryId ?fieldName ?fieldValue