diff --git a/README.md b/README.md index c91f0de7..748733e0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # VIVO: Connect, Share, Discover +[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) + VIVO is an open source semantic web tool for research discovery -- finding people and the research they do. VIVO supports editing, searching, browsing and visualizing research activity in order to discover people, programs, diff --git a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java index 4d78f904..e6ebe67a 100644 --- a/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java +++ b/api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java @@ -58,12 +58,12 @@ public class AgrovocService implements ExternalConceptService { protected final String dbpedia_endpoint = " http://dbpedia.org/sparql"; // URL to get all the information for a concept - protected final String conceptSkosMosBase = "http://artemide.art.uniroma2.it:8081/skosmos/rest/v1/"; + protected final String conceptSkosMosBase = "http://agrovoc.uniroma2.it/agrovoc/rest/v1/"; protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?"; protected final String conceptSkosMosURL = conceptSkosMosBase + "data?"; @Override public List getConcepts(String term) throws Exception { - List conceptList = new ArrayList(); + List conceptList = new ArrayList<>(); //For the RDF webservices mechanism, utilize the following /* @@ -86,7 +86,7 @@ public class AgrovocService implements ExternalConceptService { return conceptList; int conceptCounter = 0; - HashSet encounteredURI = new HashSet(); + HashSet encounteredURI = new HashSet<>(); // Loop through each of these URIs and load using the SKOSManager for (String conceptUri : conceptUris) { @@ -185,7 +185,7 @@ public class AgrovocService implements ExternalConceptService { public List getConceptsByURIWithSparql(String uri) throws Exception { // deprecating this method...just return an empty list - List conceptList = new ArrayList(); + List conceptList = new ArrayList<>(); return conceptList; } @@ -227,7 +227,7 @@ public class AgrovocService implements ExternalConceptService { // When utilizing the getTermExpansion method, will get a list of URIs back // and not just one URI protected List getConceptURIsListFromRDF(String rdf) { - List conceptUris = new ArrayList(); + List conceptUris = new ArrayList<>(); try { Document doc = XMLUtils.parse(rdf); NodeList nodes = doc.getElementsByTagName("skos:Concept"); @@ -262,21 +262,21 @@ public class AgrovocService implements ExternalConceptService { + "> rdfs:comment ?description . \n" + "FILTER (LANG(?description)='en' ) \n" + "}"; // System.out.println(qs); - List resultList = new ArrayList(); + List resultList = new ArrayList<>(); QueryExecution qexec = null; try { Query query = QueryFactory.create(qs); qexec = QueryExecutionFactory.sparqlService(this.dbpedia_endpoint, query); qexec.setTimeout(5000, TimeUnit.MILLISECONDS); - resultList = new ArrayList(); + resultList = new ArrayList<>(); ResultSet resultSet = qexec.execSelect(); int resultSetSize = 0; while (resultSet.hasNext()) { resultSetSize++; QuerySolution solution = resultSet.nextSolution(); Iterator varnames = solution.varNames(); - HashMap hm = new HashMap(); + HashMap hm = new HashMap<>(); while (varnames.hasNext()) { String name = (String) varnames.next(); RDFNode rdfnode = solution.get(name); @@ -374,7 +374,7 @@ public class AgrovocService implements ExternalConceptService { //JSON-LD array private List getConceptURIsListFromSkosMosResult(String results) { - List conceptURIs = new ArrayList(); + List conceptURIs = new ArrayList<>(); ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results); //Format should be: { ..."results":["uri":uri...] if (json.has("results")) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java index 7b9f6c36..ea5d56dd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/ajax/GeoFocusMapLocations.java @@ -31,8 +31,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder { + "PREFIX core: \n" + "PREFIX foaf: \n" + "PREFIX vivoc: \n" - + "PREFIX afn: " - + "SELECT DISTINCT ?label ?location (afn:localname(?location) AS ?localName) (COUNT(DISTINCT ?person) AS ?count) \n" + + "SELECT DISTINCT ?label ?location (REPLACE(STR(?location),\"^.*(#)(.*)$\", \"$2\") AS ?localName) (COUNT(DISTINCT ?person) AS ?count) \n" + "WHERE { { \n" + " ?location rdf:type core:GeographicRegion . \n" + " ?location rdfs:label ?label . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java index 37da3f2b..6a5024b0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java @@ -69,7 +69,6 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet { + "PREFIX core: \n" + "PREFIX rdfs: \n" + "PREFIX vitro: \n" - + "PREFIX afn: \n" + "SELECT DISTINCT ?subclass ?role (str(?label2) as ?label) ?activity ?hideThis WHERE { \n" + " ?subject ?role . \n" + " ?role a core:ResearcherRole . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java index 2029d788..dc68d76d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java @@ -69,7 +69,6 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet + "PREFIX core: \n" + "PREFIX rdfs: \n" + "PREFIX vitro: \n" - + "PREFIX afn: \n" + "PREFIX foaf: \n" + "SELECT DISTINCT ?subclass ?position ?positionLabel (str(?label) as ?name) ?person ?hideThis WHERE { \n" + " ?subject core:relatedBy ?position . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java index dd4f339d..6e003852 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePublicationsForIndividualController.java @@ -69,7 +69,6 @@ public class ManagePublicationsForIndividualController extends FreemarkerHttpSer + "PREFIX core: \n" + "PREFIX rdfs: \n" + "PREFIX vitro: \n" - + "PREFIX afn: \n" + "SELECT DISTINCT ?subclass ?authorship (str(?label) as ?title) ?pub ?hideThis WHERE { \n" + " ?subject core:relatedBy ?authorship . \n" + " ?authorship a core:Authorship . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java index 52ca4d18..baf0b552 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java @@ -346,7 +346,6 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator private static String AUTHORSHIPS_MODEL = " \n" + "PREFIX core: \n" - + "PREFIX afn: \n" + "PREFIX rdfs: \n" + "PREFIX foaf: \n" + "PREFIX vcard: \n" @@ -412,11 +411,10 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator private static String AUTHORSHIPS_QUERY = " \n" + "PREFIX core: \n" - + "PREFIX afn: \n" + "PREFIX rdfs: \n" + "PREFIX foaf: \n" + "PREFIX vcard: \n" - + "SELECT ?authorshipURI (afn:localname(?authorshipURI) AS ?authorshipName) ?authorURI ?authorName ?rank \n" + + "SELECT ?authorshipURI (REPLACE(STR(?authorshipURI),\"^.*(#)(.*)$\", \"$2\") AS ?authorshipName) ?authorURI ?authorName ?rank \n" + "WHERE { { \n" + " ?subject core:relatedBy ?authorshipURI . \n" + " ?authorshipURI a core:Authorship . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java index 56835612..dad9147f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorsToInformationResourceGenerator.java @@ -309,7 +309,6 @@ public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator private static String EDITORSHIPS_MODEL = "" + "PREFIX core: \n" - + "PREFIX afn: \n" + "PREFIX rdfs: \n" + "PREFIX foaf: \n" + "CONSTRUCT\n" @@ -347,10 +346,9 @@ public class AddEditorsToInformationResourceGenerator extends VivoBaseGenerator private static String EDITORSHIPS_QUERY = "" + "PREFIX core: \n" - + "PREFIX afn: \n" + "PREFIX rdfs: \n" + "PREFIX foaf: \n" - + "SELECT ?editorshipURI (afn:localname(?editorshipURI) AS ?editorshipName) ?editorURI ?editorName ?rank \n" + + "SELECT ?editorshipURI (REPLACE(STR(?editorshipURI),\"^.*(#)(.*)$\", \"$2\") AS ?editorshipName) ?editorURI ?editorName ?rank \n" + "WHERE { \n" + "?subject core:relatedBy ?editorshipURI . \n" + "?editorshipURI a core:Editorship . \n" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java index b6103813..6ff33808 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java @@ -41,7 +41,6 @@ public class QueryConstants { put("vivo", "http://vivo.library.cornell.edu/ns/0.1#"); put("geo", "http://aims.fao.org/aos/geopolitical.owl#"); put("public", "http://vitro.mannlib.cornell.edu/ns/vitro/public#"); - put("afn", "http://jena.apache.org/ARQ/function#"); put("vivosocnet", "http://vivo.cns.iu.edu/ns/#"); put("obo", "http://purl.obolibrary.org/obo/"); put("vcard", "http://www.w3.org/2006/vcard/ns#"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index c59d355b..d9d39201 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -8,6 +8,7 @@ import java.util.Map; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData; import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData; import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.jena.query.Dataset; @@ -73,23 +74,40 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { String visMode = vitroRequest.getParameter( VisualizationFrameworkConstants.VIS_MODE_KEY); - - return generateStandardVisualizationForPersonLevelVis(vitroRequest, - log, dataset, egoURI, visMode); - + + if (!StringUtils.isEmpty(egoURI)) { + return generateStandardVisualizationForPersonLevelVis(vitroRequest, + log, dataset, egoURI, visMode); + } else { + return UtilityFunctions.handleMalformedParameters( + "Visualization Query Error", + "Inappropriate query parameters were submitted.", + vitroRequest); + } + } @Override public ResponseValues generateVisualizationForShortURLRequests( Map parameters, VitroRequest vitroRequest, Log log, Dataset dataset) throws MalformedQueryParametersException { - - return generateStandardVisualizationForPersonLevelVis( - vitroRequest, - log, - dataset, - parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY), - parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY)); + + String egoURI = parameters.get(VisualizationFrameworkConstants.INDIVIDUAL_URI_KEY); + String visMode = parameters.get(VisualizationFrameworkConstants.VIS_MODE_KEY); + + if (!StringUtils.isEmpty(egoURI)) { + return generateStandardVisualizationForPersonLevelVis( + vitroRequest, + log, + dataset, + egoURI, + visMode); + } else { + return UtilityFunctions.handleMalformedParameters( + "Visualization Query Error", + "Inappropriate query parameters were submitted.", + vitroRequest); + } } private ResponseValues generateStandardVisualizationForPersonLevelVis( diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index 3a5c862e..f665b0fc 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -7,6 +7,11 @@ # Save a copy of this file as runtime.properties in your VIVO home directory, # and edit the properties as needed for your installation. # +# For more information on specific properties, see the configuration reference +# or installation options section of the technical documentation for the +# version of VIVO you are running: +# https://wiki.duraspace.org/display/VIVO/VIVO+Technical+Documentation +# # ----------------------------------------------------------------------------- @@ -295,8 +300,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # # When the following flag is set to enabled, the VIVO home page displays a # global map highlighting the geographical focus of foaf:person individuals. - # For information on the maps, refer to this wiki page: - # https://wiki.duraspace.org/x/c4XVAw # #homePage.geoFocusMaps=enabled @@ -306,9 +309,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # and a "quick" page view that emphasizes the individual's webpage presence. # Implementing this feature requires an installation to develop a web service # that captures images of web pages or to use an existing service outside of VIVO. - # - # For more information on implementing multiple profile pages, refer to this - # wiki page: https://wiki.duraspace.org/x/doXVAw # #multiViews.profilePageTypes=enabled @@ -317,9 +317,6 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # Tell VIVO to generate HTTP headers on its responses to facilitate caching the # profile pages that it creates. # - # For more information, see this wiki page: - # https://wiki.duraspace.org/x/5sQQAg - # # Developers will likely want to leave caching disabled, since a change to a # Freemarker template or to a Java class would not cause the page to be # considered stale. diff --git a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 index b295cf53..90d360bd 100644 --- a/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 +++ b/home/src/main/resources/rdf/display/everytime/searchIndexerConfigurationVivo.n3 @@ -23,6 +23,7 @@ searchIndex:documentBuilding.DocumentModifier , searchIndex:extensions.LabelsAcrossContextNodes ; rdfs:label "Labels across relatedBy/relates" ; + :hasTypeRestriction "http://vivoweb.org/ontology/core#Relationship" ; :hasIncomingProperty "http://vivoweb.org/ontology/core#relatedBy" ; :hasOutgoingProperty "http://vivoweb.org/ontology/core#relates" . @@ -150,4 +151,3 @@ ?emailHolder vcard:email ?email . } """ . - diff --git a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl index 95a07eaa..cffee159 100644 --- a/home/src/main/resources/rdf/tbox/filegraph/vivo.owl +++ b/home/src/main/resources/rdf/tbox/filegraph/vivo.owl @@ -1911,12 +1911,16 @@ there is a measurement process p that has specified output m, a measurement datu - has collaborator - + + + has collaborator + Fran has collaborator Jim, they work together regularly. + + Two agents are collaborators if they work together to produce common results. + PERSON: Michael Conlon + Merriam Webster (https://www.merriam-webster.com/dictionary/collaborator) - - diff --git a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 index 63b9dc73..c23d014e 100644 --- a/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 +++ b/home/src/main/resources/rdf/tbox/firsttime/vitroAnnotations.n3 @@ -1,107 +1,107 @@ @prefix bibo: . @prefix cito: . @prefix c4o: . -@prefix dcterms: . -@prefix event: . +@prefix dcterms: . +@prefix event: . @prefix fabio: . @prefix foaf: . -@prefix geo: . +@prefix geo: . @prefix obo: . -@prefix ocrer: . -@prefix ocresd: . -@prefix ocresp: . -@prefix ocrest: . +@prefix ocrer: . +@prefix ocresd: . +@prefix ocresp: . +@prefix ocrest: . @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix ro: . -@prefix scires: . -@prefix skos: . +@prefix ro: . +@prefix scires: . +@prefix skos: . @prefix swo: . @prefix vann: . -@prefix vcard: . +@prefix vcard: . @prefix vitro: . @prefix vitro-public: . @prefix vivo: . @prefix xsd: . -bibo: + rdfs:label "Bibliographic Ontology"@en-US ; vitro:ontologyPrefixAnnot "bibo" . -skos: + rdfs:label "SKOS (Simple Knowledge Organization System)"@en-US ; vitro:ontologyPrefixAnnot "skos" . -vivo: + rdfs:label "VIVO Core Ontology"@en-US ; vitro:ontologyPrefixAnnot "vivo" . -ocrer: + rdfs:label "OCRe Research"@en-US ; vitro:ontologyPrefixAnnot "ocrer" . -ocresd: + rdfs:label "OCRe Study Design"@en-US ; vitro:ontologyPrefixAnnot "ocresd" . -ocresp: + rdfs:label "OCRe Study Protocol"@en-US ; vitro:ontologyPrefixAnnot "ocresp" . -ocrest: + rdfs:label "OCRe Statistics"@en-US ; vitro:ontologyPrefixAnnot "ocresst" . -geo: + rdfs:label "Geopolitical Ontology"@en-US ; vitro:ontologyPrefixAnnot "geo" . -event: + rdfs:label "Event Ontology"@en-US ; vitro:ontologyPrefixAnnot "event" . -obo: + rdfs:label "OBO Foundry"@en-US ; vitro:ontologyPrefixAnnot "obo" . -vcard: + rdfs:label "VCard"@en-US ; vitro:ontologyPrefixAnnot "vcard" . -foaf: + rdfs:label "FOAF (Friend of a Friend)"@en-US ; vitro:ontologyPrefixAnnot "foaf" . -scires: + rdfs:label "VIVO Scientific Research Ontology"@en-US ; vitro:ontologyPrefixAnnot "scires" . -fabio: + rdfs:label "FaBiO (FRBR-Aligned Bibliographic Ontology)"@en-US ; vitro:ontologyPrefixAnnot "fabio" . -c4o: + rdfs:label "Citation Counting and Context Characterization Ontology"@en-US ; vitro:ontologyPrefixAnnot "c4o" . -cito: + rdfs:label "CiTO (Citation Typing Ontology)"@en-US ; vitro:ontologyPrefixAnnot "cito" . -dcterms: + rdfs:label "Dublin Core Terms"@en-US ; vitro:ontologyPrefixAnnot "dcterms" . -vann: + rdfs:label "Vocabulary for Annotating Vocabulary Descriptions"@en-US ; vitro:ontologyPrefixAnnot "vann" . -ro: + rdfs:label "Relations Ontology"@en-US ; vitro:ontologyPrefixAnnot "ro" . -swo: + rdfs:label "Software Ontology"@en-US ; vitro:ontologyPrefixAnnot "swo" . @@ -1730,7 +1730,9 @@ vivo:outreachOverview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "Please enter a single summary narrative of your outreach goals and/or contributions"^^xsd:string . + "Please enter a single summary narrative of your outreach goals and/or contributions"^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . obo:ERO_0000031 vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1912,7 +1914,9 @@ bibo:abstract vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "A summary of the resource."^^xsd:string . + "A summary of the resource."^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:PrincipalInvestigatorRole vitro:displayLimitAnnot @@ -2141,7 +2145,9 @@ vivo:teachingOverview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "Please enter a single narrative summary description of your teaching activities, goals, and/or experience"^^xsd:string . + "Please enter a single narrative summary description of your teaching activities, goals, and/or experience"^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:rank vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -2268,7 +2274,9 @@ vivo:overview vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; vitro:publicDescriptionAnnot - "A short narrative summary to be used as a single descriptive overview statement."^^xsd:string . + "A short narrative summary to be used as a single descriptive overview statement."^^xsd:string ; + vitro:editing + "HTML"^^xsd:string . vivo:description vitro:displayLimitAnnot @@ -5405,7 +5413,9 @@ vivo:researchOverview vitro:inPropertyGroupAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + ; + vitro:editing + "HTML"^^xsd:string . obo:ERO_0000390 vitro:displayLimitAnnot diff --git a/installer/home/pom.xml b/installer/home/pom.xml index 86ca2270..ed362430 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -58,9 +58,9 @@ run - + - + diff --git a/installer/pom.xml b/installer/pom.xml index 24e42269..e51aa26e 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -64,7 +64,7 @@ maven-compiler-plugin - 3.5.1 + 3.8.0 maven-dependency-plugin diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 82f1f54b..3e9ea3a6 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -84,9 +84,9 @@ run - + - + diff --git a/pom.xml b/pom.xml index 83469b14..eee33cf9 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -167,18 +179,6 @@ ${javadoc.opts} - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-gpg-plugin @@ -202,22 +202,28 @@ true + + + + + + jdk8 + + 1.8 + + + 9+181-r4173-1 + + + - org.codehaus.mojo - buildnumber-maven-plugin - - - validate - - create - - - + org.apache.maven.plugins + maven-compiler-plugin - false - false - 7 - Detached + true + + -J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar + @@ -269,23 +275,36 @@ 1.8 1.8 UTF-8 - javac-with-errorprone - true + + -XDcompilePolicy=simple + -Xplugin:ErrorProne + + + + com.google.errorprone + error_prone_core + 2.3.2 + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + 7 + Detached - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.8 - - - - com.google.errorprone - error_prone_core - 2.1.1 - - org.apache.maven.plugins @@ -314,7 +333,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.0 org.apache.maven.plugins diff --git a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml index d8331a7a..57320ed9 100644 --- a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml @@ -6,7 +6,7 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> @@ -31,7 +31,7 @@ ?adviseeRole a core:AdviseeRole . ?adviseeRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - LET ( ?localName := afn:localname(?advisingRel) ) + LET ( ?localName := REPLACE(STR(?advisingRel),"^.*(#)(.*)$", "$2") ) OPTIONAL { ?subject ?property ?adviseeRole . ?adviseeRole a core:AdviseeRole . diff --git a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml index 03e0c8d4..689f8ab8 100644 --- a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml @@ -6,7 +6,6 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX afn: <http://jena.apache.org/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> @@ -31,7 +30,7 @@ ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . - LET ( ?localName := afn:localname(?advisingRel) ) + LET ( ?localName := REPLACE(STR(?advisingRel),"^.*(#)(.*)$", "$2") ) OPTIONAL { ?subject ?property ?advisorRole . ?advisorRole a core:AdvisorRole . diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml index 65fecfbe..cc614d4c 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml @@ -7,7 +7,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + SELECT DISTINCT ?dateTimeInterval ?label ?valueStart ?valueStartName @@ -24,7 +24,7 @@ OPTIONAL { ?subject ?property ?dateTimeInterval . ?dateTimeInterval core:start ?valueStart . - LET (?valueStartName := afn:localname(?valueStart)) + LET (?valueStartName := REPLACE(STR(?valueStart),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?dateTimeInterval . @@ -35,13 +35,13 @@ ?subject ?property ?dateTimeInterval . ?dateTimeInterval core:start ?valueStart . ?valueStart core:dateTimePrecision ?dateTimePrecisionStart . - LET (?precisionStart := afn:localname(?dateTimePrecisionStart)) + LET (?precisionStart := REPLACE(STR(?dateTimePrecisionStart),"^.*(#)(.*)$", "$2")) } } OPTIONAL { ?subject ?property ?dateTimeInterval . ?dateTimeInterval core:end ?valueEnd . - LET (?valueEndName := afn:localname(?valueEnd)) + LET (?valueEndName := REPLACE(STR(?valueEnd),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?dateTimeInterval . ?dateTimeInterval core:end ?valueEnd . @@ -51,7 +51,7 @@ ?subject ?property ?dateTimeInterval . ?dateTimeInterval core:end ?valueEnd . ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd . - LET (?precisionEnd := afn:localname(?dateTimePrecisionEnd)) + LET (?precisionEnd := REPLACE(STR(?dateTimePrecisionEnd),"^.*(#)(.*)$", "$2")) } } OPTIONAL { diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml index 249836ee..59c77030 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml @@ -7,10 +7,10 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + SELECT DISTINCT ?dateTimeValue - (afn:localname(?dateTimePrecision) AS ?precision) + (REPLACE(STR(?dateTimePrecision),"^.*(#)(.*)$", "$2") AS ?precision) ?dateTime WHERE { ?subject ?property ?dateTimeValue . diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml index ac2128c8..46d9825f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-default.xml +++ b/webapp/src/main/webapp/config/listViewConfig-default.xml @@ -7,7 +7,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -25,7 +25,7 @@ WHERE { ?subject ?property ?object . - LET (?localName := afn:localname(?object)) + LET (?localName := REPLACE(STR(?object), "^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?object . @@ -57,7 +57,7 @@ } - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) # Order by ?type is important, because if the object has more than one mostSpecificType, diff --git a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml index 2ac5658d..c7ede94f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml +++ b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml @@ -7,7 +7,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -26,7 +26,7 @@ { ?subject ?property ?object . ?object a ?objectType . - LET (?localName := afn:localname(?object)) + LET (?localName := REPLACE(STR(?object),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?object . @@ -63,7 +63,7 @@ ?object a ?objectType . ?object a ?subclass . } - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) # Order by ?type is important, because if the object has more than one mostSpecificType, diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml index 5dc30ebe..c7c036f2 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml @@ -8,12 +8,12 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vivo: <http://vivoweb.org/ontology/core#> PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + SELECT ?concept ?conceptLabel ?conceptName ?vocabularySource ?vocabularySourceName WHERE { ?subject ?property ?concept . - LET (?conceptName := afn:localname(?concept)) + LET (?conceptName := REPLACE(STR(?concept),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?concept . ?concept rdfs:label ?conceptLabel . diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml index 70bb38b2..4bc8616f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vivo: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> @@ -55,7 +55,7 @@ } - LET (?event1Name := afn:localname(?event1)) + LET (?event1Name := REPLACE(STR(?event1),"^.*(#)(.*)$", "$2")) OPTIONAL { diff --git a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 720a3879..5c53b029 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -32,7 +32,7 @@ ?role core:relatedBy ?activity . ?activity a core:Contract . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) . + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) . } OPTIONAL { ?subject ?property ?role . @@ -40,7 +40,7 @@ ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) . + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) . } OPTIONAL { ?subject ?property ?role . diff --git a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml index 0586eab0..f5a204df 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -14,7 +14,7 @@ ?role ?subclassLabel ?activity - (afn:localname(?activity) AS ?activityLocal) + (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal) ?activityName ?dateTimeStart ?dateTimeEnd diff --git a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml index f4549c46..e6e6eac4 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -32,7 +32,7 @@ ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?activity a core:Contract . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) } OPTIONAL { ?subject ?property ?role . @@ -57,7 +57,7 @@ ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?activity a core:Grant . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) } OPTIONAL { ?subject ?property ?role . diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml index d83fb462..c14ca951 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml @@ -8,7 +8,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vivo: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> @@ -38,7 +38,7 @@ ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . ?presentation rdfs:label ?presentationLabel . - LET (?presentationName := afn:localname(?presentation)) + LET (?presentationName := REPLACE(STR(?presentation),"^.*(#)(.*)$", "$2")) } OPTIONAL { ?subject ?property ?role . diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml index c120ea34..d7742082 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -34,7 +34,7 @@ ?role core:relatedBy ?activity . ?activity a core:Contract . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) . + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) . } OPTIONAL { ?subject ?property ?role . @@ -59,7 +59,7 @@ ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) . + LET (?activityName := REPLACE(STR(?activity),"^.*(#)(.*)$", "$2")) . } OPTIONAL { ?subject ?property ?role . diff --git a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml index 76642ecc..81e587c2 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml @@ -5,7 +5,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -14,7 +14,7 @@ ?role ?subclassLabel ?activity - (afn:localname(?activity) AS ?activityLocal) + (REPLACE(STR(?activity),"^.*(#)(.*)$", "$2") AS ?activityLocal) ?activityName ?dateTimeStart ?dateTimeEnd diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml index 58100245..9c1a98fb 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml @@ -64,7 +64,7 @@ bind ( COALESCE(?firstName, "") As ?firstName1) . bind ( COALESCE(?middleName, "") As ?middleName1) . bind ( COALESCE(?lastName, "") As ?lastName1) . - bind (concat(str(?lastName1 + ", "),str(?firstName1 + " "),str(?middleName1)) as ?authorName) . + bind (concat(str(?lastName1),", ",str(?firstName1)," ",str(?middleName1)) as ?authorName) . OPTIONAL { ?subject ?property ?authorship . diff --git a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml index d4d93eb0..0cc27b44 100644 --- a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml +++ b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml @@ -6,7 +6,7 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> @@ -26,7 +26,7 @@ WHERE { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . - LET (?issuedCredentialLocal := afn:localname(?issuedCredential)) + LET (?issuedCredentialLocal := REPLACE(STR(?issuedCredential),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . @@ -39,7 +39,7 @@ ?credential a core:Credential . ?credential core:relatedBy ?issuedCredential . ?credential rdfs:label ?credentialLabel . - LET (?credentialLocal := afn:localname(?credential)) + LET (?credentialLocal := REPLACE(STR(?credential),"^.*(#)(.*)$", "$2")) } OPTIONAL { ?subject ?property ?issuedCredential . diff --git a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml index 969bcb8f..236fde80 100644 --- a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml +++ b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml @@ -7,7 +7,7 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> @@ -24,7 +24,7 @@ WHERE { ?subject ?property ?object . - LET (?localName := afn:localname(?object)) + LET (?localName := REPLACE(STR(?object),"^.*(#)(.*)$", "$2")) OPTIONAL { ?subject ?property ?object . @@ -50,7 +50,7 @@ } - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + FILTER ( REPLACE(STR(?subclass),"^(.*)(#)(.*)$", "$1$2") != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) # Order by ?type is important, because if the object has more than one mostSpecificType, diff --git a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml index 9d3a7df8..55bbe9b7 100644 --- a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml @@ -8,7 +8,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> @@ -18,7 +18,7 @@ ?property ?role ?roleLabel ?roleTypeLabel - ?indivInRole (afn:localname(?indivInRole) AS ?indivName) + ?indivInRole (REPLACE(STR(?indivInRole),"^.*(#)(.*)$", "$2") AS ?indivName) ?indivLabel ?dateTimeInterval ?dateTimeStart ?dateTimeEnd ?objectType WHERE { diff --git a/webapp/src/main/webapp/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml index 31db7f01..9fb75901 100644 --- a/webapp/src/main/webapp/config/listViewConfig-webpage.xml +++ b/webapp/src/main/webapp/config/listViewConfig-webpage.xml @@ -7,13 +7,13 @@ - PREFIX afn: <http://jena.apache.org/ARQ/function#> + PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> SELECT ?vcard ?link - (afn:localname(?link) AS ?linkName) + (REPLACE(STR(?link),"^.*(#)(.*)$", "$2") AS ?linkName) (group_concat(distinct ?linkLabel;separator="/") as ?label) ?url ?rank diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index 516a9566..73a7b1bf 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -137,8 +137,10 @@ <#assign plumIdParam = "isbn=${statement.isbn13}"> <#elseif statement.oclc??> <#assign plumIdParam = "oclc=${statement.oclc}"> + <#else> + <#assign plumIdParam = ""> - <#if plumIdParam??> + <#if plumIdParam?has_content>
- -<#-- VIVO-specific default data property statement template. - - This template must be self-contained and not rely on other variables set for the individual page, because it - is also used to generate the property statement during a deletion. - --> -<#import "lib-datetime.ftl" as dt> -<#import "lib-meta-tags.ftl" as lmt> -<#if property.rangeDatatypeURI?? && property.rangeDatatypeURI?contains("#")> - <#assign datatype = property.rangeDatatypeURI?substring(property.rangeDatatypeURI?last_index_of("#")+1) /> -<#else> - <#assign datatype = "none" /> - -<@showStatement statement property datatype /> - -<#macro showStatement statement property datatype> - <#assign theValue = statement.value /> - - <#if theValue?contains("