Skip to content

Commit aa73ce1

Browse files
committed
make rdfa module and migrate code
1 parent dda3f5e commit aa73ce1

File tree

14 files changed

+440
-431
lines changed

14 files changed

+440
-431
lines changed

html2rdf-cli/src/main.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::{io::Write, process::ExitCode};
22

33
use clap::Parser;
4-
use html2rdf::{Options, algorithms::OnlineVocabularyResolver, host_language::Html5};
4+
use html2rdf::{Options, host_language::Html5, rdfa::algorithms::OnlineVocabularyResolver};
55
use oxrdf::{
66
Graph,
77
graph::{CanonicalizationAlgorithm, CanonicalizationHashAlgorithm},
@@ -103,10 +103,12 @@ async fn main() -> Result<ExitCode, Box<dyn std::error::Error>> {
103103

104104
{
105105
// use serializer with all known prefixes
106-
let serializer = html2rdf::initial_context::prefixes().mappings().try_fold(
107-
oxttl::TurtleSerializer::new().with_base_iri(base.as_str())?,
108-
|serializer, (prefix, value)| serializer.with_prefix(prefix, value),
109-
)?;
106+
let serializer = html2rdf::rdfa::initial_context::prefixes()
107+
.mappings()
108+
.try_fold(
109+
oxttl::TurtleSerializer::new().with_base_iri(base.as_str())?,
110+
|serializer, (prefix, value)| serializer.with_prefix(prefix, value),
111+
)?;
110112

111113
if args.canonicalize {
112114
output_graph.canonicalize(CanonicalizationAlgorithm::Rdfc10 {

html2rdf/src/host_language/html.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ impl super::HostLanguage for Html5 {
4646
type ParseError = Infallible;
4747

4848
fn initial_terms(&self) -> &'static std::collections::BTreeMap<String, oxrdf::NamedNode> {
49-
crate::initial_context::terms()
49+
crate::rdfa::initial_context::terms()
5050
}
5151

5252
fn initial_prefixes(&self) -> &'static curie::PrefixMapping {
53-
crate::initial_context::prefixes()
53+
crate::rdfa::initial_context::prefixes()
5454
}
5555

5656
// “The default vocabulary URI is undefined.

html2rdf/src/host_language/xhtml.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl HostLanguage for XHtml {
6767
static INITIAL_TERMS: OnceLock<std::collections::BTreeMap<String, NamedNode>> =
6868
OnceLock::new();
6969
INITIAL_TERMS.get_or_init(|| {
70-
let mut terms = crate::initial_context::terms().clone();
70+
let mut terms = crate::rdfa::initial_context::terms().clone();
7171
for t in [
7272
"alternate",
7373
"appendix",
@@ -110,7 +110,7 @@ impl HostLanguage for XHtml {
110110
}
111111

112112
fn initial_prefixes(&self) -> &'static curie::PrefixMapping {
113-
crate::initial_context::prefixes()
113+
crate::rdfa::initial_context::prefixes()
114114
}
115115
}
116116

0 commit comments

Comments
 (0)