From fa486ecf8a26a539f952bb921c06ba66c2887754 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Thu, 13 Aug 2020 18:21:03 +0200 Subject: [PATCH] Modifications for fixed ontology --- .../everytime/article_custom_fields.n3 | 17 ++++---- .../everytime/elenphArticleDataGetters.n3 | 42 +++++++++++-------- .../everytime/elenphExcerptDataGetters.n3 | 6 +-- .../display/everytime/rubricDataGetters.n3 | 12 +++--- .../tbox/firsttime/elenphArticle-template.n3 | 2 +- .../tbox/firsttime/elenphExcerpt-template.n3 | 2 +- .../templates/freemarker/elenphAritcle.ftl | 6 +-- .../freemarker/elenphExcerpt-internal.ftl | 12 +++--- .../freemarker/elenphExcerptShortView.ftl | 8 ++-- 9 files changed, 58 insertions(+), 49 deletions(-) diff --git a/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 b/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 index c6bb0f6c..0804d0f9 100644 --- a/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 +++ b/home/src/main/resources/rdf/display/everytime/article_custom_fields.n3 @@ -8,12 +8,13 @@ :hasTargetField "ALLTEXT" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?elenphExcerpt ?property ?value WHERE { ?uri rdf:type ts_:elenphArticle . - ?uri (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ?property ?value . } """ . @@ -25,7 +26,7 @@ :hasTargetField "semantic_marks" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: PREFIX pr: SELECT DISTINCT ?rubric @@ -58,13 +59,14 @@ :hasTargetField "keywords" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?keywords WHERE { { ?uri rdf:type ts_:elenphArticle . - ?uri (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ts_:keywords ?keywords . } UNION @@ -82,13 +84,14 @@ :hasTargetField "bibliography" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?bibliography WHERE { { ?uri rdf:type ts_:elenphArticle . - ?uri (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?uri ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ts_:bibliography ?bibliography . } UNION diff --git a/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 index 15529683..d2cc48af 100644 --- a/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/elenphArticleDataGetters.n3 @@ -3,19 +3,19 @@ @prefix rdfs: . @prefix vitro: . @prefix xsd: . -@prefix ts_: . +@prefix ts_: . @prefix display: . - display:hasDataGetter display:getArticleExcerptsContentDataGetter . + display:hasDataGetter display:getArticleExcerptsContentDataGetter . - display:hasDataGetter display:getArticleExcerptPathsDataGetter . + display:hasDataGetter display:getArticleExcerptPathsDataGetter . - display:hasDataGetter display:getArticleWorksDataGetter . + display:hasDataGetter display:getArticleWorksDataGetter . - display:hasDataGetter display:getArticleBibliographyDataGetter . + display:hasDataGetter display:getArticleBibliographyDataGetter . - display:hasDataGetter display:getArticleAuthorsDataGetter . + display:hasDataGetter display:getArticleAuthorsDataGetter . display:getArticleExcerptsContentDataGetter a ; @@ -23,10 +23,11 @@ display:getArticleExcerptsContentDataGetter display:query """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: SELECT ?elenphExcerpt ?property ?value WHERE { - ?individualURI (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ?property ?value . } ORDER BY ?elenphExcerpt """ . @@ -38,10 +39,11 @@ display:getArticleExcerptPathsDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: SELECT (GROUP_CONCAT(substr(concat("000",str(?outline)),strlen(str(?outline))); SEPARATOR = ".") AS ?path ) ?tocElement ?elenphExcerpt WHERE { - ?individualURI ts_:hasTOCItem/(ts_:pointsTo/ts_:hasTOCItem)* ?tmpTOCItem . + ?individualURI ts_:hasTOC ?toc . + ?toc ts_:hasTOCItem/(ts_:pointsTo/ts_:hasTOCItem)* ?tmpTOCItem . ?tmpTOCItem rdf:type ts_:TOCItem . ?tmpTOCItem ts_:pointsTo/(ts_:hasTOCItem/ts_:pointsTo)* ?tocElement . ?tmpTOCItem ts_:itemNumber ?outline . @@ -51,8 +53,9 @@ display:getArticleExcerptPathsDataGetter { SELECT ?elenphArticle ?tocElement WHERE { - ?individualURI (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . - ?tocElement rdf:type ts_:TOCElement . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+ ?tocElement . + ?tocElement rdf:type ts_:TOCLevel . ?individualURI rdf:type ts_:elenphArticle . } } @@ -65,11 +68,12 @@ display:getArticleBibliographyDataGetter display:query """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?bibliography WHERE { - ?individualURI (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ts_:bibliography ?bibliography . } ORDER BY ?bibliography """ . @@ -80,11 +84,12 @@ display:getArticleWorksDataGetter display:query """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?works WHERE { - ?individualURI (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ts_:works ?works . } ORDER BY ?works """ . @@ -95,11 +100,12 @@ display:getArticleAuthorsDataGetter display:query """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?author WHERE { - ?individualURI (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . + ?individualURI ts_:hasTOC ?toc . + ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . ?elenphExcerpt ts_:author ?author . } ORDER BY ?author """ . diff --git a/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3 index 99c1d792..dfe1e141 100644 --- a/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3 @@ -3,11 +3,11 @@ @prefix rdfs: . @prefix vitro: . @prefix xsd: . -@prefix ts_: . +@prefix ts_: . @prefix display: . - display:hasDataGetter display:getExcerptAssignedArticlesDataGetter . + display:hasDataGetter display:getExcerptAssignedArticlesDataGetter . display:getExcerptAssignedArticlesDataGetter @@ -16,7 +16,7 @@ display:getExcerptAssignedArticlesDataGetter display:query """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts_: PREFIX rdf: SELECT DISTINCT ?articleName ?articleUri WHERE { diff --git a/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3 index d95d033f..526282df 100644 --- a/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3 +++ b/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3 @@ -3,7 +3,7 @@ @prefix rdfs: . @prefix vitro: . @prefix xsd: . -@prefix ts_: . +@prefix ts_: . @prefix display: . @@ -24,7 +24,7 @@ display:getArticlesWithChildRubricDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: PREFIX pr: SELECT DISTINCT ?childArticleID ?childArticleName WHERE { @@ -45,7 +45,7 @@ display:getArticlesWithRubricDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: PREFIX pr: SELECT DISTINCT ?articleID ?articleName WHERE { @@ -64,7 +64,7 @@ display:getChildRubricsDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: PREFIX pr: SELECT DISTINCT ?rubricID ?rubricName WHERE { @@ -82,7 +82,7 @@ display:getExcerptsWithRubricsChildsDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: PREFIX pr: SELECT DISTINCT ?childExcerptID ?childExcerptName WHERE { @@ -100,7 +100,7 @@ display:getExcerptsWithRubricDataGetter """ PREFIX rdfs: PREFIX rdf: - PREFIX ts_: + PREFIX ts_: PREFIX pr: SELECT DISTINCT ?excerptID ?excerptName WHERE { diff --git a/home/src/main/resources/rdf/tbox/firsttime/elenphArticle-template.n3 b/home/src/main/resources/rdf/tbox/firsttime/elenphArticle-template.n3 index 97061317..080da042 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/elenphArticle-template.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/elenphArticle-template.n3 @@ -1,5 +1,5 @@ @prefix vitro: . @prefix xsd: . -@prefix ts_: . +@prefix ts_: . ts_:elenphArticle vitro:customDisplayViewAnnot "elenphAritcle.ftl"^^xsd:string . diff --git a/home/src/main/resources/rdf/tbox/firsttime/elenphExcerpt-template.n3 b/home/src/main/resources/rdf/tbox/firsttime/elenphExcerpt-template.n3 index 05ca36a4..39c80dc3 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/elenphExcerpt-template.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/elenphExcerpt-template.n3 @@ -1,5 +1,5 @@ @prefix vitro: . @prefix xsd: . -@prefix ts_: . +@prefix ts_: . ts_:elenphExcerpt vitro:customDisplayViewAnnot "elenphExcerpt.ftl"^^xsd:string . diff --git a/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl b/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl index e57cf337..0989303e 100644 --- a/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl +++ b/webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl @@ -29,7 +29,7 @@ ${scripts.add('