From 9d9d936046e883a6003982128208a33e22f997e7 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Fri, 26 Feb 2021 17:37:43 +0100
Subject: [PATCH] Rewrite indexing rules for more generic cases

---
 .../display/everytime/article_custom_fields.n3  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 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 b10a3587..ad6512e9 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
@@ -33,9 +33,8 @@
           ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?subject .
         }
         """ .
-
         
-:vivodocumentModifier_PopulateText
+:vivodocumentModifier_PopulateTextWithHTMLContentsOfExcerpts
     a   <java:edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding.SelectQueryDocumentModifier> ,
         <java:edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding.DocumentModifier> ;
     rdfs:label "Html text to text field" ;
@@ -52,10 +51,10 @@
                 } 
                  UNION
                 {
-                 ?uri rdf:type ts:publication .
+                 ?uri rdf:type ts:complexPublication .
                  ?uri ts:hasTOC ?toc .
-                 ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?artExcerpt .
-                 ?artExcerpt ts:htmlExcerpt ?htmlExcerpt .
+                 ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt .
+                 ?excerpt ts:htmlExcerpt ?htmlExcerpt .
                 }
         } 
         """ .
@@ -73,16 +72,16 @@
         SELECT DISTINCT ?rubric
         WHERE {
                 {
-                 ?uri rdf:type ts:elenphExcerpt .
+                 ?uri rdf:type ts:textExcerpt .
                  ?uri pr:belongsTo ?assignedRubric .
                  ?assignedRubric (pr:hasParent)* ?rubric .
                 } 
                  UNION
                 {
-                 ?uri rdf:type ts:elenphArticle .
+                 ?uri rdf:type ts:complexPublication .
                  ?uri ts:hasTOC ?toc .
-                 ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?artExcerpt .
-                 ?artExcerpt pr:belongsTo ?assignedRubric .
+                 ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt .
+                 ?excerpt pr:belongsTo ?assignedRubric .
                  ?assignedRubric (pr:hasParent)* ?rubric .
                 }
         }