From ba0c291ccd8fe68fc17b5bbe07b27a93e586888c Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Wed, 1 Jun 2016 09:27:53 -0400 Subject: [PATCH 1/5] VIVO-1247, remove duplicate code used with ConfigurationBeanLoader. Now that the @Property annotation includes cardinality parameters, we can remove a lot of duplicate code. --- .../extensions/LabelsAcrossContextNodes.java | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java index c1d8c7f9..5ebb2fde 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java @@ -104,31 +104,19 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder, this.rdfService = models.getRDFService(); } - @Property(uri = "http://www.w3.org/2000/01/rdf-schema#label") + @Property(uri = "http://www.w3.org/2000/01/rdf-schema#label", maxOccurs = 1) public void setLabel(String l) { label = l; } - @Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasIncomingProperty") + @Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasIncomingProperty", minOccurs = 1, maxOccurs = 1) public void setIncomingProperty(String incomingUri) { - if (incomingPropertyUri == null) { - incomingPropertyUri = incomingUri; - } else { - throw new IllegalStateException( - "Configuration includes multiple declarations for hasIncomingProperty: " - + incomingPropertyUri + ", and " + incomingUri); - } + incomingPropertyUri = incomingUri; } - @Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasOutgoingProperty") + @Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasOutgoingProperty", minOccurs = 1, maxOccurs = 1) public void setOutgoingProperty(String outgoingUri) { - if (outgoingPropertyUri == null) { - outgoingPropertyUri = outgoingUri; - } else { - throw new IllegalStateException( - "Configuration includes multiple declarations for hasOutgoingProperty: " - + outgoingPropertyUri + ", and " + outgoingUri); - } + outgoingPropertyUri = outgoingUri; } @Property(uri = "http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationSetup#hasTypeRestriction") @@ -149,14 +137,6 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder, formatRestrictions(typeRestrictions), formatRestrictions(contextNodeClasses)); } - if (incomingPropertyUri == null) { - throw new IllegalStateException( - "Configuration did not declare hasIncomingProperty."); - } - if (outgoingPropertyUri == null) { - throw new IllegalStateException( - "Configuration did not declare hasOutgoingProperty."); - } } private String formatRestrictions(Set uris) { From ef643dfcfea03b38693554bff8b2e31bb3a0f749 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Fri, 5 Jan 2018 11:34:17 -0500 Subject: [PATCH 2/5] Remove hard-coded fake "version" parameters on script requests. These were inserted in order to defeat the user's browser cache one time. They had outlived their usefulness even prior to VIVO-1405. --- .../body/individual/individual--foaf-person-2column.ftl | 2 +- .../templates/freemarker/page/partials/geoFocusMapScripts.ftl | 4 ++-- .../webapp/themes/tenderfoot/templates/page/page-home.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 0cff8120..462b0d29 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -201,7 +201,7 @@ ${headScripts.add('', '', '', - '', + '', '', '', '', diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl index ce8bed22..de3b9224 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl @@ -8,5 +8,5 @@ - - + + diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl index 5b8e920b..f99c886c 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl @@ -21,7 +21,7 @@ <#if geoFocusMapsEnabled > <#include "geoFocusMapScripts.ftl"> - + diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index 74e2aa36..de94554e 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -21,7 +21,7 @@ <#if geoFocusMapsEnabled > <#include "geoFocusMapScripts.ftl"> - + From 513c084883dac0bc2520c130fbc826345515e3fb Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Wed, 10 Jan 2018 08:57:51 -0500 Subject: [PATCH 3/5] VIVO-1408 Use prefix to simplify JAVA class URIs --- .../config/example.applicationSetup.n3 | 49 ++++++++------- .../searchIndexerConfigurationVivo.n3 | 63 ++++++++++--------- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3 index cba4dc17..0d079ad5 100644 --- a/home/src/main/resources/config/example.applicationSetup.n3 +++ b/home/src/main/resources/config/example.applicationSetup.n3 @@ -11,6 +11,7 @@ # ------------------------------------------------------------------------------ @prefix : . +@prefix vitroWebapp: . # ---------------------------- # @@ -19,8 +20,8 @@ # :application - a , - ; + a vitroWebapp:application.ApplicationImpl , + vitroWebapp:modules.Application ; :hasSearchEngine :instrumentedSearchEngineWrapper ; :hasSearchIndexer :basicSearchIndexer ; :hasImageProcessor :iioImageProcessor ; @@ -35,8 +36,8 @@ # :iioImageProcessor - a , - . + a vitroWebapp:imageprocessor.imageio.IIOImageProcessor , + vitroWebapp:modules.imageProcessor.ImageProcessor . # ---------------------------- # @@ -46,8 +47,8 @@ # :ptiFileStorage - a , - . + a vitroWebapp:filestorage.impl.FileStorageImplWrapper , + vitroWebapp:modules.fileStorage.FileStorage . # ---------------------------- # @@ -58,13 +59,13 @@ # :instrumentedSearchEngineWrapper - a , - ; + a vitroWebapp:searchengine.InstrumentedSearchEngineWrapper , + vitroWebapp:modules.searchEngine.SearchEngine ; :wraps :solrSearchEngine . :solrSearchEngine - a , - . + a vitroWebapp:searchengine.solr.SolrSearchEngine , + vitroWebapp:modules.searchEngine.SearchEngine . # ---------------------------- # @@ -74,8 +75,8 @@ # :basicSearchIndexer - a , - ; + a vitroWebapp:searchindex.SearchIndexerImpl , + vitroWebapp:modules.searchIndexer.SearchIndexer ; :threadPoolSize "10" . # ---------------------------- @@ -89,26 +90,26 @@ # :sdbContentTripleSource - a , - . + a vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB , + vitroWebapp:modules.tripleSource.ContentTripleSource . #:tdbContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # May be an absolute path, or relative to the Vitro home directory. # :hasTdbDirectory "tdbContentModels" . #:sparqlContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.sparql.ContentTripleSourceSPARQL , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # The URI of the SPARQL endpoint for your triple-store. # :hasEndpointURI "PUT_YOUR_SPARQL_ENDPOINT_URI_HERE" ; # # The URI to use for SPARQL UPDATE calls against your triple-store. # :hasUpdateEndpointURI "PUT_THE UPDATE_URI_HERE" . #:virtuosoContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.virtuoso.ContentTripleSourceVirtuoso , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # The URI where Virtuoso can be accessed: don't include the /sparql path. # :hasBaseURI "http://localhost:8890" ; # # The name and password of a Virtuoso account that has the SPARQL_UPDATE role. @@ -124,8 +125,8 @@ # :tdbConfigurationTripleSource - a , - . + a vitroWebapp:triplesource.impl.tdb.ConfigurationTripleSourceTDB , + vitroWebapp:modules.tripleSource.ConfigurationTripleSource . # ---------------------------- # @@ -135,5 +136,5 @@ # :jfactTBoxReasonerModule - a , - . + a vitroWebapp:tboxreasoner.impl.jfact.JFactTBoxReasonerModule , + vitroWebapp:modules.tboxreasoner.TBoxReasonerModule . diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 index e71c39dc..b295cf53 100644 --- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 +++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 @@ -1,5 +1,6 @@ @prefix : . @prefix rdfs: . +@prefix searchIndex: . # @@ -8,8 +9,8 @@ # :vivoSearchExcluder_namespaceExcluder - a , - ; + a searchIndex:exclusions.ExcludeBasedOnNamespace , + searchIndex:exclusions.SearchIndexExcluder ; :excludes "http://purl.obolibrary.org/obo/" . @@ -18,9 +19,9 @@ # Most context nodes look like this: relatedBy ==> node ==> relates # relates <== node <== relatedBy :extension_forContextNodes - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across relatedBy/relates" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#relatedBy" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#relates" . @@ -28,17 +29,17 @@ # Some roles look like this: bearerOf ==> role ==> roleContributesTo # inheresIn <== role <== contributingRole :extension_forContextNodes_role_contributes_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/contributesTo" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#roleContributesTo" . :extension_forContextNodes_role_contributes_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across contributor/inheresIn" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#contributingRole" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -46,17 +47,17 @@ # Other roles look like this: bearerOf ==> role ==> realizedIn # inheresIn <== role <== realizes :extension_forContextNodes_role_realizedIn_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/realizedIn" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/BFO_0000054" . :extension_forContextNodes_role_realizedIn_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across realizes/inheresIn" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/BFO_0000055" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -64,17 +65,17 @@ # Roles on grants look like this: bearerOf ==> role ==> relatedBy # inheresIn <== role <== relates :extension_forContextNodes_roles_on_grants_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/relates" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#relatedBy" . :extension_forContextNodes_roles_on_grants_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across contributor/relatedBy" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#relates" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -83,14 +84,14 @@ # ------------------------------------ :vivodocumentModifier_calculateParameters - a , - . + a searchIndex:documentBuilding.CalculateParameters , + searchIndex:documentBuilding.DocumentModifier . # ------------------------------------ :vivoUriFinder_VCard - a , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:indexing.SelectQueryUriFinder ; rdfs:label "Preferred title" ; :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#title" ; :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#email" ; @@ -116,8 +117,8 @@ """ . :vivodocumentModifier_PreferredTitle - a , - ; + a searchIndex:documentBuilding.SelectQueryDocumentModifier , + searchIndex:documentBuilding.DocumentModifier ; rdfs:label "Preferred title" ; :hasTargetField "ALLTEXT" ; :hasTargetField "ALLTEXTUNSTEMMED" ; @@ -135,8 +136,8 @@ """ . :vivodocumentModifier_EmailAddress - a , - ; + a searchIndex:documentBuilding.SelectQueryDocumentModifier , + searchIndex:documentBuilding.DocumentModifier ; rdfs:label "Email address" ; :hasSelectQuery """ PREFIX vcard: From 71dfb305307f052010b6d2580b52d8c534927fa2 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Wed, 10 Jan 2018 10:06:59 -0500 Subject: [PATCH 4/5] VIVO-1408 Use prefix to simplify JAVA class URIs --- .../config/example.applicationSetup.n3 | 49 ++++++++------- .../searchIndexerConfigurationVivo.n3 | 63 ++++++++++--------- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3 index cba4dc17..0d079ad5 100644 --- a/home/src/main/resources/config/example.applicationSetup.n3 +++ b/home/src/main/resources/config/example.applicationSetup.n3 @@ -11,6 +11,7 @@ # ------------------------------------------------------------------------------ @prefix : . +@prefix vitroWebapp: . # ---------------------------- # @@ -19,8 +20,8 @@ # :application - a , - ; + a vitroWebapp:application.ApplicationImpl , + vitroWebapp:modules.Application ; :hasSearchEngine :instrumentedSearchEngineWrapper ; :hasSearchIndexer :basicSearchIndexer ; :hasImageProcessor :iioImageProcessor ; @@ -35,8 +36,8 @@ # :iioImageProcessor - a , - . + a vitroWebapp:imageprocessor.imageio.IIOImageProcessor , + vitroWebapp:modules.imageProcessor.ImageProcessor . # ---------------------------- # @@ -46,8 +47,8 @@ # :ptiFileStorage - a , - . + a vitroWebapp:filestorage.impl.FileStorageImplWrapper , + vitroWebapp:modules.fileStorage.FileStorage . # ---------------------------- # @@ -58,13 +59,13 @@ # :instrumentedSearchEngineWrapper - a , - ; + a vitroWebapp:searchengine.InstrumentedSearchEngineWrapper , + vitroWebapp:modules.searchEngine.SearchEngine ; :wraps :solrSearchEngine . :solrSearchEngine - a , - . + a vitroWebapp:searchengine.solr.SolrSearchEngine , + vitroWebapp:modules.searchEngine.SearchEngine . # ---------------------------- # @@ -74,8 +75,8 @@ # :basicSearchIndexer - a , - ; + a vitroWebapp:searchindex.SearchIndexerImpl , + vitroWebapp:modules.searchIndexer.SearchIndexer ; :threadPoolSize "10" . # ---------------------------- @@ -89,26 +90,26 @@ # :sdbContentTripleSource - a , - . + a vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB , + vitroWebapp:modules.tripleSource.ContentTripleSource . #:tdbContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # May be an absolute path, or relative to the Vitro home directory. # :hasTdbDirectory "tdbContentModels" . #:sparqlContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.sparql.ContentTripleSourceSPARQL , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # The URI of the SPARQL endpoint for your triple-store. # :hasEndpointURI "PUT_YOUR_SPARQL_ENDPOINT_URI_HERE" ; # # The URI to use for SPARQL UPDATE calls against your triple-store. # :hasUpdateEndpointURI "PUT_THE UPDATE_URI_HERE" . #:virtuosoContentTripleSource -# a , -# ; +# a vitroWebapp:triplesource.impl.virtuoso.ContentTripleSourceVirtuoso , +# vitroWebapp:modules.tripleSource.ContentTripleSource ; # # The URI where Virtuoso can be accessed: don't include the /sparql path. # :hasBaseURI "http://localhost:8890" ; # # The name and password of a Virtuoso account that has the SPARQL_UPDATE role. @@ -124,8 +125,8 @@ # :tdbConfigurationTripleSource - a , - . + a vitroWebapp:triplesource.impl.tdb.ConfigurationTripleSourceTDB , + vitroWebapp:modules.tripleSource.ConfigurationTripleSource . # ---------------------------- # @@ -135,5 +136,5 @@ # :jfactTBoxReasonerModule - a , - . + a vitroWebapp:tboxreasoner.impl.jfact.JFactTBoxReasonerModule , + vitroWebapp:modules.tboxreasoner.TBoxReasonerModule . diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 index e71c39dc..b295cf53 100644 --- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 +++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 @@ -1,5 +1,6 @@ @prefix : . @prefix rdfs: . +@prefix searchIndex: . # @@ -8,8 +9,8 @@ # :vivoSearchExcluder_namespaceExcluder - a , - ; + a searchIndex:exclusions.ExcludeBasedOnNamespace , + searchIndex:exclusions.SearchIndexExcluder ; :excludes "http://purl.obolibrary.org/obo/" . @@ -18,9 +19,9 @@ # Most context nodes look like this: relatedBy ==> node ==> relates # relates <== node <== relatedBy :extension_forContextNodes - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across relatedBy/relates" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#relatedBy" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#relates" . @@ -28,17 +29,17 @@ # Some roles look like this: bearerOf ==> role ==> roleContributesTo # inheresIn <== role <== contributingRole :extension_forContextNodes_role_contributes_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/contributesTo" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#roleContributesTo" . :extension_forContextNodes_role_contributes_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across contributor/inheresIn" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#contributingRole" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -46,17 +47,17 @@ # Other roles look like this: bearerOf ==> role ==> realizedIn # inheresIn <== role <== realizes :extension_forContextNodes_role_realizedIn_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/realizedIn" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/BFO_0000054" . :extension_forContextNodes_role_realizedIn_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across realizes/inheresIn" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/BFO_0000055" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -64,17 +65,17 @@ # Roles on grants look like this: bearerOf ==> role ==> relatedBy # inheresIn <== role <== relates :extension_forContextNodes_roles_on_grants_1 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across bearerOf/relates" ; :hasIncomingProperty "http://purl.obolibrary.org/obo/RO_0000053" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#relatedBy" . :extension_forContextNodes_roles_on_grants_2 - a , - , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:documentBuilding.DocumentModifier , + searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across contributor/relatedBy" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#relates" ; :hasOutgoingProperty "http://purl.obolibrary.org/obo/RO_0000052" . @@ -83,14 +84,14 @@ # ------------------------------------ :vivodocumentModifier_calculateParameters - a , - . + a searchIndex:documentBuilding.CalculateParameters , + searchIndex:documentBuilding.DocumentModifier . # ------------------------------------ :vivoUriFinder_VCard - a , - ; + a searchIndex:indexing.IndexingUriFinder , + searchIndex:indexing.SelectQueryUriFinder ; rdfs:label "Preferred title" ; :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#title" ; :hasPredicateRestriction "http://www.w3.org/2006/vcard/ns#email" ; @@ -116,8 +117,8 @@ """ . :vivodocumentModifier_PreferredTitle - a , - ; + a searchIndex:documentBuilding.SelectQueryDocumentModifier , + searchIndex:documentBuilding.DocumentModifier ; rdfs:label "Preferred title" ; :hasTargetField "ALLTEXT" ; :hasTargetField "ALLTEXTUNSTEMMED" ; @@ -135,8 +136,8 @@ """ . :vivodocumentModifier_EmailAddress - a , - ; + a searchIndex:documentBuilding.SelectQueryDocumentModifier , + searchIndex:documentBuilding.DocumentModifier ; rdfs:label "Email address" ; :hasSelectQuery """ PREFIX vcard: From 2c6cf554f21fe81b92f405f8793876f49ce29985 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Wed, 10 Jan 2018 10:08:31 -0500 Subject: [PATCH 5/5] Revert "Remove hard-coded fake "version" parameters on script requests." This reverts commit ef643dfcfea03b38693554bff8b2e31bb3a0f749. --- .../body/individual/individual--foaf-person-2column.ftl | 2 +- .../templates/freemarker/page/partials/geoFocusMapScripts.ftl | 4 ++-- .../webapp/themes/tenderfoot/templates/page/page-home.ftl | 2 +- webapp/src/main/webapp/themes/wilma/templates/page-home.ftl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 462b0d29..0cff8120 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -201,7 +201,7 @@ ${headScripts.add('', '', '', - '', + '', '', '', '', diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl index de3b9224..ce8bed22 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/geoFocusMapScripts.ftl @@ -8,5 +8,5 @@ - - + + diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl index f99c886c..5b8e920b 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl @@ -21,7 +21,7 @@ <#if geoFocusMapsEnabled > <#include "geoFocusMapScripts.ftl"> - + diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index de94554e..74e2aa36 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -21,7 +21,7 @@ <#if geoFocusMapsEnabled > <#include "geoFocusMapScripts.ftl"> - +