From 0627efe79962194c35b0064a3dbabb1ddc020a34 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 13 Aug 2020 19:36:57 +0200
Subject: [PATCH] Modified ontology

---
 .../rdf/display/everytime/elenphExcerptDataGetters.n3       | 3 ++-
 .../resources/rdf/display/everytime/rubricDataGetters.n3    | 6 ++++--
 .../webapp/templates/freemarker/elenphExcerpt-internal.ftl  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3
index dfe1e141..bf9c94e7 100644
--- a/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/elenphExcerptDataGetters.n3
@@ -21,7 +21,8 @@ display:getExcerptAssignedArticlesDataGetter
         SELECT DISTINCT ?articleName ?articleUri
         WHERE {
               ?articleUri rdf:type ts_:elenphArticle .
-              ?articleUri (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?individualURI .
+              ?articleUri ts_:hasTOC ?toc .
+              ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?individualURI .
               ?articleUri rdfs:label ?articleName .
         } ORDER BY ?articleName
         """ .
diff --git a/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3 b/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3
index 526282df..e17d13c8 100644
--- a/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3
+++ b/home/src/main/resources/rdf/display/everytime/rubricDataGetters.n3
@@ -31,7 +31,8 @@ display:getArticlesWithChildRubricDataGetter
           ?rubric (pr:hasParent)+ ?individualURI .
           ?excerpt pr:belongsTo ?rubric .
           ?excerpt rdf:type ts_:elenphExcerpt .
-          ?childArticleID (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt .
+          ?childArticleID ts_:hasTOC ?toc .
+          ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt .
           ?childArticleID rdfs:label ?childArticleName .
           ?childArticleID rdf:type ts_:elenphArticle .
         } ORDER BY ?childArticleName
@@ -51,7 +52,8 @@ display:getArticlesWithRubricDataGetter
         WHERE {
           ?excerpt pr:belongsTo ?individualURI .
           ?excerpt rdf:type ts_:elenphExcerpt .
-          ?articleID (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt .
+          ?articleID  ts_:hasTOC ?toc .
+          ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?excerpt .
           ?articleID rdfs:label ?articleName .
           ?articleID rdf:type ts_:elenphArticle .
         } ORDER BY ?articleName
diff --git a/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl b/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
index b4a88bba..cdc49ba0 100644
--- a/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/elenphExcerpt-internal.ftl
@@ -121,7 +121,7 @@
     </#if>
   
   <#assign rubrics = propertyGroups.pullProperty("https://iph.ras.ru/relationships#belongsTo")!>
-  <#if rubrics?has_content >
+  <#if rubrics?has_content>
     <div class="label">Относится к: <@p.addLink rubrics editable /> <@p.verboseDisplay rubrics /> </div>
       <#if rubrics.statements?has_content >
         <div class="rubrics" style="list-style:none;">