From be8ee67e1baa85e1705b64ce0eafb0df07e54d30 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 26 Feb 2021 16:50:04 +0100 Subject: [PATCH 1/5] Reindex complex publications on excerpt change --- .../display/everytime/article_custom_fields.n3 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 38ffd54e..1ed67b67 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 @@ -1,4 +1,6 @@ @prefix : . +@prefix searchIndex: . + @prefix rdfs: . :vivodocumentModifier_excerptsInArticles @@ -19,6 +21,20 @@ ?elenphExcerpt ?property ?value . } """ . + +:vivoUriFinder_excerptsInComplexPublications + a searchIndex:indexing.IndexingUriFinder , + searchIndex:indexing.SelectQueryUriFinder ; + rdfs:label "When excerpts change" ; + :hasSelectQuery """ + PREFIX ts: + SELECT ?uri + WHERE { + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?subject . + } + """ . + :vivodocumentModifier_PopulateText a , From 6e0eb8cb01b185cc42510363004e6bbb4614f08d Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 26 Feb 2021 16:51:46 +0100 Subject: [PATCH 2/5] Rename prefix --- .../everytime/article_custom_fields.n3 | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 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 1ed67b67..f4be593c 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 @@ -10,14 +10,14 @@ :hasTargetField "ALLTEXT" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts: PREFIX rdf: SELECT DISTINCT ?value WHERE { - ?uri rdf:type ts_:elenphArticle . - ?uri ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . - VALUES ?property { ts_:works ts_:bibliography ts_:htmlExcerpt ts_:keywords } + ?uri rdf:type ts:elenphArticle . + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . + VALUES ?property { ts:works ts:bibliography ts:htmlExcerpt ts:keywords } ?elenphExcerpt ?property ?value . } """ . @@ -43,20 +43,20 @@ :hasTargetField "text" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts: PREFIX rdf: SELECT DISTINCT ?htmlExcerpt WHERE { { - ?uri rdf:type ts_:textExcerpt . - ?uri ts_:htmlExcerpt ?htmlExcerpt . + ?uri rdf:type ts:textExcerpt . + ?uri ts:htmlExcerpt ?htmlExcerpt . } UNION { - ?uri rdf:type ts_:publication . - ?uri ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?artExcerpt . - ?artExcerpt ts_:htmlExcerpt ?htmlExcerpt . + ?uri rdf:type ts:publication . + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?artExcerpt . + ?artExcerpt ts:htmlExcerpt ?htmlExcerpt . } } """ . @@ -68,21 +68,21 @@ :hasTargetField "rubrics" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts: PREFIX rdf: PREFIX pr: SELECT DISTINCT ?rubric WHERE { { - ?uri rdf:type ts_:elenphExcerpt . + ?uri rdf:type ts:elenphExcerpt . ?uri pr:belongsTo ?assignedRubric . ?assignedRubric (pr:hasParent)* ?rubric . } UNION { - ?uri rdf:type ts_:elenphArticle . - ?uri ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?artExcerpt . + ?uri rdf:type ts:elenphArticle . + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?artExcerpt . ?artExcerpt pr:belongsTo ?assignedRubric . ?assignedRubric (pr:hasParent)* ?rubric . } @@ -111,20 +111,20 @@ :hasTargetField "keywords" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts: PREFIX rdf: SELECT DISTINCT ?keywords WHERE { { - ?uri rdf:type ts_:elenphArticle . - ?uri ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . - ?elenphExcerpt ts_:keywords ?keywords . + ?uri rdf:type ts:elenphArticle . + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . + ?elenphExcerpt ts:keywords ?keywords . } UNION { - ?uri rdf:type ts_:elenphExcerpt . - ?uri ts_:keywords ?keywords . + ?uri rdf:type ts:elenphExcerpt . + ?uri ts:keywords ?keywords . } } """ . @@ -136,20 +136,20 @@ :hasTargetField "bibliography" ; :hasSelectQuery """ PREFIX rdfs: - PREFIX ts_: + PREFIX ts: PREFIX rdf: SELECT DISTINCT ?bibliography WHERE { { - ?uri rdf:type ts_:elenphArticle . - ?uri ts_:hasTOC ?toc . - ?toc (ts_:hasTOCItem/ts_:pointsTo)+/ts_:hasText ?elenphExcerpt . - ?elenphExcerpt ts_:bibliography ?bibliography . + ?uri rdf:type ts:elenphArticle . + ?uri ts:hasTOC ?toc . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . + ?elenphExcerpt ts:bibliography ?bibliography . } UNION { - ?uri rdf:type ts_:elenphExcerpt . - ?uri ts_:bibliography ?bibliography . + ?uri rdf:type ts:elenphExcerpt . + ?uri ts:bibliography ?bibliography . } } """ . From 032667a87e8dc8cca4699df049c132bd2750a1ba Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 26 Feb 2021 16:57:25 +0100 Subject: [PATCH 3/5] Add excerpts of any complex publication to ALLTEXT field --- .../rdf/display/everytime/article_custom_fields.n3 | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 f4be593c..b10a3587 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 @@ -3,10 +3,10 @@ @prefix rdfs: . -:vivodocumentModifier_excerptsInArticles +:vivodocumentModifier_excerptsInComplexPublications a , ; - rdfs:label "Elenph article excerpts" ; + rdfs:label "Populate complex publications with excerpts" ; :hasTargetField "ALLTEXT" ; :hasSelectQuery """ PREFIX rdfs: @@ -14,11 +14,10 @@ PREFIX rdf: SELECT DISTINCT ?value WHERE { - ?uri rdf:type ts:elenphArticle . ?uri ts:hasTOC ?toc . - ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?elenphExcerpt . + ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?excerpt . VALUES ?property { ts:works ts:bibliography ts:htmlExcerpt ts:keywords } - ?elenphExcerpt ?property ?value . + ?excerpt ?property ?value . } """ . From b851995e60fbd5764fb83fe625701d41c359f82f Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 26 Feb 2021 17:37:43 +0100 Subject: [PATCH 4/5] 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 , ; 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 . } } From 67c7d2c363765692f00e973d7f4acb8afacb621f Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Fri, 26 Feb 2021 22:00:00 +0100 Subject: [PATCH 5/5] Temporary hack --- .../display/everytime/article_custom_fields.n3 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 ad6512e9..3bc0bb3a 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,7 +33,20 @@ ?toc (ts:hasTOCItem/ts:pointsTo)+/ts:hasText ?subject . } """ . - + +:vivoUriFinder_onRubricsAssign + a searchIndex:indexing.IndexingUriFinder , + searchIndex:indexing.SelectQueryUriFinder ; + rdfs:label "When rubric was assigned" ; + :hasSelectQuery """ + PREFIX ts: + SELECT ?uri + WHERE { + ?subject a ts:textExcerpt . + VALUES ?uri { ?subject } + } + """ . + :vivodocumentModifier_PopulateTextWithHTMLContentsOfExcerpts a , ;