.
This commit is contained in:
+52
-27
@@ -1,14 +1,17 @@
|
||||
mod app;
|
||||
mod error;
|
||||
mod rdf;
|
||||
mod windows;
|
||||
mod widget;
|
||||
mod navigator;
|
||||
mod theme;
|
||||
mod args;
|
||||
mod error;
|
||||
mod navigator;
|
||||
mod rdf;
|
||||
mod theme;
|
||||
mod widget;
|
||||
mod windows;
|
||||
|
||||
use std::fs::File;
|
||||
use crate::app::Publisher;
|
||||
use crate::args::{AppArgs, Command};
|
||||
use clap::Parser;
|
||||
use gl_graph::inference::InferenceEngine;
|
||||
use gl_search::SearchIndex;
|
||||
use iced::futures::StreamExt;
|
||||
use ldp::middleware::BasicAuthMiddleware;
|
||||
use ldp::reqwest::{Client, Url};
|
||||
@@ -16,23 +19,24 @@ use ldp::reqwest_middleware::ClientBuilder;
|
||||
use ldp::traverse::Traverse;
|
||||
use oxigraph::io::{RdfFormat, RdfParser, RdfSerializer};
|
||||
use oxigraph::model::{Dataset, GraphName, NamedNode, Quad, Triple};
|
||||
use oxigraph::sparql::{QueryResults, SparqlEvaluator};
|
||||
use oxigraph::sparql::results::{QueryResultsFormat, QueryResultsSerializer};
|
||||
use oxigraph::sparql::{QueryResults, SparqlEvaluator};
|
||||
use oxigraph::store::Store;
|
||||
use std::fs::File;
|
||||
use tracing::{debug_span, error, field};
|
||||
use crate::app::Publisher;
|
||||
use tracing_subscriber::fmt::format::FmtSpan;
|
||||
use tracing_subscriber::layer::SubscriberExt;
|
||||
use tracing_subscriber::util::SubscriberInitExt;
|
||||
use tracing_subscriber::{EnvFilter, fmt};
|
||||
use tracing_subscriber::fmt::format::FmtSpan;
|
||||
use gl_graph::inference::InferenceEngine;
|
||||
use gl_search::SearchIndex;
|
||||
use crate::args::{AppArgs, Command};
|
||||
|
||||
fn main() -> color_eyre::Result<()> {
|
||||
let appender = tracing_appender::rolling::never("/tmp", "publisher-log");
|
||||
tracing_subscriber::registry()
|
||||
.with(fmt::layer().with_span_events(FmtSpan::CLOSE).with_writer(appender))
|
||||
.with(
|
||||
fmt::layer()
|
||||
.with_span_events(FmtSpan::CLOSE)
|
||||
.with_writer(appender),
|
||||
)
|
||||
.with(EnvFilter::from_default_env())
|
||||
.init();
|
||||
color_eyre::install()?;
|
||||
@@ -48,7 +52,10 @@ fn main() -> color_eyre::Result<()> {
|
||||
let store = Store::open("/home/alex/.local/share/org.graphofliberty.desktop/ontology")?;
|
||||
let inference_engine = InferenceEngine::new(store.clone());
|
||||
|
||||
let graph_name = GraphName::NamedNode(NamedNode::new_unchecked(format!("file://{}", args.dataset_path.to_string_lossy())));
|
||||
let graph_name = GraphName::NamedNode(NamedNode::new_unchecked(format!(
|
||||
"file://{}",
|
||||
args.dataset_path.to_string_lossy()
|
||||
)));
|
||||
let dataset = RdfParser::from_format(RdfFormat::Turtle)
|
||||
.with_default_graph(graph_name)
|
||||
.for_reader(File::open(&args.dataset_path)?)
|
||||
@@ -57,11 +64,13 @@ fn main() -> color_eyre::Result<()> {
|
||||
let dataset_with_inferences = inference_engine.run(&dataset)?;
|
||||
|
||||
let raw_query = String::from_utf8(std::fs::read(&args.query_path)?)?;
|
||||
let mut query = SparqlEvaluator::new()
|
||||
.parse_query(&raw_query)?;
|
||||
let mut query = SparqlEvaluator::new().parse_query(&raw_query)?;
|
||||
query.dataset_mut().set_default_graph_as_union();
|
||||
|
||||
match query.on_queryable_dataset(&dataset_with_inferences).execute()? {
|
||||
match query
|
||||
.on_queryable_dataset(&dataset_with_inferences)
|
||||
.execute()?
|
||||
{
|
||||
QueryResults::Graph(graph) => {
|
||||
let mut serializer = RdfSerializer::from_format(RdfFormat::Turtle)
|
||||
.with_prefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#")?
|
||||
@@ -78,15 +87,20 @@ fn main() -> color_eyre::Result<()> {
|
||||
serializer.finish()?;
|
||||
}
|
||||
QueryResults::Solutions(solutions) => {
|
||||
let json_serializer = QueryResultsSerializer::from_format(QueryResultsFormat::Json);
|
||||
let mut writer = json_serializer.serialize_solutions_to_writer(std::io::stdout(), Vec::from_iter(solutions.variables().iter().cloned()))?;
|
||||
let json_serializer =
|
||||
QueryResultsSerializer::from_format(QueryResultsFormat::Json);
|
||||
let mut writer = json_serializer.serialize_solutions_to_writer(
|
||||
std::io::stdout(),
|
||||
Vec::from_iter(solutions.variables().iter().cloned()),
|
||||
)?;
|
||||
for solution in solutions.filter_map(Result::ok) {
|
||||
writer.serialize(&solution)?;
|
||||
}
|
||||
writer.finish()?;
|
||||
}
|
||||
QueryResults::Boolean(result) => {
|
||||
let json_serializer = QueryResultsSerializer::from_format(QueryResultsFormat::Json);
|
||||
let json_serializer =
|
||||
QueryResultsSerializer::from_format(QueryResultsFormat::Json);
|
||||
json_serializer.serialize_boolean_to_writer(std::io::stdout(), result)?;
|
||||
}
|
||||
}
|
||||
@@ -108,7 +122,11 @@ fn main() -> color_eyre::Result<()> {
|
||||
|
||||
{
|
||||
let span = debug_span!("Index Schema", documents = field::Empty).entered();
|
||||
let count = gl_search::rdf::index_schema(store, &*gl_search::language::ENGLISH_OR_UNTAGGED, &writer)?;
|
||||
let count = gl_search::rdf::index_schema(
|
||||
store,
|
||||
&*gl_search::language::ENGLISH_OR_UNTAGGED,
|
||||
&writer,
|
||||
)?;
|
||||
span.record("documents", count);
|
||||
}
|
||||
|
||||
@@ -140,8 +158,17 @@ fn main() -> color_eyre::Result<()> {
|
||||
let inferences = inference_engine.run(&dataset).unwrap();
|
||||
dataset.extend(&inferences);
|
||||
|
||||
let span = debug_span!("Index Repository", rdf_sources = field::Empty, documents = field::Empty).entered();
|
||||
let document_count = gl_search::rdf::index_entity(&dataset, &*gl_search::language::ENGLISH_OR_UNTAGGED, &writer)?;
|
||||
let span = debug_span!(
|
||||
"Index Repository",
|
||||
rdf_sources = field::Empty,
|
||||
documents = field::Empty
|
||||
)
|
||||
.entered();
|
||||
let document_count = gl_search::rdf::index_entity(
|
||||
&dataset,
|
||||
&*gl_search::language::ENGLISH_OR_UNTAGGED,
|
||||
&writer,
|
||||
)?;
|
||||
span.record("rdf_sources", rdf_source_count);
|
||||
span.record("documents", document_count);
|
||||
|
||||
@@ -149,9 +176,7 @@ fn main() -> color_eyre::Result<()> {
|
||||
});
|
||||
|
||||
let mut writer = runtime.block_on(traversal_task)??;
|
||||
debug_span!("Commit").in_scope(|| {
|
||||
writer.commit()
|
||||
})?;
|
||||
debug_span!("Commit").in_scope(|| writer.commit())?;
|
||||
}
|
||||
None => {
|
||||
iced::daemon(Publisher::new, Publisher::update, Publisher::view)
|
||||
|
||||
Reference in New Issue
Block a user