From 88129af70e31ba5057457d49682f2ffe8407286b Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 25 Mar 2020 15:40:32 -0400 Subject: [PATCH 01/52] Layer uqam updates onto master (minus trailing whitespace) --- .../freemarker/BrowseController.java | 35 ++ .../freemarker/FreemarkerHttpServlet.java | 16 +- .../freemarker/HomePageController.java | 1 + .../freemarker/TemplateProcessingHelper.java | 8 + .../GetRandomSearchIndividualsByVClass.java | 5 +- .../vitro/webapp/dao/jena/JenaBaseDao.java | 9 + .../webapp/dao/jena/RDFServiceGraph.java | 11 +- .../vitro/webapp/dao/jena/SparqlGraph.java | 16 +- .../VTwo/AdditionsAndRetractions.java | 5 +- .../n3editing/VTwo/BaseEditElementVTwo.java | 8 +- .../VTwo/EditConfigurationUtils.java | 34 +- .../n3editing/VTwo/EditN3GeneratorVTwo.java | 2 + .../VTwo/MultiValueEditSubmission.java | 79 +++- .../edit/n3editing/VTwo/ProcessRdfForm.java | 142 ++++++- .../VTwo/fields/ChildVClassesWithParent.java | 52 ++- .../VTwo/fields/SelectListGeneratorVTwo.java | 162 ++++--- .../DefaultObjectPropertyFormGenerator.java | 9 +- .../EditRequestDispatchController.java | 40 +- .../controller/PostEditCleanupController.java | 8 +- .../controller/ProcessRdfFormController.java | 5 +- .../webapp/filters/PageRoutingFilter.java | 5 + .../config/FreemarkerConfiguration.java | 9 + .../vitro/webapp/rdfservice/RDFService.java | 8 + .../filter/LanguageFilteringRDFService.java | 27 +- .../impl/RDFServiceFactorySingle.java | 394 +++++++++--------- .../rdfservice/impl/RDFServiceImpl.java | 35 +- .../rdfservice/impl/jena/RDFServiceJena.java | 16 + .../impl/jena/model/RDFServiceModel.java | 209 +++++----- .../impl/logging/LoggingRDFService.java | 16 + .../FakeApplicationOntologyService.java | 27 +- .../servlet/setup/UpdateKnowledgeBase.java | 6 +- .../dataGetter/SparqlQueryDataGetter.java | 345 +++++++-------- .../utils/threads/VitroBackgroundThread.java | 4 + .../edit/EditConfigurationTemplateModel.java | 18 +- 34 files changed, 1132 insertions(+), 634 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java index 0ee20f2fe7..fcf655e366 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java @@ -3,6 +3,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,6 +44,8 @@ protected ResponseValues processRequest(VitroRequest vreq) { List groups = null; VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq); groups =vcgc.getGroups(); + Collections.sort(groups, publicNameComparator); +// sortGroupListByPublicName(groups); List vcgroups = new ArrayList(groups.size()); for (VClassGroup group : groups) { vcgroups.add(new VClassGroupTemplateModel(group)); @@ -50,4 +54,35 @@ protected ResponseValues processRequest(VitroRequest vreq) { return new TemplateResponseValues(templateName, body); } + public Comparator publicNameComparator = new Comparator() { + + public int compare(VClassGroup s1, VClassGroup s2) { + String groupName1 = s1.getPublicName().toUpperCase(); + String groupName2 = s2.getPublicName().toUpperCase(); + + //ascending order + return groupName1.compareTo(groupName2); + + //descending order + //return groupName2.compareTo(groupName1); + }}; + +// +// public void sortGroupListByPublicName(List groupList) { +// groupList.sort(new Comparator() { +// public int compare(VClassGroup first, VClassGroup second) { +// if (first != null) { +// if (second != null) { +// return (first.getDisplayRank() - second.getDisplayRank()); +// } else { +// log.error("error--2nd VClassGroup is null in VClassGroupDao.getGroupList().compare()"); +// } +// } else { +// log.error("error--1st VClassGroup is null in VClassGroupDao.getGroupList().compare()"); +// } +// return 0; +// } +// }); +// } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index bc7766e83f..975ee9768b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.nio.charset.Charset; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -17,7 +18,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import edu.cornell.mannlib.vitro.webapp.dao.jena.MenuDaoJena; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,6 +93,8 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException { super.doGet(request,response); +//UQAM set for UTF-8 + response.setCharacterEncoding("UTF-8"); VitroRequest vreq = new VitroRequest(request); ResponseValues responseValues = null; @@ -103,8 +105,8 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) if (!isAuthorizedToDisplayPage(request, response, requiredActions(vreq))) { return; } - responseValues = processRequest(vreq); + doResponse(vreq, response, responseValues); } catch (Throwable e) { @@ -256,7 +258,7 @@ private void doNotAuthorized(VitroRequest vreq, protected void doTemplate(VitroRequest vreq, HttpServletResponse response, ResponseValues values) throws TemplateProcessingException { - Map templateDataModel = new HashMap(); + Map templateDataModel = new HashMap(); templateDataModel.putAll(getPageTemplateValues(vreq)); // Add the values that we got from the subcontroller processRequest() method, and merge to the template. @@ -276,8 +278,14 @@ protected void doTemplate(VitroRequest vreq, HttpServletResponse response, // is specified in the main page template. bodyString = ""; } + + //UQAM Add linguistic control management + // String bodyStringUTF = new String(bodyString.getBytes(), Charset.forName("UTF-8")); templateDataModel.put("body", bodyString); + String lang = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); + templateDataModel.put("country", lang); + // Tell the template and any directives it uses that we're processing a page template. templateDataModel.put("templateType", PAGE_TEMPLATE_TYPE); @@ -462,7 +470,7 @@ private String normalizeServletName(String name) { protected MainMenu getDisplayModelMenu(VitroRequest vreq){ String url = vreq.getRequestURI().substring(vreq.getContextPath().length()); - return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(vreq, url); + return vreq.getWebappDaoFactory().getMenuDao().getMainMenu(url); } // NIHVIVO-3307: we need this here instead of FreemarkerConfiguration.java so that updates to diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java index 6f59dbd429..40472bf34f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java @@ -32,6 +32,7 @@ protected ResponseValues processRequest(VitroRequest vreq) throws InstantiationE Map body = new HashMap(); + List dgList = DataGetterUtils.getDataGettersForPage(vreq, vreq.getDisplayModel(), DisplayVocabulary.HOME_PAGE_URI); for( DataGetter dg : dgList){ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index 85d648f6b6..0159a72746 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -33,6 +34,8 @@ public StringWriter processTemplate(String templateName, Map map throws TemplateProcessingException { Template template = getTemplate(templateName); StringWriter sw = new StringWriter(); + + processTemplate(template, map, sw); return sw; } @@ -42,6 +45,10 @@ private void processTemplate(Template template, Map map, Writer try { Environment env = template.createProcessingEnvironment(map, writer); + /* + * UQAM Set encoding to UTF-8 for i18n special character + */ +// env.setOutputEncoding("utf-8"); // Define a setup template to be included by every page template String templateType = (String) map.get("templateType"); @@ -53,6 +60,7 @@ private void processTemplate(Template template, Map map, Writer // TODO clean this up VIVO-249 FreemarkerConfigurationImpl.retrieveAndRunDataGetters(env, template.getName()); + // Now process it. env.process(); } catch (TemplateException e) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java index 8f3aaa3119..d26f27efad 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -15,6 +16,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; +import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale; import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService; import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewService.ShortViewContext; import edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup; @@ -73,7 +75,8 @@ private String renderShortView(String individualUri, String vclassName) { modelMap.put("individual", IndividualTemplateModelBuilder.build(individual, vreq)); modelMap.put("vclass", vclassName); - + String langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); //UQAM build the linguistic context + modelMap.put("langCtx", langCtx); // UQAM add the linguistic context to map ShortViewService svs = ShortViewServiceSetup.getService(ctx); return svs.renderShortView(individual, ShortViewContext.BROWSE, modelMap, vreq); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index f96349bcf4..5713d2e5fc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -1,10 +1,12 @@ /* $This file is distributed under the terms of the license in LICENSE$ */ +// package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -780,6 +782,13 @@ private Literal getLabel(String lang, ListlabelList) { } if ((lang != null) && (lang.equals(labelLanguage))) { return labelLit; + } else + /* + * UQAM + * Check for country-part of lang (ex: 'en' for default consideration of labelLanguage in english but not encoded by 'en-US' most case of labels in vivo.owl) + */ + if ((lang != null) && (Arrays.asList(lang.split("-")).get(0).equals(labelLanguage))) { + return labelLit; } } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java index 4918584533..9c543f06fc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java @@ -290,10 +290,15 @@ public static String sparqlNode(Node node, String varName) { literalBuff.append("\""); pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); - if (node.getLiteralDatatypeURI() != null) { - literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); - } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) { + /* + * UQAM + * reversing the condition tests. + * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data + */ + if (!StringUtils.isEmpty(node.getLiteralLanguage())) { literalBuff.append("@").append(node.getLiteralLanguage()); + } else if (node.getLiteralDatatypeURI() != null) { + literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); } return literalBuff.toString(); } else { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java index 8b2ed8668a..50ace6c280 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java @@ -232,10 +232,20 @@ public static String sparqlNode(Node node, String varName) { literalBuff.append("\""); pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); - if (node.getLiteralDatatypeURI() != null) { - literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); - } else if (!StringUtils.isEmpty(node.getLiteralLanguage())) { + /* + * UQAM + * reversing the condition tests. + * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data + */ +// if (node.getLiteralDatatypeURI() != null) { +// literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); +// } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) { +// literalBuff.append("@").append(node.getLiteralLanguage()); +// } + if (!StringUtils.isEmpty(node.getLiteralLanguage())) { literalBuff.append("@").append(node.getLiteralLanguage()); + } else if (node.getLiteralDatatypeURI() != null) { + literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); } return literalBuff.toString(); } else { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java index 7c83d88225..fcb72e7ab2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java @@ -57,7 +57,8 @@ public String toString(){ str += "\nadditions:["; if( getAdditions() != null ) { StringWriter writer = new StringWriter(); - getAdditions().write(writer, "N3-PP"); + // UQAM Replacing N3-PP by N3 (N3-PP does not exist in Jena + getAdditions().write(writer, "N3"); str += "\n" + writer.toString() + "\n"; } str += "],\n"; @@ -65,7 +66,7 @@ public String toString(){ str += "\nretractions:["; if( getRetractions() != null ) { StringWriter writer = new StringWriter(); - getRetractions().write(writer, "N3-PP"); + getRetractions().write(writer, "N3"); str += "\n" + writer.toString() + "\n"; } str += "],\n"; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java index a3e90d0836..eb46ac1b96 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java @@ -4,6 +4,9 @@ import java.io.IOException; import java.io.StringWriter; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.commons.logging.Log; @@ -44,7 +47,10 @@ protected String merge(Configuration fmConfig, String templateName, Map map){ } catch (TemplateException | IOException e) { log.error(e,e); } - return writer.toString(); + String sWrite = writer.toString(); + + // String UTF8String = new String(sWrite.getBytes(), Charset.forName("UTF-8")); + return sWrite; } /** diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java index e72e172c13..cf5c4dcbb7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java @@ -28,6 +28,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption; import freemarker.template.Configuration; public class EditConfigurationUtils { @@ -62,6 +63,7 @@ public static String getRangeUri(VitroRequest vreq) { } public static VClass getRangeVClass(VitroRequest vreq) { + // This needs a WebappDaoFactory with no filtering/RDFService // funny business because it needs to be able to retrieve anonymous union // classes by their "pseudo-bnode URIs". @@ -71,6 +73,17 @@ public static VClass getRangeVClass(VitroRequest vreq) { return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq)); } + public static VClass getLangAwardRangeVClass(VitroRequest vreq) { + // UQAM + // + + // This needs a WebappDaoFactory with linguistic context filtering/RDFService + // funny business because it needs to be able to retrieve anonymous union + // classes by their "pseudo-bnode URIs". + // Someday we'll need to figure out a different way of doing this. + WebappDaoFactory ctxDaoFact = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); + return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq)); + } //get individual public static Individual getSubjectIndividual(VitroRequest vreq) { @@ -122,12 +135,24 @@ public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri, String domainUri, String rangeUri) { - WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + // WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + // UQAM Use linguistic context + WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs( predicateUri, domainUri, rangeUri); return objectProp; } + // UQAM Use linguistic context + public static ObjectProperty getObjectPropertyForPredicateLangAware(VitroRequest vreq, + String predicateUri, String domainUri, String rangeUri) { + // WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + // UQAM Use linguistic context + WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); + ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs( + predicateUri, domainUri, rangeUri); + return objectProp; + } public static DataProperty getDataPropertyForPredicate(VitroRequest vreq, String predicateUri) { WebappDaoFactory wdf = vreq.getWebappDaoFactory(); //TODO: Check reason for employing unfiltered webapp dao factory and note if using a different version @@ -205,6 +230,7 @@ public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) { return (op != null && dp == null); } + private static boolean isVitroLabel(String predicateUri) { return predicateUri.equals(VitroVocabulary.LABEL); } @@ -281,6 +307,12 @@ public static Map> getExistingUriValues(EditConfigurationVT public static String generateHTMLForElement(VitroRequest vreq, String fieldName, EditConfigurationVTwo editConfig) { String html = ""; Configuration fmConfig = FreemarkerConfiguration.getConfig(vreq); + /* + * UQAM, encoded ftl to UTF-8 + */ + // fmConfig.setDefaultEncoding("utf-8"); + // fmConfig.setOutputEncoding("utf-8"); + // fmConfig.setURLEscapingCharset("UTF-8"); FieldVTwo field = editConfig == null ? null : editConfig.getField(fieldName); MultiValueEditSubmission editSub = EditSubmissionUtils.getEditSubmissionFromSession(vreq.getSession(), editConfig); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java index 0156524458..b81ce06d55 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java @@ -366,6 +366,8 @@ protected static String formatLiteral(Literal literal) { sbuff.append("@") ; sbuff.append(lang) ; + // added by UQAM to exit at this point without adding datatype + return sbuff.toString() ; } // Format the datatype diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java index 8f61f48700..5810b3ea0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java @@ -25,6 +25,7 @@ import org.apache.jena.rdf.model.ResourceFactory; import org.apache.jena.vocabulary.XSD; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; @@ -34,21 +35,34 @@ public class MultiValueEditSubmission { private Map> literalsFromForm ; private Map> urisFromForm ; - private Map validationErrors; private BasicValidationVTwo basicValidation; - + private static DateTimeFormatter dformater = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:00"); + private static DateTimeFormatter dateFormater = DateTimeFormat.forPattern("yyyy-MM-dd"); private Map> filesFromForm; - private static Model literalCreationModel; - private String entityToReturnTo; + private VitroRequest _vreq; + private static final String DATE_TIME_URI = XSD.dateTime.getURI(); + private static final String DATE_URI = XSD.date.getURI(); + private static final String TIME_URI = XSD.time.getURI(); + static{ literalCreationModel = ModelFactory.createDefaultModel(); } - - public MultiValueEditSubmission(Map queryParameters, EditConfigurationVTwo editConfig){ + /* + * UQAM + * replace + * public MultiValueEditSubmission(Map queryParameters, EditConfigurationVTwo editConfig) + * by this new signature + * This affect PostEditCleanupController and ProcessRdfFormController classes. + * This replacement is justified by the fact that we need a linguistic context in this class. + */ + public MultiValueEditSubmission(VitroRequest vreq, EditConfigurationVTwo editConfig){ + // UQAM add this both lines + _vreq = vreq; + Map queryParameters = vreq.getParameterMap(); if( editConfig == null ) throw new Error("EditSubmission needs an EditConfiguration"); this.editKey = editConfig.getEditKey(); @@ -96,7 +110,8 @@ public MultiValueEditSubmission(Map queryParameters, EditConfi Map errors = basicValidation.validateUris( urisFromForm ); //Validate literals and add errors to the list of existing errors errors.putAll(basicValidation.validateLiterals( literalsFromForm )); - if( errors != null ) { + // UQAM Add empty contition + if( errors != null && !errors.isEmpty()) { validationErrors.putAll( errors); } @@ -141,9 +156,8 @@ protected void processEditElementFields(EditConfigurationVTwo editConfig, Map 0 ) return ResourceFactory.createLangLiteral(value, lang); + } + return literalCreationModel.createTypedLiteral(value, datatypeUri); + // UQAM take into account the linguistic context + } else if( lang != null && lang.length() > 0 ) + return ResourceFactory.createLangLiteral(value, lang); + return ResourceFactory.createPlainLiteral(value); + } public Map getValidationErrors(){ return validationErrors; @@ -264,12 +294,31 @@ public void addLiteralToForm(EditConfigurationVTwo editConfig, FieldVTwo field, for(String value:valueList) { value = N3EditUtils.stripInvalidXMLChars(value); //Add to array of literals corresponding to this variable + /* UQAM OLD if (!StringUtils.isEmpty(value)) { literalsArray.add(createLiteral( value, field.getRangeDatatypeUri(), field.getRangeLang())); } + */ + /* + * UQAM Replaced by this to take the linguistic context into consideration. + */ + if (!StringUtils.isEmpty(value)) { + String rangeLang = field.getRangeLang(); //UQAM Default value + try { + if (_vreq != null ) { + rangeLang = _vreq.getLocale().getLanguage() + "-"+_vreq.getLocale().getCountry(); + } + + } catch (Exception e) { + } + literalsArray.add(createLiteral( + value, + field.getRangeDatatypeUri(), + rangeLang)); + } } literalsFromForm.put(var, literalsArray); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index 54fd7fb1b3..da2a0ac0d9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -9,15 +9,23 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.apache.jena.datatypes.xsd.XSDDatatype; import org.apache.jena.ontology.OntModel; import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.ResourceFactory; +import org.apache.jena.rdf.model.Statement; import org.apache.jena.shared.Lock; +import org.apache.jena.vocabulary.RDF; +import org.apache.jena.vocabulary.XSD; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; @@ -41,6 +49,7 @@ public class ProcessRdfForm { private EditN3GeneratorVTwo populator; private Map urisForNewResources = null; +// private VitroRequest _vreq; /** * Construct the ProcessRdfForm object. */ @@ -76,9 +85,9 @@ public AdditionsAndRetractions process( AdditionsAndRetractions changes; if( configuration.isUpdate() ){ - changes = editExistingStatements(configuration, submission); + changes = editExistingStatements(configuration, submission, vreq); //UQAM vreq for getting linguistic context } else { - changes = createNewStatements(configuration, submission ); + changes = createNewStatements(configuration, submission, vreq ); //UQAM vreq for getting linguistic context } changes = getMinimalChanges(changes); @@ -99,12 +108,15 @@ public AdditionsAndRetractions process( * any optional N3 is to originally configure the * configuration.setN3Optional() to be empty. * + * UQAM add vreq for linguistic context managing + * * @throws Exception May throw an exception if the required N3 * does not parse. + * */ private AdditionsAndRetractions createNewStatements( EditConfigurationVTwo configuration, - MultiValueEditSubmission submission) throws Exception { + MultiValueEditSubmission submission, VitroRequest vreq) throws Exception { log.debug("in createNewStatements()" ); //getN3Required and getN3Optional will return copies of the @@ -113,10 +125,10 @@ private AdditionsAndRetractions createNewStatements( List optionalN3 = configuration.getN3Optional(); /* substitute in the form values and existing values */ - subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null); + subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null, vreq); /* parse N3 to RDF Models, No retractions since all of the statements are new. */ - return parseN3ToChange(requiredN3, optionalN3, null, null); + return parseN3ToChange(requiredN3, optionalN3, null, null, vreq); } /* for a list of N3 strings, substitute in the subject, predicate and object URIs @@ -140,10 +152,12 @@ protected void substituteInSubPredObjURIs( * retractions are mutually diff'ed before statements are added to or * removed from the model. The explicit change check can cause problems in * more complex setups, like the automatic form building in DataStaR. + * @param vreq For getting linguistic context + */ protected AdditionsAndRetractions editExistingStatements( EditConfigurationVTwo editConfig, - MultiValueEditSubmission submission) throws Exception { + MultiValueEditSubmission submission, VitroRequest vreq) throws Exception { log.debug("editing an existing resource: " + editConfig.getObject() ); @@ -156,18 +170,18 @@ protected AdditionsAndRetractions editExistingStatements( subInValuesToN3(editConfig, submission, N3RequiredAssert, N3OptionalAssert, - N3RequiredRetract, N3OptionalRetract); + N3RequiredRetract, N3OptionalRetract, vreq); return parseN3ToChange( N3RequiredAssert,N3OptionalAssert, - N3RequiredRetract, N3OptionalRetract); + N3RequiredRetract, N3OptionalRetract, vreq); } @SuppressWarnings("unchecked") protected void subInValuesToN3( EditConfigurationVTwo editConfig, MultiValueEditSubmission submission, List requiredAsserts, List optionalAsserts, - List requiredRetracts, List optionalRetracts ) throws InsertException{ + List requiredRetracts, List optionalRetracts, VitroRequest vreq ) throws InsertException{ //need to substitute into the return to URL becase it may need new resource URIs List URLToReturnTo = Arrays.asList(submission.getEntityToReturnTo()); @@ -184,7 +198,36 @@ protected void subInValuesToN3( //Retractions does NOT get values from form. /* ******** Form submission Literals *********** */ - substituteInMultiLiterals( submission.getLiteralsFromForm(), requiredAsserts, optionalAsserts, URLToReturnTo); + /* + * UQAM Set all literals in the linguistic context + */ + Map> literalsFromForm = submission.getLiteralsFromForm(); + Set keys = literalsFromForm.keySet(); + for (Iterator iterator = keys.iterator(); iterator.hasNext();) { + String aKey = (String) iterator.next(); + List literalFromForm = literalsFromForm.get(aKey); + List newLiteralFromForm = new ArrayList<>(); + for (Iterator iterator2 = literalFromForm.iterator(); iterator2.hasNext();) { + Literal aLiteral = (Literal) iterator2.next(); + String aLiteratDT = aLiteral.getDatatype().getURI(); + Literal newLiteral= null; + String aText = aLiteral.getLexicalForm(); + /* + * do it only if aLiteral are xstring datatype + */ + + if ( XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT) ) { + String lang =vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); + newLiteral = ResourceFactory.createLangLiteral(aText, lang); + } else { + newLiteral = ResourceFactory.createTypedLiteral(aText, aLiteral.getDatatype()); + } + newLiteralFromForm.add(newLiteral); + } + literalsFromForm.replace(aKey, newLiteralFromForm); + } + + substituteInMultiLiterals( literalsFromForm, requiredAsserts, optionalAsserts, URLToReturnTo); logSubstitue( "Added form Literals", requiredAsserts, optionalAsserts, requiredRetracts, optionalRetracts); //Retractions does NOT get values from form. @@ -254,20 +297,87 @@ public static void applyChangesToWriteModel( protected AdditionsAndRetractions parseN3ToChange( List requiredAdds, List optionalAdds, - List requiredDels, List optionalDels) throws Exception{ + List requiredDels, List optionalDels, VitroRequest vreq) throws Exception{ List adds = parseN3ToRDF(requiredAdds, REQUIRED); adds.addAll( parseN3ToRDF(optionalAdds, OPTIONAL)); - List retracts = new ArrayList(); if( requiredDels != null && optionalDels != null ){ - retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED) ); - retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL) ); + String lingCxt=null; + //UQAM Taking into account the linguistic context in retract + try { + lingCxt = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); + } catch (Exception e) { + } + retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED, lingCxt) ); + retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL, lingCxt) ); } return new AdditionsAndRetractions(adds,retracts); } + /** + * Parse the n3Strings to a List of RDF Model objects. + * + * @param n3Strings N3 Strings to parse + * @param parseType if OPTIONAL, then don't throw exceptions on errors + * @param linguisticContext For Literals, Making parse only if the literal linguisticContext are same than linguisticContext parameter //UQAM + * If REQUIRED, then throw exceptions on errors. + * @throws Exception + */ + protected static List parseN3ToRDF( + List n3Strings, N3ParseType parseType, String linguisticContext ) throws Exception { + List errorMessages = new ArrayList(); + List rdfModels = new ArrayList(); + for(String n3 : n3Strings){ + try{ + Model model = ModelFactory.createDefaultModel(); + StringReader reader = new StringReader(n3); + model.read(reader, "", "N3"); + List stmts = model.listStatements().toList(); + for (Iterator iterator = stmts.iterator(); iterator.hasNext();) { + Statement stmt = (Statement) iterator.next(); + Resource subj = stmt.getSubject(); + Property pred = stmt.getPredicate(); + RDFNode obj = stmt.getObject(); + if (obj.isLiteral()) { + Literal lit = obj.asLiteral(); + String lang = lit.getLanguage(); + if (! linguisticContext.equals(lang)) { + //UQAM Remove if linguisticContext != lang of the Literal + model.remove(subj, pred, obj); + } + } + + } + rdfModels.add( model ); + }catch(Throwable t){ + errorMessages.add(t.getMessage() + "\nN3: \n" + n3 + "\n"); + } + } + + StringBuilder errors = new StringBuilder(); + for( String errorMsg : errorMessages){ + errors.append(errorMsg).append('\n'); + } + + if( !errorMessages.isEmpty() ){ + if( REQUIRED.equals(parseType) ){ + throw new Exception("Errors processing required N3. The EditConfiguration should " + + "be setup so that if a submission passes validation, there will not be errors " + + "in the required N3.\n" + errors ); + }else if( OPTIONAL.equals(parseType) ){ + log.debug("Some Optional N3 did not parse, if a optional N3 does not parse it " + + "will be ignored. This allows optional parts of a form submission to " + + "remain unfilled out and then the optional N3 does not get values subsituted in from" + + "the form submission values. It may also be the case that there are unintentional " + + "syntax errors the optional N3." ); + log.debug(errors.toString()); + } + } + + return rdfModels; + } /** * Parse the n3Strings to a List of RDF Model objects. * @@ -479,4 +589,4 @@ private void substituteInForcedNewURIs( private static Log log = LogFactory.getLog(ProcessRdfForm.class); -} +} \ No newline at end of file diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java index 135b384748..d5f7b9dbff 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in LICENSE$ */ -package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields; +package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields; import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashMap; @@ -12,9 +12,12 @@ import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18n; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class ChildVClassesWithParent implements FieldOptions { @@ -22,6 +25,7 @@ public class ChildVClassesWithParent implements FieldOptions { String fieldName; String classUri; String defaultOptionLabel = null; + private I18nBundle i18n; public ChildVClassesWithParent(String classUri) throws Exception { super(); @@ -37,6 +41,49 @@ public ChildVClassesWithParent setDefaultOption(String label){ return this; } +/* + * UQAM + * This method is polymorphism of getOptions(EditConfigurationVTwo editConfig,String fieldName, WebappDaoFactory wDaoFact) + * for the internationalization of word "other" in the scroling list of personHasAdvisorRelationship.ftl + */ + public Map getOptions( + EditConfigurationVTwo editConfig, + String fieldName, + VitroRequest vreq) throws Exception { +// WebappDaoFactory wDaoFact) throws Exception { + this.i18n = I18n.bundle(vreq); + HashMap optionsMap = new LinkedHashMap(); + // first test to see whether there's a default "leave blank" value specified with the literal options + if ( ! StringUtils.isEmpty( defaultOptionLabel ) ){ + optionsMap.put(LEFT_BLANK, defaultOptionLabel); + } + String other_i18n = i18n.text("other"); + // first character in capital + optionsMap.put(classUri, other_i18n.substring(0, 1).toUpperCase() + other_i18n.substring(1)); + WebappDaoFactory wDaoFact = vreq.getWebappDaoFactory(); + VClassDao vclassDao = wDaoFact.getVClassDao(); + List subClassList = vclassDao.getAllSubClassURIs(classUri); + if (subClassList != null && subClassList.size() > 0) { + for (String subClassUri : subClassList) { + VClass subClass = vclassDao.getVClassByURI(subClassUri); + if (subClass != null && !OWL.Nothing.getURI().equals(subClassUri)) { + optionsMap.put(subClassUri, subClass.getName().trim()); + } + } + } + return optionsMap; + } + + public Comparator getCustomComparator() { + return null; + } + + /* + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions#getOptions(edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo, java.lang.String, edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory) + * UQAM this version is a not internationalized use this method (see line below) more often + * getOptions(EditConfigurationVTwo editConfig, String fieldName, VitroRequest vreq) + */ @Override public Map getOptions( EditConfigurationVTwo editConfig, @@ -64,8 +111,5 @@ public Map getOptions( return optionsMap; } - public Comparator getCustomComparator() { - return null; - } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java index 3e732ce588..67436009d3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java @@ -20,8 +20,7 @@ public class SelectListGeneratorVTwo { - static Log log = LogFactory.getLog(SelectListGeneratorVTwo.class); - + static Log log = LogFactory.getLog(SelectListGeneratorVTwo.class); public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, @@ -54,63 +53,104 @@ public static Map getOptions( return Collections.emptyMap(); } } - - - //Methods to sort the options map - // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708 - //Modified to allow for a custom comparator to be sent in, defaults to mapPairsComparator - public static Map getSortedMap(Map hmap, - Comparator comparator, VitroRequest vreq){ - // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator - List objectsToSort = new ArrayList(hmap.size()); - for (String key:hmap.keySet()) { - String[] x = new String[2]; - x[0] = key; - x[1] = hmap.get(key); - objectsToSort.add(x); - } - - //if no comparator is passed in, utilize MapPairsComparator - if(comparator == null) { - comparator = new MapPairsComparator(vreq); - } - - objectsToSort.sort(comparator); - - HashMap map = new LinkedHashMap(objectsToSort.size()); - for (String[] pair:objectsToSort) { - map.put(pair[0],pair[1]); - } - return map; - } - - //Sorts by the value of the 2nd element in each of the arrays - private static class MapPairsComparator implements Comparator { - - private Collator collator; - - public MapPairsComparator(VitroRequest vreq) { - this.collator = vreq.getCollator(); - } - public int compare (String[] s1, String[] s2) { - if (s2 == null) { - return 1; - } else if (s1 == null) { - return -1; - } else { - if ("".equals(s1[0])) { - return -1; - } else if ("".equals(s2[0])) { - return 1; - } - if (s2[1]==null) { - return 1; - } else if (s1[1] == null){ - return -1; - } else { - return collator.compare(s1[1],s2[1]); - } - } - } - } + // UQAM Overcharge method for linguistic contexte processisng + public static Map getOptions( + EditConfigurationVTwo editConfig, + String fieldName, + VitroRequest vreq){ + + + if( editConfig == null ){ + log.error( "fieldToSelectItemList() must be called with a non-null EditConfigurationVTwo "); + return Collections.emptyMap(); + } + if( fieldName == null ){ + log.error( "fieldToSelectItemList() must be called with a non-null fieldName"); + return Collections.emptyMap(); + } + + FieldVTwo field = editConfig.getField(fieldName); + if (field==null) { + log.error("no field \""+fieldName+"\" found from editConfig."); + return Collections.emptyMap(); + } + + if( field.getFieldOptions() == null ){ + return Collections.emptyMap(); + } + + try { + //UQAM need vreq instead of WebappDaoFactory + Map parentClass = Collections.emptyMap(); + FieldOptions fieldOptions = field.getFieldOptions(); + // UQAM TODO - Only internationalization of ChildVClassesWithParent are implemented. For TODO, implement the internationalization for the rest of instanceof "FieldOptions" + if (fieldOptions instanceof ChildVClassesWithParent ) { + return ((ChildVClassesWithParent)fieldOptions).getOptions(editConfig,fieldName,vreq); + } else { + return fieldOptions.getOptions(editConfig,fieldName,vreq.getWebappDaoFactory()); + } + } catch (Exception e) { + log.error("Error runing getFieldOptionis()",e); + return Collections.emptyMap(); + } + } + + + //Methods to sort the options map + // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708 + //Modified to allow for a custom comparator to be sent in, defaults to mapPairsComparator + public static Map getSortedMap(Map hmap, + Comparator comparator, VitroRequest vreq){ + // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator + List objectsToSort = new ArrayList(hmap.size()); + for (String key:hmap.keySet()) { + String[] x = new String[2]; + x[0] = key; + x[1] = hmap.get(key); + objectsToSort.add(x); + } + + //if no comparator is passed in, utilize MapPairsComparator + if(comparator == null) { + comparator = new MapPairsComparator(vreq); + } + + objectsToSort.sort(comparator); + + HashMap map = new LinkedHashMap(objectsToSort.size()); + for (String[] pair:objectsToSort) { + map.put(pair[0],pair[1]); + } + return map; + } + + //Sorts by the value of the 2nd element in each of the arrays + private static class MapPairsComparator implements Comparator { + + private Collator collator; + + public MapPairsComparator(VitroRequest vreq) { + this.collator = vreq.getCollator(); + } + public int compare (String[] s1, String[] s2) { + if (s2 == null) { + return 1; + } else if (s1 == null) { + return -1; + } else { + if ("".equals(s1[0])) { + return -1; + } else if ("".equals(s2[0])) { + return 1; + } + if (s2[1]==null) { + return 1; + } else if (s1[1] == null){ + return -1; + } else { + return collator.compare(s1[1],s2[1]); + } + } + } + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java index ce471ca98b..c172294dfc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LANGUAGE_NEUTRAL; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.POLICY_NEUTRAL; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY; import java.util.ArrayList; @@ -35,6 +37,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation; import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.PolicyOption; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngineException; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery; @@ -125,7 +129,10 @@ protected List getRangeTypes(VitroRequest vreq) { // Someday we'll need to figure out a different way of doing this. //WebappDaoFactory ctxDaoFact = ModelAccess.on( // vreq.getSession().getServletContext()).getWebappDaoFactory(); - WebappDaoFactory ctxDaoFact = vreq.getLanguageNeutralWebappDaoFactory(); +// WebappDaoFactory ctxDaoFact = vreq.getLanguageNeutralWebappDaoFactory(); + //UQAM Manage linguistic context + WebappDaoFactory ctxDaoFact = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE, PolicyOption.POLICY_NEUTRAL); + List types = new ArrayList(); Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 96d6556b8d..8e6e0d681e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -13,18 +13,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.jena.ontology.OntModel; + import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; -import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditDataPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement; -import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -42,11 +35,9 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.EditConfigurationGenerator; -import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.EditConfigurationTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.MultiValueEditSubmissionTemplateModel; - /** * This servlet is intended to handle all requests to create a form for use * by the N3 editing system. It will examine the request parameters, determine @@ -69,33 +60,8 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet { final String DEFAULT_DELETE_FORM = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDeleteGenerator"; @Override - protected AuthorizationRequest requiredActions(VitroRequest vreq) { - //Check if this statement can be edited here and return unauthorized if not - String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); - String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); - String objectUri = EditConfigurationUtils.getObjectUri(vreq); - String domainUri = EditConfigurationUtils.getDomainUri(vreq); - String rangeUri = EditConfigurationUtils.getRangeUri(vreq); - Property predicateProp = new Property(); - predicateProp.setURI(predicateUri); - predicateProp.setDomainVClassURI(domainUri); - predicateProp.setRangeVClassURI(rangeUri); - OntModel ontModel = ModelAccess.on(vreq).getOntModel(); - AbstractObjectPropertyStatementAction objectPropertyAction; - if (objectUri == null) { - objectPropertyAction = new AddObjectPropertyStatement(ontModel, subjectUri, predicateProp, RequestedAction.SOME_URI); - } else { - if (isDeleteForm(vreq)) { - objectPropertyAction = new DropObjectPropertyStatement(ontModel, subjectUri, predicateProp, objectUri); - } else { - objectPropertyAction = new EditObjectPropertyStatement(ontModel, subjectUri, predicateProp, objectUri); - } - } - boolean isAuthorized = PolicyHelper.isAuthorizedForActions(vreq, - new EditDataPropertyStatement(ontModel, subjectUri, predicateUri, objectUri). - or(objectPropertyAction)); - - return isAuthorized? SimplePermission.DO_FRONT_END_EDITING.ACTION: AuthorizationRequest.UNAUTHORIZED; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + return SimplePermission.DO_FRONT_END_EDITING.ACTION; } @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java index 64f6051034..a0497b03f9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java @@ -74,9 +74,11 @@ protected static ResponseValues doPostEditRedirect( VitroRequest vreq , String e //The submission for getting the entity to return to is not retrieved from the session but needs //to be created - as it is in processRdfForm3.jsp if( entityToReturnTo == null ){ - //this will not work if there entityToReturnTo has a new resource URI, - //in that case entityToReturnTo should not have been passed to this method as null - MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig); + // this will not work if there entityToReturnTo has a new resource URI, + // in that case entityToReturnTo should not have been passed to this method as null + // UQAM + // MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig); + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, editConfig); entityToReturnTo = N3EditUtils.processEntityToReturnTo(editConfig, submission, vreq); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index 790781a95e..5bf7f1a485 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -66,7 +66,9 @@ protected ResponseValues processRequest(VitroRequest vreq) { return handleMissingConfiguration(vreq); //get the EditSubmission - MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration); + // MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration); + // Modified by UQAM + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, configuration); EditSubmissionUtils.putEditSubmissionInSession(vreq.getSession(), submission); //if errors, return error response @@ -102,7 +104,6 @@ protected ResponseValues processRequest(VitroRequest vreq) { changes = ProcessRdfForm.addDependentDeletes(changes, queryModel); N3EditUtils.preprocessModels(changes, configuration, vreq); - ProcessRdfForm.applyChangesToWriteModel(changes, queryModel, writeModel, N3EditUtils.getEditorUri(vreq) ); //Here we are trying to get the entity to return to URL, diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java index d956483f6b..2ef05e2789 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java @@ -63,6 +63,11 @@ public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chai // get URL without hostname or servlet context HttpServletResponse response = (HttpServletResponse) arg1; HttpServletRequest req = (HttpServletRequest) arg0; + // UQAM Manage UTF-8 for i18n + // req.setCharacterEncoding("UTF-8"); + // response.setContentType("text/html; charset=UTF-8"); + // response.setCharacterEncoding("UTF-8"); + String path = req.getRequestURI().substring(req.getContextPath().length()); // check for first part of path diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java index c0ab92d253..718f9543e8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import javax.servlet.ServletContext; @@ -73,6 +74,14 @@ public static Configuration getConfig(HttpServletRequest req) { clearTemplateCacheIfRequested(); keepTemplateLoaderCurrentWithThemeDirectory(req); setThreadLocalsForRequest(req); + /* + * UQAM, encoded ftl to UTF-8 + */ +// instance.setEncoding(req.getLocale(), "utf-8"); +// instance.setIncompatibleImprovements(freemarker.template.Configuration.VERSION_2_3_23); +// instance.setDefaultEncoding("utf-8"); +// instance.setOutputEncoding("utf-8"); +// instance.setURLEscapingCharset("UTF-8"); return instance; } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java index babac6c529..2601fb9549 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java @@ -10,6 +10,8 @@ import org.apache.jena.rdf.model.ModelChangedListener; import org.apache.jena.rdf.model.RDFNode; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; + /** * Interface for API to write, read, and update Vitro's RDF store, with support * to allow listening, logging and auditing. @@ -263,4 +265,10 @@ public void unregisterJenaModelChangedListener(ModelChangedListener changeListen * multiple invocations do not cause an error. */ public void close(); + /** + * UQAM Useful among other things to transport the linguistic context in the service + * @param vitroRequest + */ + public void setVitroRequest(VitroRequest vitroRequest); + public VitroRequest getVitroRequest(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java index 903711e529..42d2a5c095 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java @@ -22,11 +22,11 @@ import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelChangedListener; -import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFNode; import org.apache.jena.rdf.model.Statement; import org.apache.jena.rdf.model.StmtIterator; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; @@ -91,15 +91,7 @@ public InputStream sparqlConstructQuery(String query, @Override public void sparqlConstructQuery(String query, Model model) throws RDFServiceException { - if (model.isEmpty()) { - s.sparqlConstructQuery(query, model); - filterModel(model); - } else { - Model constructedModel = ModelFactory.createDefaultModel(); - s.sparqlConstructQuery(query, constructedModel); - filterModel(constructedModel); - model.add(constructedModel); - } + s.sparqlConstructQuery(query, model); } @Override @@ -254,7 +246,6 @@ public InputStream sparqlSelectQuery(String query, @Override public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws RDFServiceException { log.debug("sparqlSelectQuery: " + query.replaceAll("\\s+", " ")); - s.sparqlSelectQuery(query, new ResultSetConsumer.Chaining(consumer) { List vars; List solnList = new ArrayList(); @@ -562,6 +553,20 @@ public int compare(Statement s1, Statement s2) { return compareLangs(s1lang, s2lang); } } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java index f44d2b59fe..0b6e92faaf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java @@ -9,6 +9,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelChangedListener; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; @@ -25,200 +26,215 @@ */ public class RDFServiceFactorySingle implements RDFServiceFactory { - private RDFService rdfService; - - public RDFServiceFactorySingle(RDFService rdfService) { - this.rdfService = new UnclosableRDFService(rdfService); - } - - @Override - public RDFService getRDFService() { - return this.rdfService; - } - - @Override - public RDFService getShortTermRDFService() { - return this.rdfService; - } - - @Override - public void registerListener(ChangeListener listener) throws RDFServiceException { - this.rdfService.registerListener(listener); - } - - @Override - public void unregisterListener(ChangeListener listener) throws RDFServiceException { - this.rdfService.unregisterListener(listener); - } - - @Override - public void registerJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { - this.rdfService.registerJenaModelChangedListener(listener); - } - - @Override - public void unregisterJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { - this.rdfService.unregisterJenaModelChangedListener(listener); - } - - public class UnclosableRDFService implements RDFService { - - private RDFService s; - - public UnclosableRDFService(RDFService rdfService) { - this.s = rdfService; - } - - @Override - public boolean changeSetUpdate(ChangeSet changeSet) - throws RDFServiceException { - return s.changeSetUpdate(changeSet); - } - - @Override - public void newIndividual(String individualURI, String individualTypeURI) - throws RDFServiceException { - s.newIndividual(individualURI, individualTypeURI); - } - - @Override - public void newIndividual(String individualURI, - String individualTypeURI, String graphURI) - throws RDFServiceException { - s.newIndividual(individualURI, individualTypeURI, graphURI); - } - - @Override - public InputStream sparqlConstructQuery(String query, - ModelSerializationFormat resultFormat) - throws RDFServiceException { - return s.sparqlConstructQuery(query, resultFormat); - } - - @Override - public void sparqlConstructQuery(String query, Model model) - throws RDFServiceException { - s.sparqlConstructQuery(query, model); - } - - @Override - public InputStream sparqlDescribeQuery(String query, - ModelSerializationFormat resultFormat) - throws RDFServiceException { - return s.sparqlDescribeQuery(query, resultFormat); - } - - @Override - public InputStream sparqlSelectQuery(String query, - ResultFormat resultFormat) throws RDFServiceException { - return s.sparqlSelectQuery(query, resultFormat); - } - - @Override - public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws RDFServiceException { - s.sparqlSelectQuery(query, consumer); - } - - @Override - public boolean sparqlAskQuery(String query) throws RDFServiceException { - return s.sparqlAskQuery(query); - } - - @Override - public List getGraphURIs() throws RDFServiceException { - return s.getGraphURIs(); - } - - @Override - public void getGraphMetadata() throws RDFServiceException { - s.getGraphMetadata(); - } - - @Override - public String getDefaultWriteGraphURI() throws RDFServiceException { - return s.getDefaultWriteGraphURI(); - } - - @Override - public void serializeAll(OutputStream outputStream) - throws RDFServiceException { - s.serializeAll(outputStream); - } - - @Override - public void serializeGraph(String graphURI, OutputStream outputStream) - throws RDFServiceException { - s.serializeGraph(graphURI, outputStream); - } - - @Override - public boolean isEquivalentGraph(String graphURI, - InputStream serializedGraph, - ModelSerializationFormat serializationFormat) throws RDFServiceException { - return s.isEquivalentGraph(graphURI, serializedGraph, serializationFormat); - } - - @Override - public boolean isEquivalentGraph(String graphURI, - Model graph) throws RDFServiceException { - return s.isEquivalentGraph(graphURI, graph); - } - - @Override - public void registerListener(ChangeListener changeListener) - throws RDFServiceException { - s.registerListener(changeListener); - } - - @Override - public void unregisterListener(ChangeListener changeListener) - throws RDFServiceException { - s.unregisterListener(changeListener); - } - - @Override - public void registerJenaModelChangedListener(ModelChangedListener changeListener) - throws RDFServiceException { - s.registerJenaModelChangedListener(changeListener); - } - - @Override - public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) - throws RDFServiceException { - s.unregisterJenaModelChangedListener(changeListener); - } - - @Override - public ChangeSet manufactureChangeSet() { - return s.manufactureChangeSet(); - } - - @Override - public long countTriples(RDFNode subject, RDFNode predicate, RDFNode object) throws RDFServiceException { - return s.countTriples(subject, predicate, object); - } - - @Override - public Model getTriples(RDFNode subject, RDFNode predicate, RDFNode object, long limit, long offset) throws RDFServiceException { - return s.getTriples(subject, predicate, object, limit, offset); - } - - @Override - public boolean preferPreciseOptionals() { - return s.preferPreciseOptionals(); - } - - @Override - public void close() { - // Don't close s. It's being used by everybody. - } + private RDFService rdfService; + + public RDFServiceFactorySingle(RDFService rdfService) { + this.rdfService = new UnclosableRDFService(rdfService); + } + + @Override + public RDFService getRDFService() { + return this.rdfService; + } + + @Override + public RDFService getShortTermRDFService() { + return this.rdfService; + } + + @Override + public void registerListener(ChangeListener listener) throws RDFServiceException { + this.rdfService.registerListener(listener); + } + + @Override + public void unregisterListener(ChangeListener listener) throws RDFServiceException { + this.rdfService.unregisterListener(listener); + } + + @Override + public void registerJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { + this.rdfService.registerJenaModelChangedListener(listener); + } + + @Override + public void unregisterJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { + this.rdfService.unregisterJenaModelChangedListener(listener); + } + + public class UnclosableRDFService implements RDFService { + + private RDFService s; + + public UnclosableRDFService(RDFService rdfService) { + this.s = rdfService; + } + + @Override + public boolean changeSetUpdate(ChangeSet changeSet) + throws RDFServiceException { + return s.changeSetUpdate(changeSet); + } + + @Override + public void newIndividual(String individualURI, String individualTypeURI) + throws RDFServiceException { + s.newIndividual(individualURI, individualTypeURI); + } + + @Override + public void newIndividual(String individualURI, + String individualTypeURI, String graphURI) + throws RDFServiceException { + s.newIndividual(individualURI, individualTypeURI, graphURI); + } + + @Override + public InputStream sparqlConstructQuery(String query, + ModelSerializationFormat resultFormat) + throws RDFServiceException { + return s.sparqlConstructQuery(query, resultFormat); + } + + @Override + public void sparqlConstructQuery(String query, Model model) + throws RDFServiceException { + s.sparqlConstructQuery(query, model); + } + + @Override + public InputStream sparqlDescribeQuery(String query, + ModelSerializationFormat resultFormat) + throws RDFServiceException { + return s.sparqlDescribeQuery(query, resultFormat); + } + + @Override + public InputStream sparqlSelectQuery(String query, + ResultFormat resultFormat) throws RDFServiceException { + return s.sparqlSelectQuery(query, resultFormat); + } + + @Override + public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws RDFServiceException { + s.sparqlSelectQuery(query, consumer); + } + + @Override + public boolean sparqlAskQuery(String query) throws RDFServiceException { + return s.sparqlAskQuery(query); + } + + @Override + public List getGraphURIs() throws RDFServiceException { + return s.getGraphURIs(); + } + + @Override + public void getGraphMetadata() throws RDFServiceException { + s.getGraphMetadata(); + } + + @Override + public String getDefaultWriteGraphURI() throws RDFServiceException { + return s.getDefaultWriteGraphURI(); + } + + @Override + public void serializeAll(OutputStream outputStream) + throws RDFServiceException { + s.serializeAll(outputStream); + } + + @Override + public void serializeGraph(String graphURI, OutputStream outputStream) + throws RDFServiceException { + s.serializeGraph(graphURI, outputStream); + } + + @Override + public boolean isEquivalentGraph(String graphURI, + InputStream serializedGraph, + ModelSerializationFormat serializationFormat) throws RDFServiceException { + return s.isEquivalentGraph(graphURI, serializedGraph, serializationFormat); + } + + @Override + public boolean isEquivalentGraph(String graphURI, + Model graph) throws RDFServiceException { + return s.isEquivalentGraph(graphURI, graph); + } + + @Override + public void registerListener(ChangeListener changeListener) + throws RDFServiceException { + s.registerListener(changeListener); + } + + @Override + public void unregisterListener(ChangeListener changeListener) + throws RDFServiceException { + s.unregisterListener(changeListener); + } + + @Override + public void registerJenaModelChangedListener(ModelChangedListener changeListener) + throws RDFServiceException { + s.registerJenaModelChangedListener(changeListener); + } + + @Override + public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) + throws RDFServiceException { + s.unregisterJenaModelChangedListener(changeListener); + } + + @Override + public ChangeSet manufactureChangeSet() { + return s.manufactureChangeSet(); + } + + @Override + public long countTriples(RDFNode subject, RDFNode predicate, RDFNode object) throws RDFServiceException { + return s.countTriples(subject, predicate, object); + } + + @Override + public Model getTriples(RDFNode subject, RDFNode predicate, RDFNode object, long limit, long offset) throws RDFServiceException { + return s.getTriples(subject, predicate, object, limit, offset); + } + + @Override + public boolean preferPreciseOptionals() { + return s.preferPreciseOptionals(); + } + + @Override + public void close() { + // Don't close s. It's being used by everybody. + } @Override public String toString() { return ToString.simpleName(this) + "[" + ToString.hashHex(this) - + ", inner=" + s + "]"; + + ", inner=" + s + "]"; + } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; } - } + public VitroRequest getVitroRequest() { + return vitroRequest; + } + + + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java index 2171492838..e6d34fe54b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java @@ -32,6 +32,7 @@ import org.apache.jena.riot.out.NodeFormatterTTL; import org.apache.jena.vocabulary.RDF; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange; @@ -141,8 +142,8 @@ protected void notifyListenersOfChanges(ChangeSet changeSet) } protected void notifyListeners(ModelChange modelChange) throws IOException { + modelChange.getSerializedModel().reset(); for (ChangeListener listener : registeredListeners) { - modelChange.getSerializedModel().reset(); listener.notifyModelChange(modelChange); } log.debug(registeredJenaListeners.size() + " registered Jena listeners"); @@ -254,11 +255,22 @@ protected static String sparqlNode(Node node, String varName) { literalBuff.append("\""); pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); - if (node.getLiteralDatatypeURI() != null) { - literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); - } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) { + /* + * UQAM + * reversing the condition tests. + * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data + */ +// if (node.getLiteralDatatypeURI() != null) { +// literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); +// } else if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) { +// literalBuff.append("@").append(node.getLiteralLanguage()); +// } + if (node.getLiteralLanguage() != null && node.getLiteralLanguage().length() > 0) { literalBuff.append("@").append(node.getLiteralLanguage()); + } else if (node.getLiteralDatatypeURI() != null) { + literalBuff.append("^^<").append(node.getLiteralDatatypeURI()).append(">"); } + return literalBuff.toString(); } else { return varName; @@ -453,4 +465,19 @@ protected void processQuerySolution(QuerySolution qs) { } } } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java index dadccfed4a..7e363a0cac 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java @@ -42,6 +42,7 @@ import org.apache.jena.shared.Lock; import org.apache.jena.sparql.core.Quad; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset; import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlGraph; @@ -704,4 +705,19 @@ public void close() { protected QueryExecution createQueryExecution(String queryString, Query q, Dataset d) { return QueryExecutionFactory.create(q, d); } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java index 496928fbcc..864156a52b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java @@ -13,6 +13,7 @@ import org.apache.jena.query.DatasetFactory; import org.apache.jena.rdf.model.Model; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.jena.DatasetWrapper; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.ModelChange; @@ -22,101 +23,115 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService { - private final static Log log = LogFactory.getLog(RDFServiceModel.class); - - private Model model; - private Dataset dataset; - private String modelName; - - /** - * Create an RDFService to access a single default graph - * @param model Jena Model - */ - public RDFServiceModel(Model model) { - this.model = model; - } - - /** - * Create an RDFService to access a Jena Dataset - * @param dataset Jena Dataset - */ - public RDFServiceModel(Dataset dataset) { - this.dataset = dataset; - } - - @Override - protected DatasetWrapper getDatasetWrapper() { - Dataset d = null; - if (dataset != null) { - d = dataset; - } else { - d = DatasetFactory.createMem(); - if (modelName == null) { - d.setDefaultModel(this.model); - } else { - d.addNamedModel(this.modelName, model); - } - } - DatasetWrapper datasetWrapper = new DatasetWrapper(d); - return datasetWrapper; - } - - @Override - public boolean changeSetUpdate(ChangeSet changeSet) - throws RDFServiceException { - - if (changeSet.getPreconditionQuery() != null - && !isPreconditionSatisfied( - changeSet.getPreconditionQuery(), - changeSet.getPreconditionQueryType())) { - return false; - } - - //Dataset dataset = getDatasetWrapper().getDataset(); - - try { - for (Object o : changeSet.getPreChangeEvents()) { - this.notifyListenersOfEvent(o); - } - - for (ModelChange modelChange : changeSet.getModelChanges()) { - if (!modelChange.getSerializedModel().markSupported()) { - byte[] bytes = IOUtils.toByteArray(modelChange.getSerializedModel()); - modelChange.setSerializedModel(new ByteArrayInputStream(bytes)); - } - modelChange.getSerializedModel().mark(Integer.MAX_VALUE); - Model m = this.model; - if (m == null && dataset != null) { - String changeGraphURI = modelChange.getGraphURI(); - if (changeGraphURI != null) { - m = dataset.getNamedModel(changeGraphURI); - } else { - m = dataset.getDefaultModel(); - } - } - operateOnModel(m, modelChange, null); - } - - // notify listeners of triple changes - notifyListenersOfChanges(changeSet); -// csIt = changeSet.getModelChanges().iterator(); -// while (csIt.hasNext()) { -// ModelChange modelChange = csIt.next(); -// modelChange.getSerializedModel().reset(); -// Model model = ModelFactory.createModelForGraph( -// new ListeningGraph(modelChange.getGraphURI(), this)); -// operateOnModel(model, modelChange, null); -// } - - for (Object o : changeSet.getPostChangeEvents()) { - this.notifyListenersOfEvent(o); - } - - } catch (Exception e) { - log.error(e, e); - throw new RDFServiceException(e); - } - - return true; - } + private final static Log log = LogFactory.getLog(RDFServiceModel.class); + + private Model model; + private Dataset dataset; + private String modelName; + + /** + * Create an RDFService to access a single default graph + * @param model Jena Model + */ + public RDFServiceModel(Model model) { + this.model = model; + } + + /** + * Create an RDFService to access a Jena Dataset + * @param dataset Jena Dataset + */ + public RDFServiceModel(Dataset dataset) { + this.dataset = dataset; + } + + @Override + protected DatasetWrapper getDatasetWrapper() { + Dataset d = null; + if (dataset != null) { + d = dataset; + } else { + d = DatasetFactory.createMem(); + if (modelName == null) { + d.setDefaultModel(this.model); + } else { + d.addNamedModel(this.modelName, model); + } + } + DatasetWrapper datasetWrapper = new DatasetWrapper(d); + return datasetWrapper; + } + + @Override + public boolean changeSetUpdate(ChangeSet changeSet) + throws RDFServiceException { + + if (changeSet.getPreconditionQuery() != null + && !isPreconditionSatisfied( + changeSet.getPreconditionQuery(), + changeSet.getPreconditionQueryType())) { + return false; + } + + //Dataset dataset = getDatasetWrapper().getDataset(); + + try { + for (Object o : changeSet.getPreChangeEvents()) { + this.notifyListenersOfEvent(o); + } + + for (ModelChange modelChange : changeSet.getModelChanges()) { + if (!modelChange.getSerializedModel().markSupported()) { + byte[] bytes = IOUtils.toByteArray(modelChange.getSerializedModel()); + modelChange.setSerializedModel(new ByteArrayInputStream(bytes)); + } + modelChange.getSerializedModel().mark(Integer.MAX_VALUE); + Model m = this.model; + if (m == null && dataset != null) { + String changeGraphURI = modelChange.getGraphURI(); + if (changeGraphURI != null) { + m = dataset.getNamedModel(changeGraphURI); + } else { + m = dataset.getDefaultModel(); + } + } + operateOnModel(m, modelChange, null); + } + + // notify listeners of triple changes + notifyListenersOfChanges(changeSet); + // csIt = changeSet.getModelChanges().iterator(); + // while (csIt.hasNext()) { + // ModelChange modelChange = csIt.next(); + // modelChange.getSerializedModel().reset(); + // Model model = ModelFactory.createModelForGraph( + // new ListeningGraph(modelChange.getGraphURI(), this)); + // operateOnModel(model, modelChange, null); + // } + + for (Object o : changeSet.getPostChangeEvents()) { + this.notifyListenersOfEvent(o); + } + + } catch (Exception e) { + log.error(e, e); + throw new RDFServiceException(e); + } + + return true; + } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java index 5a0189f411..7a45dbcf29 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java @@ -9,6 +9,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelChangedListener; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; @@ -207,4 +208,19 @@ public void close() { public String toString() { return "LoggingRDFService[inner=" + innerService + "]"; } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index 383177cd78..fd8c4f5cbf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -185,7 +185,7 @@ private List contextsFromNames(Resource view, */ private Map> createClassMappings( Map viewSpecsByUri) - throws ShortViewConfigException { + throws ShortViewConfigException { Property hasView = viewModel.getProperty(HAS_VIEW); StmtIterator stmts = viewModel.listStatements(null, hasView, @@ -445,14 +445,26 @@ public ShortViewConfigException(String message, Throwable cause) { * "display model". The query finds a preferred title for the individual. */ private static class FakeVivoPeopleDataGetter extends SparqlQueryDataGetter { - private static String QUERY_STRING = "" + // private static String QUERY_STRING = "" + // + "PREFIX obo: \n" + // + "PREFIX vcard: \n" + // + "SELECT ?pt \n" + "WHERE { \n" + // + " ?uri obo:ARG_2000028 ?vIndividual . \n" + // + " ?vIndividual vcard:hasTitle ?vTitle . \n" + // + " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1"; + + /* + * UQAM New query including Linguistic context + */ + private static String QUERY_STRING_LANG = "" + "PREFIX obo: \n" + "PREFIX vcard: \n" + "SELECT ?pt \n" + "WHERE { \n" + " ?uri obo:ARG_2000028 ?vIndividual . \n" + " ?vIndividual vcard:hasTitle ?vTitle . \n" - + " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1"; - + + " ?vTitle vcard:title ?pt . \n" + + " FILTER (lang(?pt) = '?langCtx' ) \n" + + " } LIMIT 1"; private static final String FAKE_VIVO_PEOPLE_DATA_GETTER_URI = "http://FakeVivoPeopleDataGetter"; private static OntModel fakeDisplayModel = initializeFakeDisplayModel(); @@ -467,7 +479,7 @@ private static OntModel initializeFakeDisplayModel() { Property saveToVarProperty = m .getProperty(DisplayVocabulary.SAVE_TO_VAR); - m.add(dataGetter, queryProperty, QUERY_STRING); + m.add(dataGetter, queryProperty, QUERY_STRING_LANG); //UQAM Using query with linguistic context m.add(dataGetter, saveToVarProperty, "extra"); return m; } @@ -475,18 +487,21 @@ private static OntModel initializeFakeDisplayModel() { private String individualUri; private VitroRequest vreq; private ServletContext ctx; + private String langCtx = "en-US"; public FakeVivoPeopleDataGetter(VitroRequest vreq, String individualUri) { - super(vreq, fakeDisplayModel, "http://FakeVivoPeopleDataGetter"); + super(vreq, initializeFakeDisplayModel(), "http://FakeVivoPeopleDataGetter"); this.individualUri = individualUri; this.vreq = vreq; this.ctx = vreq.getSession().getServletContext(); + this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM add the linguistic context } @Override public Map getData(Map pageData) { Map parms = new HashMap<>(); parms.put("uri", individualUri); + parms.put("langCtx", langCtx); //UQAM add the linguistic context return super.getData(parms); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java index 00fdcf1b0c..be09c3623f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java @@ -534,8 +534,12 @@ private void readFile(File f, OntModel om, String path) { try { if (f.getName().endsWith(".md")) { // Markdown files are documentation - skip. - } else if (f.getName().endsWith(".n3")) { + // UQAM accept lower and upper case in fn extension + } else if (f.getName().toLowerCase().endsWith(".n3")) { om.read(fis, null, "N3"); + // UQAM Accept Turtle + } else if (f.getName().toLowerCase().endsWith(".ttl")) { + om.read(fis, null, "TURTLE"); } else { om.read(fis, null, "RDF/XML"); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java index 7c1da263e4..5df1680ee2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java @@ -34,111 +34,111 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{ private final static Log log = LogFactory.getLog(SparqlQueryDataGetter.class); - private static final String queryPropertyURI = "<" + DisplayVocabulary.QUERY + ">"; - private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">"; - private static final String queryModelPropertyURI= "<" + DisplayVocabulary.QUERY_MODEL+ ">"; - - public static final String defaultVarNameForResults = "results"; - private static final String defaultTemplate = "menupage--defaultSparql.ftl"; - - String dataGetterURI; - String queryText; - String saveToVar; - String modelURI; - VitroRequest vreq; - ServletContext context; - - /** - * Constructor with display model and data getter URI that will be called by reflection. - */ - public SparqlQueryDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){ - this.configure(vreq, displayModel,dataGetterURI); - } + private static final String queryPropertyURI = "<" + DisplayVocabulary.QUERY + ">"; + private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">"; + private static final String queryModelPropertyURI= "<" + DisplayVocabulary.QUERY_MODEL+ ">"; + + public static final String defaultVarNameForResults = "results"; + private static final String defaultTemplate = "menupage--defaultSparql.ftl"; + + String dataGetterURI; + String queryText; + String saveToVar; + String modelURI; + VitroRequest vreq; + ServletContext context; + + /** + * Constructor with display model and data getter URI that will be called by reflection. + */ + public SparqlQueryDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){ + this.configure(vreq, displayModel,dataGetterURI); + } /** - * Configure this instance based on the URI and display model. - */ - @SuppressWarnings("hiding") + * Configure this instance based on the URI and display model. + */ + @SuppressWarnings("hiding") protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) { - if( vreq == null ) - throw new IllegalArgumentException("VitroRequest may not be null."); - if( displayModel == null ) - throw new IllegalArgumentException("Display Model may not be null."); - if( dataGetterURI == null ) - throw new IllegalArgumentException("PageUri may not be null."); - - this.vreq = vreq; - this.context = vreq.getSession().getServletContext(); - this.dataGetterURI = dataGetterURI; - - QuerySolutionMap initBindings = new QuerySolutionMap(); - initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI)); - - Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ; - displayModel.enterCriticalSection(Lock.READ); - try{ - QueryExecution qexec = QueryExecutionFactory.create( - dataGetterConfigurationQuery, displayModel, initBindings) ; - ResultSet res = qexec.execSelect(); - try{ - while( res.hasNext() ){ - QuerySolution soln = res.next(); - - //query is NOT OPTIONAL - Literal value = soln.getLiteral("query"); - if( dataGetterConfigurationQuery == null ) - log.error("no query defined for page " + this.dataGetterURI); - else - this.queryText = value.getLexicalForm(); - - //model is OPTIONAL - RDFNode node = soln.get("queryModel"); - if( node != null && node.isURIResource() ){ - this.modelURI = node.asResource().getURI(); - }else if( node != null && node.isLiteral() ){ - this.modelURI = node.asLiteral().getLexicalForm(); - }else{ - this.modelURI = null; - } - - //saveToVar is OPTIONAL - Literal saveTo = soln.getLiteral("saveToVar"); - if( saveTo != null && saveTo.isLiteral() ){ - this.saveToVar = saveTo.asLiteral().getLexicalForm(); - }else{ - this.saveToVar = defaultVarNameForResults; - } - } - }finally{ qexec.close(); } - }finally{ displayModel.leaveCriticalSection(); } - } - - /** - * Query to get the definition of the SparqlDataGetter for a given URI. - */ - private static final String dataGetterQuery = - "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" + - "SELECT ?query ?saveToVar ?queryModel WHERE { \n" + - " ?dataGetterURI "+queryPropertyURI+" ?query . \n" + - " OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " + - " OPTIONAL{ ?dataGetterURI "+queryModelPropertyURI+" ?queryModel } \n" + - "}"; - - - @Override - public Map getData(Map pageData) { - Map merged = mergeParameters(vreq.getParameterMap(), pageData); - - String boundQueryText = bindParameters(queryText, merged); - - if (modelURI != null) { - return doQueryOnModel(boundQueryText, getModel(context, vreq, modelURI)); - } else { - return doQueryOnRDFService(boundQueryText); - } - } - - /** Merge the pageData with the request parameters. PageData overrides. */ + if( vreq == null ) + throw new IllegalArgumentException("VitroRequest may not be null."); + if( displayModel == null ) + throw new IllegalArgumentException("Display Model may not be null."); + if( dataGetterURI == null ) + throw new IllegalArgumentException("PageUri may not be null."); + + this.vreq = vreq; + this.context = vreq.getSession().getServletContext(); + this.dataGetterURI = dataGetterURI; + + QuerySolutionMap initBindings = new QuerySolutionMap(); + initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI)); + + Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ; + displayModel.enterCriticalSection(Lock.READ); + try{ + QueryExecution qexec = QueryExecutionFactory.create( + dataGetterConfigurationQuery, displayModel, initBindings) ; + ResultSet res = qexec.execSelect(); + try{ + while( res.hasNext() ){ + QuerySolution soln = res.next(); + + //query is NOT OPTIONAL + Literal value = soln.getLiteral("query"); + if( dataGetterConfigurationQuery == null ) + log.error("no query defined for page " + this.dataGetterURI); + else + this.queryText = value.getLexicalForm(); + + //model is OPTIONAL + RDFNode node = soln.get("queryModel"); + if( node != null && node.isURIResource() ){ + this.modelURI = node.asResource().getURI(); + }else if( node != null && node.isLiteral() ){ + this.modelURI = node.asLiteral().getLexicalForm(); + }else{ + this.modelURI = null; + } + + //saveToVar is OPTIONAL + Literal saveTo = soln.getLiteral("saveToVar"); + if( saveTo != null && saveTo.isLiteral() ){ + this.saveToVar = saveTo.asLiteral().getLexicalForm(); + }else{ + this.saveToVar = defaultVarNameForResults; + } + } + }finally{ qexec.close(); } + }finally{ displayModel.leaveCriticalSection(); } + } + + /** + * Query to get the definition of the SparqlDataGetter for a given URI. + */ + private static final String dataGetterQuery = + "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" + + "SELECT ?query ?saveToVar ?queryModel WHERE { \n" + + " ?dataGetterURI "+queryPropertyURI+" ?query . \n" + + " OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " + + " OPTIONAL{ ?dataGetterURI "+queryModelPropertyURI+" ?queryModel } \n" + + "}"; + + + @Override + public Map getData(Map pageData) { + Map merged = mergeParameters(vreq.getParameterMap(), pageData); + + String boundQueryText = bindParameters(queryText, merged); + + if (modelURI != null) { + return doQueryOnModel(boundQueryText, getModel(context, vreq, modelURI)); + } else { + return doQueryOnRDFService(boundQueryText); + } + } + + /** Merge the pageData with the request parameters. PageData overrides. */ private Map mergeParameters( Map parameterMap, Map pageData) { Map merged = new HashMap<>(); @@ -165,7 +165,16 @@ private Map mergeParameters( private String bindParameters(String text, Map merged) { String bound = text; for (String key : merged.keySet()) { - bound = bound.replaceAll("([?$]" + key + ")([^a-zA-Z0-9_\\-])", "<" + merged.get(key) + ">$2"); + String value = merged.get(key); + if (value.startsWith("http:")) { + /* + * UQAM if the "value" looks like an URI then wrap the value with the characters '<' '>' + * + */ + bound = bound.replaceAll("([?$]" + key + ")([^a-zA-Z0-9_\\-])", "<" + value + ">$2"); + } else { + bound = bound.replaceAll("([?$]" + key + ")([^a-zA-Z0-9_\\-])", value + "$2"); + } } if (log.isDebugEnabled()) { log.debug("parameters: " + merged); @@ -181,27 +190,27 @@ private String bindParameters(String text, Map merged) { */ protected Map doQueryOnRDFService(String q) { log.debug("Going to RDFService with " + q); - ResultSet results = QueryUtils.getQueryResults(q, vreq); - return assembleMap(parseResults(results)); + ResultSet results = QueryUtils.getQueryResults(q, vreq); + return assembleMap(parseResults(results)); } - /** + /** * Do the query and return a result. This is in its own method, with * protected access, to make testing easy. */ - protected Map doQueryOnModel(String q, Model queryModel){ + protected Map doQueryOnModel(String q, Model queryModel){ log.debug("Going to model " + modelURI + " with " + q); - if (q == null) { - return Collections.emptyMap(); - } + if (q == null) { + return Collections.emptyMap(); + } Query query = makeQuery(q); - if (query == null) { - return Collections.emptyMap(); - } + if (query == null) { + return Collections.emptyMap(); + } - return assembleMap(executeQuery( query, queryModel)); - } + return assembleMap(executeQuery( query, queryModel)); + } private Query makeQuery(String q) { try { @@ -213,69 +222,69 @@ private Query makeQuery(String q) { } private List> executeQuery(Query query, Model model) { - model.enterCriticalSection(Lock.READ); - try{ - QueryExecution qexec= QueryExecutionFactory.create(query, model ); - ResultSet results = qexec.execSelect(); - try{ - return parseResults(results); - }finally{ qexec.close(); } - }finally{ model.leaveCriticalSection(); } - } - - /** - * Converts a ResultSet into a List of Maps. + model.enterCriticalSection(Lock.READ); + try{ + QueryExecution qexec= QueryExecutionFactory.create(query, model ); + ResultSet results = qexec.execSelect(); + try{ + return parseResults(results); + }finally{ qexec.close(); } + }finally{ model.leaveCriticalSection(); } + } + + /** + * Converts a ResultSet into a List of Maps. */ private List> parseResults(ResultSet results) { - List> rows = new ArrayList>(); - while (results.hasNext()) { - QuerySolution soln = results.nextSolution(); - rows.add( toRow( soln ) ); - } - return rows; + List> rows = new ArrayList>(); + while (results.hasNext()) { + QuerySolution soln = results.nextSolution(); + rows.add( toRow( soln ) ); + } + return rows; } /** - * Converts a row from a QuerySolution to a Map - */ - private Map toRow(QuerySolution soln) { - HashMap row = new HashMap(); - Iterator varNames = soln.varNames(); - while( varNames.hasNext()){ - String varname = varNames.next(); - row.put(varname, toCell( soln.get(varname))); - } - return row; - } - - private String toCell(RDFNode rdfNode) { - if( rdfNode == null){ - return ""; - }else if( rdfNode.isLiteral() ){ - return rdfNode.asLiteral().getLexicalForm(); - }else if( rdfNode.isResource() ){ - Resource resource = (Resource)rdfNode; - if( ! resource.isAnon() ){ - return resource.getURI(); - }else{ - return resource.getId().getLabelString(); - } - }else{ - return rdfNode.toString(); - } - } + * Converts a row from a QuerySolution to a Map + */ + private Map toRow(QuerySolution soln) { + HashMap row = new HashMap(); + Iterator varNames = soln.varNames(); + while( varNames.hasNext()){ + String varname = varNames.next(); + row.put(varname, toCell( soln.get(varname))); + } + return row; + } + + private String toCell(RDFNode rdfNode) { + if( rdfNode == null){ + return ""; + }else if( rdfNode.isLiteral() ){ + return rdfNode.asLiteral().getLexicalForm(); + }else if( rdfNode.isResource() ){ + Resource resource = (Resource)rdfNode; + if( ! resource.isAnon() ){ + return resource.getURI(); + }else{ + return resource.getId().getLabelString(); + } + }else{ + return rdfNode.toString(); + } + } private Map assembleMap(List> results) { Map rmap = new HashMap(); - //put results in page data - rmap.put(this.saveToVar, results); - //also store the variable name within which results will be returned - rmap.put("variableName", this.saveToVar); - //This will be overridden at page level in display model if template specified there - rmap.put("bodyTemplate", defaultTemplate); + //put results in page data + rmap.put(this.saveToVar, results); + //also store the variable name within which results will be returned + rmap.put("variableName", this.saveToVar); + //This will be overridden at page level in display model if template specified there + rmap.put("bodyTemplate", defaultTemplate); - return rmap; + return rmap; } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java index d0ff197f71..0c080102bf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java @@ -21,6 +21,10 @@ * check their current status. */ public class VitroBackgroundThread extends Thread { + // UQAM add start + public synchronized void start() { + super.start(); + } private static final Log log = LogFactory.getLog(VitroBackgroundThread.class); private static final ConcurrentLinkedQueue> allThreads = new ConcurrentLinkedQueue>(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index 7f88848ecf..1a92035b33 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -39,6 +39,9 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.SelectListGeneratorVTwo; import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.PolicyOption; import edu.cornell.mannlib.vitro.webapp.web.beanswrappers.ReadOnlyBeansWrapper; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyStatementTemplateModel; @@ -98,7 +101,9 @@ private void retrieveEditData() throws Exception { private void populateDropdowns() throws Exception { //For each field with an optionType defined, create the options - WebappDaoFactory wdf = vreq.getWebappDaoFactory(); +// WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + // UQAM Manage Linguistic context + WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); for(String fieldName: editConfig.getFields().keySet()){ FieldVTwo field = editConfig.getField(fieldName); //TODO: Check if we even need empty options if field options do not exist @@ -106,7 +111,9 @@ private void populateDropdowns() throws Exception { //empty options field.setOptions(new ConstantFieldOptions()); } + //UQAM changing signature for including internationalization in scroll-down menu Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf); +// Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, vreq); optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap, field.getFieldOptions().getCustomComparator(), vreq); if(pageData.containsKey(fieldName)) { log.error("Check the edit configuration setup as pageData already contains " + fieldName + " and this will be overwritten now with empty collection"); @@ -184,7 +191,7 @@ public String getObjectPropertyNameForDisplay() { Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq); ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq); Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq); - VClass rangeClass = EditConfigurationUtils.getRangeVClass(vreq); + VClass rangeClass = EditConfigurationUtils.getLangAwardRangeVClass(vreq); if(objectIndividual != null) { propertyTitle = prop.getDomainPublic(); } else { @@ -529,14 +536,17 @@ private String getDataLiteralValuesFromParameter() { //TODO:Check where this logic should actually go, copied from input element formatting tag //Updating to enable multiple vclasses applicable to subject to be analyzed to understand possible range of types public Map getOfferTypesCreateNew() { - WebappDaoFactory wdf = vreq.getWebappDaoFactory(); +// WebappDaoFactory wdf = vreq.getWebappDaoFactory(); + // UQAM Manage Linguistic context + WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(editConfig.getPredicateUri()); Individual sub = wdf.getIndividualDao().getIndividualByURI(editConfig.getSubjectUri()); - VClass rangeClass = EditConfigurationUtils.getRangeVClass(vreq); + // UQAM Manage Linguistic context + VClass rangeClass = EditConfigurationUtils.getLangAwardRangeVClass(vreq); List vclasses = null; List subjectVClasses = sub.getVClasses(); From 1cb9a1da52c12b7533dc564c99e76bf5955e4e76 Mon Sep 17 00:00:00 2001 From: Nicolas D <46490666+nicalico@users.noreply.github.com> Date: Fri, 27 Mar 2020 14:39:33 -0400 Subject: [PATCH 02/52] Update RDFServiceFactorySingle.java --- .../impl/RDFServiceFactorySingle.java | 410 +++++++++--------- 1 file changed, 204 insertions(+), 206 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java index 0b6e92faaf..fc9ef4c3df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java @@ -26,215 +26,213 @@ */ public class RDFServiceFactorySingle implements RDFServiceFactory { - private RDFService rdfService; - - public RDFServiceFactorySingle(RDFService rdfService) { - this.rdfService = new UnclosableRDFService(rdfService); - } - - @Override - public RDFService getRDFService() { - return this.rdfService; - } - - @Override - public RDFService getShortTermRDFService() { - return this.rdfService; - } - - @Override - public void registerListener(ChangeListener listener) throws RDFServiceException { - this.rdfService.registerListener(listener); - } - - @Override - public void unregisterListener(ChangeListener listener) throws RDFServiceException { - this.rdfService.unregisterListener(listener); - } - - @Override - public void registerJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { - this.rdfService.registerJenaModelChangedListener(listener); - } - - @Override - public void unregisterJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { - this.rdfService.unregisterJenaModelChangedListener(listener); - } - - public class UnclosableRDFService implements RDFService { - - private RDFService s; - - public UnclosableRDFService(RDFService rdfService) { - this.s = rdfService; - } - - @Override - public boolean changeSetUpdate(ChangeSet changeSet) - throws RDFServiceException { - return s.changeSetUpdate(changeSet); - } - - @Override - public void newIndividual(String individualURI, String individualTypeURI) - throws RDFServiceException { - s.newIndividual(individualURI, individualTypeURI); - } - - @Override - public void newIndividual(String individualURI, - String individualTypeURI, String graphURI) - throws RDFServiceException { - s.newIndividual(individualURI, individualTypeURI, graphURI); - } - - @Override - public InputStream sparqlConstructQuery(String query, - ModelSerializationFormat resultFormat) - throws RDFServiceException { - return s.sparqlConstructQuery(query, resultFormat); - } - - @Override - public void sparqlConstructQuery(String query, Model model) - throws RDFServiceException { - s.sparqlConstructQuery(query, model); - } - - @Override - public InputStream sparqlDescribeQuery(String query, - ModelSerializationFormat resultFormat) - throws RDFServiceException { - return s.sparqlDescribeQuery(query, resultFormat); - } - - @Override - public InputStream sparqlSelectQuery(String query, - ResultFormat resultFormat) throws RDFServiceException { - return s.sparqlSelectQuery(query, resultFormat); - } - - @Override - public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws RDFServiceException { - s.sparqlSelectQuery(query, consumer); - } - - @Override - public boolean sparqlAskQuery(String query) throws RDFServiceException { - return s.sparqlAskQuery(query); - } - - @Override - public List getGraphURIs() throws RDFServiceException { - return s.getGraphURIs(); - } - - @Override - public void getGraphMetadata() throws RDFServiceException { - s.getGraphMetadata(); - } - - @Override - public String getDefaultWriteGraphURI() throws RDFServiceException { - return s.getDefaultWriteGraphURI(); - } - - @Override - public void serializeAll(OutputStream outputStream) - throws RDFServiceException { - s.serializeAll(outputStream); - } - - @Override - public void serializeGraph(String graphURI, OutputStream outputStream) - throws RDFServiceException { - s.serializeGraph(graphURI, outputStream); - } - - @Override - public boolean isEquivalentGraph(String graphURI, - InputStream serializedGraph, - ModelSerializationFormat serializationFormat) throws RDFServiceException { - return s.isEquivalentGraph(graphURI, serializedGraph, serializationFormat); - } - - @Override - public boolean isEquivalentGraph(String graphURI, - Model graph) throws RDFServiceException { - return s.isEquivalentGraph(graphURI, graph); - } - - @Override - public void registerListener(ChangeListener changeListener) - throws RDFServiceException { - s.registerListener(changeListener); - } - - @Override - public void unregisterListener(ChangeListener changeListener) - throws RDFServiceException { - s.unregisterListener(changeListener); - } - - @Override - public void registerJenaModelChangedListener(ModelChangedListener changeListener) - throws RDFServiceException { - s.registerJenaModelChangedListener(changeListener); - } - - @Override - public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) - throws RDFServiceException { - s.unregisterJenaModelChangedListener(changeListener); - } - - @Override - public ChangeSet manufactureChangeSet() { - return s.manufactureChangeSet(); - } - - @Override - public long countTriples(RDFNode subject, RDFNode predicate, RDFNode object) throws RDFServiceException { - return s.countTriples(subject, predicate, object); - } - - @Override - public Model getTriples(RDFNode subject, RDFNode predicate, RDFNode object, long limit, long offset) throws RDFServiceException { - return s.getTriples(subject, predicate, object, limit, offset); - } - - @Override - public boolean preferPreciseOptionals() { - return s.preferPreciseOptionals(); - } - - @Override - public void close() { - // Don't close s. It's being used by everybody. - } + private RDFService rdfService; + + public RDFServiceFactorySingle(RDFService rdfService) { + this.rdfService = new UnclosableRDFService(rdfService); + } + + @Override + public RDFService getRDFService() { + return this.rdfService; + } + + @Override + public RDFService getShortTermRDFService() { + return this.rdfService; + } + + @Override + public void registerListener(ChangeListener listener) throws RDFServiceException { + this.rdfService.registerListener(listener); + } + + @Override + public void unregisterListener(ChangeListener listener) throws RDFServiceException { + this.rdfService.unregisterListener(listener); + } + + @Override + public void registerJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { + this.rdfService.registerJenaModelChangedListener(listener); + } + + @Override + public void unregisterJenaModelChangedListener(ModelChangedListener listener) throws RDFServiceException { + this.rdfService.unregisterJenaModelChangedListener(listener); + } + + public class UnclosableRDFService implements RDFService { + + private RDFService s; + + public UnclosableRDFService(RDFService rdfService) { + this.s = rdfService; + } + + @Override + public boolean changeSetUpdate(ChangeSet changeSet) + throws RDFServiceException { + return s.changeSetUpdate(changeSet); + } + + @Override + public void newIndividual(String individualURI, String individualTypeURI) + throws RDFServiceException { + s.newIndividual(individualURI, individualTypeURI); + } + + @Override + public void newIndividual(String individualURI, + String individualTypeURI, String graphURI) + throws RDFServiceException { + s.newIndividual(individualURI, individualTypeURI, graphURI); + } + + @Override + public InputStream sparqlConstructQuery(String query, + ModelSerializationFormat resultFormat) + throws RDFServiceException { + return s.sparqlConstructQuery(query, resultFormat); + } + + @Override + public void sparqlConstructQuery(String query, Model model) + throws RDFServiceException { + s.sparqlConstructQuery(query, model); + } + + @Override + public InputStream sparqlDescribeQuery(String query, + ModelSerializationFormat resultFormat) + throws RDFServiceException { + return s.sparqlDescribeQuery(query, resultFormat); + } + + @Override + public InputStream sparqlSelectQuery(String query, + ResultFormat resultFormat) throws RDFServiceException { + return s.sparqlSelectQuery(query, resultFormat); + } + + @Override + public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws RDFServiceException { + s.sparqlSelectQuery(query, consumer); + } + + @Override + public boolean sparqlAskQuery(String query) throws RDFServiceException { + return s.sparqlAskQuery(query); + } + + @Override + public List getGraphURIs() throws RDFServiceException { + return s.getGraphURIs(); + } + + @Override + public void getGraphMetadata() throws RDFServiceException { + s.getGraphMetadata(); + } + + @Override + public String getDefaultWriteGraphURI() throws RDFServiceException { + return s.getDefaultWriteGraphURI(); + } + + @Override + public void serializeAll(OutputStream outputStream) + throws RDFServiceException { + s.serializeAll(outputStream); + } + + @Override + public void serializeGraph(String graphURI, OutputStream outputStream) + throws RDFServiceException { + s.serializeGraph(graphURI, outputStream); + } + + @Override + public boolean isEquivalentGraph(String graphURI, + InputStream serializedGraph, + ModelSerializationFormat serializationFormat) throws RDFServiceException { + return s.isEquivalentGraph(graphURI, serializedGraph, serializationFormat); + } + + @Override + public boolean isEquivalentGraph(String graphURI, + Model graph) throws RDFServiceException { + return s.isEquivalentGraph(graphURI, graph); + } + + @Override + public void registerListener(ChangeListener changeListener) + throws RDFServiceException { + s.registerListener(changeListener); + } + + @Override + public void unregisterListener(ChangeListener changeListener) + throws RDFServiceException { + s.unregisterListener(changeListener); + } + + @Override + public void registerJenaModelChangedListener(ModelChangedListener changeListener) + throws RDFServiceException { + s.registerJenaModelChangedListener(changeListener); + } + + @Override + public void unregisterJenaModelChangedListener(ModelChangedListener changeListener) + throws RDFServiceException { + s.unregisterJenaModelChangedListener(changeListener); + } + + @Override + public ChangeSet manufactureChangeSet() { + return s.manufactureChangeSet(); + } + + @Override + public long countTriples(RDFNode subject, RDFNode predicate, RDFNode object) throws RDFServiceException { + return s.countTriples(subject, predicate, object); + } + + @Override + public Model getTriples(RDFNode subject, RDFNode predicate, RDFNode object, long limit, long offset) throws RDFServiceException { + return s.getTriples(subject, predicate, object, limit, offset); + } + + @Override + public boolean preferPreciseOptionals() { + return s.preferPreciseOptionals(); + } + + @Override + public void close() { + // Don't close s. It's being used by everybody. + } @Override public String toString() { return ToString.simpleName(this) + "[" + ToString.hashHex(this) - + ", inner=" + s + "]"; - } - /* - * UQAM Useful among other things to transport the linguistic context in the service - * (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) - */ - private VitroRequest vitroRequest; - - public void setVitroRequest(VitroRequest vitroRequest) { - this.vitroRequest = vitroRequest; - } - - public VitroRequest getVitroRequest() { - return vitroRequest; - } - - - } + + ", inner=" + s + "]"; + } + /* + * UQAM Useful among other things to transport the linguistic context in the service + * (non-Javadoc) + * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) + */ + private VitroRequest vitroRequest; + + public void setVitroRequest(VitroRequest vitroRequest) { + this.vitroRequest = vitroRequest; + } + + public VitroRequest getVitroRequest() { + return vitroRequest; + } + } } From 1f7998b4c14e8d67bc800af7335021bf0518507f Mon Sep 17 00:00:00 2001 From: VIVO UQAM <62542918+UQAM-VIVO@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:12:18 -0400 Subject: [PATCH 03/52] Sprint i18n whitespace (#143) * Removed extraneous whitespace - modified: api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java * move RootUserPolicy.java from VIVO to Vitro repo. --- .../webapp/auth/policy/RootUserPolicy.java | 38 ++++++++++++++++++- .../n3editing/VTwo/BaseEditElementVTwo.java | 8 +--- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java index e724361524..466988967a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java @@ -37,7 +37,14 @@ public class RootUserPolicy implements PolicyIface { private static final Log log = LogFactory.getLog(RootUserPolicy.class); private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress"; + /* + * UQAM For parameterization of rootUser + */ + private static final String PROPERTY_ROOT_USER_PASSWORD = "rootUser.password"; + private static final String PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED = "rootUser.passwordChangeRequired"; + private static final String ROOT_USER_INITIAL_PASSWORD = "rootPassword"; + private static final String ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED = "true"; /** * This is the entire policy. If you are a root user, you are authorized. @@ -150,10 +157,13 @@ private void createRootUser() { ua.setEmailAddress(configuredRootUser); ua.setFirstName("root"); ua.setLastName("user"); + // UQAM using getRootPasswordFromConfig() ua.setArgon2Password(Authenticator.applyArgon2iEncoding( - ROOT_USER_INITIAL_PASSWORD)); + getRootPasswordFromConfig())); ua.setMd5Password(""); - ua.setPasswordChangeRequired(true); + Boolean toto; + // UQAM using getRootPasswdChangeRequiredFromConfig() + ua.setPasswordChangeRequired(getRootPasswdChangeRequiredFromConfig().booleanValue()); ua.setStatus(Status.ACTIVE); ua.setRootUser(true); @@ -191,7 +201,31 @@ private void complainAboutWrongRootUsers() { ss.warning(this, "For security, " + "it is best to delete unneeded root user accounts."); } + /* + * UQAM + * Add for getting rootUser.password property value from runtime.properties + */ + private String getRootPasswordFromConfig() { + String passwd = ConfigurationProperties.getBean(ctx).getProperty( + PROPERTY_ROOT_USER_PASSWORD); + if (passwd == null) { + passwd = ROOT_USER_INITIAL_PASSWORD; + } + return passwd; + } + /* + * UQAM + * Add for getting rootUser.passwordChangeRequired property value from runtime.properties + */ + private Boolean getRootPasswdChangeRequiredFromConfig() { + String passwdCR = ConfigurationProperties.getBean(ctx).getProperty( + PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED); + if (passwdCR == null) { + passwdCR = ROOT_USER_INITIAL_PASSWORD_CHANGE_REQUIRED; + } + return new Boolean(passwdCR); + } @Override public void contextDestroyed(ServletContextEvent sce) { // Nothing to destroy diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java index eb46ac1b96..a3e90d0836 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java @@ -4,9 +4,6 @@ import java.io.IOException; import java.io.StringWriter; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.commons.logging.Log; @@ -47,10 +44,7 @@ protected String merge(Configuration fmConfig, String templateName, Map map){ } catch (TemplateException | IOException e) { log.error(e,e); } - String sWrite = writer.toString(); - - // String UTF8String = new String(sWrite.getBytes(), Charset.forName("UTF-8")); - return sWrite; + return writer.toString(); } /** From be6ef1323d04b943037f26c1fa1b846ad13d8099 Mon Sep 17 00:00:00 2001 From: Nicolas D <46490666+nicalico@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:57:03 -0400 Subject: [PATCH 04/52] Remove blank line --- .../vitro/webapp/controller/freemarker/HomePageController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java index 40472bf34f..6f59dbd429 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java @@ -32,7 +32,6 @@ protected ResponseValues processRequest(VitroRequest vreq) throws InstantiationE Map body = new HashMap(); - List dgList = DataGetterUtils.getDataGettersForPage(vreq, vreq.getDisplayModel(), DisplayVocabulary.HOME_PAGE_URI); for( DataGetter dg : dgList){ From 9ae724073c286dea363c77a71bc263f4f845e9cd Mon Sep 17 00:00:00 2001 From: Nicolas D <46490666+nicalico@users.noreply.github.com> Date: Mon, 30 Mar 2020 12:11:02 -0400 Subject: [PATCH 05/52] Fixed indentations --- .../shortview/FakeApplicationOntologyService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index fd8c4f5cbf..b488cfc7b5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -185,7 +185,7 @@ private List contextsFromNames(Resource view, */ private Map> createClassMappings( Map viewSpecsByUri) - throws ShortViewConfigException { + throws ShortViewConfigException { Property hasView = viewModel.getProperty(HAS_VIEW); StmtIterator stmts = viewModel.listStatements(null, hasView, @@ -487,21 +487,21 @@ private static OntModel initializeFakeDisplayModel() { private String individualUri; private VitroRequest vreq; private ServletContext ctx; - private String langCtx = "en-US"; + private String langCtx = "en-US"; public FakeVivoPeopleDataGetter(VitroRequest vreq, String individualUri) { super(vreq, initializeFakeDisplayModel(), "http://FakeVivoPeopleDataGetter"); this.individualUri = individualUri; this.vreq = vreq; this.ctx = vreq.getSession().getServletContext(); - this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM add the linguistic context + this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM add the linguistic context } @Override public Map getData(Map pageData) { Map parms = new HashMap<>(); parms.put("uri", individualUri); - parms.put("langCtx", langCtx); //UQAM add the linguistic context + parms.put("langCtx", langCtx); //UQAM add the linguistic context return super.getData(parms); } From 0a2403c002eec7d1936093cabb7e63ea75c3e1cb Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Mon, 30 Mar 2020 15:50:22 -0400 Subject: [PATCH 06/52] Update whitespace for: TemplateProcessingHelper.java --- .../controller/freemarker/TemplateProcessingHelper.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index 0159a72746..6f66940354 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import java.nio.charset.StandardCharsets; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -34,8 +33,6 @@ public StringWriter processTemplate(String templateName, Map map throws TemplateProcessingException { Template template = getTemplate(templateName); StringWriter sw = new StringWriter(); - - processTemplate(template, map, sw); return sw; } @@ -60,7 +57,6 @@ private void processTemplate(Template template, Map map, Writer // TODO clean this up VIVO-249 FreemarkerConfigurationImpl.retrieveAndRunDataGetters(env, template.getName()); - // Now process it. env.process(); } catch (TemplateException e) { From 771df103264414a1f167ee53c716fff73e1e2b95 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Mon, 30 Mar 2020 17:11:52 -0400 Subject: [PATCH 07/52] Update whitespace for: RDFServiceModel.java --- .../impl/jena/model/RDFServiceModel.java | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java index 864156a52b..fc7c6249f6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java @@ -23,103 +23,103 @@ public class RDFServiceModel extends RDFServiceJena implements RDFService { - private final static Log log = LogFactory.getLog(RDFServiceModel.class); - - private Model model; - private Dataset dataset; - private String modelName; - - /** - * Create an RDFService to access a single default graph - * @param model Jena Model - */ - public RDFServiceModel(Model model) { - this.model = model; - } - - /** - * Create an RDFService to access a Jena Dataset - * @param dataset Jena Dataset - */ - public RDFServiceModel(Dataset dataset) { - this.dataset = dataset; - } - - @Override - protected DatasetWrapper getDatasetWrapper() { - Dataset d = null; - if (dataset != null) { - d = dataset; - } else { - d = DatasetFactory.createMem(); - if (modelName == null) { - d.setDefaultModel(this.model); - } else { - d.addNamedModel(this.modelName, model); - } - } - DatasetWrapper datasetWrapper = new DatasetWrapper(d); - return datasetWrapper; - } - - @Override - public boolean changeSetUpdate(ChangeSet changeSet) - throws RDFServiceException { - - if (changeSet.getPreconditionQuery() != null - && !isPreconditionSatisfied( - changeSet.getPreconditionQuery(), - changeSet.getPreconditionQueryType())) { - return false; - } - - //Dataset dataset = getDatasetWrapper().getDataset(); - - try { - for (Object o : changeSet.getPreChangeEvents()) { - this.notifyListenersOfEvent(o); - } - - for (ModelChange modelChange : changeSet.getModelChanges()) { - if (!modelChange.getSerializedModel().markSupported()) { - byte[] bytes = IOUtils.toByteArray(modelChange.getSerializedModel()); - modelChange.setSerializedModel(new ByteArrayInputStream(bytes)); - } - modelChange.getSerializedModel().mark(Integer.MAX_VALUE); - Model m = this.model; - if (m == null && dataset != null) { - String changeGraphURI = modelChange.getGraphURI(); - if (changeGraphURI != null) { - m = dataset.getNamedModel(changeGraphURI); - } else { - m = dataset.getDefaultModel(); - } - } - operateOnModel(m, modelChange, null); - } - - // notify listeners of triple changes - notifyListenersOfChanges(changeSet); - // csIt = changeSet.getModelChanges().iterator(); - // while (csIt.hasNext()) { - // ModelChange modelChange = csIt.next(); - // modelChange.getSerializedModel().reset(); - // Model model = ModelFactory.createModelForGraph( - // new ListeningGraph(modelChange.getGraphURI(), this)); - // operateOnModel(model, modelChange, null); - // } - - for (Object o : changeSet.getPostChangeEvents()) { - this.notifyListenersOfEvent(o); - } - - } catch (Exception e) { - log.error(e, e); - throw new RDFServiceException(e); - } - - return true; - } + private final static Log log = LogFactory.getLog(RDFServiceModel.class); + + private Model model; + private Dataset dataset; + private String modelName; + + /** + * Create an RDFService to access a single default graph + * @param model Jena Model + */ + public RDFServiceModel(Model model) { + this.model = model; + } + + /** + * Create an RDFService to access a Jena Dataset + * @param dataset Jena Dataset + */ + public RDFServiceModel(Dataset dataset) { + this.dataset = dataset; + } + + @Override + protected DatasetWrapper getDatasetWrapper() { + Dataset d = null; + if (dataset != null) { + d = dataset; + } else { + d = DatasetFactory.createMem(); + if (modelName == null) { + d.setDefaultModel(this.model); + } else { + d.addNamedModel(this.modelName, model); + } + } + DatasetWrapper datasetWrapper = new DatasetWrapper(d); + return datasetWrapper; + } + + @Override + public boolean changeSetUpdate(ChangeSet changeSet) + throws RDFServiceException { + + if (changeSet.getPreconditionQuery() != null + && !isPreconditionSatisfied( + changeSet.getPreconditionQuery(), + changeSet.getPreconditionQueryType())) { + return false; + } + + //Dataset dataset = getDatasetWrapper().getDataset(); + + try { + for (Object o : changeSet.getPreChangeEvents()) { + this.notifyListenersOfEvent(o); + } + + for (ModelChange modelChange : changeSet.getModelChanges()) { + if (!modelChange.getSerializedModel().markSupported()) { + byte[] bytes = IOUtils.toByteArray(modelChange.getSerializedModel()); + modelChange.setSerializedModel(new ByteArrayInputStream(bytes)); + } + modelChange.getSerializedModel().mark(Integer.MAX_VALUE); + Model m = this.model; + if (m == null && dataset != null) { + String changeGraphURI = modelChange.getGraphURI(); + if (changeGraphURI != null) { + m = dataset.getNamedModel(changeGraphURI); + } else { + m = dataset.getDefaultModel(); + } + } + operateOnModel(m, modelChange, null); + } + + // notify listeners of triple changes + notifyListenersOfChanges(changeSet); +// csIt = changeSet.getModelChanges().iterator(); +// while (csIt.hasNext()) { +// ModelChange modelChange = csIt.next(); +// modelChange.getSerializedModel().reset(); +// Model model = ModelFactory.createModelForGraph( +// new ListeningGraph(modelChange.getGraphURI(), this)); +// operateOnModel(model, modelChange, null); +// } + + for (Object o : changeSet.getPostChangeEvents()) { + this.notifyListenersOfEvent(o); + } + + } catch (Exception e) { + log.error(e, e); + throw new RDFServiceException(e); + } + + return true; + } /* * UQAM Useful among other things to transport the linguistic context in the service * (non-Javadoc) From 66c50255a9418889cb40197326fdb8da920d3de3 Mon Sep 17 00:00:00 2001 From: Matthias Luehr Date: Thu, 2 Apr 2020 20:23:48 +0200 Subject: [PATCH 08/52] Removed extraneous whitespaces. --- .../vitro/webapp/dao/jena/JenaBaseDao.java | 1 - .../dataGetter/SparqlQueryDataGetter.java | 334 +++++++++--------- 2 files changed, 167 insertions(+), 168 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index 5713d2e5fc..d92c901360 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -1,6 +1,5 @@ /* $This file is distributed under the terms of the license in LICENSE$ */ -// package edu.cornell.mannlib.vitro.webapp.dao.jena; import java.text.DateFormat; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java index 5df1680ee2..0de494abd9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java @@ -34,111 +34,111 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{ private final static Log log = LogFactory.getLog(SparqlQueryDataGetter.class); - private static final String queryPropertyURI = "<" + DisplayVocabulary.QUERY + ">"; - private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">"; - private static final String queryModelPropertyURI= "<" + DisplayVocabulary.QUERY_MODEL+ ">"; - - public static final String defaultVarNameForResults = "results"; - private static final String defaultTemplate = "menupage--defaultSparql.ftl"; - - String dataGetterURI; - String queryText; - String saveToVar; - String modelURI; - VitroRequest vreq; - ServletContext context; + private static final String queryPropertyURI = "<" + DisplayVocabulary.QUERY + ">"; + private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">"; + private static final String queryModelPropertyURI= "<" + DisplayVocabulary.QUERY_MODEL+ ">"; + + public static final String defaultVarNameForResults = "results"; + private static final String defaultTemplate = "menupage--defaultSparql.ftl"; + + String dataGetterURI; + String queryText; + String saveToVar; + String modelURI; + VitroRequest vreq; + ServletContext context; + + /** + * Constructor with display model and data getter URI that will be called by reflection. + */ + public SparqlQueryDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){ + this.configure(vreq, displayModel,dataGetterURI); + } /** - * Constructor with display model and data getter URI that will be called by reflection. - */ - public SparqlQueryDataGetter(VitroRequest vreq, Model displayModel, String dataGetterURI){ - this.configure(vreq, displayModel,dataGetterURI); - } - - /** - * Configure this instance based on the URI and display model. - */ - @SuppressWarnings("hiding") + * Configure this instance based on the URI and display model. + */ + @SuppressWarnings("hiding") protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) { - if( vreq == null ) - throw new IllegalArgumentException("VitroRequest may not be null."); - if( displayModel == null ) - throw new IllegalArgumentException("Display Model may not be null."); - if( dataGetterURI == null ) - throw new IllegalArgumentException("PageUri may not be null."); - - this.vreq = vreq; - this.context = vreq.getSession().getServletContext(); - this.dataGetterURI = dataGetterURI; - - QuerySolutionMap initBindings = new QuerySolutionMap(); - initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI)); - - Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ; - displayModel.enterCriticalSection(Lock.READ); - try{ - QueryExecution qexec = QueryExecutionFactory.create( - dataGetterConfigurationQuery, displayModel, initBindings) ; - ResultSet res = qexec.execSelect(); - try{ - while( res.hasNext() ){ - QuerySolution soln = res.next(); - - //query is NOT OPTIONAL - Literal value = soln.getLiteral("query"); - if( dataGetterConfigurationQuery == null ) - log.error("no query defined for page " + this.dataGetterURI); - else - this.queryText = value.getLexicalForm(); - - //model is OPTIONAL - RDFNode node = soln.get("queryModel"); - if( node != null && node.isURIResource() ){ - this.modelURI = node.asResource().getURI(); - }else if( node != null && node.isLiteral() ){ - this.modelURI = node.asLiteral().getLexicalForm(); - }else{ - this.modelURI = null; - } - - //saveToVar is OPTIONAL - Literal saveTo = soln.getLiteral("saveToVar"); - if( saveTo != null && saveTo.isLiteral() ){ - this.saveToVar = saveTo.asLiteral().getLexicalForm(); - }else{ - this.saveToVar = defaultVarNameForResults; - } - } - }finally{ qexec.close(); } - }finally{ displayModel.leaveCriticalSection(); } - } - - /** - * Query to get the definition of the SparqlDataGetter for a given URI. - */ - private static final String dataGetterQuery = - "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" + - "SELECT ?query ?saveToVar ?queryModel WHERE { \n" + - " ?dataGetterURI "+queryPropertyURI+" ?query . \n" + - " OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " + - " OPTIONAL{ ?dataGetterURI "+queryModelPropertyURI+" ?queryModel } \n" + - "}"; - - - @Override - public Map getData(Map pageData) { - Map merged = mergeParameters(vreq.getParameterMap(), pageData); - - String boundQueryText = bindParameters(queryText, merged); - - if (modelURI != null) { - return doQueryOnModel(boundQueryText, getModel(context, vreq, modelURI)); - } else { - return doQueryOnRDFService(boundQueryText); - } - } - - /** Merge the pageData with the request parameters. PageData overrides. */ + if( vreq == null ) + throw new IllegalArgumentException("VitroRequest may not be null."); + if( displayModel == null ) + throw new IllegalArgumentException("Display Model may not be null."); + if( dataGetterURI == null ) + throw new IllegalArgumentException("PageUri may not be null."); + + this.vreq = vreq; + this.context = vreq.getSession().getServletContext(); + this.dataGetterURI = dataGetterURI; + + QuerySolutionMap initBindings = new QuerySolutionMap(); + initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI)); + + Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ; + displayModel.enterCriticalSection(Lock.READ); + try{ + QueryExecution qexec = QueryExecutionFactory.create( + dataGetterConfigurationQuery, displayModel, initBindings) ; + ResultSet res = qexec.execSelect(); + try{ + while( res.hasNext() ){ + QuerySolution soln = res.next(); + + //query is NOT OPTIONAL + Literal value = soln.getLiteral("query"); + if( dataGetterConfigurationQuery == null ) + log.error("no query defined for page " + this.dataGetterURI); + else + this.queryText = value.getLexicalForm(); + + //model is OPTIONAL + RDFNode node = soln.get("queryModel"); + if( node != null && node.isURIResource() ){ + this.modelURI = node.asResource().getURI(); + }else if( node != null && node.isLiteral() ){ + this.modelURI = node.asLiteral().getLexicalForm(); + }else{ + this.modelURI = null; + } + + //saveToVar is OPTIONAL + Literal saveTo = soln.getLiteral("saveToVar"); + if( saveTo != null && saveTo.isLiteral() ){ + this.saveToVar = saveTo.asLiteral().getLexicalForm(); + }else{ + this.saveToVar = defaultVarNameForResults; + } + } + }finally{ qexec.close(); } + }finally{ displayModel.leaveCriticalSection(); } + } + + /** + * Query to get the definition of the SparqlDataGetter for a given URI. + */ + private static final String dataGetterQuery = + "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" + + "SELECT ?query ?saveToVar ?queryModel WHERE { \n" + + " ?dataGetterURI "+queryPropertyURI+" ?query . \n" + + " OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " + + " OPTIONAL{ ?dataGetterURI "+queryModelPropertyURI+" ?queryModel } \n" + + "}"; + + + @Override + public Map getData(Map pageData) { + Map merged = mergeParameters(vreq.getParameterMap(), pageData); + + String boundQueryText = bindParameters(queryText, merged); + + if (modelURI != null) { + return doQueryOnModel(boundQueryText, getModel(context, vreq, modelURI)); + } else { + return doQueryOnRDFService(boundQueryText); + } + } + + /** Merge the pageData with the request parameters. PageData overrides. */ private Map mergeParameters( Map parameterMap, Map pageData) { Map merged = new HashMap<>(); @@ -190,27 +190,27 @@ private String bindParameters(String text, Map merged) { */ protected Map doQueryOnRDFService(String q) { log.debug("Going to RDFService with " + q); - ResultSet results = QueryUtils.getQueryResults(q, vreq); - return assembleMap(parseResults(results)); + ResultSet results = QueryUtils.getQueryResults(q, vreq); + return assembleMap(parseResults(results)); } - /** + /** * Do the query and return a result. This is in its own method, with * protected access, to make testing easy. */ - protected Map doQueryOnModel(String q, Model queryModel){ + protected Map doQueryOnModel(String q, Model queryModel){ log.debug("Going to model " + modelURI + " with " + q); - if (q == null) { - return Collections.emptyMap(); - } + if (q == null) { + return Collections.emptyMap(); + } Query query = makeQuery(q); - if (query == null) { - return Collections.emptyMap(); - } + if (query == null) { + return Collections.emptyMap(); + } - return assembleMap(executeQuery( query, queryModel)); - } + return assembleMap(executeQuery( query, queryModel)); + } private Query makeQuery(String q) { try { @@ -222,69 +222,69 @@ private Query makeQuery(String q) { } private List> executeQuery(Query query, Model model) { - model.enterCriticalSection(Lock.READ); - try{ - QueryExecution qexec= QueryExecutionFactory.create(query, model ); - ResultSet results = qexec.execSelect(); - try{ - return parseResults(results); - }finally{ qexec.close(); } - }finally{ model.leaveCriticalSection(); } - } - - /** - * Converts a ResultSet into a List of Maps. + model.enterCriticalSection(Lock.READ); + try{ + QueryExecution qexec= QueryExecutionFactory.create(query, model ); + ResultSet results = qexec.execSelect(); + try{ + return parseResults(results); + }finally{ qexec.close(); } + }finally{ model.leaveCriticalSection(); } + } + + /** + * Converts a ResultSet into a List of Maps. */ private List> parseResults(ResultSet results) { - List> rows = new ArrayList>(); - while (results.hasNext()) { - QuerySolution soln = results.nextSolution(); - rows.add( toRow( soln ) ); - } - return rows; + List> rows = new ArrayList>(); + while (results.hasNext()) { + QuerySolution soln = results.nextSolution(); + rows.add( toRow( soln ) ); + } + return rows; } /** - * Converts a row from a QuerySolution to a Map - */ - private Map toRow(QuerySolution soln) { - HashMap row = new HashMap(); - Iterator varNames = soln.varNames(); - while( varNames.hasNext()){ - String varname = varNames.next(); - row.put(varname, toCell( soln.get(varname))); - } - return row; - } - - private String toCell(RDFNode rdfNode) { - if( rdfNode == null){ - return ""; - }else if( rdfNode.isLiteral() ){ - return rdfNode.asLiteral().getLexicalForm(); - }else if( rdfNode.isResource() ){ - Resource resource = (Resource)rdfNode; - if( ! resource.isAnon() ){ - return resource.getURI(); - }else{ - return resource.getId().getLabelString(); - } - }else{ - return rdfNode.toString(); - } - } + * Converts a row from a QuerySolution to a Map + */ + private Map toRow(QuerySolution soln) { + HashMap row = new HashMap(); + Iterator varNames = soln.varNames(); + while( varNames.hasNext()){ + String varname = varNames.next(); + row.put(varname, toCell( soln.get(varname))); + } + return row; + } + + private String toCell(RDFNode rdfNode) { + if( rdfNode == null){ + return ""; + }else if( rdfNode.isLiteral() ){ + return rdfNode.asLiteral().getLexicalForm(); + }else if( rdfNode.isResource() ){ + Resource resource = (Resource)rdfNode; + if( ! resource.isAnon() ){ + return resource.getURI(); + }else{ + return resource.getId().getLabelString(); + } + }else{ + return rdfNode.toString(); + } + } private Map assembleMap(List> results) { Map rmap = new HashMap(); - //put results in page data - rmap.put(this.saveToVar, results); - //also store the variable name within which results will be returned - rmap.put("variableName", this.saveToVar); - //This will be overridden at page level in display model if template specified there - rmap.put("bodyTemplate", defaultTemplate); + //put results in page data + rmap.put(this.saveToVar, results); + //also store the variable name within which results will be returned + rmap.put("variableName", this.saveToVar); + //This will be overridden at page level in display model if template specified there + rmap.put("bodyTemplate", defaultTemplate); - return rmap; + return rmap; } } From 46b05bfa6ac5775216dd461a663da1430b384d10 Mon Sep 17 00:00:00 2001 From: michelheonuqam Date: Thu, 2 Apr 2020 06:37:34 -0400 Subject: [PATCH 09/52] Tagging UQAM Comments with following tags -Add-Feature -Optimization -Linguistic-Management -Bug-Correction --- .../vitro/webapp/auth/policy/RootUserPolicy.java | 11 +++++------ .../controller/freemarker/FreemarkerHttpServlet.java | 4 +--- .../freemarker/TemplateProcessingHelper.java | 6 +----- .../json/GetRandomSearchIndividualsByVClass.java | 4 ++-- .../mannlib/vitro/webapp/dao/jena/JenaBaseDao.java | 2 +- .../vitro/webapp/dao/jena/RDFServiceGraph.java | 2 +- .../mannlib/vitro/webapp/dao/jena/SparqlGraph.java | 2 +- .../edit/n3editing/VTwo/AdditionsAndRetractions.java | 2 +- .../edit/n3editing/VTwo/EditConfigurationUtils.java | 10 ++-------- .../VTwo/fields/ChildVClassesWithParent.java | 2 +- .../VTwo/fields/SelectListGeneratorVTwo.java | 4 ++-- .../DefaultObjectPropertyFormGenerator.java | 2 +- .../controller/PostEditCleanupController.java | 2 +- .../controller/ProcessRdfFormController.java | 2 +- .../vitro/webapp/filters/PageRoutingFilter.java | 4 ---- .../freemarker/config/FreemarkerConfiguration.java | 8 -------- .../mannlib/vitro/webapp/rdfservice/RDFService.java | 2 +- .../filter/LanguageFilteringRDFService.java | 2 +- .../rdfservice/impl/RDFServiceFactorySingle.java | 2 +- .../vitro/webapp/rdfservice/impl/RDFServiceImpl.java | 2 +- .../webapp/rdfservice/impl/jena/RDFServiceJena.java | 2 +- .../rdfservice/impl/jena/model/RDFServiceModel.java | 2 +- .../rdfservice/impl/logging/LoggingRDFService.java | 2 +- .../shortview/FakeApplicationOntologyService.java | 8 ++++---- .../webapp/servlet/setup/UpdateKnowledgeBase.java | 4 ++-- .../utils/dataGetter/SparqlQueryDataGetter.java | 2 +- .../webapp/utils/threads/VitroBackgroundThread.java | 2 +- .../edit/EditConfigurationTemplateModel.java | 8 ++++---- 28 files changed, 40 insertions(+), 65 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java index 466988967a..816bf7d515 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java @@ -38,7 +38,7 @@ public class RootUserPolicy implements PolicyIface { private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress"; /* - * UQAM For parameterization of rootUser + * UQAM Add-Feature For parameterization of rootUser */ private static final String PROPERTY_ROOT_USER_PASSWORD = "rootUser.password"; private static final String PROPERTY_ROOT_USER_PASSWORD_CHANGE_REQUIRED = "rootUser.passwordChangeRequired"; @@ -157,12 +157,11 @@ private void createRootUser() { ua.setEmailAddress(configuredRootUser); ua.setFirstName("root"); ua.setLastName("user"); - // UQAM using getRootPasswordFromConfig() + // UQAM Add-Feature using getRootPasswordFromConfig() ua.setArgon2Password(Authenticator.applyArgon2iEncoding( getRootPasswordFromConfig())); ua.setMd5Password(""); - Boolean toto; - // UQAM using getRootPasswdChangeRequiredFromConfig() + // UQAM Add-Feature using getRootPasswdChangeRequiredFromConfig() ua.setPasswordChangeRequired(getRootPasswdChangeRequiredFromConfig().booleanValue()); ua.setStatus(Status.ACTIVE); ua.setRootUser(true); @@ -202,7 +201,7 @@ private void complainAboutWrongRootUsers() { + "it is best to delete unneeded root user accounts."); } /* - * UQAM + * UQAM Add-Feature * Add for getting rootUser.password property value from runtime.properties */ private String getRootPasswordFromConfig() { @@ -215,7 +214,7 @@ private String getRootPasswordFromConfig() { } /* - * UQAM + * UQAM Add-Feature * Add for getting rootUser.passwordChangeRequired property value from runtime.properties */ private Boolean getRootPasswdChangeRequiredFromConfig() { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 975ee9768b..9d513b3ba1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -93,7 +93,7 @@ public void doGet( HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException { super.doGet(request,response); -//UQAM set for UTF-8 +//UQAM-Optimization set for UTF-8 response.setCharacterEncoding("UTF-8"); VitroRequest vreq = new VitroRequest(request); @@ -279,8 +279,6 @@ protected void doTemplate(VitroRequest vreq, HttpServletResponse response, bodyString = ""; } - //UQAM Add linguistic control management - // String bodyStringUTF = new String(bodyString.getBytes(), Charset.forName("UTF-8")); templateDataModel.put("body", bodyString); String lang = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java index 6f66940354..c5439d4a24 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java @@ -42,11 +42,7 @@ private void processTemplate(Template template, Map map, Writer try { Environment env = template.createProcessingEnvironment(map, writer); - /* - * UQAM Set encoding to UTF-8 for i18n special character - */ -// env.setOutputEncoding("utf-8"); - + // Define a setup template to be included by every page template String templateType = (String) map.get("templateType"); if (FreemarkerHttpServlet.PAGE_TEMPLATE_TYPE.equals(templateType)) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java index d26f27efad..9be3a758de 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java @@ -75,8 +75,8 @@ private String renderShortView(String individualUri, String vclassName) { modelMap.put("individual", IndividualTemplateModelBuilder.build(individual, vreq)); modelMap.put("vclass", vclassName); - String langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); //UQAM build the linguistic context - modelMap.put("langCtx", langCtx); // UQAM add the linguistic context to map + String langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); //UQAM-Linguistic-Management build the linguistic context + modelMap.put("langCtx", langCtx); // UQAM-Linguistic-Management add the linguistic context to map ShortViewService svs = ShortViewServiceSetup.getService(ctx); return svs.renderShortView(individual, ShortViewContext.BROWSE, modelMap, vreq); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index d92c901360..3e94ca202a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -783,7 +783,7 @@ private Literal getLabel(String lang, ListlabelList) { return labelLit; } else /* - * UQAM + * UQAM-Linguistic-Management * Check for country-part of lang (ex: 'en' for default consideration of labelLanguage in english but not encoded by 'en-US' most case of labels in vivo.owl) */ if ((lang != null) && (Arrays.asList(lang.split("-")).get(0).equals(labelLanguage))) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java index 9c543f06fc..ab509c82e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/RDFServiceGraph.java @@ -291,7 +291,7 @@ public static String sparqlNode(Node node, String varName) { pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); /* - * UQAM + * UQAM-Bug-Correction * reversing the condition tests. * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java index 50ace6c280..b85b7a79bf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/SparqlGraph.java @@ -233,7 +233,7 @@ public static String sparqlNode(Node node, String varName) { pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); /* - * UQAM + * UQAM-Bug-Correction * reversing the condition tests. * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java index fcb72e7ab2..1714e8db50 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractions.java @@ -57,7 +57,7 @@ public String toString(){ str += "\nadditions:["; if( getAdditions() != null ) { StringWriter writer = new StringWriter(); - // UQAM Replacing N3-PP by N3 (N3-PP does not exist in Jena + // UQAM-Bug Replacing N3-PP by N3 (N3-PP does not exist in Jena getAdditions().write(writer, "N3"); str += "\n" + writer.toString() + "\n"; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java index cf5c4dcbb7..837f69febf 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java @@ -74,7 +74,7 @@ public static VClass getRangeVClass(VitroRequest vreq) { } public static VClass getLangAwardRangeVClass(VitroRequest vreq) { - // UQAM + // UQAM-Linguistic-Management // // This needs a WebappDaoFactory with linguistic context filtering/RDFService @@ -136,7 +136,7 @@ public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri, String domainUri, String rangeUri) { // WebappDaoFactory wdf = vreq.getWebappDaoFactory(); - // UQAM Use linguistic context + // UQAM-Linguistic-Management Use linguistic context WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURIs( predicateUri, domainUri, rangeUri); @@ -307,12 +307,6 @@ public static Map> getExistingUriValues(EditConfigurationVT public static String generateHTMLForElement(VitroRequest vreq, String fieldName, EditConfigurationVTwo editConfig) { String html = ""; Configuration fmConfig = FreemarkerConfiguration.getConfig(vreq); - /* - * UQAM, encoded ftl to UTF-8 - */ - // fmConfig.setDefaultEncoding("utf-8"); - // fmConfig.setOutputEncoding("utf-8"); - // fmConfig.setURLEscapingCharset("UTF-8"); FieldVTwo field = editConfig == null ? null : editConfig.getField(fieldName); MultiValueEditSubmission editSub = EditSubmissionUtils.getEditSubmissionFromSession(vreq.getSession(), editConfig); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java index d5f7b9dbff..c20a63c91b 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java @@ -42,7 +42,7 @@ public ChildVClassesWithParent setDefaultOption(String label){ } /* - * UQAM + * UQAM-Linguistic-Management * This method is polymorphism of getOptions(EditConfigurationVTwo editConfig,String fieldName, WebappDaoFactory wDaoFact) * for the internationalization of word "other" in the scroling list of personHasAdvisorRelationship.ftl */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java index 67436009d3..b57e828795 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java @@ -53,7 +53,7 @@ public static Map getOptions( return Collections.emptyMap(); } } - // UQAM Overcharge method for linguistic contexte processisng + // UQAM-Linguistic-ManagementOvercharge method for linguistic contexte processisng public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, @@ -80,7 +80,7 @@ public static Map getOptions( } try { - //UQAM need vreq instead of WebappDaoFactory + //UQAM-Linguistic-Management need vreq instead of WebappDaoFactory Map parentClass = Collections.emptyMap(); FieldOptions fieldOptions = field.getFieldOptions(); // UQAM TODO - Only internationalization of ChildVClassesWithParent are implemented. For TODO, implement the internationalization for the rest of instanceof "FieldOptions" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java index c172294dfc..38a63b6219 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java @@ -130,7 +130,7 @@ protected List getRangeTypes(VitroRequest vreq) { //WebappDaoFactory ctxDaoFact = ModelAccess.on( // vreq.getSession().getServletContext()).getWebappDaoFactory(); // WebappDaoFactory ctxDaoFact = vreq.getLanguageNeutralWebappDaoFactory(); - //UQAM Manage linguistic context + //UQAM Linguistic-Management Manage linguistic context WebappDaoFactory ctxDaoFact = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE, PolicyOption.POLICY_NEUTRAL); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java index a0497b03f9..b1336b50f9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java @@ -76,7 +76,7 @@ protected static ResponseValues doPostEditRedirect( VitroRequest vreq , String e if( entityToReturnTo == null ){ // this will not work if there entityToReturnTo has a new resource URI, // in that case entityToReturnTo should not have been passed to this method as null - // UQAM + // UQAM-Linguistic-Management // MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), editConfig); MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, editConfig); entityToReturnTo = N3EditUtils.processEntityToReturnTo(editConfig, submission, vreq); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index 5bf7f1a485..cd9f5d8327 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -67,7 +67,7 @@ protected ResponseValues processRequest(VitroRequest vreq) { //get the EditSubmission // MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq.getParameterMap(), configuration); - // Modified by UQAM + // Modified by UQAM-Linguistic-Management MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, configuration); EditSubmissionUtils.putEditSubmissionInSession(vreq.getSession(), submission); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java index 2ef05e2789..0f739361cd 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java @@ -63,10 +63,6 @@ public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chai // get URL without hostname or servlet context HttpServletResponse response = (HttpServletResponse) arg1; HttpServletRequest req = (HttpServletRequest) arg0; - // UQAM Manage UTF-8 for i18n - // req.setCharacterEncoding("UTF-8"); - // response.setContentType("text/html; charset=UTF-8"); - // response.setCharacterEncoding("UTF-8"); String path = req.getRequestURI().substring(req.getContextPath().length()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java index 718f9543e8..719b041ab9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfiguration.java @@ -74,14 +74,6 @@ public static Configuration getConfig(HttpServletRequest req) { clearTemplateCacheIfRequested(); keepTemplateLoaderCurrentWithThemeDirectory(req); setThreadLocalsForRequest(req); - /* - * UQAM, encoded ftl to UTF-8 - */ -// instance.setEncoding(req.getLocale(), "utf-8"); -// instance.setIncompatibleImprovements(freemarker.template.Configuration.VERSION_2_3_23); -// instance.setDefaultEncoding("utf-8"); -// instance.setOutputEncoding("utf-8"); -// instance.setURLEscapingCharset("UTF-8"); return instance; } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java index 2601fb9549..06a17e4f4f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/RDFService.java @@ -266,7 +266,7 @@ public void unregisterJenaModelChangedListener(ModelChangedListener changeListen */ public void close(); /** - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Bug-Correction Useful among other things to transport the linguistic context in the service * @param vitroRequest */ public void setVitroRequest(VitroRequest vitroRequest); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java index 42d2a5c095..5413511ad7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java @@ -554,7 +554,7 @@ public int compare(Statement s1, Statement s2) { } } /* - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java index fc9ef4c3df..44bd2aabb5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceFactorySingle.java @@ -220,7 +220,7 @@ public String toString() { + ", inner=" + s + "]"; } /* - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java index e6d34fe54b..6958f27724 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java @@ -256,7 +256,7 @@ protected static String sparqlNode(Node node, String varName) { pyString(literalBuff, node.getLiteralLexicalForm()); literalBuff.append("\""); /* - * UQAM + * UQAM-Bug-Correction * reversing the condition tests. * It is important to prioritize the language typology test in order to exploit the linguistic context in testing the type of data */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java index 7e363a0cac..888a51506f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/RDFServiceJena.java @@ -706,7 +706,7 @@ protected QueryExecution createQueryExecution(String queryString, Query q, Datas return QueryExecutionFactory.create(q, d); } /* - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java index fc7c6249f6..4b910b568c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/model/RDFServiceModel.java @@ -121,7 +121,7 @@ public boolean changeSetUpdate(ChangeSet changeSet) return true; } /* - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java index 7a45dbcf29..abae2aeb91 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java @@ -209,7 +209,7 @@ public String toString() { return "LoggingRDFService[inner=" + innerService + "]"; } /* - * UQAM Useful among other things to transport the linguistic context in the service + * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) * @see edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService#setVitroRequest(edu.cornell.mannlib.vitro.webapp.controller.VitroRequest) */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index b488cfc7b5..c9b9dee6a7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -454,7 +454,7 @@ private static class FakeVivoPeopleDataGetter extends SparqlQueryDataGetter { // + " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1"; /* - * UQAM New query including Linguistic context + * UQAM-Optimization New query including Linguistic context */ private static String QUERY_STRING_LANG = "" + "PREFIX obo: \n" @@ -479,7 +479,7 @@ private static OntModel initializeFakeDisplayModel() { Property saveToVarProperty = m .getProperty(DisplayVocabulary.SAVE_TO_VAR); - m.add(dataGetter, queryProperty, QUERY_STRING_LANG); //UQAM Using query with linguistic context + m.add(dataGetter, queryProperty, QUERY_STRING_LANG); //UQAM-Optimization Using query with linguistic context m.add(dataGetter, saveToVarProperty, "extra"); return m; } @@ -494,14 +494,14 @@ public FakeVivoPeopleDataGetter(VitroRequest vreq, String individualUri) { this.individualUri = individualUri; this.vreq = vreq; this.ctx = vreq.getSession().getServletContext(); - this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM add the linguistic context + this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM-Optimization add the linguistic context } @Override public Map getData(Map pageData) { Map parms = new HashMap<>(); parms.put("uri", individualUri); - parms.put("langCtx", langCtx); //UQAM add the linguistic context + parms.put("langCtx", langCtx); //UQAM-Optimization add the linguistic context return super.getData(parms); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java index be09c3623f..1bce3fbad6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java @@ -534,10 +534,10 @@ private void readFile(File f, OntModel om, String path) { try { if (f.getName().endsWith(".md")) { // Markdown files are documentation - skip. - // UQAM accept lower and upper case in fn extension + // UQAM-Optimization accept lower and upper case in fn extension } else if (f.getName().toLowerCase().endsWith(".n3")) { om.read(fis, null, "N3"); - // UQAM Accept Turtle + // UQAM-Optimization Accept Turtle (Must for us) } else if (f.getName().toLowerCase().endsWith(".ttl")) { om.read(fis, null, "TURTLE"); } else { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java index 0de494abd9..5b08edf8c0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java @@ -168,7 +168,7 @@ private String bindParameters(String text, Map merged) { String value = merged.get(key); if (value.startsWith("http:")) { /* - * UQAM if the "value" looks like an URI then wrap the value with the characters '<' '>' + * UQAM-Optimization if the "value" looks like an URI then wrap the value with the characters '<' '>' * */ bound = bound.replaceAll("([?$]" + key + ")([^a-zA-Z0-9_\\-])", "<" + value + ">$2"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java index 0c080102bf..2d38449332 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/threads/VitroBackgroundThread.java @@ -21,7 +21,7 @@ * check their current status. */ public class VitroBackgroundThread extends Thread { - // UQAM add start + // UQAM-Bug-Correction add start public synchronized void start() { super.start(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index 1a92035b33..a7c3d26ae6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -102,7 +102,7 @@ private void populateDropdowns() throws Exception { //For each field with an optionType defined, create the options // WebappDaoFactory wdf = vreq.getWebappDaoFactory(); - // UQAM Manage Linguistic context + // UQAM-Optimization Manage Linguistic context WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); for(String fieldName: editConfig.getFields().keySet()){ FieldVTwo field = editConfig.getField(fieldName); @@ -111,7 +111,7 @@ private void populateDropdowns() throws Exception { //empty options field.setOptions(new ConstantFieldOptions()); } - //UQAM changing signature for including internationalization in scroll-down menu + //UQAM-Optimization changing signature for including internationalization in scroll-down menu Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf); // Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, vreq); optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap, field.getFieldOptions().getCustomComparator(), vreq); @@ -537,7 +537,7 @@ private String getDataLiteralValuesFromParameter() { //Updating to enable multiple vclasses applicable to subject to be analyzed to understand possible range of types public Map getOfferTypesCreateNew() { // WebappDaoFactory wdf = vreq.getWebappDaoFactory(); - // UQAM Manage Linguistic context + // UQAM-Optimization Manage Linguistic context WebappDaoFactory wdf = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(editConfig.getPredicateUri()); @@ -545,7 +545,7 @@ public Map getOfferTypesCreateNew() { Individual sub = wdf.getIndividualDao().getIndividualByURI(editConfig.getSubjectUri()); - // UQAM Manage Linguistic context + // UQAM-Optimization Manage Linguistic context VClass rangeClass = EditConfigurationUtils.getLangAwardRangeVClass(vreq); List vclasses = null; From 09a6f652cdb1646dc2157d764b567e71b6f1fc0f Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 1 Apr 2020 13:08:24 -0400 Subject: [PATCH 10/52] Resolve compilation failures in Vitro tests --- .../n3editing/VTwo/ProcessRdfFormTest.java | 52 +++++++++++++++---- .../validators/AntiXssValidationTest.java | 25 +++++++-- .../servlet/http/HttpServletRequestStub.java | 3 +- 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java index 79ee543655..3f0d5ad8aa 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java @@ -19,10 +19,13 @@ import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants; +import stubs.javax.servlet.http.HttpServletRequestStub; + public class ProcessRdfFormTest extends AbstractTestClass{ @Test @@ -40,14 +43,16 @@ public void basicNewStatementTest() throws Exception{ values.put("test3", (new String[] {"http://test.com/uri3"})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); /* test just the N3 substitution part */ Listreq = config.getN3Required(); Listopt = config.getN3Optional(); - processor.subInValuesToN3( config , submission, req, opt, null , null); + processor.subInValuesToN3( config , submission, req, opt, null , null, vreq); assertNotNull(req); assertTrue( req.size() > 0); assertNotNull(req.get(0)); @@ -102,7 +107,10 @@ public void basicEditStatement() throws Exception{ Map values = new HashMap(); values.put("testZ", (new String[] {testZURIChanged})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); AdditionsAndRetractions changes = processor.process( config, submission, null ); @@ -176,14 +184,17 @@ public void unicodeTest() throws Exception{ values.put("test2", (new String[] {test2})); values.put("test3", (new String[] {test3})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); /* test just the N3 substitution part */ Listreq = config.getN3Required(); Listopt = config.getN3Optional(); - processor.subInValuesToN3( config , submission, req, opt, null , null); + processor.subInValuesToN3( config , submission, req, opt, null , null, vreq); assertNotNull(req); assertTrue( req.size() > 0); assertNotNull(req.get(0)); @@ -220,14 +231,16 @@ public void basicNewResourceTest() throws Exception{ values.put("test3", (new String[] {"http://test.com/uri3"})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); /* test just the N3 substitution part */ Listreq = config.getN3Required(); Listopt = config.getN3Optional(); - processor.subInValuesToN3( config , submission, req, opt, null , null); + processor.subInValuesToN3( config , submission, req, opt, null , null, vreq); assertNotNull(req); assertTrue( req.size() > 0); assertNotNull(req.get(0)); @@ -270,14 +283,16 @@ public void forcedNewResourceTest() throws Exception{ values.put("test3", (new String[] {"http://test.com/uri3"})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); /* test just the N3 substitution part */ Listreq = config.getN3Required(); Listopt = config.getN3Optional(); - processor.subInValuesToN3( config , submission, req, opt, null , null); + processor.subInValuesToN3( config , submission, req, opt, null , null, vreq); assertNotNull(req); assertTrue( req.size() > 0); assertNotNull(req.get(0)); @@ -357,10 +372,13 @@ public void basicEditReplaceStatement() throws Exception{ values.put("testZ", (new String[] {testZURIChanged})); values.put("zLabel", (new String[] {"New Z Label"})); values.put("editKey", (new String[] {"mockEditKey"})); - MultiValueEditSubmission submission = new MultiValueEditSubmission(values, config); + + VitroRequest vreq = createRequestWithParameters(values); + + MultiValueEditSubmission submission = new MultiValueEditSubmission(vreq, config); ProcessRdfForm processor = new ProcessRdfForm(config,getMockNewURIMaker()); - AdditionsAndRetractions changes = processor.process( config, submission, null ); + AdditionsAndRetractions changes = processor.process( config, submission, vreq ); assertNotNull( changes ); assertNotNull( changes.getAdditions() ); @@ -396,4 +414,16 @@ public String getUnusedNewURI(String prefixURI) throws InsertException { } }; } + + private VitroRequest createRequestWithParameters(Map parameters) { + HttpServletRequestStub req = new HttpServletRequestStub(); + for (String key : parameters.keySet()) { + for (String value : parameters.get(key)) { + req.addParameter(key, value); + } + } + + return new VitroRequest(req); + } + } diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java index e9e2c463d7..3c238facd2 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/validators/AntiXssValidationTest.java @@ -9,10 +9,13 @@ import org.junit.Assert; import org.junit.Test; +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; +import stubs.javax.servlet.http.HttpServletRequestStub; + public class AntiXssValidationTest { @Test @@ -29,8 +32,10 @@ public void testLiteral( ){ String[] vals= { "some sort of string" }; params.put("X", vals); + VitroRequest vreq = createRequestWithParameters(params); + MultiValueEditSubmission mvEditSub = - new MultiValueEditSubmission(params,eConf); + new MultiValueEditSubmission(vreq,eConf); Map res = validator.validate(eConf, mvEditSub); Assert.assertEquals(null, res); @@ -53,8 +58,10 @@ public void testAllURI( ){ String[] strings2 = {"no problem 2"}; params.put("Z", strings2 ); + VitroRequest vreq = createRequestWithParameters(params); + MultiValueEditSubmission mvEditSub = - new MultiValueEditSubmission(params,eConf); + new MultiValueEditSubmission(vreq,eConf); Map res = validator.validate(eConf, mvEditSub); Assert.assertNull( res ); @@ -72,8 +79,10 @@ protected Map testURI( String ... strings){ Map params = new HashMap(); params.put("X", strings ); + VitroRequest vreq = createRequestWithParameters(params); + MultiValueEditSubmission mvEditSub = - new MultiValueEditSubmission(params,eConf); + new MultiValueEditSubmission(vreq,eConf); return validator.validate(eConf, mvEditSub); } @@ -125,5 +134,15 @@ public void testURIValidationWithScriptTagLevel2(){ Assert.assertNotNull(result); } + private VitroRequest createRequestWithParameters(Map parameters) { + HttpServletRequestStub req = new HttpServletRequestStub(); + for (String key : parameters.keySet()) { + for (String value : parameters.get(key)) { + req.addParameter(key, value); + } + } + + return new VitroRequest(req); + } } diff --git a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java index 27bb5e69fa..35b8da99c4 100644 --- a/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java +++ b/api/src/test/java/stubs/javax/servlet/http/HttpServletRequestStub.java @@ -510,8 +510,7 @@ public DispatcherType getDispatcherType() { @Override public Locale getLocale() { - throw new RuntimeException( - "HttpServletRequestStub.getLocale() not implemented."); + return Locale.ENGLISH; } @Override From 6fbaab82c1e53d3015ed15866d4ce4dd744dfa0d Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Thu, 9 Apr 2020 12:49:17 -0400 Subject: [PATCH 11/52] Remove whitespace changes from SelectListGeneratorVTwo.java --- .../VTwo/fields/SelectListGeneratorVTwo.java | 110 +++++++++--------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java index b57e828795..0af862694f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java @@ -20,7 +20,8 @@ public class SelectListGeneratorVTwo { - static Log log = LogFactory.getLog(SelectListGeneratorVTwo.class); + static Log log = LogFactory.getLog(SelectListGeneratorVTwo.class); + public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, @@ -53,7 +54,8 @@ public static Map getOptions( return Collections.emptyMap(); } } - // UQAM-Linguistic-ManagementOvercharge method for linguistic contexte processisng + + // UQAM Overcharge method for linguistic contexte processisng public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, @@ -80,7 +82,7 @@ public static Map getOptions( } try { - //UQAM-Linguistic-Management need vreq instead of WebappDaoFactory + //UQAM need vreq instead of WebappDaoFactory Map parentClass = Collections.emptyMap(); FieldOptions fieldOptions = field.getFieldOptions(); // UQAM TODO - Only internationalization of ChildVClassesWithParent are implemented. For TODO, implement the internationalization for the rest of instanceof "FieldOptions" @@ -96,61 +98,61 @@ public static Map getOptions( } - //Methods to sort the options map - // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708 - //Modified to allow for a custom comparator to be sent in, defaults to mapPairsComparator - public static Map getSortedMap(Map hmap, - Comparator comparator, VitroRequest vreq){ - // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator - List objectsToSort = new ArrayList(hmap.size()); - for (String key:hmap.keySet()) { - String[] x = new String[2]; - x[0] = key; - x[1] = hmap.get(key); - objectsToSort.add(x); - } + //Methods to sort the options map + // from http://forum.java.sun.com/thread.jspa?threadID=639077&messageID=4250708 + //Modified to allow for a custom comparator to be sent in, defaults to mapPairsComparator + public static Map getSortedMap(Map hmap, + Comparator comparator, VitroRequest vreq){ + // first make temporary list of String arrays holding both the key and its corresponding value, so that the list can be sorted with a decent comparator + List objectsToSort = new ArrayList(hmap.size()); + for (String key:hmap.keySet()) { + String[] x = new String[2]; + x[0] = key; + x[1] = hmap.get(key); + objectsToSort.add(x); + } - //if no comparator is passed in, utilize MapPairsComparator - if(comparator == null) { - comparator = new MapPairsComparator(vreq); - } + //if no comparator is passed in, utilize MapPairsComparator + if(comparator == null) { + comparator = new MapPairsComparator(vreq); + } - objectsToSort.sort(comparator); + objectsToSort.sort(comparator); - HashMap map = new LinkedHashMap(objectsToSort.size()); - for (String[] pair:objectsToSort) { - map.put(pair[0],pair[1]); - } - return map; - } + HashMap map = new LinkedHashMap(objectsToSort.size()); + for (String[] pair:objectsToSort) { + map.put(pair[0],pair[1]); + } + return map; + } - //Sorts by the value of the 2nd element in each of the arrays - private static class MapPairsComparator implements Comparator { + //Sorts by the value of the 2nd element in each of the arrays + private static class MapPairsComparator implements Comparator { - private Collator collator; + private Collator collator; - public MapPairsComparator(VitroRequest vreq) { - this.collator = vreq.getCollator(); - } - public int compare (String[] s1, String[] s2) { - if (s2 == null) { - return 1; - } else if (s1 == null) { - return -1; - } else { - if ("".equals(s1[0])) { - return -1; - } else if ("".equals(s2[0])) { - return 1; - } - if (s2[1]==null) { - return 1; - } else if (s1[1] == null){ - return -1; - } else { - return collator.compare(s1[1],s2[1]); - } - } - } - } + public MapPairsComparator(VitroRequest vreq) { + this.collator = vreq.getCollator(); + } + public int compare (String[] s1, String[] s2) { + if (s2 == null) { + return 1; + } else if (s1 == null) { + return -1; + } else { + if ("".equals(s1[0])) { + return -1; + } else if ("".equals(s2[0])) { + return 1; + } + if (s2[1]==null) { + return 1; + } else if (s1[1] == null){ + return -1; + } else { + return collator.compare(s1[1],s2[1]); + } + } + } + } } From 48e893195e0da33b29d4c28a945d4a8f4a42b42f Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 15 Apr 2020 11:38:36 -0400 Subject: [PATCH 12/52] Add null check on field values of RDF Form (#158) Resolves: https://jira.lyrasis.org/browse/VIVO-1800 Co-authored-by: Andrew Woods --- .../edit/n3editing/VTwo/ProcessRdfForm.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index da2a0ac0d9..a6a33a68e2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -203,26 +203,26 @@ protected void subInValuesToN3( */ Map> literalsFromForm = submission.getLiteralsFromForm(); Set keys = literalsFromForm.keySet(); - for (Iterator iterator = keys.iterator(); iterator.hasNext();) { - String aKey = (String) iterator.next(); + for (String aKey : keys) { List literalFromForm = literalsFromForm.get(aKey); List newLiteralFromForm = new ArrayList<>(); - for (Iterator iterator2 = literalFromForm.iterator(); iterator2.hasNext();) { - Literal aLiteral = (Literal) iterator2.next(); - String aLiteratDT = aLiteral.getDatatype().getURI(); - Literal newLiteral= null; - String aText = aLiteral.getLexicalForm(); - /* - * do it only if aLiteral are xstring datatype - */ - - if ( XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT) ) { - String lang =vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); - newLiteral = ResourceFactory.createLangLiteral(aText, lang); - } else { - newLiteral = ResourceFactory.createTypedLiteral(aText, aLiteral.getDatatype()); - } - newLiteralFromForm.add(newLiteral); + for (Literal aLiteral : literalFromForm) { + if (aLiteral != null) { + String aLiteratDT = aLiteral.getDatatype().getURI(); + Literal newLiteral = null; + String aText = aLiteral.getLexicalForm(); + /* + * do it only if aLiteral are xstring datatype + */ + + if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) { + String lang = vreq.getLocale().getLanguage() + "-" + vreq.getLocale().getCountry(); + newLiteral = ResourceFactory.createLangLiteral(aText, lang); + } else { + newLiteral = ResourceFactory.createTypedLiteral(aText, aLiteral.getDatatype()); + } + newLiteralFromForm.add(newLiteral); + } } literalsFromForm.replace(aKey, newLiteralFromForm); } From f502d799ad8b8b927935eac011b5a3c484fa7c7f Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 15 Apr 2020 11:47:46 -0400 Subject: [PATCH 13/52] Fix incorrect tool-tip in language selection dropdown (#156) Resolves: https://jira.lyrasis.org/browse/VIVO-1783 Co-authored-by: Andrew Woods --- .../templates/freemarker/page/partials/languageSelector.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl index 80a0c633f2..0a2bd19434 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl @@ -8,7 +8,7 @@ <#-- This is included by identity.ftl --> <#if selectLocale??> -
    • ${i18n().select_a_language}
        +
        • ${i18n().select_a_language}
            <#list selectLocale.locales as locale>
          • status="selected"> From 3804c908d258f9212f3ed82d1f039237052e53cf Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Fri, 17 Apr 2020 22:37:47 +0300 Subject: [PATCH 14/52] Sprint i18n/lang filtering model (#159) * Add language-aware graph filtering instead of layering on additional RDFService Resolves: https://jira.lyrasis.org/browse/VIVO-1771 --- .../VTwo/EditConfigurationUtils.java | 18 +-- .../adapters/AbstractGraphDecorator.java | 136 ++++++++++++++++ .../adapters/AbstractModelDecorator.java | 2 +- .../filter/AcceptableLanguages.java | 36 +++++ .../webapp/rdfservice/filter/LangSort.java | 72 +++++++++ .../filter/LanguageFilterModel.java | 104 ++++++++++++ .../filter/LanguageFilteringGraph.java | 59 +++++++ .../filter/LanguageFilteringRDFService.java | 153 ++---------------- .../filter/LanguageFilteringUtils.java | 12 +- .../LanguageFilteringRDFServiceTest.java | 8 +- 10 files changed, 432 insertions(+), 168 deletions(-) create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractGraphDecorator.java create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LangSort.java create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilterModel.java create mode 100644 api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringGraph.java diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java index 837f69febf..e0b68e7b29 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java @@ -63,11 +63,6 @@ public static String getRangeUri(VitroRequest vreq) { } public static VClass getRangeVClass(VitroRequest vreq) { - - // This needs a WebappDaoFactory with no filtering/RDFService - // funny business because it needs to be able to retrieve anonymous union - // classes by their "pseudo-bnode URIs". - // Someday we'll need to figure out a different way of doing this. WebappDaoFactory ctxDaoFact = ModelAccess.on( vreq.getSession().getServletContext()).getWebappDaoFactory(); return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq)); @@ -75,17 +70,12 @@ public static VClass getRangeVClass(VitroRequest vreq) { public static VClass getLangAwardRangeVClass(VitroRequest vreq) { // UQAM-Linguistic-Management - // - - // This needs a WebappDaoFactory with linguistic context filtering/RDFService - // funny business because it needs to be able to retrieve anonymous union - // classes by their "pseudo-bnode URIs". - // Someday we'll need to figure out a different way of doing this. - WebappDaoFactory ctxDaoFact = ModelAccess.on(vreq).getWebappDaoFactory(LanguageOption.LANGUAGE_AWARE); - return ctxDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq)); + WebappDaoFactory vreqDaoFact = ModelAccess.on(vreq).getWebappDaoFactory( + LanguageOption.LANGUAGE_AWARE); + return vreqDaoFact.getVClassDao().getVClassByURI(getRangeUri(vreq)); } + //get individual - public static Individual getSubjectIndividual(VitroRequest vreq) { Individual subject = null; String subjectUri = getSubjectUri(vreq); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractGraphDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractGraphDecorator.java new file mode 100644 index 0000000000..c2f9faa67f --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractGraphDecorator.java @@ -0,0 +1,136 @@ +package edu.cornell.mannlib.vitro.webapp.rdfservice.adapters; + +import org.apache.jena.graph.Capabilities; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphEventManager; +import org.apache.jena.graph.GraphStatisticsHandler; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.TransactionHandler; +import org.apache.jena.graph.Triple; +import org.apache.jena.shared.AddDeniedException; +import org.apache.jena.shared.DeleteDeniedException; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.util.iterator.ExtendedIterator; + +import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; + +/** + * The base class for a delegating graph decorator. + * + * As implemented, all methods simply delegate to the inner graph. Subclasses + * should override selected methods to provide functionality. + */ +public abstract class AbstractGraphDecorator implements + Graph { + + private final Graph inner; + + protected AbstractGraphDecorator(Graph g) { + if (g == null) { + throw new IllegalArgumentException("g may not be null."); + } + this.inner = g; + } + + @Override + public String toString() { + return ToString.simpleName(this) + "[" + ToString.hashHex(this) + + ", inner=" + ToString.graphToString(inner) + "]"; + } + + @Override + public void add(Triple arg0) throws AddDeniedException { + inner.add(arg0); + } + + @Override + public void clear() { + inner.clear(); + } + + @Override + public void close() { + inner.close(); + } + + @Override + public boolean contains(Triple arg0) { + return inner.contains(arg0); + } + + @Override + public boolean contains(Node arg0, Node arg1, Node arg2) { + return inner.contains(arg0, arg1, arg2); + } + + @Override + public void delete(Triple arg0) throws DeleteDeniedException { + inner.delete(arg0); + } + + @Override + public boolean dependsOn(Graph arg0) { + return inner.dependsOn(arg0); + } + + @Override + public ExtendedIterator find(Triple arg0) { + return inner.find(arg0); + } + + @Override + public ExtendedIterator find(Node arg0, Node arg1, Node arg2) { + return inner.find(arg0, arg1, arg2); + } + + @Override + public Capabilities getCapabilities() { + return inner.getCapabilities(); + } + + @Override + public GraphEventManager getEventManager() { + return inner.getEventManager(); + } + + @Override + public PrefixMapping getPrefixMapping() { + return inner.getPrefixMapping(); + } + + @Override + public GraphStatisticsHandler getStatisticsHandler() { + return inner.getStatisticsHandler(); + } + + @Override + public TransactionHandler getTransactionHandler() { + return inner.getTransactionHandler(); + } + + @Override + public boolean isClosed() { + return inner.isClosed(); + } + + @Override + public boolean isEmpty() { + return inner.isEmpty(); + } + + @Override + public boolean isIsomorphicWith(Graph arg0) { + return inner.isIsomorphicWith(arg0); + } + + @Override + public void remove(Node arg0, Node arg1, Node arg2) { + inner.remove(arg0, arg1, arg2); + } + + @Override + public int size() { + return inner.size(); + } + +} \ No newline at end of file diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java index 052d1b8db4..47e4d2a3ec 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/AbstractModelDecorator.java @@ -54,7 +54,7 @@ public abstract class AbstractModelDecorator implements Model { protected AbstractModelDecorator(Model m) { if (m == null) { - throw new NullPointerException("m may not be null."); + throw new IllegalArgumentException("m may not be null."); } this.inner = m; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java new file mode 100644 index 0000000000..092ad9bc00 --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java @@ -0,0 +1,36 @@ +package edu.cornell.mannlib.vitro.webapp.rdfservice.filter; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A normalized list of languages/locales acceptable in results + * returned by language-filtering RDFServices, graphs, models, etc. + */ +public class AcceptableLanguages extends ArrayList{ + + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(AcceptableLanguages.class); + + /** + * Construct a normalized list of acceptable language strings + * from a set of raw language strings. For any values of form 'aa-BB', + * the base language ('aa') will be also added to the list. + * @param rawLanguageStrs may not be null + */ + public AcceptableLanguages(List rawLanguageStrs) { + log.debug("Raw language strings:" + rawLanguageStrs); + for (String lang : rawLanguageStrs) { + this.add(lang); + String baseLang = lang.split("-")[0]; + if (!lang.equals(baseLang) && !this.contains(baseLang)) { + this.add(baseLang); + } + } + log.debug("Normalized language strings:" + this); + } + +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LangSort.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LangSort.java new file mode 100644 index 0000000000..933da13c24 --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LangSort.java @@ -0,0 +1,72 @@ +package edu.cornell.mannlib.vitro.webapp.rdfservice.filter; + +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * A class for sorting language strings by acceptability according to a + * supplied list of language preferences. + * Refactored from LanguageFilteringRDFService for reuse by classes performing + * similar functions. + */ +public class LangSort { + + private static final Log log = LogFactory.getLog(LangSort.class); + + protected List langs; + private int inexactMatchPenalty; + private int noLanguage; + private int noMatch; + + /** + * Construct a language string sorter with a supplied list of preferred + * language strings + * @param preferredLanguageStrings list of preferred languages of form + * 'en-US', 'es', 'fr-CA'. May not be null. + */ + public LangSort(List preferredLanguageStrings) { + this.langs = preferredLanguageStrings; + this.inexactMatchPenalty = langs.size(); + // no language is worse than any inexact match (if the preferred list does not include ""). + this.noLanguage = 2 * inexactMatchPenalty; + // no match is worse than no language. + this.noMatch = noLanguage + 1; + } + + protected int compareLangs(String t1lang, String t2lang) { + return languageIndex(t1lang) - languageIndex(t2lang); + } + + /** + * Return index of exact match, or index of partial match, or + * language-free, or no match. + */ + private int languageIndex(String lang) { + if (lang == null) { + lang = ""; + } + + int index = langs.indexOf(lang); + if (index >= 0) { + log.debug("languageIndex for '" + lang + "' is " + index); + return index; + } + + if (lang.length() > 2) { + index = langs.indexOf(lang.substring(0, 2)); + if (index >= 0) { + log.debug("languageIndex for '" + lang + "' is " + index + inexactMatchPenalty); + return index + inexactMatchPenalty; + } + } + + if (lang.isEmpty()) { + log.debug("languageIndex for '" + lang + "' is " + noLanguage); + return noLanguage; + } + + return noMatch; + } +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilterModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilterModel.java new file mode 100644 index 0000000000..0b1e5ce2fb --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilterModel.java @@ -0,0 +1,104 @@ +package edu.cornell.mannlib.vitro.webapp.rdfservice.filter; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; + +/** + * A filter of literal statements from Models according to language preferences. + */ +public class LanguageFilterModel { + + private static final Log log = LogFactory.getLog(LanguageFilterModel.class); + + /** + * + * @param m the model to filter. May not be null. + * @param langs list of strings of type 'en-US'. May not be null. + * @return model with language-inappropriate literal statements filtered out. + */ + public Model filterModel(Model m, List langs) { + log.debug("filterModel"); + List retractions = new ArrayList(); + StmtIterator stmtIt = m.listStatements(); + while (stmtIt.hasNext()) { + Statement stmt = stmtIt.nextStatement(); + if (stmt.getObject().isLiteral()) { + List candidatesForRemoval = m.listStatements( + stmt.getSubject(), stmt.getPredicate(), (RDFNode) null).toList(); + if (candidatesForRemoval.size() == 1) { + continue; + } + candidatesForRemoval.sort(new StatementSortByLang(langs)); + log.debug("sorted statements: " + showSortedStatements(candidatesForRemoval)); + Iterator candIt = candidatesForRemoval.iterator(); + String langRegister = null; + boolean chuckRemaining = false; + while(candIt.hasNext()) { + Statement s = candIt.next(); + if (!s.getObject().isLiteral()) { + continue; + } else if (chuckRemaining) { + retractions.add(s); + } + String lang = s.getObject().asLiteral().getLanguage(); + if (langRegister == null) { + langRegister = lang; + } else if (!langRegister.equals(lang)) { + chuckRemaining = true; + retractions.add(s); + } + } + } + + } + m.remove(retractions); + return m; + } + + private String showSortedStatements(List candidatesForRemoval) { + List langStrings = new ArrayList(); + for (Statement stmt: candidatesForRemoval) { + if (stmt == null) { + langStrings.add("null stmt"); + } else { + RDFNode node = stmt.getObject(); + if (!node.isLiteral()) { + langStrings.add("not literal"); + } else { + langStrings.add(node.asLiteral().getLanguage()); + } + } + } + return langStrings.toString(); + } + + private class StatementSortByLang extends LangSort implements Comparator { + + public StatementSortByLang(List langs) { + super(langs); + } + + public int compare(Statement s1, Statement s2) { + if (s1 == null || s2 == null) { + return 0; + } else if (!s1.getObject().isLiteral() || !s2.getObject().isLiteral()) { + return 0; + } + + String s1lang = s1.getObject().asLiteral().getLanguage(); + String s2lang = s2.getObject().asLiteral().getLanguage(); + + return compareLangs(s1lang, s2lang); + } + } + +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringGraph.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringGraph.java new file mode 100644 index 0000000000..b578fddebb --- /dev/null +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringGraph.java @@ -0,0 +1,59 @@ +package edu.cornell.mannlib.vitro.webapp.rdfservice.filter; + +import java.util.List; + +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.mem.GraphMem; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.util.iterator.ExtendedIterator; + +import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.AbstractGraphDecorator; + +/** + * A graph decorator that filters find() results according to a list of + * preferred language strings + */ +public class LanguageFilteringGraph extends AbstractGraphDecorator + implements Graph { + + private List langs; + private LanguageFilterModel filterModel = new LanguageFilterModel(); + + /** + * Return a graph wrapped in a decorator that will filter find() results + * according to the supplied list of acceptable languages + * @param g the graph to wrap with language awareness. May not be null. + * @param preferredLanguages a list of preferred language strings. May not + * be null. + */ + protected LanguageFilteringGraph(Graph g, List preferredLanguages) { + super(g); + this.langs = preferredLanguages; + } + + @Override + public ExtendedIterator find(Triple arg0) { + return filter(super.find(arg0)); + + } + + @Override + public ExtendedIterator find(Node arg0, Node arg1, Node arg2) { + return filter(super.find(arg0, arg1, arg2)); + } + + private ExtendedIterator filter(ExtendedIterator triples) { + Graph tmp = new GraphMem(); + while(triples.hasNext()) { + Triple t = triples.next(); + tmp.add(t); + } + Model filteredModel = filterModel.filterModel( + ModelFactory.createModelForGraph(tmp), langs); + return filteredModel.getGraph().find(); + } + +} diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java index 5413511ad7..9cd57b4cbc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java @@ -7,14 +7,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.jena.query.QuerySolution; import org.apache.jena.query.ResultSet; import org.apache.jena.query.ResultSetFactory; @@ -23,8 +21,6 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelChangedListener; import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.rdf.model.Statement; -import org.apache.jena.rdf.model.StmtIterator; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeListener; @@ -39,27 +35,13 @@ public class LanguageFilteringRDFService implements RDFService { private static final Log log = LogFactory.getLog(LanguageFilteringRDFService.class); private RDFService s; private List langs; + private LanguageFilterModel filterModel = new LanguageFilterModel(); public LanguageFilteringRDFService(RDFService service, List langs) { this.s = service; - this.langs = normalizeLangs(langs); + this.langs = new AcceptableLanguages(langs); } - private List normalizeLangs(List langs) { - log.debug("Preferred languages:" + langs); - - List normalizedLangs = new ArrayList(langs); - for (String lang : langs) { - String baseLang = lang.split("-")[0]; - if (!normalizedLangs.contains(baseLang)) { - normalizedLangs.add(baseLang); - } - } - - log.debug("Normalized languages:" + normalizedLangs); - return normalizedLangs; - } - @Override public boolean changeSetUpdate(ChangeSet changeSet) throws RDFServiceException { @@ -83,8 +65,10 @@ public void newIndividual(String individualURI, public InputStream sparqlConstructQuery(String query, ModelSerializationFormat resultFormat) throws RDFServiceException { - Model m = RDFServiceUtils.parseModel(s.sparqlConstructQuery(query, resultFormat), resultFormat); - InputStream in = outputModel(filterModel(m), resultFormat); + Model m = RDFServiceUtils.parseModel(s.sparqlConstructQuery( + query, resultFormat), resultFormat); + InputStream in = outputModel(filterModel.filterModel( + m, langs), resultFormat); return in; } @@ -99,7 +83,7 @@ public InputStream sparqlDescribeQuery(String query, ModelSerializationFormat resultFormat) throws RDFServiceException { Model m = RDFServiceUtils.parseModel(s.sparqlDescribeQuery(query, resultFormat), resultFormat); - return outputModel(filterModel(m), resultFormat); + return outputModel(filterModel.filterModel(m, langs), resultFormat); } private InputStream outputModel(Model m, ModelSerializationFormat resultFormat) { @@ -108,62 +92,6 @@ private InputStream outputModel(Model m, ModelSerializationFormat resultFormat) return new ByteArrayInputStream(out.toByteArray()); } - private Model filterModel(Model m) { - log.debug("filterModel"); - List retractions = new ArrayList(); - StmtIterator stmtIt = m.listStatements(); - while (stmtIt.hasNext()) { - Statement stmt = stmtIt.nextStatement(); - if (stmt.getObject().isLiteral()) { - List candidatesForRemoval = m.listStatements( - stmt.getSubject(), stmt.getPredicate(), (RDFNode) null).toList(); - if (candidatesForRemoval.size() == 1) { - continue; - } - candidatesForRemoval.sort(new StatementSortByLang()); - log.debug("sorted statements: " + showSortedStatements(candidatesForRemoval)); - Iterator candIt = candidatesForRemoval.iterator(); - String langRegister = null; - boolean chuckRemaining = false; - while(candIt.hasNext()) { - Statement s = candIt.next(); - if (!s.getObject().isLiteral()) { - continue; - } else if (chuckRemaining) { - retractions.add(s); - } - String lang = s.getObject().asLiteral().getLanguage(); - if (langRegister == null) { - langRegister = lang; - } else if (!langRegister.equals(lang)) { - chuckRemaining = true; - retractions.add(s); - } - } - } - - } - m.remove(retractions); - return m; - } - - private String showSortedStatements(List candidatesForRemoval) { - List langStrings = new ArrayList(); - for (Statement stmt: candidatesForRemoval) { - if (stmt == null) { - langStrings.add("null stmt"); - } else { - RDFNode node = stmt.getObject(); - if (!node.isLiteral()) { - langStrings.add("not literal"); - } else { - langStrings.add(node.asLiteral().getLanguage()); - } - } - } - return langStrings.toString(); - } - @Override public InputStream sparqlSelectQuery(String query, ResultFormat resultFormat) throws RDFServiceException { @@ -198,7 +126,7 @@ public InputStream sparqlSelectQuery(String query, if (candidatesForRemoval.size() == 1) { continue; } - candidatesForRemoval.sort(new RowIndexedLiteralSortByLang()); + candidatesForRemoval.sort(new RowIndexedLiteralSortByLang(langs)); log.debug("sorted RowIndexedLiterals: " + showSortedRILs(candidatesForRemoval)); Iterator candIt = candidatesForRemoval.iterator(); String langRegister = null; @@ -290,7 +218,7 @@ protected void endProcessing() { if (candidatesForRemoval.size() == 1) { continue; } - candidatesForRemoval.sort(new RowIndexedLiteralSortByLang()); + candidatesForRemoval.sort(new RowIndexedLiteralSortByLang(langs)); log.debug("sorted RowIndexedLiterals: " + showSortedRILs(candidatesForRemoval)); Iterator candIt = candidatesForRemoval.iterator(); String langRegister = null; @@ -480,52 +408,12 @@ public void close() { s.close(); } - private class LangSort { - // any inexact match is worse than any exact match - private int inexactMatchPenalty = langs.size(); - // no language is worse than any inexact match (if the preferred list does not include ""). - private int noLanguage = 2 * inexactMatchPenalty; - // no match is worse than no language. - private int noMatch = noLanguage + 1; - - protected int compareLangs(String t1lang, String t2lang) { - return languageIndex(t1lang) - languageIndex(t2lang); - } - - /** - * Return index of exact match, or index of partial match, or - * language-free, or no match. - */ - private int languageIndex(String lang) { - if (lang == null) { - lang = ""; - } - - int index = langs.indexOf(lang); - if (index >= 0) { - log.debug("languageIndex for '" + lang + "' is " + index); - return index; - } - - if (lang.length() > 2) { - index = langs.indexOf(lang.substring(0, 2)); - if (index >= 0) { - log.debug("languageIndex for '" + lang + "' is " + index + inexactMatchPenalty); - return index + inexactMatchPenalty; - } - } - - if (lang.isEmpty()) { - log.debug("languageIndex for '" + lang + "' is " + noLanguage); - return noLanguage; - } - - return noMatch; - } - } - private class RowIndexedLiteralSortByLang extends LangSort implements Comparator { + public RowIndexedLiteralSortByLang(List langs) { + super(langs); + } + public int compare(RowIndexedLiteral rilit1, RowIndexedLiteral rilit2) { if (rilit1 == null || rilit2 == null) { return 0; @@ -538,21 +426,6 @@ public int compare(RowIndexedLiteral rilit1, RowIndexedLiteral rilit2) { } } - private class StatementSortByLang extends LangSort implements Comparator { - - public int compare(Statement s1, Statement s2) { - if (s1 == null || s2 == null) { - return 0; - } else if (!s1.getObject().isLiteral() || !s2.getObject().isLiteral()) { - return 0; - } - - String s1lang = s1.getObject().asLiteral().getLanguage(); - String s2lang = s2.getObject().asLiteral().getLanguage(); - - return compareLangs(s1lang, s2lang); - } - } /* * UQAM-Linguistic-Management Useful among other things to transport the linguistic context in the service * (non-Javadoc) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java index 5a03364624..e8f71124ab 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java @@ -13,9 +13,6 @@ import org.apache.jena.ontology.OntModelSpec; import org.apache.jena.rdf.model.ModelFactory; -import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph; -import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; - /** * Some methods that will come in handy when dealing with Language Filtering */ @@ -43,17 +40,14 @@ public static List localesToLanguages(Enumeration locales) { } /** - * Add a Language Filtering layer to an OntModel by treating it as an RDFService. + * Add a Language Filtering layer to an OntModel */ public static OntModel wrapOntModelInALanguageFilter(OntModel rawModel, ServletRequest req) { - /** This is some nasty layering. Could we do this more easily? */ List languages = localesToLanguages(req.getLocales()); return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, - RDFServiceGraph.createRDFServiceModel( - new RDFServiceGraph( - new LanguageFilteringRDFService( - new RDFServiceModel(rawModel), languages)))); + ModelFactory.createModelForGraph(new LanguageFilteringGraph( + rawModel.getGraph(), languages))); } private LanguageFilteringUtils() { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java index 261718d6d2..a062798f1b 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFServiceTest.java @@ -282,12 +282,12 @@ private Object buildRowIndexedLiteral(String language) { private Comparator buildRowIndexedLiteralSortByLang() { try { Class clazz = Class.forName(COLLATOR_CLASSNAME); - Class[] argTypes = { LanguageFilteringRDFService.class }; - Constructor constructor = clazz.getDeclaredConstructor(argTypes); + Class[] argTypes = { LanguageFilteringRDFService.class, List.class }; + Constructor constructor = clazz.getDeclaredConstructor(argTypes); constructor.setAccessible(true); - return (Comparator) constructor - .newInstance(filteringRDFService); + .newInstance(filteringRDFService, new AcceptableLanguages( + preferredLanguages)); } catch (Exception e) { throw new RuntimeException("Could not create a collator", e); } From 6e3b9d2980bf24e3eeaff19efc13c36eee43db3a Mon Sep 17 00:00:00 2001 From: j-dornbusch Date: Mon, 27 Apr 2020 19:53:30 +0200 Subject: [PATCH 15/52] Remove hardcoded link label (#161) Resolves: https://jira.lyrasis.org/browse/VIVO-1779 --- .../body/individual/manageLabelsForIndividualMacros.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl index 117b4b9185..3eef638c16 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualMacros.ftl @@ -81,7 +81,7 @@ <#macro displayLabel labelSeq labelStr languageCode labelEditLink tagOrTypeStr editGenerator editable displayRemoveLink>
          • ${labelStr} <#if labelSeq?seq_contains(labelStr)> (duplicate value) - <#if editable> <#if labelEditLink?has_content> Edit + <#if editable> <#if labelEditLink?has_content> ${i18n().edit_capitalized} <#if displayRemoveLink> ${i18n().remove_capitalized} From 413184dad6ea9cc16c1a2cb89ad7b2ed60a094ea Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Fri, 1 May 2020 06:03:37 -0400 Subject: [PATCH 16/52] Enable filtering of non-enabled i18n language files from being loaded into triple store (#160) Define name of available language listing file (found in Vitro-languages) Update RDFFilesLoader method interfaces to include ServletContext Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836 Co-authored-by: Andrew Woods --- .../vitro/webapp/beans/ApplicationBean.java | 7 ++ .../setup/ConfigurationModelsSetup.java | 4 +- .../servlet/setup/ContentModelSetup.java | 10 +- .../webapp/servlet/setup/RDFFilesLoader.java | 112 ++++++++++++------ installer/webapp/pom.xml | 14 +-- 5 files changed, 98 insertions(+), 49 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java index c083d44f3d..563b1c9b44 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ApplicationBean.java @@ -20,6 +20,7 @@ public class ApplicationBean { public final static int VIVO_SEARCHBOX_SIZE = 20; private final static String DEFAULT_APPLICATION_NAME = "Vitro"; + private final static String DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE = "available-langs"; private final static String DEFAULT_ROOT_LOGOTYPE_IMAGE = ""; private final static int DEFAULT_ROOT_LOGOTYPE_WIDTH = 0; private final static int DEFAULT_ROOT_LOGOTYPE_HEIGHT = 0; @@ -33,6 +34,7 @@ public class ApplicationBean { private boolean initialized = false; private String sessionIdStr = null; private String applicationName = DEFAULT_APPLICATION_NAME; + private String availableLangsFile = DEFAULT_APPLICATION_AVAILABLE_LANGS_FILE; private String rootLogotypeImage = DEFAULT_ROOT_LOGOTYPE_IMAGE; private int rootLogotypeWidth = DEFAULT_ROOT_LOGOTYPE_WIDTH; @@ -52,6 +54,7 @@ public String toString() { output += " initialized from DB: [" + initialized + "]\n"; output += " session id: [" + sessionIdStr + "]\n"; output += " application name: [" + applicationName + "]\n"; + output += " available langs file: [" + availableLangsFile + "]\n"; output += " root logotype image: [" + rootLogotypeImage + "]\n"; output += " root logotype width: [" + rootLogotypeWidth + "]\n"; output += " root logotype height: [" + rootLogotypeHeight + "]\n"; @@ -177,6 +180,10 @@ public String getShortHand() { return ""; } + public String getAvailableLangsFile() { + return availableLangsFile; + } + /** * Directory to find the images. Subdirectories include css, jsp and site_icons. * Example: "themes/enhanced/" diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java index 1c0ea33ce3..7cabec5728 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java @@ -52,12 +52,12 @@ private void setupModel(ServletContext ctx, String modelUri, private void loadFirstTimeFiles(ServletContext ctx, String modelPath, OntModel baseModel) { - RDFFilesLoader.loadFirstTimeFiles(modelPath, baseModel, baseModel.isEmpty()); + RDFFilesLoader.loadFirstTimeFiles(ctx, modelPath, baseModel, baseModel.isEmpty()); } private void loadEveryTimeFiles(ServletContext ctx, String modelPath, OntModel memoryModel) { - RDFFilesLoader.loadEveryTimeFiles(modelPath, memoryModel); + RDFFilesLoader.loadEveryTimeFiles(ctx, modelPath, memoryModel); } @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java index 84e2d68093..9103ab24e5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java @@ -67,15 +67,15 @@ private void setUpJenaDataSource(ServletContext ctx) { OntModel baseABoxModel = models.getOntModel(ABOX_ASSERTIONS); if (firstTimeStartup) { - RDFFilesLoader.loadFirstTimeFiles("abox", baseABoxModel, true); + RDFFilesLoader.loadFirstTimeFiles(ctx, "abox", baseABoxModel, true); } - RDFFilesLoader.loadEveryTimeFiles("abox", baseABoxModel); + RDFFilesLoader.loadEveryTimeFiles(ctx, "abox", baseABoxModel); OntModel baseTBoxModel = models.getOntModel(TBOX_ASSERTIONS); if (firstTimeStartup) { - RDFFilesLoader.loadFirstTimeFiles("tbox", baseTBoxModel, true); + RDFFilesLoader.loadFirstTimeFiles(ctx, "tbox", baseTBoxModel, true); } - RDFFilesLoader.loadEveryTimeFiles("tbox", baseTBoxModel); + RDFFilesLoader.loadEveryTimeFiles(ctx, "tbox", baseTBoxModel); } private long secondsSince(long startTime) { @@ -94,7 +94,7 @@ private long secondsSince(long startTime) { private void initializeApplicationMetadata(ServletContext ctx, Model applicationMetadataModel) { OntModel temporaryAMModel = VitroModelFactory.createOntologyModel(); - RDFFilesLoader.loadFirstTimeFiles("applicationMetadata", temporaryAMModel, true); + RDFFilesLoader.loadFirstTimeFiles(ctx, "applicationMetadata", temporaryAMModel, true); setPortalUriOnFirstTime(temporaryAMModel, ctx); applicationMetadataModel.add(temporaryAMModel); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java index 35fdaf54df..f9055f5e06 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java @@ -2,7 +2,6 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup; -import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -10,9 +9,20 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Enumeration; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.ResourceBundle; import java.util.Set; import java.util.TreeSet; +import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; +import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.i18n.VitroResourceBundle; +import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,6 +33,8 @@ import edu.cornell.mannlib.vitro.webapp.application.ApplicationUtils; +import javax.servlet.ServletContext; + /** * Help to load RDF files on first time and on every startup. */ @@ -34,8 +46,10 @@ public class RDFFilesLoader { private static final String FIRST_TIME = "firsttime"; private static final String EVERY_TIME = "everytime"; + private static List omittedLocales; + /** - * Path filter that ignores sub-directories, hidden files, and markdown + * Path filter that ignores sub-directories, hidden files, markdown and non-enabled language * files. */ private static final DirectoryStream.Filter RDF_FILE_FILTER = new DirectoryStream.Filter() { @@ -52,6 +66,15 @@ public boolean accept(Path p) throws IOException { if (p.toString().endsWith(".md")) { return false; } + // Skip language files that are not enabled + // ..Assumes all language files take the form: path/to/file/name-.extension + String basename = FilenameUtils.getBaseName(p.toString()); + for (String omit : omittedLocales) { + if (basename.endsWith(omit)) { + log.info("Ignoring file not enabled in i18n configuration: " + p); + return false; + } + } return true; } }; @@ -64,11 +87,11 @@ public boolean accept(Path p) throws IOException { * * The files from the directory are added to the model. */ - public static void loadFirstTimeFiles(String modelPath, Model model, + public static void loadFirstTimeFiles(ServletContext ctx, String modelPath, Model model, boolean firstTime) { if (firstTime) { String home = locateHomeDirectory(); - Set paths = getPaths(home, RDF, modelPath, FIRST_TIME); + Set paths = getPaths(ctx, home, RDF, modelPath, FIRST_TIME); for (Path p : paths) { log.info("Loading " + relativePath(p, home)); readOntologyFileIntoModel(p, model); @@ -87,11 +110,11 @@ public static void loadFirstTimeFiles(String modelPath, Model model, * * The files from the directory become a sub-model of the model. */ - public static void loadEveryTimeFiles(String modelPath, OntModel model) { + public static void loadEveryTimeFiles(ServletContext ctx, String modelPath, OntModel model) { OntModel everytimeModel = ModelFactory .createOntologyModel(OntModelSpec.OWL_MEM); String home = locateHomeDirectory(); - Set paths = getPaths(home, RDF, modelPath, EVERY_TIME); + Set paths = getPaths(ctx, home, RDF, modelPath, EVERY_TIME); for (Path p : paths) { log.info("Loading " + relativePath(p, home)); readOntologyFileIntoModel(p, everytimeModel); @@ -107,38 +130,14 @@ private static Path relativePath(Path p, String home) { } } - /** - * Create a model from all the RDF files in the specified directory. - */ - public static OntModel getModelFromDir(File dir) { - OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); - if (dir == null) { - log.warn("Must pass a File to getModelFromDir()"); - return model; - } - if (!dir.isDirectory()) { - log.warn("Directory must be a File object for a directory"); - return model; - } - if (!dir.canRead()) { - log.warn("getModelFromDir(): Directory " - + " must be readable, check permissions on " - + dir.getAbsolutePath()); - return model; - } - - Set paths = getPaths(dir.getPath()); - for (Path p : paths) { - readOntologyFileIntoModel(p, model); - } - return model; - } - /** * Find the paths to RDF files in this directory. Sub-directories, hidden - * files, and markdown files are ignored. + * files, markdown, and non-enabled language files are ignored. */ - private static Set getPaths(String parentDir, String... strings) { + private static Set getPaths(ServletContext ctx, String parentDir, String... strings) { + // Ensure that omitted locales are loaded and available + loadOmittedLocales(ctx); + Path dir = Paths.get(parentDir, strings); Set paths = new TreeSet<>(); @@ -158,6 +157,49 @@ private static Set getPaths(String parentDir, String... strings) { return paths; } + private static void loadOmittedLocales(ServletContext ctx) { + // Only load if 'omittedLocales' has not been initialized + if (omittedLocales == null) { + omittedLocales = new LinkedList<>(); + List enabledLocales = new LinkedList<>(); + + // Which locales are enabled in runtime.properties? + List locales = SelectedLocale.getSelectableLocales(ctx); + for (Locale locale : locales) { + enabledLocales.add(locale.toLanguageTag().replace('-', '_')); + } + + // Get ResourceBundle that contains listing of all available i18n languages + WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory(); + ApplicationBean app = wadf.getApplicationDao().getApplicationBean(); + String availableLangsFilename = app.getAvailableLangsFile(); + String themeI18nPath = "/not-used"; + String appI18nPath = "/i18n"; + VitroResourceBundle bundle = VitroResourceBundle.getBundle( + availableLangsFilename, ctx, appI18nPath, themeI18nPath, + ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_PROPERTIES)); + + // This should not happen + if (bundle == null) { + throw new RuntimeException("Unable to find bundle: " + availableLangsFilename); + } + + // If no languages were enabled in runtime.properties, add 'en_US' as the default + if (enabledLocales.isEmpty()) { + enabledLocales.add("en_US"); + } + + // Omitted locales are the available locales minus the enabled locales + Enumeration langs = bundle.getKeys(); + while (langs.hasMoreElements()) { + String available = (String) langs.nextElement(); + if (!enabledLocales.contains(available)) { + omittedLocales.add(available); + } + } + } + } + private static void readOntologyFileIntoModel(Path p, Model model) { String format = getRdfFormat(p); log.debug("Loading " + p); diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index a17179d147..4be7c1604f 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -45,11 +45,11 @@ war - + @@ -148,12 +148,12 @@ war - + javax.servlet From abeccaf8e6674f2c4c8fb911d92e0a3f6061e466 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Fri, 15 May 2020 09:19:12 -0600 Subject: [PATCH 17/52] Add i18n version of Edit page title (#157) Related to: https://jira.lyrasis.org/browse/VIVO-1779 Co-authored-by: Andrew Woods --- .../n3editing/controller/EditRequestDispatchController.java | 2 +- .../templatemodels/edit/EditConfigurationTemplateModel.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 8e6e0d681e..938651ca2a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -114,7 +114,7 @@ protected ResponseValues processRequest(VitroRequest vreq) { templateData.put("editConfiguration", etm); templateData.put("editSubmission", submissionTemplateModel); //Corresponding to original note for consistency with selenium tests and 1.1.1 - templateData.put("title", "Edit"); + templateData.put("title", etm.getPageTitle()); templateData.put("submitUrl", getSubmissionUrl(vreq)); templateData.put("cancelUrl", etm.getCancelUrl()); templateData.put("editKey", editConfig.getEditKey()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index a7c3d26ae6..6266901cd5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -136,6 +136,11 @@ private String getSelectedValue(String field) { return selectedValue; } + public String getPageTitle() { + String pageTitle = i18n.text("edit_page_title"); + return pageTitle != null ? pageTitle : "Edit"; + } + private void setFormTitle() { String predicateUri = editConfig.getPredicateUri(); if(predicateUri != null) { From 9c0050cf623766b00d80c7f25bdcb68fe0541976 Mon Sep 17 00:00:00 2001 From: Michel Heon Date: Fri, 22 May 2020 11:13:53 -0400 Subject: [PATCH 18/52] Changing ontology extensions for n3 & assigning a base IRI to each (#163) ontology Co-authored-by: michelheon Co-authored-by: Andrew Woods https://jira.lyrasis.org/browse/VIVO-1862 --- .../rdf/auth/everytime/permission_config.n3 | 283 +++++------- .../rdf/display/everytime/dataGetterLabels.n3 | 28 +- .../everytime/displayModelListViews.n3 | 13 + .../everytime/displayModelListViews.rdf | 23 - .../rdf/display/everytime/pageList.n3 | 18 +- .../rdf/display/everytime/permissions.n3 | 242 +++++----- .../everytime/vitroSearchProhibited.n3 | 29 +- .../rdf/display/firsttime/application.n3 | 177 ++++++++ .../rdf/display/firsttime/application.owl | 137 ------ .../resources/rdf/display/firsttime/menu.n3 | 55 +-- .../firsttime/pageList_editableStatements.n3 | 38 +- .../rdf/display/firsttime/profilePageType.n3 | 46 +- .../everytime/displayDisplay.n3 | 45 +- .../rdf/displayTbox/everytime/displayTBOX.n3 | 427 +++++++++--------- .../rdf/tbox/filegraph/vitro-0.7.owl | 157 ------- .../rdf/tbox/filegraph/vitro-0.72.n3 | 219 +++++++++ .../rdf/tbox/filegraph/vitroPublic.n3 | 57 +++ .../rdf/tbox/filegraph/vitroPublic.owl | 74 --- 18 files changed, 1022 insertions(+), 1046 deletions(-) create mode 100644 home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 delete mode 100644 home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf create mode 100644 home/src/main/resources/rdf/display/firsttime/application.n3 delete mode 100644 home/src/main/resources/rdf/display/firsttime/application.owl delete mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl create mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 create mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 delete mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl diff --git a/home/src/main/resources/rdf/auth/everytime/permission_config.n3 b/home/src/main/resources/rdf/auth/everytime/permission_config.n3 index f94e3516fb..01575203a6 100644 --- a/home/src/main/resources/rdf/auth/everytime/permission_config.n3 +++ b/home/src/main/resources/rdf/auth/everytime/permission_config.n3 @@ -1,175 +1,128 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/permission_config -@prefix rdfs: . +@prefix : . @prefix auth: . -@prefix simplePermission: . @prefix displayByRole: . @prefix editByRole: . +@prefix owl: . @prefix publishByRole: . +@prefix rdf: . +@prefix rdfs: . +@prefix simplePermission: . +@prefix xsd: . auth:ADMIN - a auth:PermissionSet ; - rdfs:label "Site Admin" ; - - # ADMIN-only permissions - auth:hasPermission simplePermission:AccessSpecialDataModels ; - auth:hasPermission simplePermission:EnableDeveloperPanel ; - auth:hasPermission simplePermission:LoginDuringMaintenance ; - auth:hasPermission simplePermission:ManageMenus ; - auth:hasPermission simplePermission:ManageProxies ; - auth:hasPermission simplePermission:ManageSearchIndex ; - auth:hasPermission simplePermission:ManageUserAccounts ; - auth:hasPermission simplePermission:RefreshVisualizationCache ; - auth:hasPermission simplePermission:SeeConfiguration ; - auth:hasPermission simplePermission:SeeStartupStatus ; - auth:hasPermission simplePermission:UseAdvancedDataToolsPages ; - auth:hasPermission simplePermission:UseMiscellaneousAdminPages ; - auth:hasPermission simplePermission:UseSparqlQueryPage ; - auth:hasPermission simplePermission:PageViewableAdmin ; - - # Uncomment the following permission line to enable the SPARQL update API. - # Before enabling, be sure that the URL api/sparqlUpdate is secured by HTTPS, - # so passwords will not be sent in clear text. - #auth:hasPermission simplePermission:UseSparqlUpdateApi ; - - # permissions for CURATOR and above. - auth:hasPermission simplePermission:EditOntology ; - auth:hasPermission simplePermission:EditSiteInformation ; - auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; - auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; - auth:hasPermission simplePermission:PageViewableCurator ; - - # permissions for EDITOR and above. - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:PageViewableEditor ; - - # permissions for ANY logged-in user. - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - - # permissions for ANY user, even if they are not logged in. - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:PageViewablePublic ; - - # role-based permissions for ADMIN - auth:hasPermission displayByRole:Admin ; - auth:hasPermission editByRole:Admin ; - auth:hasPermission publishByRole:Admin ; - . - + a auth:PermissionSet ; + auth:hasPermission displayByRole:Admin ; + auth:hasPermission editByRole:Admin ; + auth:hasPermission publishByRole:Admin ; + auth:hasPermission simplePermission:AccessSpecialDataModels ; + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOntology ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:EditSiteInformation ; + auth:hasPermission simplePermission:EnableDeveloperPanel ; + auth:hasPermission simplePermission:LoginDuringMaintenance ; + auth:hasPermission simplePermission:ManageMenus ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:ManageProxies ; + auth:hasPermission simplePermission:ManageSearchIndex ; + auth:hasPermission simplePermission:ManageUserAccounts ; + auth:hasPermission simplePermission:PageViewableAdmin ; + auth:hasPermission simplePermission:PageViewableCurator ; + auth:hasPermission simplePermission:PageViewableEditor ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + auth:hasPermission simplePermission:PageViewablePublic ; + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:RefreshVisualizationCache ; + auth:hasPermission simplePermission:SeeConfiguration ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:SeeStartupStatus ; + auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; + auth:hasPermission simplePermission:UseAdvancedDataToolsPages ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:UseMiscellaneousAdminPages ; + auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + auth:hasPermission simplePermission:UseSparqlQueryPage ; + rdfs:label "Site Admin" ; +. auth:CURATOR - a auth:PermissionSet ; - rdfs:label "Curator" ; - - # permissions for CURATOR and above. - auth:hasPermission simplePermission:EditOntology ; - auth:hasPermission simplePermission:EditSiteInformation ; - auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; - auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; - auth:hasPermission simplePermission:PageViewableCurator ; - - # permissions for EDITOR and above. - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:PageViewableEditor ; - - # permissions for ANY logged-in user. - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - - # permissions for ANY user, even if they are not logged in. - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:PageViewablePublic ; - - # role-based permissions for CURATOR - auth:hasPermission displayByRole:Curator ; - auth:hasPermission editByRole:Curator ; - auth:hasPermission publishByRole:Curator ; - . - + a auth:PermissionSet ; + auth:hasPermission displayByRole:Curator ; + auth:hasPermission editByRole:Curator ; + auth:hasPermission publishByRole:Curator ; + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOntology ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:EditSiteInformation ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:PageViewableCurator ; + auth:hasPermission simplePermission:PageViewableEditor ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + auth:hasPermission simplePermission:PageViewablePublic ; + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + rdfs:label "Curator" ; +. auth:EDITOR - a auth:PermissionSet ; - rdfs:label "Editor" ; - - # permissions for EDITOR and above. - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:PageViewableEditor ; - - # permissions for ANY logged-in user. - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - - # permissions for ANY user, even if they are not logged in. - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:PageViewablePublic ; - - # role-based permissions for EDITOR - auth:hasPermission displayByRole:Editor ; - auth:hasPermission editByRole:Editor ; - auth:hasPermission publishByRole:Editor ; - . - -auth:SELF_EDITOR - a auth:PermissionSet ; - a auth:PermissionSetForNewUsers ; - rdfs:label "Self Editor" ; - - # permissions for ANY logged-in user. - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - - # permissions for ANY user, even if they are not logged in. - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:PageViewablePublic ; - - # role-based permissions for SELF_EDITOR - # For role-based display and editing, SelfEditor is like Public. - # SelfEditor uses its special permissions to edit/display its own values. - auth:hasPermission displayByRole:Public ; - auth:hasPermission publishByRole:Public ; - . - + a auth:PermissionSet ; + auth:hasPermission displayByRole:Editor ; + auth:hasPermission editByRole:Editor ; + auth:hasPermission publishByRole:Editor ; + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:PageViewableEditor ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + auth:hasPermission simplePermission:PageViewablePublic ; + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + rdfs:label "Editor" ; +. auth:PUBLIC - a auth:PermissionSet ; - a auth:PermissionSetForPublic ; - rdfs:label "Public" ; - - # permissions for ANY user, even if they are not logged in. - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:PageViewablePublic ; - - # role-based permissions for PUBLIC - auth:hasPermission displayByRole:Public ; - auth:hasPermission publishByRole:Public ; - . + a auth:PermissionSet ; + a auth:PermissionSetForPublic ; + auth:hasPermission displayByRole:Public ; + auth:hasPermission publishByRole:Public ; + auth:hasPermission simplePermission:PageViewablePublic ; + auth:hasPermission simplePermission:QueryFullModel ; + rdfs:label "Public" ; +. +auth:SELF_EDITOR + a auth:PermissionSet ; + a auth:PermissionSetForNewUsers ; + auth:hasPermission displayByRole:Public ; + auth:hasPermission publishByRole:Public ; + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + auth:hasPermission simplePermission:PageViewablePublic ; + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + rdfs:label "Self Editor" ; +. diff --git a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 index a53effd4fe..6b50a177b8 100644 --- a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 +++ b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 @@ -1,14 +1,20 @@ -# $This file is distributed under the terms of the license in LICENSE$ -@prefix rdfs: . - -#Data getter type labels +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/dataGetterLabels +@prefix : . +@prefix owl: . +@prefix rdf: . @prefix rdfs: . +@prefix xsd: . - rdfs:label "Class Group Page" . - rdfs:label "Browse Page" . - rdfs:label "Class Group Page - Selected Classes" . - rdfs:label "Sparql Query Results" . - - - + + rdfs:label "Browse Page" ; +. + + rdfs:label "Class Group Page" ; +. + + rdfs:label "Class Group Page - Selected Classes" ; +. + + rdfs:label "Sparql Query Results" ; +. diff --git a/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 b/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 new file mode 100644 index 0000000000..177fcb8985 --- /dev/null +++ b/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 @@ -0,0 +1,13 @@ +# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1/ + +@prefix : . +@prefix display: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix vitro: . +@prefix xsd: . + +display:hasElement + display:listViewConfigFile "listViewConfig-hasElement.xml" ; +. diff --git a/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf b/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf deleted file mode 100644 index 77f7620fdd..0000000000 --- a/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - -]> - - - - - - listViewConfig-hasElement.xml - - - diff --git a/home/src/main/resources/rdf/display/everytime/pageList.n3 b/home/src/main/resources/rdf/display/everytime/pageList.n3 index d09a0e5891..577cbd0a37 100644 --- a/home/src/main/resources/rdf/display/everytime/pageList.n3 +++ b/home/src/main/resources/rdf/display/everytime/pageList.n3 @@ -1,16 +1,14 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/pageList -# This file is for the portions of the pageList that should not be editable, i.e.# -# that it cannot be deleted and that it requires certain permissions # - -@prefix owl: . +@prefix : . +@prefix action: . @prefix display: . +@prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix action: . - -### This file defines the page list menu for vitro. ### +@prefix xsd: . display:pageListPage - display:requiresAction ; - display:cannotDeletePage "true" . + display:cannotDeletePage "true" ; + display:requiresAction action:ManageMenus ; +. diff --git a/home/src/main/resources/rdf/display/everytime/permissions.n3 b/home/src/main/resources/rdf/display/everytime/permissions.n3 index 38055479d0..7743528f06 100644 --- a/home/src/main/resources/rdf/display/everytime/permissions.n3 +++ b/home/src/main/resources/rdf/display/everytime/permissions.n3 @@ -1,164 +1,138 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/permissions -@prefix owl: . +@prefix : . +@prefix action: . @prefix display: . +@prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix action: . - -# These are the reqired action objects from the SimplePermission.java. +@prefix xsd: . action:AccessSpecialDataModels - a display:RequiredAction ; - rdfs:label "ACCESS_SPECIAL_DATA_MODELS" . - - + a display:RequiredAction ; + rdfs:label "ACCESS_SPECIAL_DATA_MODELS" ; +. action:DoBackEndEditing - a display:RequiredAction ; - rdfs:label "DO_BACK_END_EDITING" . - - + a display:RequiredAction ; + rdfs:label "DO_BACK_END_EDITING" ; +. action:DoFrontEndEditing - a display:RequiredAction ; - rdfs:label "DO_FRONT_END_EDITING" . - - + a display:RequiredAction ; + rdfs:label "DO_FRONT_END_EDITING" ; +. action:EditOntology - a display:RequiredAction ; - rdfs:label "EDIT_ONTOLOGY" . - - + a display:RequiredAction ; + rdfs:label "EDIT_ONTOLOGY" ; +. action:EditOwnAccount - a display:RequiredAction ; - rdfs:label "EDIT_OWN_ACCOUNT" . - - + a display:RequiredAction ; + rdfs:label "EDIT_OWN_ACCOUNT" ; +. action:EditSiteInformation - a display:RequiredAction ; - rdfs:label "EDIT_SITE_INFORMATION" . - - + a display:RequiredAction ; + rdfs:label "EDIT_SITE_INFORMATION" ; +. action:LoginDuringMaintenance - a display:RequiredAction ; - rdfs:label "LOGIN_DURING_MAINTENANCE" . - - + a display:RequiredAction ; + rdfs:label "LOGIN_DURING_MAINTENANCE" ; +. action:ManageMenus - a display:RequiredAction ; - rdfs:label "MANAGE_MENUS" . - - + a display:RequiredAction ; + rdfs:label "MANAGE_MENUS" ; +. action:ManageOwnProxies - a display:RequiredAction ; - rdfs:label "MANAGE_OWN_PROXIES" . - - + a display:RequiredAction ; + rdfs:label "MANAGE_OWN_PROXIES" ; +. action:ManageProxies - a display:RequiredAction ; - rdfs:label "MANAGE_PROXIES" . - - + a display:RequiredAction ; + rdfs:label "MANAGE_PROXIES" ; +. action:ManageSearchIndex - a display:RequiredAction ; - rdfs:label "MANAGE_SEARCH_INDEX" . - - + a display:RequiredAction ; + rdfs:label "MANAGE_SEARCH_INDEX" ; +. action:ManageUserAccounts - a display:RequiredAction ; - rdfs:label "MANAGE_USER_ACCOUNTS" . - - + a display:RequiredAction ; + rdfs:label "MANAGE_USER_ACCOUNTS" ; +. +action:PageViewableAdmin + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_ADMIN" ; +. +action:PageViewableCurator + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_CURATOR" ; +. +action:PageViewableEditor + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_EDITOR" ; +. +action:PageViewableLoggedIn + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_LOGGEDIN" ; +. +action:PageViewablePublic + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_PUBLIC" ; +. action:QueryFullModel - a display:RequiredAction ; - rdfs:label "QUERY_FULL_MODEL" . - - + a display:RequiredAction ; + rdfs:label "QUERY_FULL_MODEL" ; +. action:QueryUserAccountsModel - a display:RequiredAction ; - rdfs:label "QUERY_USER_ACCOUNTS_MODEL" . - - + a display:RequiredAction ; + rdfs:label "QUERY_USER_ACCOUNTS_MODEL" ; +. action:RefreshVisualizationCache - a display:RequiredAction ; - rdfs:label "REFRESH_VISUALIZATION_CACHE" . - - + a display:RequiredAction ; + rdfs:label "REFRESH_VISUALIZATION_CACHE" ; +. action:SeeIndividualEditingPanel - a display:RequiredAction ; - rdfs:label "SEE_INDVIDUAL_EDITING_PANEL" . - - + a display:RequiredAction ; + rdfs:label "SEE_INDVIDUAL_EDITING_PANEL" ; +. action:SeeRevisionInfo - a display:RequiredAction ; - rdfs:label "SEE_REVISION_INFO" . - - + a display:RequiredAction ; + rdfs:label "SEE_REVISION_INFO" ; +. action:SeeSiteAdminPage - a display:RequiredAction ; - rdfs:label "SEE_SITE_ADMIN_PAGE" . - - + a display:RequiredAction ; + rdfs:label "SEE_SITE_ADMIN_PAGE" ; +. action:SeeStartupStatus - a display:RequiredAction ; - rdfs:label "SEE_STARTUP_STATUS" . - - + a display:RequiredAction ; + rdfs:label "SEE_STARTUP_STATUS" ; +. action:SeeVerbosePropertyInformation - a display:RequiredAction ; - rdfs:label "SEE_VERBOSE_PROPERTY_INFORMATION" . - - + a display:RequiredAction ; + rdfs:label "SEE_VERBOSE_PROPERTY_INFORMATION" ; +. action:UseAdvancedDataToolsPages - a display:RequiredAction ; - rdfs:label "USE_ADVANCED_DATA_TOOLS_PAGES" . - - -action:UseSparqlQueryPage - a display:RequiredAction ; - rdfs:label "USE_SPARQL_QUERY_PAGE" . - - + a display:RequiredAction ; + rdfs:label "USE_ADVANCED_DATA_TOOLS_PAGES" ; +. action:UseBasicAjaxControllers - a display:RequiredAction ; - rdfs:label "USE_BASIC_AJAX_CONTROLLERS" . - - + a display:RequiredAction ; + rdfs:label "USE_BASIC_AJAX_CONTROLLERS" ; +. +action:UseIndividualControlPanel + a display:RequiredAction ; + rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" ; +. action:UseMiscellaneousAdminPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_ADMIN_PAGES" . - - + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_ADMIN_PAGES" ; +. action:UseMiscellaneousCuratorPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" . - - -action:UseIndividualControlPanel - a display:RequiredAction ; - rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" . - - + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" ; +. action:UseMiscellaneousPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_PAGES" . - -##Page specific permissions -action:PageViewableAdmin - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_ADMIN" . - -action:PageViewableCurator - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_CURATOR" . - -action:PageViewableEditor - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_EDITOR" . - -action:PageViewableLoggedIn - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_LOGGEDIN" . - -action:PageViewablePublic - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_PUBLIC" . + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_PAGES" ; +. +action:UseSparqlQueryPage + a display:RequiredAction ; + rdfs:label "USE_SPARQL_QUERY_PAGE" ; +. diff --git a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 index 74b223d253..47d2908385 100644 --- a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 +++ b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 @@ -1,25 +1,8 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/vitroSearchProhibited.n3 -# All instances of a class can be excluded from the search index by adding a -# vitroDisplay:excludeClass property between vitroDisplay:SearchIndex and the -# URI of the class that you would like to exclude. +@prefix : . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix xsd: . -# .n3 or .rdf files can be created in this directory to configure the search -# exclusions. Each file must be a valid file in the format specified by its -# extension. Each file will be loaded individually and must be a complete -# stand alone example of its format. Each file must contain all the necessary -# prefixes, namespaces and preambles required by the format specified by its -# extension. - -# If you would like to add classes to the exclusions, add a file to this -# directory ending in .n3 with N3 statements similar to this example. - -# -# @prefix owl: . -# @prefix vitroDisplay: . -# @prefix rdf: . -# @prefix example: . -# -# vitroDisplay:SearchIndex -# rdf:type owl:Thing ; -# vitroDisplay:excludeClass example:classToExclude ; diff --git a/home/src/main/resources/rdf/display/firsttime/application.n3 b/home/src/main/resources/rdf/display/firsttime/application.n3 new file mode 100644 index 0000000000..6f77597aef --- /dev/null +++ b/home/src/main/resources/rdf/display/firsttime/application.n3 @@ -0,0 +1,177 @@ +# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1/ + +@prefix : . +@prefix display: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix vitro: . +@prefix xsd: . + +display:ClassGroupPage + a owl:Class ; +. +display:ExternallyLinkedNamespace + a owl:Class ; + rdfs:label "Externally Linked Namespace" ; +. +display:HomePage + a owl:Class ; +. +display:IndividualsForClassesPage + a owl:Class ; +. +display:InternalClassesPage + a owl:Class ; +. +display:MainMenu + a owl:Class ; + vitro:customDisplayViewAnnot """ + individual-menu.ftl + """ ; +. +display:NavigationElement + a owl:Class ; + rdfs:comment "This represents a menu item or other general navigation item." ; + rdfs:label "Navigation Element" ; +. +display:Page + a owl:Class ; + rdfs:comment "Class of pages." ; + rdfs:label "Page" ; +. +display:RequiredAction + a owl:Class ; +. +display:excludeClass + a owl:ObjectProperty ; +. +display:forClassGroup + a owl:ObjectProperty ; +. +display:getIndividualsForClass + a owl:ObjectProperty ; +. +display:hasDataGetter + a owl:ObjectProperty ; +. +display:hasElement + a owl:ObjectProperty ; +. +display:linkText + a owl:DatatypeProperty ; + rdfs:comment "Text to display to a link." ; +. +display:listViewConfigFile + a owl:DatatypeProperty ; +. +display:menuPosition + a owl:DatatypeProperty ; + rdfs:label "menu position" ; +. +display:parameterName + a owl:DatatypeProperty ; + rdfs:label "parameter name" ; +. +display:parameterValue + a owl:DatatypeProperty ; + rdfs:label "parameter value" ; +. +display:requiresAction + a owl:ObjectProperty ; +. +display:requiresBodyTemplate + a owl:DatatypeProperty ; + rdfs:comment "Indicates that a page requires a body template." ; + rdfs:domain display:Page ; + rdfs:label "Body Template" ; +. +display:restrictResultsByClass + a owl:ObjectProperty ; +. +display:restrictResultsByInternalClass + a owl:DatatypeProperty ; +. +display:title + a owl:DatatypeProperty ; + rdfs:comment "Value for HTML title element." ; + rdfs:domain display:Page ; + rdfs:label "title" ; +. +display:toPage + a owl:ObjectProperty ; + rdfs:domain display:NavigationElement ; + rdfs:range display:Page ; +. +display:urlMapping + a owl:DatatypeProperty ; + rdfs:comment "Values from HttpRequest.getPathInfo() will be mapped to values from urlMapping." ; +. +: + a owl:Ontology ; + rdfs:label "Vitro display ontology" ; + owl:versionInfo "1.1" ; +. + + a owl:Class ; +. + + a owl:ObjectProperty ; + rdfs:domain display:Page ; + rdfs:range ; +. + + a owl:Class ; +. +:excludeClass + a owl:ObjectProperty ; +. +:includeClass + a owl:ObjectProperty ; +. +rdfs:comment + a owl:AnnotationProperty ; + a owl:DatatypeProperty ; +. +rdfs:domain + a owl:ObjectProperty ; +. +rdfs:label + a owl:AnnotationProperty ; + a owl:DatatypeProperty ; +. +rdfs:range + a owl:ObjectProperty ; +. +rdfs:subPropertyOf + a owl:Class ; +. +owl:AnnotationProperty + a owl:Class ; +. +owl:Class + a owl:Class ; +. +owl:DatatypeProperty + a owl:Class ; + a owl:DatatypeProperty ; +. +owl:NamedIndividual + a owl:Class ; +. +owl:ObjectProperty + a owl:Class ; +. +owl:Ontology + a owl:Class ; +. +owl:topDataProperty + a owl:DatatypeProperty ; +. +owl:topObjectProperty + a owl:ObjectProperty ; +. +owl:versionInfo + a owl:AnnotationProperty ; + a owl:DatatypeProperty ; +. diff --git a/home/src/main/resources/rdf/display/firsttime/application.owl b/home/src/main/resources/rdf/display/firsttime/application.owl deleted file mode 100644 index 02dbd57368..0000000000 --- a/home/src/main/resources/rdf/display/firsttime/application.owl +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - -]> - - - - - - - - - - - This represents a menu item or other general navigation item. - - - - - - - - - - - - - - individual-menu.ftl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Indicates that a page requires a body template. - - - - - - - - - Values from HttpRequest.getPathInfo() will be mapped to values from urlMapping. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/home/src/main/resources/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3 index 2fc75e1b41..4d24607b45 100644 --- a/home/src/main/resources/rdf/display/firsttime/menu.n3 +++ b/home/src/main/resources/rdf/display/firsttime/menu.n3 @@ -1,38 +1,31 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/menu -@prefix owl: . +@prefix : . +@prefix action: . @prefix display: . +@prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix action: . - -### This file defines the default menu for vitro. ### - -#### Default Menu #### +@prefix xsd: . display:DefaultMenu - a display:MainMenu ; - display:hasElement display:HomeMenuItem . - -#### Menu Items for Default Menu #### - -display:HomeMenuItem - a display:NavigationElement ; - display:menuPosition 1; - display:linkText "Home"; - display:toPage display:Home . - -########## Pages ############ - + a display:MainMenu ; + display:hasElement display:HomeMenuItem ; +. display:Home - a display:HomePage ; - a display:Page ; - display:title "Home" ; - display:urlMapping "/" ; - display:hasDataGetter display:homeDataGetter; - display:cannotDeletePage "true" . - -########## Data Getter ############ - - - a . + a display:HomePage ; + a display:Page ; + display:cannotDeletePage "true" ; + display:hasDataGetter display:homeDataGetter ; + display:title "Home" ; + display:urlMapping "/" ; +. +display:HomeMenuItem + a display:NavigationElement ; + display:linkText "Home" ; + display:menuPosition 1 ; + display:toPage display:Home ; +. +display:homeDataGetter + a ; +. diff --git a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 index d9869b12e4..04e537eabd 100644 --- a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 +++ b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 @@ -1,25 +1,16 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/pageList_editableStatements -@prefix owl: . +@prefix : . +@prefix action: . @prefix display: . +@prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix action: . - -### This file defines the page list menu for vitro. These statements can be edited through the interface.### - -display:pageListPage - a display:Page ; - display:title "Pages" ; - display:urlMapping "/pageList" ; - display:requiresBodyTemplate "pageList.ftl" ; - display:hasDataGetter display:pageListData. +@prefix xsd: . display:pageListData - a ; - display:saveToVar "pages" ; - display:queryModel ; - display:query """ + a ; + display:query """ PREFIX display: PREFIX rdfs: SELECT ?listedPageUri ?listedPageTitle ?listedPageUrlMapping ?listedPageTemplate ?listedPageMenuItem ?listedPageCannotDeletePage @@ -30,7 +21,14 @@ display:pageListData OPTIONAL {?listedPageUri display:requiresBodyTemplate ?listedPageTemplate .} OPTIONAL {?listedPageMenuItem display:toPage ?listedPageUri .} OPTIONAL {?listedPageUri display:cannotDeletePage ?listedPageCannotDeletePage .} - } ORDER BY ?listedPageTitle """ . -###Page Management and Data Getters - - + } ORDER BY ?listedPageTitle """ ; + display:queryModel ; + display:saveToVar "pages" ; +. +display:pageListPage + a display:Page ; + display:hasDataGetter display:pageListData ; + display:requiresBodyTemplate "pageList.ftl" ; + display:title "Pages" ; + display:urlMapping "/pageList" ; +. diff --git a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 b/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 index a3760f7385..0b0801728d 100644 --- a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 +++ b/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 @@ -1,25 +1,31 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1 -@prefix xsd: . +@prefix : . +@prefix display: . @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix display: . -@base . - -display:ProfilePageType rdf:type owl:Class ; - - owl:equivalentClass [ rdf:type owl:Class ; - owl:oneOf ( display:standard - display:quickView - ) - ] . - -display:quickView rdf:type display:ProfilePageType , - owl:NamedIndividual . - -display:standard rdf:type display:ProfilePageType , - owl:NamedIndividual . +@prefix xsd: . -display:hasDefaultProfilePageType rdf:type owl:ObjectProperty . -display:hasDefaultProfilePageType rdfs:range display:ProfilePageType . +display:ProfilePageType + a owl:Class ; + owl:equivalentClass [ + a owl:Class ; + owl:oneOf ( + display:standard + display:quickView + ) ; + ] ; +. +display:hasDefaultProfilePageType + a owl:ObjectProperty ; + rdfs:range display:ProfilePageType ; +. +display:quickView + a display:ProfilePageType ; + a owl:NamedIndividual ; +. +display:standard + a display:ProfilePageType ; + a owl:NamedIndividual ; +. diff --git a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 index b8656304e2..bb311012a7 100644 --- a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 +++ b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 @@ -1,28 +1,25 @@ -@prefix rdfs: . -@prefix xsd: . -@prefix owl: . -@prefix rdf: . +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/displayDisplay + +@prefix : . @prefix display: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix xsd: . rdf:type - a owl:ObjectProperty ; - rdfs:label "RDF Type"@en-US ; - rdfs:range owl:Class; - - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ; - - "true"^^xsd:boolean ; - - "true"^^xsd:boolean . - - + a owl:ObjectProperty ; + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator" ; + true ; + true ; + rdfs:label "RDF Type"@en-US ; + rdfs:range owl:Class ; +. display:requiresAction - a owl:ObjectProperty ; - rdfs:label "Required Action"@en-US ; - rdfs:comment "Indicates that a resource has a required action that may need to be authorized" ; - rdfs:range display:RequiredAction ; - - "true"^^xsd:boolean ; - - "true"^^xsd:boolean . - + a owl:ObjectProperty ; + true ; + true ; + rdfs:comment "Indicates that a resource has a required action that may need to be authorized" ; + rdfs:label "Required Action"@en-US ; + rdfs:range display:RequiredAction ; +. diff --git a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 index d5fcf9ec28..4250c152f4 100644 --- a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 +++ b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 @@ -1,227 +1,220 @@ -# $This file is distributed under the terms of the license in LICENSE$ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/TBOX -@prefix rdfs: . -@prefix xsd: . -@prefix owl: . -@prefix rdf: . +@prefix : . @prefix display: . -@prefix vitro: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix vitro: . +@prefix xsd: . -#########Classes######### -###Basic -owl:Class a owl:Class . -owl:Ontology a owl:Class . -owl:AnnotationProperty a owl:Class . -owl:DatatypeProperty a owl:Class . -owl:ObjectProperty a owl:Class . - -###Display Model -display:MainMenu - a owl:Class ; - vitro:customDisplayViewAnnot "individual-menu.ftl"^^xsd:string . - -display:NavigationElement a owl:Class . - -display:Page a owl:Class . - -display:HomePage a owl:Class . - -display:ClassGroupPage a owl:Class . - -display:IndividualsForClassesPage a owl:Class . - -display:InternalClassesPage a owl:Class . - -display:DataGetter a owl:Class . - -display:RequiredAction a owl:Class ; - rdfs:comment "Represents a action that may need authorization to perform." . - - - a owl:Class ; - rdfs:comment "Data getter for running a SPARQL query." . - - - a owl:Class ; - rdfs:comment "A data getter for a Class search, i.e. get individuals for VClass" . - - - a owl:Class ; - rdfs:comment "A data getter that runs a SPARQL Update" . - - - a owl:Class ; - rdfs:comment "A data getter for a standard Vitro browse page" . - - - a owl:Class ; - rdfs:comment "A data getter for a VClassGroup page" . - - - a owl:Class ; - rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF" . - - - a owl:Class . - -## Class defining what N3 editing model preprocessors are associated with the system -## This is technically a JAVA interface but we can designate this as an owl:Class to indicate -## which classes are model change preprocessors - - a owl:Class . -########Data Properties######### - -###Basic - -rdfs:comment - a owl:DatatypeProperty . -rdfs:label - a owl:DatatypeProperty . -owl:versionInfo - a owl:DatatypeProperty . - -###Vitro model - -vitro:modTime - a owl:DatatypeProperty . -vitro:displayRank - a owl:DatatypeProperty . +rdf:type + a owl:ObjectProperty ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator" ; + vitro:offerCreateNewOptionAnnot true ; + vitro:selectFromExistingAnnot true ; + rdfs:label "RDF Type"@en-US ; + rdfs:range owl:Class ; +. +vitro:additionalLink + a owl:ObjectProperty ; + vitro:customEntryFormAnnot "defaultLinkForm.jsp" ; + vitro:forceStubDeletionAnnot true ; + vitro:offerCreateNewOptionAnnot true ; + vitro:selectFromExistingAnnot false ; + vitro:stubObjectPropertyAnnot true ; + rdfs:label "Additional Link"@en-US ; + rdfs:range vitro:Link ; + rdfs:subPropertyOf vitro:additionalLink ; + rdfs:subPropertyOf owl:topObjectProperty ; +. vitro:customDisplayViewAnnot - a owl:DatatypeProperty . - -###Display model - -display:listViewConfigFile - a owl:DatatypeProperty . - -display:title - a owl:DatatypeProperty . - -display:urlMapping - a owl:DatatypeProperty . - -display:requiresBodyTemplate - a owl:DatatypeProperty . - + a owl:DatatypeProperty ; +. +vitro:displayRank + a owl:DatatypeProperty ; +. +vitro:modTime + a owl:DatatypeProperty ; +. +vitro:primaryLink + a owl:ObjectProperty ; + vitro:customEntryFormAnnot "defaultLinkForm.jsp" ; + vitro:forceStubDeletionAnnot true ; + vitro:offerCreateNewOptionAnnot true ; + vitro:selectFromExistingAnnot false ; + vitro:stubObjectPropertyAnnot true ; + rdfs:label "Primary Link"@en-US ; + rdfs:range vitro:Link ; + rdfs:subPropertyOf vitro:primaryLink ; + rdfs:subPropertyOf owl:topObjectProperty ; +. + + a owl:ObjectProperty ; + rdfs:range ; + rdfs:subPropertyOf ; + rdfs:subPropertyOf owl:topObjectProperty ; +. +display:ClassGroupPage + a owl:Class ; +. +display:DataGetter + a owl:Class ; +. +display:HomePage + a owl:Class ; +. +display:IndividualsForClassesPage + a owl:Class ; +. +display:InternalClassesPage + a owl:Class ; +. +display:MainMenu + a owl:Class ; + vitro:customDisplayViewAnnot "individual-menu.ftl" ; +. +display:NavigationElement + a owl:Class ; +. +display:Page + a owl:Class ; +. +display:RequiredAction + a owl:Class ; + rdfs:comment "Represents a action that may need authorization to perform." ; +. +display:cannotDeletePage + a owl:DatatypeProperty ; +. +display:excludeClass + a owl:ObjectProperty ; +. +display:forClassGroup + a owl:ObjectProperty ; +. +display:getIndividualsForClass + a owl:ObjectProperty ; +. +display:hasDataGetter + a owl:ObjectProperty ; +. +display:hasElement + a owl:ObjectProperty ; +. +display:hasMenuText + a owl:DatatypeProperty ; +. +display:hasVClassId + a owl:ObjectProperty ; + rdfs:comment "Object property defining class for search data getter" ; +. +display:htmlValue + a owl:DatatypeProperty ; +. display:isSelfContainedTemplate - a owl:DatatypeProperty . - -display:menuPosition - a owl:DatatypeProperty ; - vitro:displayLimitAnnot - "1"^^xsd:int . - + a owl:DatatypeProperty ; +. display:linkText - a owl:DatatypeProperty . - -display:hasMenuText - a owl:DatatypeProperty . - -display:usesDataGetterClass - a owl:DatatypeProperty . - + a owl:DatatypeProperty ; +. +display:listViewConfigFile + a owl:DatatypeProperty ; +. +display:menuPosition + a owl:DatatypeProperty ; + vitro:displayLimitAnnot "1"^^xsd:int ; +. display:query - a owl:DatatypeProperty . - -display:saveToVar - a owl:DatatypeProperty. - + a owl:DatatypeProperty ; +. display:queryModel - a owl:DatatypeProperty. - -display:htmlValue - a owl:DatatypeProperty. - -display:cannotDeletePage - a owl:DatatypeProperty. - -######### Object Properties######### -###Basic -rdfs:range - a owl:ObjectProperty . + a owl:DatatypeProperty ; +. +display:requiresAction + a owl:ObjectProperty ; +. +display:requiresBodyTemplate + a owl:DatatypeProperty ; +. +display:restrictResultsByClass + a owl:ObjectProperty ; +. +display:saveToVar + a owl:DatatypeProperty ; +. +display:title + a owl:DatatypeProperty ; +. +display:toPage + a owl:ObjectProperty ; +. +display:urlMapping + a owl:DatatypeProperty ; +. +display:usesDataGetterClass + a owl:DatatypeProperty ; +. +rdfs:comment + a owl:DatatypeProperty ; +. rdfs:domain - a owl:ObjectProperty . + a owl:ObjectProperty ; +. +rdfs:label + a owl:DatatypeProperty ; +. +rdfs:range + a owl:ObjectProperty ; +. +owl:AnnotationProperty + a owl:Class ; +. +owl:Class + a owl:Class ; +. +owl:DatatypeProperty + a owl:Class ; +. +owl:ObjectProperty + a owl:Class ; +. +owl:Ontology + a owl:Class ; +. owl:topObjectProperty - a owl:ObjectProperty . - -display:hasVClassId - a owl:ObjectProperty ; - rdfs:comment "Object property defining class for search data getter" . - -###Vitro properties without which individual templates throw errors as are required - - - a owl:ObjectProperty ; - rdfs:range ; - rdfs:subPropertyOf , owl:topObjectProperty . - -vitro:primaryLink - a owl:ObjectProperty ; - rdfs:label "Primary Link"@en-US ; - rdfs:range vitro:Link ; - rdfs:subPropertyOf vitro:primaryLink , owl:topObjectProperty ; - vitro:customEntryFormAnnot - "defaultLinkForm.jsp"^^xsd:string ; - vitro:forceStubDeletionAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot - "false"^^xsd:boolean ; - vitro:stubObjectPropertyAnnot - "true"^^xsd:boolean . - -rdf:type - a owl:ObjectProperty ; - rdfs:label "RDF Type"@en-US ; - rdfs:range owl:Class ; - vitro:customEntryFormAnnot - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean . - - -vitro:additionalLink - a owl:ObjectProperty ; - rdfs:label "Additional Link"@en-US ; - rdfs:range vitro:Link ; - rdfs:subPropertyOf vitro:additionalLink , owl:topObjectProperty ; - vitro:customEntryFormAnnot - "defaultLinkForm.jsp"^^xsd:string ; - vitro:forceStubDeletionAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot - "false"^^xsd:boolean ; - vitro:stubObjectPropertyAnnot - "true"^^xsd:boolean . - -###Display model - -display:hasElement - a owl:ObjectProperty . - -display:excludeClass - a owl:ObjectProperty . - -display:toPage - a owl:ObjectProperty . - -display:forClassGroup - a owl:ObjectProperty . - -display:hasDataGetter - a owl:ObjectProperty . - -display:getIndividualsForClass - a owl:ObjectProperty . - -display:restrictResultsByClass - a owl:ObjectProperty . - -display:requiresAction - a owl:ObjectProperty . - + a owl:ObjectProperty ; +. +owl:versionInfo + a owl:DatatypeProperty ; +. + + a owl:Class ; +. + + a owl:Class ; + rdfs:comment "A data getter for a standard Vitro browse page" ; +. + + a owl:Class ; + rdfs:comment "A data getter for a VClassGroup page" ; +. + + a owl:Class ; + rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF" ; +. + + a owl:Class ; +. + + a owl:Class ; + rdfs:comment "A data getter for a Class search, i.e. get individuals for VClass" ; +. + + a owl:Class ; + rdfs:comment "Data getter for running a SPARQL query." ; +. + + a owl:Class ; + rdfs:comment "A data getter that runs a SPARQL Update" ; +. diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl deleted file mode 100644 index 1fda081082..0000000000 --- a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl +++ /dev/null @@ -1,157 +0,0 @@ - - - - ]> - - - - - - - - - - Vitro internals - 0.7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 new file mode 100644 index 0000000000..9044a99662 --- /dev/null +++ b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 @@ -0,0 +1,219 @@ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro-0.7 + +@prefix : . +@prefix dc: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix vitro: . +@prefix xsd: . + + + a owl:Ontology ; + rdfs:label "Vitro internals" ; + owl:versionInfo 0.7 ; +. +vitro:Application + a owl:Class ; +. +vitro:ClassGroup + a owl:Class ; +. +vitro:Namespace + a owl:Class ; +. +vitro:Portal + a owl:Class ; +. +vitro:PropertyGroup + a owl:Class ; +. +vitro:User + a owl:Class ; +. +vitro:aboutText + a owl:DatatypeProperty ; +. +vitro:acknowledgeText + a owl:DatatypeProperty ; +. +vitro:bannerHeight + a owl:DatatypeProperty ; +. +vitro:bannerImage + a owl:DatatypeProperty ; +. +vitro:bannerWidth + a owl:DatatypeProperty ; +. +vitro:contactMail + a owl:DatatypeProperty ; +. +vitro:copyrightAnchor + a owl:DatatypeProperty ; +. +vitro:copyrightURL + a owl:DatatypeProperty ; +. +vitro:customDisplayViewAnnot + a owl:AnnotationProperty ; +. +vitro:customEntryFormAnnot + a owl:AnnotationProperty ; +. +vitro:customShortViewAnnot + a owl:AnnotationProperty ; +. +vitro:descriptionAnnot + a owl:AnnotationProperty ; +. +vitro:displayLimit + a owl:DatatypeProperty ; +. +vitro:displayLimitAnnot + a owl:AnnotationProperty ; +. +vitro:displayRank + a owl:DatatypeProperty ; +. +vitro:displayRankAnnot + a owl:AnnotationProperty ; +. +vitro:editing + a owl:AnnotationProperty ; +. +vitro:exampleAnnot + a owl:AnnotationProperty ; +. +vitro:extendedLinkedData + a owl:AnnotationProperty ; +. +vitro:firstTime + a owl:DatatypeProperty ; +. +vitro:forceStubDeletionAnnot + a owl:AnnotationProperty ; +. +vitro:fullPropertyNameAnnot + a owl:AnnotationProperty ; +. +vitro:harvestId + a owl:AnnotationProperty ; +. +vitro:hidden + a owl:DatatypeProperty ; +. +vitro:hiddenAnnot + a owl:AnnotationProperty ; +. +vitro:hiddenFromDisplayBelowRoleLevelAnnot + a owl:AnnotationProperty ; +. +vitro:hiddenFromPublishBelowRoleLevelAnnot + a owl:AnnotationProperty ; +. +vitro:imageThumbWidth + a owl:DatatypeProperty ; +. +vitro:inClassGroup + a owl:AnnotationProperty ; +. +vitro:inPropertyGroupAnnot + a owl:AnnotationProperty ; +. +vitro:individualSortDirectionAnnot + a owl:AnnotationProperty ; +. +vitro:isExternalId + a owl:AnnotationProperty ; +. +vitro:isMenuPageIntersectionClass + a owl:AnnotationProperty ; +. +vitro:loginCount + a owl:DatatypeProperty ; +. +vitro:logotypeHeight + a owl:DatatypeProperty ; +. +vitro:logotypeImage + a owl:DatatypeProperty ; +. +vitro:logotypeWidth + a owl:DatatypeProperty ; +. +vitro:md5password + a owl:DatatypeProperty ; +. +vitro:modTime + a owl:DatatypeProperty ; +. +vitro:modTimeAnnot + a owl:AnnotationProperty ; +. +vitro:moniker + a owl:DatatypeProperty ; +. +vitro:mostSpecificType + a owl:AnnotationProperty ; +. +vitro:namespaceURI + a owl:DatatypeProperty ; +. +vitro:objectIndividualSortProperty + a owl:AnnotationProperty ; +. +vitro:offerCreateNewOptionAnnot + a owl:AnnotationProperty ; +. +vitro:oldId + a owl:AnnotationProperty ; +. +vitro:oldpassword + a owl:DatatypeProperty ; +. +vitro:originalId + a owl:AnnotationProperty ; +. +vitro:prohibitedFromUpdateBelowRoleLevelAnnot + a owl:AnnotationProperty ; +. +vitro:publicDescriptionAnnot + a owl:AnnotationProperty ; +. +vitro:roleURI + a owl:DatatypeProperty ; +. +vitro:rootBreadCrumbAnchor + a owl:DatatypeProperty ; +. +vitro:rootBreadCrumbURL + a owl:DatatypeProperty ; +. +vitro:rootLogotypeImage + a owl:DatatypeProperty ; +. +vitro:rootTab + a owl:ObjectProperty ; +. +vitro:selectFromExistingAnnot + a owl:AnnotationProperty ; +. +vitro:shortDef + a owl:AnnotationProperty ; +. +vitro:shortDefAnnot + a owl:AnnotationProperty ; +. +vitro:shortHand + a owl:DatatypeProperty ; +. +vitro:themeDir + a owl:DatatypeProperty ; +. +vitro:urlPrefix + a owl:DatatypeProperty ; +. +vitro:username + a owl:DatatypeProperty ; +. diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 new file mode 100644 index 0000000000..7b48170222 --- /dev/null +++ b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 @@ -0,0 +1,57 @@ +# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/public + +@prefix : . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix xsd: . + + + a owl:Ontology ; + rdfs:label "Vitro public constructs ontology" ; + owl:versionInfo 0.1 ; +. +:File + a owl:Class ; +. +:FileByteStream + a owl:Class ; +. +:attribution + a owl:DatatypeProperty ; + rdfs:domain :File ; + rdfs:range xsd:string ; +. +:directDownloadUrl + a owl:DatatypeProperty ; + rdfs:domain :FileByteStream ; + rdfs:range xsd:string ; +. +:downloadLocation + a owl:ObjectProperty ; + rdfs:domain :File ; + rdfs:range :FileByteStream ; +. +:filename + a owl:DatatypeProperty ; + rdfs:domain :File ; + rdfs:range xsd:string ; +. +:image + a owl:ObjectProperty ; + rdfs:range :File ; +. +:mainImage + a owl:ObjectProperty ; + rdfs:range :File ; +. +:mimeType + a owl:DatatypeProperty ; + rdfs:domain :File ; + rdfs:range xsd:string ; +. +:thumbnailImage + a owl:ObjectProperty ; + rdfs:domain :File ; + rdfs:range :File ; +. diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl deleted file mode 100644 index 597799a9b1..0000000000 --- a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl +++ /dev/null @@ -1,74 +0,0 @@ - - - -]> - - - - - - - Vitro public constructs - 0.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 52f2d53e33d709cb4d824a1f7eb4be7692257025 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Fri, 19 Jun 2020 10:47:10 -0400 Subject: [PATCH 19/52] Update sprint-i18n with master branch (#166) * Make data property richtext editor option selectable from UI * [VIVO-1755] - Better error handling when reasoner disabled (#137) * Better error handling when reasoner disabled * Change reasoner error log message to debug * Extend reasoner status error handling * Improve reasoner error log message and extend to JenaAdminActions * Bump up log level for admin action to 'warn' and edit admin panel error message * Change Model writer lang from "N3-PP" to "N3" (#149) Resolves: https://jira.lyrasis.org/browse/VIVO-1761 Co-authored-by: Andrew Woods * [VIVO-1851] - Add 'remove' option to named graph management page (#162) * Add 'remove' option to named graph management page Resolves: https://jira.lyrasis.org/browse/VIVO-1851 * [VIVO-1872] - Add download option to SPARQL Query page (#164) * Add download option to SPARQL Query page * Set SPARQL query results content type even if downloading * Address pull request comments Co-authored-by: gneissone Co-authored-by: Ralph O'Flinn Co-authored-by: Andrew Woods --- .../admin/SparqlQueryController.java | 30 +++++++++-- .../api/sparqlquery/RdfResultMediaType.java | 24 ++++++--- .../api/sparqlquery/ResultSetMediaType.java | 22 +++++--- .../edit/DatapropEditController.java | 12 +++-- .../edit/DatapropRetryController.java | 15 +++++- .../freemarker/BaseSiteAdminController.java | 17 ++++--- .../controller/jena/JenaAdminActions.java | 50 ++++++++++--------- .../controller/jena/RDFUploadController.java | 23 +++++++-- .../webapp/dao/jena/DataPropertyDaoJena.java | 11 +++- .../VTwo/AdditionsAndRetractions.java | 1 - .../fields/IndividualsViaVClassOptions.java | 14 +++++- .../VTwo/AdditionsAndRetractionsTest.java | 39 +++++++++++++++ .../src/main/webapp/jenaIngest/listModels.jsp | 2 +- .../main/webapp/jenaIngest/loadRDFData.jsp | 5 ++ .../edit/specific/dataprop_retry.jsp | 6 +++ .../body/admin/admin-sparqlQueryForm.ftl | 5 ++ 16 files changed, 214 insertions(+), 62 deletions(-) create mode 100644 api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/AdditionsAndRetractionsTest.java diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java index 6166d1cf93..096263dab3 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/admin/SparqlQueryController.java @@ -40,6 +40,8 @@ import edu.cornell.mannlib.vitro.webapp.utils.http.AcceptHeaderParsingException; import edu.cornell.mannlib.vitro.webapp.utils.http.NotAcceptableException; import edu.cornell.mannlib.vitro.webapp.utils.sparql.SparqlQueryUtils; +import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.RdfResultMediaType; +import edu.cornell.mannlib.vitro.webapp.controller.api.sparqlquery.ResultSetMediaType; /** * Present the SPARQL Query form, and execute the queries. @@ -110,11 +112,20 @@ private void respondToQuery(HttpServletRequest req, HttpServletResponse resp) .getRDFService(); String queryString = req.getParameter("query"); + boolean download = Boolean.parseBoolean(req.getParameter("download")); + Query query = SparqlQueryUtils.create(queryString); try { - String format = interpretRequestedFormats(req, queryString); + String format = interpretRequestedFormats(req, query); SparqlQueryApiExecutor core = SparqlQueryApiExecutor.instance( rdfService, queryString, format); resp.setContentType(core.getMediaType()); + + if (download) { + String extension = getFilenameExtension(req, query, format); + resp.setHeader("Content-Transfer-Encoding", "binary"); + resp.setHeader("Content-disposition", "attachment; filename=query-results." + extension); + } + core.executeAndFormat(resp.getOutputStream()); } catch (InvalidQueryTypeException e) { do400BadRequest("Query type is not SELECT, ASK, CONSTRUCT, " @@ -132,8 +143,7 @@ private void respondToQuery(HttpServletRequest req, HttpServletResponse resp) } private String interpretRequestedFormats(HttpServletRequest req, - String queryString) throws NotAcceptableException { - Query query = SparqlQueryUtils.create(queryString); + Query query) throws NotAcceptableException { String parameterName = (query.isSelectType() || query.isAskType()) ? "resultFormat" : "rdfResultFormat"; String parameterValue = req.getParameter(parameterName); @@ -145,6 +155,20 @@ private String interpretRequestedFormats(HttpServletRequest req, } } + private String getFilenameExtension(HttpServletRequest req, + Query query, String format) { + String extension; + if (query.isSelectType() || query.isAskType()) { + ResultSetMediaType mediaType = ResultSetMediaType.fromContentType(format); + extension = mediaType.getExtension(); + } + else { + RdfResultMediaType mediaType = RdfResultMediaType.fromContentType(format); + extension = mediaType.getExtension(); + } + return extension; + } + private void do400BadRequest(String message, HttpServletResponse resp) throws IOException { resp.setStatus(400); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java index 03ffcd93a2..3812bf43e9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/RdfResultMediaType.java @@ -12,17 +12,17 @@ * and DESCRIBE). */ public enum RdfResultMediaType { - TEXT("text/plain", true, "NTRIPLE", "N-TRIPLE"), + TEXT("text/plain", true, "NTRIPLE", "N-TRIPLE", "nt"), - RDF_XML("application/rdf+xml", true, "RDFXML", "RDF/XML"), + RDF_XML("application/rdf+xml", true, "RDFXML", "RDF/XML", "rdf"), - N3("text/n3", true, "N3", "N3"), + N3("text/n3", true, "N3", "N3", "n3"), - TTL("text/turtle", false, "N3", "TTL"), + TTL("text/turtle", false, "N3", "TTL", "ttl"), - JSON("application/json", false, "N3", "JSON"), + JSON("application/json", false, "N3", "JSON", "json"), - JSON_LD("application/ld+json", false, "N3", "JSON"); + JSON_LD("application/ld+json", false, "N3", "JSON", "jsonld"); // ---------------------------------------------------------------------- // Keep a map of content types, for easy conversion back and forth @@ -79,12 +79,18 @@ public static RdfResultMediaType fromContentType(String contentType) */ private final String jenaResponseFormat; + /** + * What extension should be used if file is downloaded? + */ + private final String extension; + private RdfResultMediaType(String contentType, boolean nativeFormat, - String serializationFormat, String jenaResponseFormat) { + String serializationFormat, String jenaResponseFormat, String extension) { this.contentType = contentType; this.nativeFormat = nativeFormat; this.serializationFormat = serializationFormat; this.jenaResponseFormat = jenaResponseFormat; + this.extension = extension; } public String getContentType() { @@ -103,4 +109,8 @@ public String getJenaResponseFormat() { return jenaResponseFormat; } + public String getExtension() { + return extension; + } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/ResultSetMediaType.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/ResultSetMediaType.java index b283d84fe2..5aa424f14e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/ResultSetMediaType.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/api/sparqlquery/ResultSetMediaType.java @@ -12,15 +12,15 @@ * SELECT and ASK). */ public enum ResultSetMediaType { - TEXT("text/plain", true, "TEXT", null), + TEXT("text/plain", true, "TEXT", null, "txt"), - CSV("text/csv", true, "CSV", null), + CSV("text/csv", true, "CSV", null, "csv"), - TSV("text/tab-separated-values", false, "CSV", "tsv"), + TSV("text/tab-separated-values", false, "CSV", "tsv", "tsv"), - XML("application/sparql-results+xml", true, "XML", null), + XML("application/sparql-results+xml", true, "XML", null, "xml"), - JSON("application/sparql-results+json", true, "JSON", null); + JSON("application/sparql-results+json", true, "JSON", null, "json"); // ---------------------------------------------------------------------- // Keep a map of content types, for easy conversion back and forth @@ -78,12 +78,18 @@ public static ResultSetMediaType fromContentType(String contentType) */ private final String jenaResponseFormat; + /** + * What extension should be used if file is downloaded? + */ + private final String extension; + private ResultSetMediaType(String contentType, boolean nativeFormat, - String rdfServiceFormat, String jenaResponseFormat) { + String rdfServiceFormat, String jenaResponseFormat, String extension) { this.contentType = contentType; this.nativeFormat = nativeFormat; this.rdfServiceFormat = rdfServiceFormat; this.jenaResponseFormat = jenaResponseFormat; + this.extension = extension; } public String getContentType() { @@ -102,4 +108,8 @@ public String getJenaResponseFormat() { return jenaResponseFormat; } + public String getExtension() { + return extension; + } + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java index a076d9aa5b..26e71f4f0e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java @@ -42,7 +42,7 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) { VitroRequest vreq = new VitroRequest(request); - final int NUM_COLS=18; + final int NUM_COLS=19; String datapropURI = request.getParameter("uri"); @@ -73,8 +73,9 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) { results.add("display tier"); // column 14 results.add("display limit"); // column 15 results.add("custom entry form"); // column 16 - results.add("URI"); // column 17 - results.add("publish level"); // column 18 + results.add("editing"); // column 17 + results.add("URI"); // column 18 + results.add("publish level"); // column 19 results.add(dp.getPickListName()); // column 1 results.add(dp.getPublicName() == null ? "(no public label)" : dp.getPublicName()); // column 2 @@ -142,9 +143,10 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) { results.add(String.valueOf(dp.getDisplayTier())); // column 14 results.add(String.valueOf(dp.getDisplayLimit())); // column 15 results.add(dp.getCustomEntryForm() == null ? "(unspecified)" : dp.getCustomEntryForm()); // column 16 - results.add(dp.getURI() == null ? "" : dp.getURI()); // column 17 + results.add(dp.getEditing() == null ? "" : dp.getEditing()); // column 17 + results.add(dp.getURI() == null ? "" : dp.getURI()); // column 18 results.add(dp.getHiddenFromPublishBelowRoleLevel() == null ? "(unspecified)" - : dp.getHiddenFromPublishBelowRoleLevel().getDisplayLabel()); // column 18 + : dp.getHiddenFromPublishBelowRoleLevel().getDisplayLabel()); // column 19 request.setAttribute("results",results); request.setAttribute("columncount",NUM_COLS); request.setAttribute("suppressquery","true"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java index c8f3ced07e..c4b04c08bb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java @@ -168,13 +168,26 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) { optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(objectForEditing)); optionMap.put("HiddenFromPublishBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getPublishOptionsList(objectForEditing)); + // Set the value of the editing parameter (as defined in VitroVocabulary.java). + // Use value to control form types as in defaultDataPropertyForm.ftl + String editingVal = objectForEditing.getEditing(); + List
            • ${i18n().select_a_language} @@ -22,11 +16,11 @@ <#-- * selectLocale * -- selectLocaleUrl - * -- locales [list of maps] - * -- [map] + * -- locales [list of locales with country] + * -- [locale with country] * -- code - * -- label (tooltip relative to the current Locale) - * -- imageUrl + * -- label (tooltip displayed in original locale, not current locale) + * -- country (displayed in original locale, not current locale) * -- selected (boolean) --> diff --git a/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl b/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl deleted file mode 100644 index 205a0012ed..0000000000 --- a/webapp/src/main/webapp/templates/freemarker/body/termsOfUse.ftl +++ /dev/null @@ -1,34 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -
              -

              Terms of Use

              - -

              Disclaimers

              -

              This ${termsOfUse.siteName} website contains material—text information, publication - citations, links, and images—provided by ${termsOfUse.siteHost} and by various - third parties, both individuals and organizations, commercial and otherwise. To the extent copyrightable, - the information presented on the VIVO website and available as Resource Description Framework (RDF) data - from VIVO at ${termsOfUse.siteHost} is intended for public use and is freely distributed under the terms of the - Creative Commons CC-BY 3.0 license which allows you - to copy, distribute, display and make derivatives of this information provided you give credit to - ${termsOfUse.siteHost}. Any non-copyrightable information is available to you under a - CC0 waiver. However, source documents, - images or web pages attached to or linked from VIVO may contain copyrighted information and should only be - used or distributed under terms included with each source or in accordance with the principles of fair use. -

              - -

              Disclaimer of Liability

              -

              ${termsOfUse.siteHost?cap_first} makes no warranty, expressed or implied, including the warranties of merchantability - and fitness for a particular purpose, or assumes any legal liability or responsibility for the accuracy, - completeness, currency or usefulness of any material displayed or distributed through the - ${termsOfUse.siteName} website or represents that its use would not infringe privately owned rights. - ${termsOfUse.siteHost?cap_first} disclaims all warranties with regard to the information provided. Any reliance upon such information - is at your own risk. In no event will ${termsOfUse.siteHost} be liable to you for any damages or losses whatsoever resulting - from or caused by the ${siteName} website or its contents.

              - -

              Disclaimer of Endorsement

              -

              Reference herein to any specific commercial product, process, or service by trade name, - trademark, manufacturer, or otherwise, does not necessarily constitute or imply its endorsement or recommendation - by ${termsOfUse.siteHost}. The views and opinions of authors expressed herein do not necessarily state or reflect those of - ${termsOfUse.siteHost} and shall not be used for advertising or product endorsement purposes.

              -
              From 4ec92fb4d63150967327b1b181303a6c56ef5c1d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 6 Jul 2020 10:56:51 +0200 Subject: [PATCH 23/52] Making UQAM-optimization aware of https:// --- .../vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java index 5b08edf8c0..e5c0577782 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java @@ -166,7 +166,7 @@ private String bindParameters(String text, Map merged) { String bound = text; for (String key : merged.keySet()) { String value = merged.get(key); - if (value.startsWith("http:")) { + if (value.startsWith("http://") || value.startsWith("https://")) { /* * UQAM-Optimization if the "value" looks like an URI then wrap the value with the characters '<' '>' * From 8e1c965a83393397f357729ae565884b536f20f2 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Tue, 14 Jul 2020 11:11:02 -0600 Subject: [PATCH 24/52] Add parent reference to installer/pom.xml (#174) Resolves: https://jira.lyrasis.org/browse/VIVO-1903 Co-authored-by: Andrew Woods --- installer/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/installer/pom.xml b/installer/pom.xml index 0323adcf4b..a79aaa4c97 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -10,6 +10,13 @@ 1.11.2-SNAPSHOT pom + + org.vivoweb + vitro-project + 1.11.2-SNAPSHOT + .. + + Vitro Installer From e40401225a6b3388eabec8be7616cc648429605f Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Mon, 24 Aug 2020 05:07:10 -0600 Subject: [PATCH 25/52] Revert non-function RDF changes (#177) Related to: https://jira.lyrasis.org/browse/VIVO-1905 Co-authored-by: Andrew Woods --- .../rdf/auth/everytime/permission_config.n3 | 283 +++++++----- .../rdf/display/everytime/dataGetterLabels.n3 | 28 +- .../everytime/displayModelListViews.n3 | 13 - .../everytime/displayModelListViews.rdf | 23 + .../rdf/display/everytime/pageList.n3 | 18 +- .../rdf/display/everytime/permissions.n3 | 242 +++++----- .../everytime/vitroSearchProhibited.n3 | 29 +- .../rdf/display/firsttime/application.n3 | 177 -------- .../rdf/display/firsttime/application.owl | 137 ++++++ .../resources/rdf/display/firsttime/menu.n3 | 55 ++- .../firsttime/pageList_editableStatements.n3 | 38 +- .../rdf/display/firsttime/profilePageType.n3 | 46 +- .../everytime/displayDisplay.n3 | 45 +- .../rdf/displayTbox/everytime/displayTBOX.n3 | 427 +++++++++--------- .../rdf/tbox/filegraph/vitro-0.7.owl | 157 +++++++ .../rdf/tbox/filegraph/vitro-0.72.n3 | 219 --------- .../rdf/tbox/filegraph/vitroPublic.n3 | 57 --- .../rdf/tbox/filegraph/vitroPublic.owl | 74 +++ 18 files changed, 1046 insertions(+), 1022 deletions(-) delete mode 100644 home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 create mode 100644 home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf delete mode 100644 home/src/main/resources/rdf/display/firsttime/application.n3 create mode 100644 home/src/main/resources/rdf/display/firsttime/application.owl create mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl delete mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 delete mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 create mode 100644 home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl diff --git a/home/src/main/resources/rdf/auth/everytime/permission_config.n3 b/home/src/main/resources/rdf/auth/everytime/permission_config.n3 index 01575203a6..f94e3516fb 100644 --- a/home/src/main/resources/rdf/auth/everytime/permission_config.n3 +++ b/home/src/main/resources/rdf/auth/everytime/permission_config.n3 @@ -1,128 +1,175 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/permission_config +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . +@prefix rdfs: . @prefix auth: . +@prefix simplePermission: . @prefix displayByRole: . @prefix editByRole: . -@prefix owl: . @prefix publishByRole: . -@prefix rdf: . -@prefix rdfs: . -@prefix simplePermission: . -@prefix xsd: . auth:ADMIN - a auth:PermissionSet ; - auth:hasPermission displayByRole:Admin ; - auth:hasPermission editByRole:Admin ; - auth:hasPermission publishByRole:Admin ; - auth:hasPermission simplePermission:AccessSpecialDataModels ; - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOntology ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:EditSiteInformation ; - auth:hasPermission simplePermission:EnableDeveloperPanel ; - auth:hasPermission simplePermission:LoginDuringMaintenance ; - auth:hasPermission simplePermission:ManageMenus ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:ManageProxies ; - auth:hasPermission simplePermission:ManageSearchIndex ; - auth:hasPermission simplePermission:ManageUserAccounts ; - auth:hasPermission simplePermission:PageViewableAdmin ; - auth:hasPermission simplePermission:PageViewableCurator ; - auth:hasPermission simplePermission:PageViewableEditor ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - auth:hasPermission simplePermission:PageViewablePublic ; - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:RefreshVisualizationCache ; - auth:hasPermission simplePermission:SeeConfiguration ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:SeeStartupStatus ; - auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; - auth:hasPermission simplePermission:UseAdvancedDataToolsPages ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:UseMiscellaneousAdminPages ; - auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - auth:hasPermission simplePermission:UseSparqlQueryPage ; - rdfs:label "Site Admin" ; -. + a auth:PermissionSet ; + rdfs:label "Site Admin" ; + + # ADMIN-only permissions + auth:hasPermission simplePermission:AccessSpecialDataModels ; + auth:hasPermission simplePermission:EnableDeveloperPanel ; + auth:hasPermission simplePermission:LoginDuringMaintenance ; + auth:hasPermission simplePermission:ManageMenus ; + auth:hasPermission simplePermission:ManageProxies ; + auth:hasPermission simplePermission:ManageSearchIndex ; + auth:hasPermission simplePermission:ManageUserAccounts ; + auth:hasPermission simplePermission:RefreshVisualizationCache ; + auth:hasPermission simplePermission:SeeConfiguration ; + auth:hasPermission simplePermission:SeeStartupStatus ; + auth:hasPermission simplePermission:UseAdvancedDataToolsPages ; + auth:hasPermission simplePermission:UseMiscellaneousAdminPages ; + auth:hasPermission simplePermission:UseSparqlQueryPage ; + auth:hasPermission simplePermission:PageViewableAdmin ; + + # Uncomment the following permission line to enable the SPARQL update API. + # Before enabling, be sure that the URL api/sparqlUpdate is secured by HTTPS, + # so passwords will not be sent in clear text. + #auth:hasPermission simplePermission:UseSparqlUpdateApi ; + + # permissions for CURATOR and above. + auth:hasPermission simplePermission:EditOntology ; + auth:hasPermission simplePermission:EditSiteInformation ; + auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; + auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; + auth:hasPermission simplePermission:PageViewableCurator ; + + # permissions for EDITOR and above. + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:PageViewableEditor ; + + # permissions for ANY logged-in user. + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + + # permissions for ANY user, even if they are not logged in. + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:PageViewablePublic ; + + # role-based permissions for ADMIN + auth:hasPermission displayByRole:Admin ; + auth:hasPermission editByRole:Admin ; + auth:hasPermission publishByRole:Admin ; + . + auth:CURATOR - a auth:PermissionSet ; - auth:hasPermission displayByRole:Curator ; - auth:hasPermission editByRole:Curator ; - auth:hasPermission publishByRole:Curator ; - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOntology ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:EditSiteInformation ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:PageViewableCurator ; - auth:hasPermission simplePermission:PageViewableEditor ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - auth:hasPermission simplePermission:PageViewablePublic ; - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - rdfs:label "Curator" ; -. + a auth:PermissionSet ; + rdfs:label "Curator" ; + + # permissions for CURATOR and above. + auth:hasPermission simplePermission:EditOntology ; + auth:hasPermission simplePermission:EditSiteInformation ; + auth:hasPermission simplePermission:SeeVerbosePropertyInformation ; + auth:hasPermission simplePermission:UseMiscellaneousCuratorPages ; + auth:hasPermission simplePermission:PageViewableCurator ; + + # permissions for EDITOR and above. + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:PageViewableEditor ; + + # permissions for ANY logged-in user. + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + + # permissions for ANY user, even if they are not logged in. + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:PageViewablePublic ; + + # role-based permissions for CURATOR + auth:hasPermission displayByRole:Curator ; + auth:hasPermission editByRole:Curator ; + auth:hasPermission publishByRole:Curator ; + . + auth:EDITOR - a auth:PermissionSet ; - auth:hasPermission displayByRole:Editor ; - auth:hasPermission editByRole:Editor ; - auth:hasPermission publishByRole:Editor ; - auth:hasPermission simplePermission:DoBackEndEditing ; - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:PageViewableEditor ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - auth:hasPermission simplePermission:PageViewablePublic ; - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:SeeIndividualEditingPanel ; - auth:hasPermission simplePermission:SeeRevisionInfo ; - auth:hasPermission simplePermission:SeeSiteAdminPage ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseIndividualControlPanel ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - rdfs:label "Editor" ; -. -auth:PUBLIC - a auth:PermissionSet ; - a auth:PermissionSetForPublic ; - auth:hasPermission displayByRole:Public ; - auth:hasPermission publishByRole:Public ; - auth:hasPermission simplePermission:PageViewablePublic ; - auth:hasPermission simplePermission:QueryFullModel ; - rdfs:label "Public" ; -. + a auth:PermissionSet ; + rdfs:label "Editor" ; + + # permissions for EDITOR and above. + auth:hasPermission simplePermission:DoBackEndEditing ; + auth:hasPermission simplePermission:SeeIndividualEditingPanel ; + auth:hasPermission simplePermission:SeeRevisionInfo ; + auth:hasPermission simplePermission:SeeSiteAdminPage ; + auth:hasPermission simplePermission:UseIndividualControlPanel ; + auth:hasPermission simplePermission:PageViewableEditor ; + + # permissions for ANY logged-in user. + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + + # permissions for ANY user, even if they are not logged in. + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:PageViewablePublic ; + + # role-based permissions for EDITOR + auth:hasPermission displayByRole:Editor ; + auth:hasPermission editByRole:Editor ; + auth:hasPermission publishByRole:Editor ; + . + auth:SELF_EDITOR - a auth:PermissionSet ; - a auth:PermissionSetForNewUsers ; - auth:hasPermission displayByRole:Public ; - auth:hasPermission publishByRole:Public ; - auth:hasPermission simplePermission:DoFrontEndEditing ; - auth:hasPermission simplePermission:EditOwnAccount ; - auth:hasPermission simplePermission:ManageOwnProxies ; - auth:hasPermission simplePermission:PageViewableLoggedIn ; - auth:hasPermission simplePermission:PageViewablePublic ; - auth:hasPermission simplePermission:QueryFullModel ; - auth:hasPermission simplePermission:QueryUserAccountsModel ; - auth:hasPermission simplePermission:UseBasicAjaxControllers ; - auth:hasPermission simplePermission:UseMiscellaneousPages ; - rdfs:label "Self Editor" ; -. + a auth:PermissionSet ; + a auth:PermissionSetForNewUsers ; + rdfs:label "Self Editor" ; + + # permissions for ANY logged-in user. + auth:hasPermission simplePermission:DoFrontEndEditing ; + auth:hasPermission simplePermission:EditOwnAccount ; + auth:hasPermission simplePermission:ManageOwnProxies ; + auth:hasPermission simplePermission:QueryUserAccountsModel ; + auth:hasPermission simplePermission:UseBasicAjaxControllers ; + auth:hasPermission simplePermission:UseMiscellaneousPages ; + auth:hasPermission simplePermission:PageViewableLoggedIn ; + + # permissions for ANY user, even if they are not logged in. + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:PageViewablePublic ; + + # role-based permissions for SELF_EDITOR + # For role-based display and editing, SelfEditor is like Public. + # SelfEditor uses its special permissions to edit/display its own values. + auth:hasPermission displayByRole:Public ; + auth:hasPermission publishByRole:Public ; + . + +auth:PUBLIC + a auth:PermissionSet ; + a auth:PermissionSetForPublic ; + rdfs:label "Public" ; + + # permissions for ANY user, even if they are not logged in. + auth:hasPermission simplePermission:QueryFullModel ; + auth:hasPermission simplePermission:PageViewablePublic ; + + # role-based permissions for PUBLIC + auth:hasPermission displayByRole:Public ; + auth:hasPermission publishByRole:Public ; + . diff --git a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 index 6b50a177b8..a53effd4fe 100644 --- a/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 +++ b/home/src/main/resources/rdf/display/everytime/dataGetterLabels.n3 @@ -1,20 +1,14 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/dataGetterLabels +# $This file is distributed under the terms of the license in LICENSE$ +@prefix rdfs: . + +#Data getter type labels -@prefix : . -@prefix owl: . -@prefix rdf: . @prefix rdfs: . -@prefix xsd: . - - rdfs:label "Browse Page" ; -. - - rdfs:label "Class Group Page" ; -. - - rdfs:label "Class Group Page - Selected Classes" ; -. - - rdfs:label "Sparql Query Results" ; -. + rdfs:label "Class Group Page" . + rdfs:label "Browse Page" . + rdfs:label "Class Group Page - Selected Classes" . + rdfs:label "Sparql Query Results" . + + + diff --git a/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 b/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 deleted file mode 100644 index 177fcb8985..0000000000 --- a/home/src/main/resources/rdf/display/everytime/displayModelListViews.n3 +++ /dev/null @@ -1,13 +0,0 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1/ - -@prefix : . -@prefix display: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix vitro: . -@prefix xsd: . - -display:hasElement - display:listViewConfigFile "listViewConfig-hasElement.xml" ; -. diff --git a/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf b/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf new file mode 100644 index 0000000000..77f7620fdd --- /dev/null +++ b/home/src/main/resources/rdf/display/everytime/displayModelListViews.rdf @@ -0,0 +1,23 @@ + + + + + + + +]> + + + + + + listViewConfig-hasElement.xml + + + diff --git a/home/src/main/resources/rdf/display/everytime/pageList.n3 b/home/src/main/resources/rdf/display/everytime/pageList.n3 index 577cbd0a37..d09a0e5891 100644 --- a/home/src/main/resources/rdf/display/everytime/pageList.n3 +++ b/home/src/main/resources/rdf/display/everytime/pageList.n3 @@ -1,14 +1,16 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/pageList +# $This file is distributed under the terms of the license in LICENSE$ + +# This file is for the portions of the pageList that should not be editable, i.e.# +# that it cannot be deleted and that it requires certain permissions # -@prefix : . -@prefix action: . -@prefix display: . @prefix owl: . +@prefix display: . @prefix rdf: . @prefix rdfs: . -@prefix xsd: . +@prefix action: . + +### This file defines the page list menu for vitro. ### display:pageListPage - display:cannotDeletePage "true" ; - display:requiresAction action:ManageMenus ; -. + display:requiresAction ; + display:cannotDeletePage "true" . diff --git a/home/src/main/resources/rdf/display/everytime/permissions.n3 b/home/src/main/resources/rdf/display/everytime/permissions.n3 index 7743528f06..38055479d0 100644 --- a/home/src/main/resources/rdf/display/everytime/permissions.n3 +++ b/home/src/main/resources/rdf/display/everytime/permissions.n3 @@ -1,138 +1,164 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/permissions +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . -@prefix action: . -@prefix display: . @prefix owl: . +@prefix display: . @prefix rdf: . @prefix rdfs: . -@prefix xsd: . +@prefix action: . + +# These are the reqired action objects from the SimplePermission.java. action:AccessSpecialDataModels - a display:RequiredAction ; - rdfs:label "ACCESS_SPECIAL_DATA_MODELS" ; -. + a display:RequiredAction ; + rdfs:label "ACCESS_SPECIAL_DATA_MODELS" . + + action:DoBackEndEditing - a display:RequiredAction ; - rdfs:label "DO_BACK_END_EDITING" ; -. + a display:RequiredAction ; + rdfs:label "DO_BACK_END_EDITING" . + + action:DoFrontEndEditing - a display:RequiredAction ; - rdfs:label "DO_FRONT_END_EDITING" ; -. + a display:RequiredAction ; + rdfs:label "DO_FRONT_END_EDITING" . + + action:EditOntology - a display:RequiredAction ; - rdfs:label "EDIT_ONTOLOGY" ; -. + a display:RequiredAction ; + rdfs:label "EDIT_ONTOLOGY" . + + action:EditOwnAccount - a display:RequiredAction ; - rdfs:label "EDIT_OWN_ACCOUNT" ; -. + a display:RequiredAction ; + rdfs:label "EDIT_OWN_ACCOUNT" . + + action:EditSiteInformation - a display:RequiredAction ; - rdfs:label "EDIT_SITE_INFORMATION" ; -. + a display:RequiredAction ; + rdfs:label "EDIT_SITE_INFORMATION" . + + action:LoginDuringMaintenance - a display:RequiredAction ; - rdfs:label "LOGIN_DURING_MAINTENANCE" ; -. + a display:RequiredAction ; + rdfs:label "LOGIN_DURING_MAINTENANCE" . + + action:ManageMenus - a display:RequiredAction ; - rdfs:label "MANAGE_MENUS" ; -. + a display:RequiredAction ; + rdfs:label "MANAGE_MENUS" . + + action:ManageOwnProxies - a display:RequiredAction ; - rdfs:label "MANAGE_OWN_PROXIES" ; -. + a display:RequiredAction ; + rdfs:label "MANAGE_OWN_PROXIES" . + + action:ManageProxies - a display:RequiredAction ; - rdfs:label "MANAGE_PROXIES" ; -. + a display:RequiredAction ; + rdfs:label "MANAGE_PROXIES" . + + action:ManageSearchIndex - a display:RequiredAction ; - rdfs:label "MANAGE_SEARCH_INDEX" ; -. + a display:RequiredAction ; + rdfs:label "MANAGE_SEARCH_INDEX" . + + action:ManageUserAccounts - a display:RequiredAction ; - rdfs:label "MANAGE_USER_ACCOUNTS" ; -. -action:PageViewableAdmin - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_ADMIN" ; -. -action:PageViewableCurator - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_CURATOR" ; -. -action:PageViewableEditor - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_EDITOR" ; -. -action:PageViewableLoggedIn - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_LOGGEDIN" ; -. -action:PageViewablePublic - a display:RequiredAction ; - rdfs:label "PAGE_VIEWABLE_PUBLIC" ; -. + a display:RequiredAction ; + rdfs:label "MANAGE_USER_ACCOUNTS" . + + action:QueryFullModel - a display:RequiredAction ; - rdfs:label "QUERY_FULL_MODEL" ; -. + a display:RequiredAction ; + rdfs:label "QUERY_FULL_MODEL" . + + action:QueryUserAccountsModel - a display:RequiredAction ; - rdfs:label "QUERY_USER_ACCOUNTS_MODEL" ; -. + a display:RequiredAction ; + rdfs:label "QUERY_USER_ACCOUNTS_MODEL" . + + action:RefreshVisualizationCache - a display:RequiredAction ; - rdfs:label "REFRESH_VISUALIZATION_CACHE" ; -. + a display:RequiredAction ; + rdfs:label "REFRESH_VISUALIZATION_CACHE" . + + action:SeeIndividualEditingPanel - a display:RequiredAction ; - rdfs:label "SEE_INDVIDUAL_EDITING_PANEL" ; -. + a display:RequiredAction ; + rdfs:label "SEE_INDVIDUAL_EDITING_PANEL" . + + action:SeeRevisionInfo - a display:RequiredAction ; - rdfs:label "SEE_REVISION_INFO" ; -. + a display:RequiredAction ; + rdfs:label "SEE_REVISION_INFO" . + + action:SeeSiteAdminPage - a display:RequiredAction ; - rdfs:label "SEE_SITE_ADMIN_PAGE" ; -. + a display:RequiredAction ; + rdfs:label "SEE_SITE_ADMIN_PAGE" . + + action:SeeStartupStatus - a display:RequiredAction ; - rdfs:label "SEE_STARTUP_STATUS" ; -. + a display:RequiredAction ; + rdfs:label "SEE_STARTUP_STATUS" . + + action:SeeVerbosePropertyInformation - a display:RequiredAction ; - rdfs:label "SEE_VERBOSE_PROPERTY_INFORMATION" ; -. + a display:RequiredAction ; + rdfs:label "SEE_VERBOSE_PROPERTY_INFORMATION" . + + action:UseAdvancedDataToolsPages - a display:RequiredAction ; - rdfs:label "USE_ADVANCED_DATA_TOOLS_PAGES" ; -. + a display:RequiredAction ; + rdfs:label "USE_ADVANCED_DATA_TOOLS_PAGES" . + + +action:UseSparqlQueryPage + a display:RequiredAction ; + rdfs:label "USE_SPARQL_QUERY_PAGE" . + + action:UseBasicAjaxControllers - a display:RequiredAction ; - rdfs:label "USE_BASIC_AJAX_CONTROLLERS" ; -. -action:UseIndividualControlPanel - a display:RequiredAction ; - rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" ; -. + a display:RequiredAction ; + rdfs:label "USE_BASIC_AJAX_CONTROLLERS" . + + action:UseMiscellaneousAdminPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_ADMIN_PAGES" ; -. + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_ADMIN_PAGES" . + + action:UseMiscellaneousCuratorPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" ; -. + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_CURATOR_PAGES" . + + +action:UseIndividualControlPanel + a display:RequiredAction ; + rdfs:label "USE_INDIVIDUAL_CONTROL_PANEL" . + + action:UseMiscellaneousPages - a display:RequiredAction ; - rdfs:label "USE_MISCELLANEOUS_PAGES" ; -. -action:UseSparqlQueryPage - a display:RequiredAction ; - rdfs:label "USE_SPARQL_QUERY_PAGE" ; -. + a display:RequiredAction ; + rdfs:label "USE_MISCELLANEOUS_PAGES" . + +##Page specific permissions +action:PageViewableAdmin + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_ADMIN" . + +action:PageViewableCurator + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_CURATOR" . + +action:PageViewableEditor + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_EDITOR" . + +action:PageViewableLoggedIn + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_LOGGEDIN" . + +action:PageViewablePublic + a display:RequiredAction ; + rdfs:label "PAGE_VIEWABLE_PUBLIC" . diff --git a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 index 47d2908385..74b223d253 100644 --- a/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 +++ b/home/src/main/resources/rdf/display/everytime/vitroSearchProhibited.n3 @@ -1,8 +1,25 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/vitroSearchProhibited.n3 +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix xsd: . +# All instances of a class can be excluded from the search index by adding a +# vitroDisplay:excludeClass property between vitroDisplay:SearchIndex and the +# URI of the class that you would like to exclude. +# .n3 or .rdf files can be created in this directory to configure the search +# exclusions. Each file must be a valid file in the format specified by its +# extension. Each file will be loaded individually and must be a complete +# stand alone example of its format. Each file must contain all the necessary +# prefixes, namespaces and preambles required by the format specified by its +# extension. + +# If you would like to add classes to the exclusions, add a file to this +# directory ending in .n3 with N3 statements similar to this example. + +# +# @prefix owl: . +# @prefix vitroDisplay: . +# @prefix rdf: . +# @prefix example: . +# +# vitroDisplay:SearchIndex +# rdf:type owl:Thing ; +# vitroDisplay:excludeClass example:classToExclude ; diff --git a/home/src/main/resources/rdf/display/firsttime/application.n3 b/home/src/main/resources/rdf/display/firsttime/application.n3 deleted file mode 100644 index 6f77597aef..0000000000 --- a/home/src/main/resources/rdf/display/firsttime/application.n3 +++ /dev/null @@ -1,177 +0,0 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1/ - -@prefix : . -@prefix display: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix vitro: . -@prefix xsd: . - -display:ClassGroupPage - a owl:Class ; -. -display:ExternallyLinkedNamespace - a owl:Class ; - rdfs:label "Externally Linked Namespace" ; -. -display:HomePage - a owl:Class ; -. -display:IndividualsForClassesPage - a owl:Class ; -. -display:InternalClassesPage - a owl:Class ; -. -display:MainMenu - a owl:Class ; - vitro:customDisplayViewAnnot """ - individual-menu.ftl - """ ; -. -display:NavigationElement - a owl:Class ; - rdfs:comment "This represents a menu item or other general navigation item." ; - rdfs:label "Navigation Element" ; -. -display:Page - a owl:Class ; - rdfs:comment "Class of pages." ; - rdfs:label "Page" ; -. -display:RequiredAction - a owl:Class ; -. -display:excludeClass - a owl:ObjectProperty ; -. -display:forClassGroup - a owl:ObjectProperty ; -. -display:getIndividualsForClass - a owl:ObjectProperty ; -. -display:hasDataGetter - a owl:ObjectProperty ; -. -display:hasElement - a owl:ObjectProperty ; -. -display:linkText - a owl:DatatypeProperty ; - rdfs:comment "Text to display to a link." ; -. -display:listViewConfigFile - a owl:DatatypeProperty ; -. -display:menuPosition - a owl:DatatypeProperty ; - rdfs:label "menu position" ; -. -display:parameterName - a owl:DatatypeProperty ; - rdfs:label "parameter name" ; -. -display:parameterValue - a owl:DatatypeProperty ; - rdfs:label "parameter value" ; -. -display:requiresAction - a owl:ObjectProperty ; -. -display:requiresBodyTemplate - a owl:DatatypeProperty ; - rdfs:comment "Indicates that a page requires a body template." ; - rdfs:domain display:Page ; - rdfs:label "Body Template" ; -. -display:restrictResultsByClass - a owl:ObjectProperty ; -. -display:restrictResultsByInternalClass - a owl:DatatypeProperty ; -. -display:title - a owl:DatatypeProperty ; - rdfs:comment "Value for HTML title element." ; - rdfs:domain display:Page ; - rdfs:label "title" ; -. -display:toPage - a owl:ObjectProperty ; - rdfs:domain display:NavigationElement ; - rdfs:range display:Page ; -. -display:urlMapping - a owl:DatatypeProperty ; - rdfs:comment "Values from HttpRequest.getPathInfo() will be mapped to values from urlMapping." ; -. -: - a owl:Ontology ; - rdfs:label "Vitro display ontology" ; - owl:versionInfo "1.1" ; -. - - a owl:Class ; -. - - a owl:ObjectProperty ; - rdfs:domain display:Page ; - rdfs:range ; -. - - a owl:Class ; -. -:excludeClass - a owl:ObjectProperty ; -. -:includeClass - a owl:ObjectProperty ; -. -rdfs:comment - a owl:AnnotationProperty ; - a owl:DatatypeProperty ; -. -rdfs:domain - a owl:ObjectProperty ; -. -rdfs:label - a owl:AnnotationProperty ; - a owl:DatatypeProperty ; -. -rdfs:range - a owl:ObjectProperty ; -. -rdfs:subPropertyOf - a owl:Class ; -. -owl:AnnotationProperty - a owl:Class ; -. -owl:Class - a owl:Class ; -. -owl:DatatypeProperty - a owl:Class ; - a owl:DatatypeProperty ; -. -owl:NamedIndividual - a owl:Class ; -. -owl:ObjectProperty - a owl:Class ; -. -owl:Ontology - a owl:Class ; -. -owl:topDataProperty - a owl:DatatypeProperty ; -. -owl:topObjectProperty - a owl:ObjectProperty ; -. -owl:versionInfo - a owl:AnnotationProperty ; - a owl:DatatypeProperty ; -. diff --git a/home/src/main/resources/rdf/display/firsttime/application.owl b/home/src/main/resources/rdf/display/firsttime/application.owl new file mode 100644 index 0000000000..02dbd57368 --- /dev/null +++ b/home/src/main/resources/rdf/display/firsttime/application.owl @@ -0,0 +1,137 @@ + + + + + + + + +]> + + + + + + + + + + + This represents a menu item or other general navigation item. + + + + + + + + + + + + + + individual-menu.ftl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Indicates that a page requires a body template. + + + + + + + + + Values from HttpRequest.getPathInfo() will be mapped to values from urlMapping. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/home/src/main/resources/rdf/display/firsttime/menu.n3 b/home/src/main/resources/rdf/display/firsttime/menu.n3 index 4d24607b45..2fc75e1b41 100644 --- a/home/src/main/resources/rdf/display/firsttime/menu.n3 +++ b/home/src/main/resources/rdf/display/firsttime/menu.n3 @@ -1,31 +1,38 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/menu +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . -@prefix action: . -@prefix display: . @prefix owl: . +@prefix display: . @prefix rdf: . @prefix rdfs: . -@prefix xsd: . +@prefix action: . + +### This file defines the default menu for vitro. ### + +#### Default Menu #### display:DefaultMenu - a display:MainMenu ; - display:hasElement display:HomeMenuItem ; -. -display:Home - a display:HomePage ; - a display:Page ; - display:cannotDeletePage "true" ; - display:hasDataGetter display:homeDataGetter ; - display:title "Home" ; - display:urlMapping "/" ; -. + a display:MainMenu ; + display:hasElement display:HomeMenuItem . + +#### Menu Items for Default Menu #### + display:HomeMenuItem - a display:NavigationElement ; - display:linkText "Home" ; - display:menuPosition 1 ; - display:toPage display:Home ; -. -display:homeDataGetter - a ; -. + a display:NavigationElement ; + display:menuPosition 1; + display:linkText "Home"; + display:toPage display:Home . + +########## Pages ############ + +display:Home + a display:HomePage ; + a display:Page ; + display:title "Home" ; + display:urlMapping "/" ; + display:hasDataGetter display:homeDataGetter; + display:cannotDeletePage "true" . + +########## Data Getter ############ + + + a . diff --git a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 index 04e537eabd..d9869b12e4 100644 --- a/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 +++ b/home/src/main/resources/rdf/display/firsttime/pageList_editableStatements.n3 @@ -1,16 +1,25 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/pageList_editableStatements +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . -@prefix action: . -@prefix display: . @prefix owl: . +@prefix display: . @prefix rdf: . @prefix rdfs: . -@prefix xsd: . +@prefix action: . + +### This file defines the page list menu for vitro. These statements can be edited through the interface.### + +display:pageListPage + a display:Page ; + display:title "Pages" ; + display:urlMapping "/pageList" ; + display:requiresBodyTemplate "pageList.ftl" ; + display:hasDataGetter display:pageListData. display:pageListData - a ; - display:query """ + a ; + display:saveToVar "pages" ; + display:queryModel ; + display:query """ PREFIX display: PREFIX rdfs: SELECT ?listedPageUri ?listedPageTitle ?listedPageUrlMapping ?listedPageTemplate ?listedPageMenuItem ?listedPageCannotDeletePage @@ -21,14 +30,7 @@ display:pageListData OPTIONAL {?listedPageUri display:requiresBodyTemplate ?listedPageTemplate .} OPTIONAL {?listedPageMenuItem display:toPage ?listedPageUri .} OPTIONAL {?listedPageUri display:cannotDeletePage ?listedPageCannotDeletePage .} - } ORDER BY ?listedPageTitle """ ; - display:queryModel ; - display:saveToVar "pages" ; -. -display:pageListPage - a display:Page ; - display:hasDataGetter display:pageListData ; - display:requiresBodyTemplate "pageList.ftl" ; - display:title "Pages" ; - display:urlMapping "/pageList" ; -. + } ORDER BY ?listedPageTitle """ . +###Page Management and Data Getters + + diff --git a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 b/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 index 0b0801728d..a3760f7385 100644 --- a/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 +++ b/home/src/main/resources/rdf/display/firsttime/profilePageType.n3 @@ -1,31 +1,25 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ontologies/display/1.1 +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . -@prefix display: . +@prefix xsd: . @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix xsd: . +@prefix display: . +@base . + +display:ProfilePageType rdf:type owl:Class ; + + owl:equivalentClass [ rdf:type owl:Class ; + owl:oneOf ( display:standard + display:quickView + ) + ] . + +display:quickView rdf:type display:ProfilePageType , + owl:NamedIndividual . + +display:standard rdf:type display:ProfilePageType , + owl:NamedIndividual . -display:ProfilePageType - a owl:Class ; - owl:equivalentClass [ - a owl:Class ; - owl:oneOf ( - display:standard - display:quickView - ) ; - ] ; -. -display:hasDefaultProfilePageType - a owl:ObjectProperty ; - rdfs:range display:ProfilePageType ; -. -display:quickView - a display:ProfilePageType ; - a owl:NamedIndividual ; -. -display:standard - a display:ProfilePageType ; - a owl:NamedIndividual ; -. +display:hasDefaultProfilePageType rdf:type owl:ObjectProperty . +display:hasDefaultProfilePageType rdfs:range display:ProfilePageType . diff --git a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 index bb311012a7..b8656304e2 100644 --- a/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 +++ b/home/src/main/resources/rdf/displayDisplay/everytime/displayDisplay.n3 @@ -1,25 +1,28 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/displayDisplay - -@prefix : . +@prefix rdfs: . +@prefix xsd: . +@prefix owl: . +@prefix rdf: . @prefix display: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix xsd: . rdf:type - a owl:ObjectProperty ; - "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator" ; - true ; - true ; - rdfs:label "RDF Type"@en-US ; - rdfs:range owl:Class ; -. + a owl:ObjectProperty ; + rdfs:label "RDF Type"@en-US ; + rdfs:range owl:Class; + + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ; + + "true"^^xsd:boolean ; + + "true"^^xsd:boolean . + + display:requiresAction - a owl:ObjectProperty ; - true ; - true ; - rdfs:comment "Indicates that a resource has a required action that may need to be authorized" ; - rdfs:label "Required Action"@en-US ; - rdfs:range display:RequiredAction ; -. + a owl:ObjectProperty ; + rdfs:label "Required Action"@en-US ; + rdfs:comment "Indicates that a resource has a required action that may need to be authorized" ; + rdfs:range display:RequiredAction ; + + "true"^^xsd:boolean ; + + "true"^^xsd:boolean . + diff --git a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 index 4250c152f4..d5fcf9ec28 100644 --- a/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 +++ b/home/src/main/resources/rdf/displayTbox/everytime/displayTBOX.n3 @@ -1,220 +1,227 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/TBOX +# $This file is distributed under the terms of the license in LICENSE$ -@prefix : . +@prefix rdfs: . +@prefix xsd: . +@prefix owl: . +@prefix rdf: . @prefix display: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix vitro: . -@prefix xsd: . +@prefix vitro: . -rdf:type - a owl:ObjectProperty ; - vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator" ; - vitro:offerCreateNewOptionAnnot true ; - vitro:selectFromExistingAnnot true ; - rdfs:label "RDF Type"@en-US ; - rdfs:range owl:Class ; -. -vitro:additionalLink - a owl:ObjectProperty ; - vitro:customEntryFormAnnot "defaultLinkForm.jsp" ; - vitro:forceStubDeletionAnnot true ; - vitro:offerCreateNewOptionAnnot true ; - vitro:selectFromExistingAnnot false ; - vitro:stubObjectPropertyAnnot true ; - rdfs:label "Additional Link"@en-US ; - rdfs:range vitro:Link ; - rdfs:subPropertyOf vitro:additionalLink ; - rdfs:subPropertyOf owl:topObjectProperty ; -. -vitro:customDisplayViewAnnot - a owl:DatatypeProperty ; -. -vitro:displayRank - a owl:DatatypeProperty ; -. -vitro:modTime - a owl:DatatypeProperty ; -. -vitro:primaryLink - a owl:ObjectProperty ; - vitro:customEntryFormAnnot "defaultLinkForm.jsp" ; - vitro:forceStubDeletionAnnot true ; - vitro:offerCreateNewOptionAnnot true ; - vitro:selectFromExistingAnnot false ; - vitro:stubObjectPropertyAnnot true ; - rdfs:label "Primary Link"@en-US ; - rdfs:range vitro:Link ; - rdfs:subPropertyOf vitro:primaryLink ; - rdfs:subPropertyOf owl:topObjectProperty ; -. - - a owl:ObjectProperty ; - rdfs:range ; - rdfs:subPropertyOf ; - rdfs:subPropertyOf owl:topObjectProperty ; -. -display:ClassGroupPage - a owl:Class ; -. -display:DataGetter - a owl:Class ; -. -display:HomePage - a owl:Class ; -. -display:IndividualsForClassesPage - a owl:Class ; -. -display:InternalClassesPage - a owl:Class ; -. +#########Classes######### +###Basic +owl:Class a owl:Class . +owl:Ontology a owl:Class . +owl:AnnotationProperty a owl:Class . +owl:DatatypeProperty a owl:Class . +owl:ObjectProperty a owl:Class . + +###Display Model display:MainMenu - a owl:Class ; - vitro:customDisplayViewAnnot "individual-menu.ftl" ; -. -display:NavigationElement - a owl:Class ; -. -display:Page - a owl:Class ; -. -display:RequiredAction - a owl:Class ; - rdfs:comment "Represents a action that may need authorization to perform." ; -. -display:cannotDeletePage - a owl:DatatypeProperty ; -. -display:excludeClass - a owl:ObjectProperty ; -. -display:forClassGroup - a owl:ObjectProperty ; -. -display:getIndividualsForClass - a owl:ObjectProperty ; -. -display:hasDataGetter - a owl:ObjectProperty ; -. -display:hasElement - a owl:ObjectProperty ; -. -display:hasMenuText - a owl:DatatypeProperty ; -. -display:hasVClassId - a owl:ObjectProperty ; - rdfs:comment "Object property defining class for search data getter" ; -. -display:htmlValue - a owl:DatatypeProperty ; -. -display:isSelfContainedTemplate - a owl:DatatypeProperty ; -. -display:linkText - a owl:DatatypeProperty ; -. + a owl:Class ; + vitro:customDisplayViewAnnot "individual-menu.ftl"^^xsd:string . + +display:NavigationElement a owl:Class . + +display:Page a owl:Class . + +display:HomePage a owl:Class . + +display:ClassGroupPage a owl:Class . + +display:IndividualsForClassesPage a owl:Class . + +display:InternalClassesPage a owl:Class . + +display:DataGetter a owl:Class . + +display:RequiredAction a owl:Class ; + rdfs:comment "Represents a action that may need authorization to perform." . + + + a owl:Class ; + rdfs:comment "Data getter for running a SPARQL query." . + + + a owl:Class ; + rdfs:comment "A data getter for a Class search, i.e. get individuals for VClass" . + + + a owl:Class ; + rdfs:comment "A data getter that runs a SPARQL Update" . + + + a owl:Class ; + rdfs:comment "A data getter for a standard Vitro browse page" . + + + a owl:Class ; + rdfs:comment "A data getter for a VClassGroup page" . + + + a owl:Class ; + rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF" . + + + a owl:Class . + +## Class defining what N3 editing model preprocessors are associated with the system +## This is technically a JAVA interface but we can designate this as an owl:Class to indicate +## which classes are model change preprocessors + + a owl:Class . +########Data Properties######### + +###Basic + +rdfs:comment + a owl:DatatypeProperty . +rdfs:label + a owl:DatatypeProperty . +owl:versionInfo + a owl:DatatypeProperty . + +###Vitro model + +vitro:modTime + a owl:DatatypeProperty . +vitro:displayRank + a owl:DatatypeProperty . +vitro:customDisplayViewAnnot + a owl:DatatypeProperty . + +###Display model + display:listViewConfigFile - a owl:DatatypeProperty ; -. -display:menuPosition - a owl:DatatypeProperty ; - vitro:displayLimitAnnot "1"^^xsd:int ; -. -display:query - a owl:DatatypeProperty ; -. -display:queryModel - a owl:DatatypeProperty ; -. -display:requiresAction - a owl:ObjectProperty ; -. -display:requiresBodyTemplate - a owl:DatatypeProperty ; -. -display:restrictResultsByClass - a owl:ObjectProperty ; -. -display:saveToVar - a owl:DatatypeProperty ; -. + a owl:DatatypeProperty . + display:title - a owl:DatatypeProperty ; -. -display:toPage - a owl:ObjectProperty ; -. + a owl:DatatypeProperty . + display:urlMapping - a owl:DatatypeProperty ; -. + a owl:DatatypeProperty . + +display:requiresBodyTemplate + a owl:DatatypeProperty . + +display:isSelfContainedTemplate + a owl:DatatypeProperty . + +display:menuPosition + a owl:DatatypeProperty ; + vitro:displayLimitAnnot + "1"^^xsd:int . + +display:linkText + a owl:DatatypeProperty . + +display:hasMenuText + a owl:DatatypeProperty . + display:usesDataGetterClass - a owl:DatatypeProperty ; -. -rdfs:comment - a owl:DatatypeProperty ; -. -rdfs:domain - a owl:ObjectProperty ; -. -rdfs:label - a owl:DatatypeProperty ; -. + a owl:DatatypeProperty . + +display:query + a owl:DatatypeProperty . + +display:saveToVar + a owl:DatatypeProperty. + +display:queryModel + a owl:DatatypeProperty. + +display:htmlValue + a owl:DatatypeProperty. + +display:cannotDeletePage + a owl:DatatypeProperty. + +######### Object Properties######### +###Basic rdfs:range - a owl:ObjectProperty ; -. -owl:AnnotationProperty - a owl:Class ; -. -owl:Class - a owl:Class ; -. -owl:DatatypeProperty - a owl:Class ; -. -owl:ObjectProperty - a owl:Class ; -. -owl:Ontology - a owl:Class ; -. + a owl:ObjectProperty . +rdfs:domain + a owl:ObjectProperty . owl:topObjectProperty - a owl:ObjectProperty ; -. -owl:versionInfo - a owl:DatatypeProperty ; -. - - a owl:Class ; -. - - a owl:Class ; - rdfs:comment "A data getter for a standard Vitro browse page" ; -. - - a owl:Class ; - rdfs:comment "A data getter for a VClassGroup page" ; -. - - a owl:Class ; - rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF" ; -. - - a owl:Class ; -. - - a owl:Class ; - rdfs:comment "A data getter for a Class search, i.e. get individuals for VClass" ; -. - - a owl:Class ; - rdfs:comment "Data getter for running a SPARQL query." ; -. - - a owl:Class ; - rdfs:comment "A data getter that runs a SPARQL Update" ; -. + a owl:ObjectProperty . + +display:hasVClassId + a owl:ObjectProperty ; + rdfs:comment "Object property defining class for search data getter" . + +###Vitro properties without which individual templates throw errors as are required + + + a owl:ObjectProperty ; + rdfs:range ; + rdfs:subPropertyOf , owl:topObjectProperty . + +vitro:primaryLink + a owl:ObjectProperty ; + rdfs:label "Primary Link"@en-US ; + rdfs:range vitro:Link ; + rdfs:subPropertyOf vitro:primaryLink , owl:topObjectProperty ; + vitro:customEntryFormAnnot + "defaultLinkForm.jsp"^^xsd:string ; + vitro:forceStubDeletionAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot + "false"^^xsd:boolean ; + vitro:stubObjectPropertyAnnot + "true"^^xsd:boolean . + +rdf:type + a owl:ObjectProperty ; + rdfs:label "RDF Type"@en-US ; + rdfs:range owl:Class ; + vitro:customEntryFormAnnot + "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.RdfTypeGenerator"^^xsd:string ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean . + + +vitro:additionalLink + a owl:ObjectProperty ; + rdfs:label "Additional Link"@en-US ; + rdfs:range vitro:Link ; + rdfs:subPropertyOf vitro:additionalLink , owl:topObjectProperty ; + vitro:customEntryFormAnnot + "defaultLinkForm.jsp"^^xsd:string ; + vitro:forceStubDeletionAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean ; + vitro:selectFromExistingAnnot + "false"^^xsd:boolean ; + vitro:stubObjectPropertyAnnot + "true"^^xsd:boolean . + +###Display model + +display:hasElement + a owl:ObjectProperty . + +display:excludeClass + a owl:ObjectProperty . + +display:toPage + a owl:ObjectProperty . + +display:forClassGroup + a owl:ObjectProperty . + +display:hasDataGetter + a owl:ObjectProperty . + +display:getIndividualsForClass + a owl:ObjectProperty . + +display:restrictResultsByClass + a owl:ObjectProperty . + +display:requiresAction + a owl:ObjectProperty . + diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl new file mode 100644 index 0000000000..1fda081082 --- /dev/null +++ b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.7.owl @@ -0,0 +1,157 @@ + + + + ]> + + + + + + + + + + Vitro internals + 0.7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 b/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 deleted file mode 100644 index 9044a99662..0000000000 --- a/home/src/main/resources/rdf/tbox/filegraph/vitro-0.72.n3 +++ /dev/null @@ -1,219 +0,0 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro-0.7 - -@prefix : . -@prefix dc: . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix vitro: . -@prefix xsd: . - - - a owl:Ontology ; - rdfs:label "Vitro internals" ; - owl:versionInfo 0.7 ; -. -vitro:Application - a owl:Class ; -. -vitro:ClassGroup - a owl:Class ; -. -vitro:Namespace - a owl:Class ; -. -vitro:Portal - a owl:Class ; -. -vitro:PropertyGroup - a owl:Class ; -. -vitro:User - a owl:Class ; -. -vitro:aboutText - a owl:DatatypeProperty ; -. -vitro:acknowledgeText - a owl:DatatypeProperty ; -. -vitro:bannerHeight - a owl:DatatypeProperty ; -. -vitro:bannerImage - a owl:DatatypeProperty ; -. -vitro:bannerWidth - a owl:DatatypeProperty ; -. -vitro:contactMail - a owl:DatatypeProperty ; -. -vitro:copyrightAnchor - a owl:DatatypeProperty ; -. -vitro:copyrightURL - a owl:DatatypeProperty ; -. -vitro:customDisplayViewAnnot - a owl:AnnotationProperty ; -. -vitro:customEntryFormAnnot - a owl:AnnotationProperty ; -. -vitro:customShortViewAnnot - a owl:AnnotationProperty ; -. -vitro:descriptionAnnot - a owl:AnnotationProperty ; -. -vitro:displayLimit - a owl:DatatypeProperty ; -. -vitro:displayLimitAnnot - a owl:AnnotationProperty ; -. -vitro:displayRank - a owl:DatatypeProperty ; -. -vitro:displayRankAnnot - a owl:AnnotationProperty ; -. -vitro:editing - a owl:AnnotationProperty ; -. -vitro:exampleAnnot - a owl:AnnotationProperty ; -. -vitro:extendedLinkedData - a owl:AnnotationProperty ; -. -vitro:firstTime - a owl:DatatypeProperty ; -. -vitro:forceStubDeletionAnnot - a owl:AnnotationProperty ; -. -vitro:fullPropertyNameAnnot - a owl:AnnotationProperty ; -. -vitro:harvestId - a owl:AnnotationProperty ; -. -vitro:hidden - a owl:DatatypeProperty ; -. -vitro:hiddenAnnot - a owl:AnnotationProperty ; -. -vitro:hiddenFromDisplayBelowRoleLevelAnnot - a owl:AnnotationProperty ; -. -vitro:hiddenFromPublishBelowRoleLevelAnnot - a owl:AnnotationProperty ; -. -vitro:imageThumbWidth - a owl:DatatypeProperty ; -. -vitro:inClassGroup - a owl:AnnotationProperty ; -. -vitro:inPropertyGroupAnnot - a owl:AnnotationProperty ; -. -vitro:individualSortDirectionAnnot - a owl:AnnotationProperty ; -. -vitro:isExternalId - a owl:AnnotationProperty ; -. -vitro:isMenuPageIntersectionClass - a owl:AnnotationProperty ; -. -vitro:loginCount - a owl:DatatypeProperty ; -. -vitro:logotypeHeight - a owl:DatatypeProperty ; -. -vitro:logotypeImage - a owl:DatatypeProperty ; -. -vitro:logotypeWidth - a owl:DatatypeProperty ; -. -vitro:md5password - a owl:DatatypeProperty ; -. -vitro:modTime - a owl:DatatypeProperty ; -. -vitro:modTimeAnnot - a owl:AnnotationProperty ; -. -vitro:moniker - a owl:DatatypeProperty ; -. -vitro:mostSpecificType - a owl:AnnotationProperty ; -. -vitro:namespaceURI - a owl:DatatypeProperty ; -. -vitro:objectIndividualSortProperty - a owl:AnnotationProperty ; -. -vitro:offerCreateNewOptionAnnot - a owl:AnnotationProperty ; -. -vitro:oldId - a owl:AnnotationProperty ; -. -vitro:oldpassword - a owl:DatatypeProperty ; -. -vitro:originalId - a owl:AnnotationProperty ; -. -vitro:prohibitedFromUpdateBelowRoleLevelAnnot - a owl:AnnotationProperty ; -. -vitro:publicDescriptionAnnot - a owl:AnnotationProperty ; -. -vitro:roleURI - a owl:DatatypeProperty ; -. -vitro:rootBreadCrumbAnchor - a owl:DatatypeProperty ; -. -vitro:rootBreadCrumbURL - a owl:DatatypeProperty ; -. -vitro:rootLogotypeImage - a owl:DatatypeProperty ; -. -vitro:rootTab - a owl:ObjectProperty ; -. -vitro:selectFromExistingAnnot - a owl:AnnotationProperty ; -. -vitro:shortDef - a owl:AnnotationProperty ; -. -vitro:shortDefAnnot - a owl:AnnotationProperty ; -. -vitro:shortHand - a owl:DatatypeProperty ; -. -vitro:themeDir - a owl:DatatypeProperty ; -. -vitro:urlPrefix - a owl:DatatypeProperty ; -. -vitro:username - a owl:DatatypeProperty ; -. diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 deleted file mode 100644 index 7b48170222..0000000000 --- a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.n3 +++ /dev/null @@ -1,57 +0,0 @@ -# baseURI: http://vitro.mannlib.cornell.edu/ns/vitro/public - -@prefix : . -@prefix owl: . -@prefix rdf: . -@prefix rdfs: . -@prefix xsd: . - - - a owl:Ontology ; - rdfs:label "Vitro public constructs ontology" ; - owl:versionInfo 0.1 ; -. -:File - a owl:Class ; -. -:FileByteStream - a owl:Class ; -. -:attribution - a owl:DatatypeProperty ; - rdfs:domain :File ; - rdfs:range xsd:string ; -. -:directDownloadUrl - a owl:DatatypeProperty ; - rdfs:domain :FileByteStream ; - rdfs:range xsd:string ; -. -:downloadLocation - a owl:ObjectProperty ; - rdfs:domain :File ; - rdfs:range :FileByteStream ; -. -:filename - a owl:DatatypeProperty ; - rdfs:domain :File ; - rdfs:range xsd:string ; -. -:image - a owl:ObjectProperty ; - rdfs:range :File ; -. -:mainImage - a owl:ObjectProperty ; - rdfs:range :File ; -. -:mimeType - a owl:DatatypeProperty ; - rdfs:domain :File ; - rdfs:range xsd:string ; -. -:thumbnailImage - a owl:ObjectProperty ; - rdfs:domain :File ; - rdfs:range :File ; -. diff --git a/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl new file mode 100644 index 0000000000..597799a9b1 --- /dev/null +++ b/home/src/main/resources/rdf/tbox/filegraph/vitroPublic.owl @@ -0,0 +1,74 @@ + + + +]> + + + + + + + Vitro public constructs + 0.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 160994761bfb4702d1fb2440d5e2b9126576faef Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Mon, 29 Jun 2020 18:36:26 -0400 Subject: [PATCH 26/52] Ensure 'other' in Individual->Teaching->advisees->type is translated Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881 --- .../VTwo/fields/ChildVClassesOptions.java | 4 +- .../VTwo/fields/ChildVClassesWithParent.java | 43 +------------------ .../VTwo/fields/ConstantFieldOptions.java | 4 +- .../n3editing/VTwo/fields/FieldOptions.java | 4 +- .../IndividualsViaClassGroupOptions.java | 4 +- .../IndividualsViaObjectPropetyOptions.java | 4 +- .../IndividualsViaSearchQueryOptions.java | 4 +- .../fields/IndividualsViaVClassOptions.java | 4 +- .../n3editing/VTwo/fields/RdfTypeOptions.java | 4 +- .../VTwo/fields/SelectListGeneratorVTwo.java | 15 +++---- .../edit/EditConfigurationTemplateModel.java | 5 +-- 11 files changed, 34 insertions(+), 61 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java index f87dd8f488..0c7b44ef20 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesOptions.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +41,8 @@ public ChildVClassesOptions setDefaultOptionLabel(String label){ public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception{ + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception{ // now create an empty HashMap to populate and return HashMap optionsMap = new LinkedHashMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java index c20a63c91b..22f5763a42 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ChildVClassesWithParent.java @@ -12,11 +12,9 @@ import org.apache.jena.vocabulary.OWL; import edu.cornell.mannlib.vitro.webapp.beans.VClass; -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; -import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class ChildVClassesWithParent implements FieldOptions { @@ -25,7 +23,6 @@ public class ChildVClassesWithParent implements FieldOptions { String fieldName; String classUri; String defaultOptionLabel = null; - private I18nBundle i18n; public ChildVClassesWithParent(String classUri) throws Exception { super(); @@ -49,9 +46,8 @@ public ChildVClassesWithParent setDefaultOption(String label){ public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - VitroRequest vreq) throws Exception { -// WebappDaoFactory wDaoFact) throws Exception { - this.i18n = I18n.bundle(vreq); + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception { HashMap optionsMap = new LinkedHashMap(); // first test to see whether there's a default "leave blank" value specified with the literal options if ( ! StringUtils.isEmpty( defaultOptionLabel ) ){ @@ -60,7 +56,6 @@ public Map getOptions( String other_i18n = i18n.text("other"); // first character in capital optionsMap.put(classUri, other_i18n.substring(0, 1).toUpperCase() + other_i18n.substring(1)); - WebappDaoFactory wDaoFact = vreq.getWebappDaoFactory(); VClassDao vclassDao = wDaoFact.getVClassDao(); List subClassList = vclassDao.getAllSubClassURIs(classUri); if (subClassList != null && subClassList.size() > 0) { @@ -78,38 +73,4 @@ public Comparator getCustomComparator() { return null; } - /* - * (non-Javadoc) - * @see edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions#getOptions(edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo, java.lang.String, edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory) - * UQAM this version is a not internationalized use this method (see line below) more often - * getOptions(EditConfigurationVTwo editConfig, String fieldName, VitroRequest vreq) - */ - @Override - public Map getOptions( - EditConfigurationVTwo editConfig, - String fieldName, - WebappDaoFactory wDaoFact) throws Exception { - - HashMap optionsMap = new LinkedHashMap(); - // first test to see whether there's a default "leave blank" value specified with the literal options - if ( ! StringUtils.isEmpty( defaultOptionLabel ) ){ - optionsMap.put(LEFT_BLANK, defaultOptionLabel); - } - - optionsMap.put(classUri, "Other"); - - VClassDao vclassDao = wDaoFact.getVClassDao(); - List subClassList = vclassDao.getAllSubClassURIs(classUri); - if (subClassList != null && subClassList.size() > 0) { - for (String subClassUri : subClassList) { - VClass subClass = vclassDao.getVClassByURI(subClassUri); - if (subClass != null && !OWL.Nothing.getURI().equals(subClassUri)) { - optionsMap.put(subClassUri, subClass.getName().trim()); - } - } - } - return optionsMap; - } - - } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java index 3c68ac14d8..9fc7662d58 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/ConstantFieldOptions.java @@ -10,6 +10,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class ConstantFieldOptions implements FieldOptions { @@ -54,7 +55,8 @@ public ConstantFieldOptions(String fieldName2, public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception { + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception { // originally not auto-sorted but sorted now, and empty values not removed or replaced HashMap optionsMap = new LinkedHashMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java index b2c67f5493..772b22913c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldOptions.java @@ -6,6 +6,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; /** * Represents an object that can return a list of options @@ -28,7 +29,8 @@ public interface FieldOptions { public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception; + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception; /* * Certain field options may have custom sorting requirements. If no sorting requirements exist, diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java index b0a4990050..fa627a12e5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaClassGroupOptions.java @@ -6,6 +6,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class IndividualsViaClassGroupOptions implements FieldOptions { @@ -27,7 +28,8 @@ public IndividualsViaClassGroupOptions setDefaultOptionLabel(String label){ public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception { + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception { throw new Error("not implemented"); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java index 6a5d30be55..0cd216ef79 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropetyOptions.java @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,7 +78,8 @@ public IndividualsViaObjectPropetyOptions setDefaultOptionLabel(String label){ public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) { + WebappDaoFactory wDaoFact, + I18nBundle i18n) { HashMap optionsMap = new LinkedHashMap(); int optionsCount = 0; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java index ec7167c581..d752bfe28a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaSearchQueryOptions.java @@ -8,6 +8,7 @@ import java.util.ListIterator; import java.util.Map; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -90,7 +91,8 @@ protected Map getIndividualsForClass(String vclassURI, Webapp public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception { + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception { Map individualMap = new HashMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java index 80c9cf273a..374d571ed0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,7 +49,8 @@ public FieldOptions setDefaultOptionLabel(String label){ public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact) throws Exception { + WebappDaoFactory wDaoFact, + I18nBundle i18n) throws Exception { Map individualMap = new HashMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java index 9943856731..32c520fd38 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java @@ -9,6 +9,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class RdfTypeOptions implements FieldOptions { @@ -29,7 +30,8 @@ public RdfTypeOptions(String ... superClassURIs) public Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wdf) { + WebappDaoFactory wdf, + I18nBundle i18n) { Map uriToLabel = new HashMap(); for (String uri : typeURIs) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java index 0af862694f..c554cf39e6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java @@ -11,6 +11,8 @@ import java.util.List; import java.util.Map; +import edu.cornell.mannlib.vitro.webapp.i18n.I18n; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,7 +27,8 @@ public class SelectListGeneratorVTwo { public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, - WebappDaoFactory wDaoFact){ + WebappDaoFactory wDaoFact, + I18nBundle i18n){ if( editConfig == null ){ @@ -48,7 +51,7 @@ public static Map getOptions( } try { - return field.getFieldOptions().getOptions(editConfig,fieldName,wDaoFact); + return field.getFieldOptions().getOptions(editConfig,fieldName,wDaoFact,i18n); } catch (Exception e) { log.error("Error runing getFieldOptionis()",e); return Collections.emptyMap(); @@ -56,6 +59,7 @@ public static Map getOptions( } // UQAM Overcharge method for linguistic contexte processisng + // AWoods: This method appears to never be invoked. public static Map getOptions( EditConfigurationVTwo editConfig, String fieldName, @@ -85,12 +89,7 @@ public static Map getOptions( //UQAM need vreq instead of WebappDaoFactory Map parentClass = Collections.emptyMap(); FieldOptions fieldOptions = field.getFieldOptions(); - // UQAM TODO - Only internationalization of ChildVClassesWithParent are implemented. For TODO, implement the internationalization for the rest of instanceof "FieldOptions" - if (fieldOptions instanceof ChildVClassesWithParent ) { - return ((ChildVClassesWithParent)fieldOptions).getOptions(editConfig,fieldName,vreq); - } else { - return fieldOptions.getOptions(editConfig,fieldName,vreq.getWebappDaoFactory()); - } + return fieldOptions.getOptions(editConfig,fieldName,vreq.getWebappDaoFactory(), I18n.bundle(vreq)); } catch (Exception e) { log.error("Error runing getFieldOptionis()",e); return Collections.emptyMap(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index 6266901cd5..c3bd701dd0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -6,7 +6,6 @@ import java.net.URLDecoder; import java.text.Collator; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -41,7 +40,6 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.LanguageOption; -import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.PolicyOption; import edu.cornell.mannlib.vitro.webapp.web.beanswrappers.ReadOnlyBeansWrapper; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.ObjectPropertyStatementTemplateModel; @@ -112,8 +110,7 @@ private void populateDropdowns() throws Exception { field.setOptions(new ConstantFieldOptions()); } //UQAM-Optimization changing signature for including internationalization in scroll-down menu - Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf); -// Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, vreq); + Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf, I18n.bundle(vreq)); optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap, field.getFieldOptions().getCustomComparator(), vreq); if(pageData.containsKey(fieldName)) { log.error("Check the edit configuration setup as pageData already contains " + fieldName + " and this will be overwritten now with empty collection"); From 0d67f11667131192f2a2b274bad82fdef9a5e8e9 Mon Sep 17 00:00:00 2001 From: gneissone Date: Mon, 20 Jul 2020 11:46:22 -0600 Subject: [PATCH 27/52] Re-add logic from commit 7420957 --- .../EditRequestDispatchController.java | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java index 938651ca2a..3bd52e9859 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/EditRequestDispatchController.java @@ -13,11 +13,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.apache.jena.ontology.OntModel; import org.apache.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; +import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.RequestedAction; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditDataPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement; +import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Property; @@ -35,9 +42,11 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.EditConfigurationGenerator; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.EditConfigurationTemplateModel; import edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit.MultiValueEditSubmissionTemplateModel; + /** * This servlet is intended to handle all requests to create a form for use * by the N3 editing system. It will examine the request parameters, determine @@ -60,8 +69,33 @@ public class EditRequestDispatchController extends FreemarkerHttpServlet { final String DEFAULT_DELETE_FORM = "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDeleteGenerator"; @Override - protected AuthorizationRequest requiredActions(VitroRequest vreq) { - return SimplePermission.DO_FRONT_END_EDITING.ACTION; + protected AuthorizationRequest requiredActions(VitroRequest vreq) { + //Check if this statement can be edited here and return unauthorized if not + String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); + String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); + String objectUri = EditConfigurationUtils.getObjectUri(vreq); + String domainUri = EditConfigurationUtils.getDomainUri(vreq); + String rangeUri = EditConfigurationUtils.getRangeUri(vreq); + Property predicateProp = new Property(); + predicateProp.setURI(predicateUri); + predicateProp.setDomainVClassURI(domainUri); + predicateProp.setRangeVClassURI(rangeUri); + OntModel ontModel = ModelAccess.on(vreq).getOntModel(); + AbstractObjectPropertyStatementAction objectPropertyAction; + if (objectUri == null) { + objectPropertyAction = new AddObjectPropertyStatement(ontModel, subjectUri, predicateProp, RequestedAction.SOME_URI); + } else { + if (isDeleteForm(vreq)) { + objectPropertyAction = new DropObjectPropertyStatement(ontModel, subjectUri, predicateProp, objectUri); + } else { + objectPropertyAction = new EditObjectPropertyStatement(ontModel, subjectUri, predicateProp, objectUri); + } + } + boolean isAuthorized = PolicyHelper.isAuthorizedForActions(vreq, + new EditDataPropertyStatement(ontModel, subjectUri, predicateUri, objectUri). + or(objectPropertyAction)); + + return isAuthorized? SimplePermission.DO_FRONT_END_EDITING.ACTION: AuthorizationRequest.UNAUTHORIZED; } @Override From 05c3a89df497bae49acdc4160731dcb6984c8264 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 25 Aug 2020 09:21:56 -0500 Subject: [PATCH 28/52] [VIVO-1812] use i18n translation for validation messages (#179) * replace constants with i18n text in BasicValidationVTwo * use constants for i18n template key Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1812 --- ...ividualDataPropertyStatementProcessor.java | 1 - .../n3editing/VTwo/BasicValidationVTwo.java | 29 +++++++------- .../VTwo/MultiValueEditSubmission.java | 16 +++----- .../controller/api/SparqlUpdateApiTest.java | 1 - .../controller/edit/AuthenticateTest.java | 1 - .../VTwo/BasicValidationVTwoTest.java | 38 ++++++++++--------- 6 files changed, 41 insertions(+), 45 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java index f2b6cad4f5..b2758c7fd6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import org.apache.commons.logging.Log; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java index c5eb8280f6..463663e3df 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java @@ -24,15 +24,22 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.DatatypeDaoJena; import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; - +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; public class BasicValidationVTwo { + public final static String REQUIRED_FIELD_EMPTY_MSG = "required_field_empty_msg"; + + public final static String DATA_NOT_PAST_MSG = "data_not_past_msg"; + + private I18nBundle i18n; + Map> varsToValidations; EditConfigurationVTwo editConfig; - public BasicValidationVTwo(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub){ + public BasicValidationVTwo(EditConfigurationVTwo editConfig, I18nBundle i18n){ this.editConfig = editConfig; + this.i18n = i18n; Map> validatorsForFields = new HashMap>(); for(String fieldName: editConfig.getFields().keySet()){ FieldVTwo field = editConfig.getField(fieldName); @@ -42,8 +49,9 @@ public BasicValidationVTwo(EditConfigurationVTwo editConfig, MultiValueEditSubmi checkValidations(); } - public BasicValidationVTwo(Map> varsToValidations){ + public BasicValidationVTwo(Map> varsToValidations, I18nBundle i18n){ this.varsToValidations = varsToValidations; + this.i18n = i18n; checkValidations(); } @@ -94,7 +102,7 @@ public Map validateLiterals(Map> varNamesTo //If no literals and this field was required, this is an error message //and can return if((literals == null || literals.size() == 0) && isRequiredField) { - errors.put(name, REQUIRED_FIELD_EMPTY_MSG); + errors.put(name, i18n.text(REQUIRED_FIELD_EMPTY_MSG)); break; } //Loop through literals if literals exist @@ -113,7 +121,7 @@ public Map validateLiterals(Map> varNamesTo // incorrectly generate errors. if (isEmpty(value)) { if (isRequiredField) { - errors.put(name, REQUIRED_FIELD_EMPTY_MSG); + errors.put(name, i18n.text(REQUIRED_FIELD_EMPTY_MSG)); } break; } @@ -174,7 +182,7 @@ public String validate(String validationType, String value){ // This case may be needed for validation of other field types. if( "nonempty".equalsIgnoreCase(validationType)){ if( isEmpty(value) ) - return REQUIRED_FIELD_EMPTY_MSG; + return i18n.text(REQUIRED_FIELD_EMPTY_MSG); } // Format validation else if("isDate".equalsIgnoreCase(validationType)){ @@ -216,7 +224,7 @@ else if( "dateNotPast".equalsIgnoreCase(validationType)){ dayParamStr = value.substring(monthDash + 1, value.length()); inputC.set(Integer.parseInt(yearParamStr), Integer.parseInt(monthParamStr) - 1, Integer.parseInt(dayParamStr)); if(inputC.before(c)) { - return this.DATE_NOT_PAST_MSG; + return i18n.text(DATA_NOT_PAST_MSG); //Returning null makes the error message "field is empty" display instead //return null; } else { @@ -278,14 +286,9 @@ private static boolean isEmpty(String value) { return (value == null || value.trim().length() == 0); } - - - private static Pattern urlRX = Pattern.compile("(([a-zA-Z][0-9a-zA-Z+\\-\\.]*:)/{0,2}[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)(#[0-9a-zA-Z;/?:@&=+$\\.\\-_!~*'()%]+)?"); - /** we use null to indicate success */ public final static String SUCCESS = null; - public final static String REQUIRED_FIELD_EMPTY_MSG = "This field must not be empty."; - public final static String DATE_NOT_PAST_MSG = "Please enter a future target date for publication (past dates are invalid)."; + //public final static String MIN_FIELDS_NOT_POPULATED = "Please enter values for at least "; //public final static String FORM_ERROR_FIELD_ID = "formannotationerrors"; /** regex for strings like "12/31/2004" */ diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java index 5810b3ea0e..b4590ad109 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java @@ -10,14 +10,11 @@ import java.util.List; import java.util.Map; -import org.apache.commons.fileupload.FileItem; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; import org.apache.jena.rdf.model.Literal; import org.apache.jena.rdf.model.Model; @@ -28,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; +import edu.cornell.mannlib.vitro.webapp.i18n.I18n; public class MultiValueEditSubmission { @@ -37,14 +35,11 @@ public class MultiValueEditSubmission { private Map> urisFromForm ; private Map validationErrors; private BasicValidationVTwo basicValidation; - private static DateTimeFormatter dformater = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:00"); - private static DateTimeFormatter dateFormater = DateTimeFormat.forPattern("yyyy-MM-dd"); - private Map> filesFromForm; + private static Model literalCreationModel; private String entityToReturnTo; - private VitroRequest _vreq; - private static final String DATE_TIME_URI = XSD.dateTime.getURI(); - private static final String DATE_URI = XSD.date.getURI(); + private VitroRequest _vreq; + private static final String TIME_URI = XSD.time.getURI(); @@ -106,7 +101,7 @@ public MultiValueEditSubmission(VitroRequest vreq, EditConfigurationVTwo editCo processEditElementFields(editConfig,queryParameters); //Incorporating basic validation //Validate URIS - this.basicValidation = new BasicValidationVTwo(editConfig, this); + this.basicValidation = new BasicValidationVTwo(editConfig, I18n.bundle(vreq)); Map errors = basicValidation.validateUris( urisFromForm ); //Validate literals and add errors to the list of existing errors errors.putAll(basicValidation.validateLiterals( literalsFromForm )); @@ -175,7 +170,6 @@ public Literal createLiteral_ORIG(String value, String datatypeUri, String lang) /* maybe this could be static */ public Literal createLiteral(String value, String datatypeUri, String lang) { - Literal literal; if( datatypeUri != null && !datatypeUri.isEmpty() ){ // UQAM Original code contained tow-dots ':' in place of '#' // if( "http://www.w3.org/2001/XMLSchema:anyURI".equals(datatypeUri) ){ diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java index 8fde7a7420..aeed2e551e 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/api/SparqlUpdateApiTest.java @@ -73,7 +73,6 @@ public void nullRdfService() throws Exception { try { if(ds.supportsTransactions()) { ds.begin(ReadWrite.WRITE); - System.out.println("yep"); } UpdateAction.execute(UpdateFactory.create(updateStr1), graphStore); } finally { diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java index f15e055678..c849fa411a 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java @@ -48,7 +48,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; -import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator; import edu.cornell.mannlib.vitro.webapp.controller.authenticate.AuthenticatorStub; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean; import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java index 678ca76d15..4b3b27cfe6 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwoTest.java @@ -4,44 +4,46 @@ import java.util.Collections; -import org.junit.Assert; +import javax.servlet.http.HttpServletRequest; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub; +import stubs.javax.servlet.http.HttpServletRequestStub; + public class BasicValidationVTwoTest { + @Before + public void useI18nStubBundles() { + I18nStub.setup(); + } @SuppressWarnings("unchecked") @Test public void testHttpUrlValidate() { - BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP); + HttpServletRequest req = new HttpServletRequestStub(); + BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP, I18nStub.bundle(req)); String res; res = bv.validate("httpUrl", "http://example.com/index"); - Assert.assertEquals(res, BasicValidationVTwo.SUCCESS); + Assert.assertEquals(BasicValidationVTwo.SUCCESS, res); res = bv.validate("httpUrl", "http://example.com/index?bogus=skjd%20skljd&something=sdkf"); - Assert.assertEquals(res, BasicValidationVTwo.SUCCESS); + Assert.assertEquals(BasicValidationVTwo.SUCCESS, res); res = bv.validate("httpUrl", "http://example.com/index#2.23?bogus=skjd%20skljd&something=sdkf"); - Assert.assertEquals(res, BasicValidationVTwo.SUCCESS); + Assert.assertEquals(BasicValidationVTwo.SUCCESS, res); } @SuppressWarnings("unchecked") @Test public void testEmptyValidate(){ - BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP); - - Assert.assertEquals( - bv.validate("nonempty", null) - , BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG); - - - Assert.assertEquals( - bv.validate("nonempty", "") - , BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG); + HttpServletRequest req = new HttpServletRequestStub(); + BasicValidationVTwo bv = new BasicValidationVTwo(Collections.EMPTY_MAP, I18nStub.bundle(req)); - Assert.assertEquals( - bv.validate("nonempty", "some value") - , BasicValidationVTwo.SUCCESS); + Assert.assertEquals(BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG, bv.validate("nonempty", null)); + Assert.assertEquals(BasicValidationVTwo.REQUIRED_FIELD_EMPTY_MSG, bv.validate("nonempty", "")); + Assert.assertEquals(BasicValidationVTwo.SUCCESS, bv.validate("nonempty", "some value")); } } From 35375ed6988f42c9f9b0824b9d614332c49a9ba6 Mon Sep 17 00:00:00 2001 From: dofeldsc Date: Wed, 26 Aug 2020 16:58:20 +0200 Subject: [PATCH 29/52] added js_string at i18n strings to handle quotes properly, ticket vivo-1842 (#180) Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842 --- .../accounts/userAccounts-myProxiesPanel.ftl | 2 +- .../body/contactForm/contactForm-form.ftl | 4 +-- .../body/individual/individual-menu.ftl | 4 +-- .../body/individual/individual-vitro.ftl | 14 ++++----- .../individual/manageLabelsForIndividual.ftl | 4 +-- .../body/manageproxies/manageProxies-list.ftl | 2 +- .../body/pagemanagement/pageList.ftl | 2 +- .../body/partials/browse-classgroups.ftl | 4 +-- .../partials/menupage/menupage-scripts.ftl | 16 +++++----- .../siteAdmin/siteAdmin-classHierarchy.ftl | 18 +++++------ .../siteAdmin-objectPropHierarchy.ftl | 26 ++++++++-------- .../edit/forms/autoCompleteObjectPropForm.ftl | 6 ++-- .../edit/forms/defaultDataPropertyForm.ftl | 16 +++++----- .../freemarker/edit/forms/menuManagement.ftl | 14 ++++----- .../pageManagement--browseClassGroups.ftl | 8 ++--- .../edit/forms/pageManagement--fixedHtml.ftl | 10 +++---- .../pageManagement--searchIndividuals.ftl | 12 ++++---- .../forms/pageManagement--sparqlQuery.ftl | 10 +++---- .../freemarker/edit/forms/pageManagement.ftl | 30 +++++++++---------- .../freemarker/page/partials/headScripts.ftl | 2 +- .../page/partials/languageSelector.ftl | 2 +- 21 files changed, 103 insertions(+), 103 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl index 7bd14ea42e..c2ee386cf2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl @@ -56,7 +56,7 @@ var proxyContextInfo = { ajaxUrl: '${formUrls.proxyAjax}' }; var i18nStrings = { - selectEditorAndProfile: '${i18n().select_editor_and_profile}' + selectEditorAndProfile: '${i18n().select_editor_and_profile?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl index 303311e14d..55c0fb688e 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/contactForm/contactForm-form.ftl @@ -43,8 +43,8 @@ diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl index 2b44602b51..a4d5895531 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl @@ -54,8 +54,8 @@ positionPredicate: '${positionPredicate}' }; var i18nStrings = { - dragDropMenus: '${i18n().drag_drop_to_reorder_menus}', - reorderingFailed: '${i18n().reordering_menus_failed}' + dragDropMenus: '${i18n().drag_drop_to_reorder_menus?js_string}', + reorderingFailed: '${i18n().reordering_menus_failed?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl index efbaedd828..2817b59d3b 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl @@ -87,14 +87,14 @@ @@ -110,5 +110,5 @@ ${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl index 199b3aa298..ef345f0a51 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl @@ -97,8 +97,8 @@ var customFormData = { numberAvailableLocales:${availableLocalesNumber} }; var i18nStrings = { - errorProcessingLabels: '${i18n().error_processing_labels}', - selectLocaleOptionString : '${i18n().select_locale}' + errorProcessingLabels: '${i18n().error_processing_labels?js_string}', + selectLocaleOptionString : '${i18n().select_locale?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl index d0c1bd3075..cf192af8b2 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl @@ -189,7 +189,7 @@ var proxyContextInfo = { ajaxUrl: '${formUrls.ajax}' }; var i18nStrings = { - selectEditorAndProfile: '${i18n().select_editor_and_profile}' + selectEditorAndProfile: '${i18n().select_editor_and_profile?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl index af0636a8ac..e00b4c448b 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl @@ -75,7 +75,7 @@ ${stylesheets.add('', diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl index 28fb6e4ce6..c3ed982b7a 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/browse-classgroups.ftl @@ -72,8 +72,8 @@ ${stylesheets.add(' var json = [${jsonTree!}]; var i18nStrings = { - hideSubclasses: '${i18n().hide_subclasses}', - showSubclasses: '${i18n().show_subclasses}', - classGroup: '${i18n().class_group_all_caps}', - ontologyString: '${i18n().ontology_capitalized}', - subclassesString: '${i18n().subclasses_capitalized}', - expandAll: '${i18n().expand_all}', - collapseAll: '${i18n().collapse_all}', - classesString: '${i18n().classes_capitalized}', - displayRank: '${i18n().display_rank}' + hideSubclasses: '${i18n().hide_subclasses?js_string}', + showSubclasses: '${i18n().show_subclasses?js_string}', + classGroup: '${i18n().class_group_all_caps?js_string}', + ontologyString: '${i18n().ontology_capitalized?js_string}', + subclassesString: '${i18n().subclasses_capitalized?js_string}', + expandAll: '${i18n().expand_all?js_string}', + collapseAll: '${i18n().collapse_all?js_string}', + classesString: '${i18n().classes_capitalized?js_string}', + displayRank: '${i18n().display_rank?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl index fac6c3b9ef..9244c14037 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl @@ -47,19 +47,19 @@ var json = [${jsonTree!}]; var propertyType = '${propType}'; var i18nStrings = { - hideProperties: '${i18n().hide_properties}', - showProperties: '${i18n().show_properties}', - localNameString: '${i18n().local_name}', - groupString: '${i18n().group_capitalized}', - domainClass: '${i18n().domain_class}', - rangeClass: '${i18n().range_class}', - rangeDataType: '${i18n().range_data_type}', - expandAll: '${i18n().expand_all}', - collapseAll: '${i18n().collapse_all}', - subProperties: '${i18n().sub_properties}', - displayRank: '${i18n().display_rank}', - subProperty: '${i18n().subproperty}', - propertiesString: '${i18n().properties_capitalized}' + hideProperties: '${i18n().hide_properties?js_string}', + showProperties: '${i18n().show_properties?js_string}', + localNameString: '${i18n().local_name?js_string}', + groupString: '${i18n().group_capitalized?js_string}', + domainClass: '${i18n().domain_class?js_string}', + rangeClass: '${i18n().range_class?js_string}', + rangeDataType: '${i18n().range_data_type?js_string}', + expandAll: '${i18n().expand_all?js_string}', + collapseAll: '${i18n().collapse_all?js_string}', + subProperties: '${i18n().sub_properties?js_string}', + displayRank: '${i18n().display_rank?js_string}', + subProperty: '${i18n().subproperty?js_string}', + propertiesString: '${i18n().properties_capitalized?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl index d979f65c07..ee1f57911f 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl @@ -124,9 +124,9 @@ Also multiple types parameter set to true only if more than one type returned--> baseHref: '${urls.base}/individual?uri=' }; var i18nStrings = { - selectAnExisting: '${i18n().select_an_existing}', - orCreateNewOne: '${i18n().or_create_new_one}', - selectedString: '${i18n().selected}' + selectAnExisting: '${i18n().select_an_existing?js_string}', + orCreateNewOne: '${i18n().or_create_new_one?js_string}', + selectedString: '${i18n().selected?js_string}' }; <#-- diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl index 62ab74c31d..61efd558d7 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl @@ -85,14 +85,14 @@ var datatype = "${datatype!}"; var i18nStrings = { - four_digit_year: '${i18n().four_digit_year}', - year_numeric: '${i18n().year_numeric}', - year_month_day: '${i18n().year_month_day}', - minimum_ymd: '${i18n().minimum_ymd}', - minimum_hour: '${i18n().minimum_hour}', - year_month: '${i18n().year_month}', - decimal_only: '${i18n().decimal_only}', - whole_number: '${i18n().whole_number}' + four_digit_year: '${i18n().four_digit_year?js_string}', + year_numeric: '${i18n().year_numeric?js_string}', + year_month_day: '${i18n().year_month_day?js_string}', + minimum_ymd: '${i18n().minimum_ymd?js_string}', + minimum_hour: '${i18n().minimum_hour?js_string}', + year_month: '${i18n().year_month?js_string}', + decimal_only: '${i18n().decimal_only?js_string}', + whole_number: '${i18n().whole_number?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl index 4643480edb..54b5b0296e 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl @@ -99,13 +99,13 @@ ${stylesheets.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl index d912e16419..9f4688aed9 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl @@ -59,10 +59,10 @@ <#--Include JavaScript specific to the types of data getters related to this content--> diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl index d7252b2ebc..727c76a354 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl @@ -13,11 +13,11 @@ ${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl index 737bbbf896..1a9a55dceb 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl @@ -22,12 +22,12 @@ ${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl index 2a1bc7db5f..e047967643 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl @@ -15,11 +15,11 @@ ${scripts.add('')} diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl index 64b7473da5..550ae8b398 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl @@ -176,21 +176,21 @@ <#include "pageManagement--customDataScript.ftl"> diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl index bc71431c8b..4cb139f9dc 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/headScripts.ftl @@ -3,7 +3,7 @@ <#-- Template for scripts that must be loaded in the head --> diff --git a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl index 5b1e9b262f..9bb4b9047f 100644 --- a/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl +++ b/webapp/src/main/webapp/templates/freemarker/page/partials/languageSelector.ftl @@ -25,7 +25,7 @@ --> From 96cd46f6ec8c4ea59ed73afe29abdbaf6af694b5 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 26 Aug 2020 13:03:29 -0500 Subject: [PATCH 30/52] [VIVO-1870] simplify and concat translation for browse by vclass (#182) * simplify and concat translation for browse by vclass Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1870 --- webapp/src/main/webapp/js/menupage/browseByVClass.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js index 4aec58fa69..940810bacb 100644 --- a/webapp/src/main/webapp/js/menupage/browseByVClass.js +++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js @@ -234,9 +234,9 @@ var browseByVClass = { var alpha = this.selectedAlpha(alpha); if ( alpha != "all" ) { - nothingToSeeHere = '

              ' + browseByVClass.thereAreNo + ' ' + vclass.name + ' ' + browseByVClass.indNamesStartWith + ' '+ alpha.toUpperCase() +'.

              ' + browseByVClass.tryAnotherLetter + '

              '; + nothingToSeeHere = '

              ' + browseByVClass.thereAreNoEntriesStartingWith + ' '+ alpha.toUpperCase() +'.

              ' + browseByVClass.tryAnotherLetter + '

              '; } else { - nothingToSeeHere = '

              ' + browseByVClass.thereAreNo + ' ' + vclass.name + ' ' + browseByVClass.indsInSystem + '

              ' + browseByVClass.selectAnotherClass + '

              '; + nothingToSeeHere = '

              ' + browseByVClass.thereAreNoEntriesStartingWith + '

              ' + browseByVClass.selectAnotherClass + '

              '; } browseByVClass.individualsContainer.prepend(nothingToSeeHere); From 4f99b0ac922a52ca89a8b10d9d9aa495578d2d8f Mon Sep 17 00:00:00 2001 From: dofeldsc Date: Thu, 27 Aug 2020 16:22:19 +0200 Subject: [PATCH 31/52] [VIVO-1900] i18n: added empty check for getCountry, fixing bug with spanish label (es) (#181) * added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900 Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900 --- .../freemarker/FreemarkerHttpServlet.java | 5 ++++- .../GetRandomSearchIndividualsByVClass.java | 5 ++++- .../VTwo/MultiValueEditSubmission.java | 5 ++++- .../edit/n3editing/VTwo/ProcessRdfForm.java | 18 ++++++++++++------ .../FakeApplicationOntologyService.java | 5 ++++- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 9d513b3ba1..50f54e2e04 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -281,7 +281,10 @@ protected void doTemplate(VitroRequest vreq, HttpServletResponse response, templateDataModel.put("body", bodyString); - String lang = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); + String lang = vreq.getLocale().getLanguage(); + if (!vreq.getLocale().getCountry().isEmpty()) { + lang += "-" + vreq.getLocale().getCountry(); + } templateDataModel.put("country", lang); // Tell the template and any directives it uses that we're processing a page template. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java index 9be3a758de..325683d542 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetRandomSearchIndividualsByVClass.java @@ -75,7 +75,10 @@ private String renderShortView(String individualUri, String vclassName) { modelMap.put("individual", IndividualTemplateModelBuilder.build(individual, vreq)); modelMap.put("vclass", vclassName); - String langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); //UQAM-Linguistic-Management build the linguistic context + String langCtx = vreq.getLocale().getLanguage(); //UQAM-Linguistic-Management build the linguistic context + if (!vreq.getLocale().getCountry().isEmpty()) { + langCtx += "-" + vreq.getLocale().getCountry(); + } modelMap.put("langCtx", langCtx); // UQAM-Linguistic-Management add the linguistic context to map ShortViewService svs = ShortViewServiceSetup.getService(ctx); return svs.renderShortView(individual, ShortViewContext.BROWSE, diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java index b4590ad109..ac49d96113 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java @@ -303,7 +303,10 @@ public void addLiteralToForm(EditConfigurationVTwo editConfig, FieldVTwo field, String rangeLang = field.getRangeLang(); //UQAM Default value try { if (_vreq != null ) { - rangeLang = _vreq.getLocale().getLanguage() + "-"+_vreq.getLocale().getCountry(); + rangeLang = _vreq.getLocale().getLanguage(); + if (!_vreq.getLocale().getCountry().isEmpty()) { + rangeLang += "-" + _vreq.getLocale().getCountry(); + } } } catch (Exception e) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index a6a33a68e2..c95b0bf5d5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -216,7 +216,10 @@ protected void subInValuesToN3( */ if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) { - String lang = vreq.getLocale().getLanguage() + "-" + vreq.getLocale().getCountry(); + String lang = vreq.getLocale().getLanguage(); + if (!vreq.getLocale().getCountry().isEmpty()) { + lang += "-" + vreq.getLocale().getCountry(); + } newLiteral = ResourceFactory.createLangLiteral(aText, lang); } else { newLiteral = ResourceFactory.createTypedLiteral(aText, aLiteral.getDatatype()); @@ -304,11 +307,14 @@ protected AdditionsAndRetractions parseN3ToChange( List retracts = new ArrayList(); if( requiredDels != null && optionalDels != null ){ String lingCxt=null; - //UQAM Taking into account the linguistic context in retract - try { - lingCxt = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); - } catch (Exception e) { - } + //UQAM Taking into account the linguistic context in retract + try { + lingCxt = vreq.getLocale().getLanguage(); + if (!vreq.getLocale().getCountry().isEmpty()) { + lingCxt += "-" + vreq.getLocale().getCountry(); + } + } catch (Exception e) { + } retracts.addAll( parseN3ToRDF(requiredDels, REQUIRED, lingCxt) ); retracts.addAll( parseN3ToRDF(optionalDels, OPTIONAL, lingCxt) ); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java index c9b9dee6a7..770aab1818 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java @@ -494,7 +494,10 @@ public FakeVivoPeopleDataGetter(VitroRequest vreq, String individualUri) { this.individualUri = individualUri; this.vreq = vreq; this.ctx = vreq.getSession().getServletContext(); - this.langCtx = vreq.getLocale().getLanguage() + "-"+vreq.getLocale().getCountry(); // UQAM-Optimization add the linguistic context + this.langCtx = vreq.getLocale().getLanguage(); // UQAM-Optimization add the linguistic context + if (!vreq.getLocale().getCountry().isEmpty()) { + this.langCtx += "-" + vreq.getLocale().getCountry(); + } } @Override From 2863d1f094ce460a2f779d42a25a1e07ca77abeb Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 28 Aug 2020 09:05:47 -0500 Subject: [PATCH 32/52] [VIVO 1870] update i18n key to JavaScript mapping (#183) * update menupage-script i18n key to JavaScript mapping Follow-on to resolution of: https://jira.lyrasis.org/browse/VIVO-1870 --- .../freemarker/body/partials/menupage/menupage-scripts.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl index 07b1b7074d..9ad5892b6d 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-scripts.ftl @@ -33,8 +33,7 @@ pageString: '${i18n().page?js_string}', viewPageString: '${i18n().view_page?js_string}', ofTheResults: '${i18n().of_the_results?js_string}', - thereAreNo: '${i18n().there_are_no?js_string}', - indNamesStartWith: '${i18n().individuals_names_starting_with?js_string}', + thereAreNoEntriesStartingWith: '${i18n().there_are_no_entries_starting_with?js_string}', tryAnotherLetter: '${i18n().try_another_letter?js_string}', indsInSystem: '${i18n().individuals_in_system?js_string}', selectAnotherClass: '${i18n().select_another_class?js_string}' From 80140a8ab0c82334a16d42708a4f22f0e2afc323 Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 28 Aug 2020 11:42:19 -0500 Subject: [PATCH 33/52] [VIVO-1837] get i18n bundle from WebappDaoFactoryConfig preferred locales (#178) * apply i18n text to VClassDaoJena.getLabelForClass * expose i18n bundle through webapp dao factory interface * use whole messages for i18n * if request available use request bundle else use context bundle * clear cache when context theme directory changes * make getOverridingLocale from context private * select locale based on preferred locale from webapp dao factory * use first preferred local even when no selectable locales available on context * build default preferred locales from default preferred languages Resolves: https://jira.lyrasis.org/browse/VIVO-1837 --- .../vitro/webapp/dao/WebappDaoFactory.java | 4 + .../webapp/dao/WebappDaoFactoryConfig.java | 14 ++- .../filtering/WebappDaoFactoryFiltering.java | 8 +- .../vitro/webapp/dao/jena/JenaBaseDao.java | 1 - .../vitro/webapp/dao/jena/MenuDaoJena.java | 1 + .../vitro/webapp/dao/jena/VClassDaoJena.java | 27 +++-- .../webapp/dao/jena/WebappDaoFactoryJena.java | 7 ++ .../mannlib/vitro/webapp/i18n/I18n.java | 111 ++++++++++++++++-- .../i18n/selection/LocaleSelectionSetup.java | 5 + .../webapp/i18n/selection/SelectedLocale.java | 92 +++++++++++++-- .../filter/AcceptableLanguages.java | 2 +- .../filter/LanguageFilteringUtils.java | 40 ++++++- .../controller/PagedSearchController.java | 1 - .../webapp/servlet/setup/ThemeInfoSetup.java | 1 - .../BasicShortTermCombinedTripleSource.java | 3 +- .../CustomListViewConfigFile.java | 2 - .../n3editing/VTwo/ProcessRdfFormTest.java | 8 +- .../webapp/dao/WebappDaoFactoryStub.java | 6 + .../mannlib/vitro/webapp/i18n/I18nStub.java | 2 + 19 files changed, 296 insertions(+), 39 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java index 622367e233..7ebe8a2097 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactory.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.Set; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; + public interface WebappDaoFactory { /** @@ -132,4 +134,6 @@ public interface WebappDaoFactory { public MenuDao getMenuDao(); + public I18nBundle getI18nBundle(); + } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java index 3d3dc4afd0..9ab5563f5c 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java @@ -5,21 +5,25 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import edu.cornell.mannlib.vitro.webapp.dao.PropertyDao.FullPropertyKey; +import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils; public class WebappDaoFactoryConfig { private List preferredLanguages; + private List preferredLocales; private String defaultNamespace; private Set nonUserNamespaces; private boolean isUnderlyingStoreReasoned = false; public Map customListViewConfigFileMap; public WebappDaoFactoryConfig() { - preferredLanguages = Arrays.asList("en-US", "en", "EN"); + preferredLanguages = Arrays.asList("en-US", "en", "EN"); + preferredLocales = LanguageFilteringUtils.languagesToLocales(preferredLanguages); defaultNamespace = "http://vitro.mannlib.cornell.edu/ns/default#"; nonUserNamespaces = new HashSet(); nonUserNamespaces.add(VitroVocabulary.vitroURI); @@ -33,6 +37,14 @@ public void setPreferredLanguages(List pl) { this.preferredLanguages = pl; } + public List getPreferredLocales() { + return this.preferredLocales; + } + + public void setPreferredLocales(List pl) { + this.preferredLocales = pl; + } + public String getDefaultNamespace() { return defaultNamespace; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java index 84e2823d7f..fdb386a128 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/WebappDaoFactoryFiltering.java @@ -24,6 +24,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; /** * This wraps a WebappDaoFactory and applies filtering. @@ -67,7 +68,7 @@ public class WebappDaoFactoryFiltering implements WebappDaoFactory { transient private PropertyGroupDao filteringPropertyGroupDao=null; transient private PropertyInstanceDao filteringPropertyInstanceDao=null; - public WebappDaoFactoryFiltering( WebappDaoFactory innerDao, VitroFilters filters){ + public WebappDaoFactoryFiltering(WebappDaoFactory innerDao, VitroFilters filters){ if( innerDao == null ) throw new Error("innerWebappDaoFactory must be non-null"); this.filters = filters; @@ -276,4 +277,9 @@ public DisplayModelDao getDisplayModelDao(){ public void close() { innerWebappDaoFactory.close(); } + + @Override + public I18nBundle getI18nBundle() { + return innerWebappDaoFactory.getI18nBundle(); + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java index 3e94ca202a..577d6fa15e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashSet; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java index 73da8f76b2..30dd022c94 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJena.java @@ -72,6 +72,7 @@ public MainMenu getMainMenu( String url ) { return getMenu( getOntModelSelector().getDisplayModel(), url ); } + @Override public MainMenu getMainMenu( ServletRequest req, String url ) { OntModel displayModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(getOntModelSelector().getDisplayModel(), req ); return getMenu(displayModel, url) ; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java index 8d79155b18..0a4c557bce 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java @@ -2,6 +2,8 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; +import static java.lang.String.format; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -60,15 +62,18 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; public class VClassDaoJena extends JenaBaseDao implements VClassDao { protected static final Log log = LogFactory.getLog(VClassDaoJena.class); + private final I18nBundle i18n; private boolean isUnderlyingStoreReasoned = false; public VClassDaoJena(WebappDaoFactoryJena wadf, boolean isUnderlyingStoreReasoned) { super(wadf); + this.i18n = wadf.getI18nBundle(); this.isUnderlyingStoreReasoned = isUnderlyingStoreReasoned; } @@ -91,17 +96,19 @@ public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickLi Restriction rest = cls.asRestriction(); OntProperty onProperty = rest.getOnProperty(); StringBuilder labelStr = new StringBuilder(); - labelStr.append("restriction on ").append(getLabelOrId(onProperty)).append(": "); + labelStr.append(format("%s ", i18n.text("restriction_on"))) + .append(getLabelOrId(onProperty)) + .append(": "); if (rest.isAllValuesFromRestriction() || rest.isSomeValuesFromRestriction()) { Resource fillerRes = null; if (rest.isAllValuesFromRestriction()) { AllValuesFromRestriction avfRest = rest.asAllValuesFromRestriction(); fillerRes = avfRest.getAllValuesFrom(); - labelStr.append("all values from "); + labelStr.append(format("%s ", i18n.text("all_values_from"))); } else { SomeValuesFromRestriction svfRest = rest.asSomeValuesFromRestriction(); fillerRes = svfRest.getSomeValuesFrom(); - labelStr.append("some values from "); + labelStr.append(format("%s ", i18n.text("some_values_from"))); } if (fillerRes.canAs(OntClass.class)) { OntClass avf = fillerRes.as(OntClass.class); @@ -115,7 +122,7 @@ public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickLi } } else if (rest.isHasValueRestriction()) { HasValueRestriction hvRest = rest.asHasValueRestriction(); - labelStr.append("has value "); + labelStr.append(format("%s ", i18n.text("has_value"))); RDFNode fillerNode = hvRest.getHasValue(); try { if (fillerNode.isResource()) { @@ -128,22 +135,22 @@ public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickLi } } else if (rest.isMinCardinalityRestriction()) { MinCardinalityRestriction mcRest = rest.asMinCardinalityRestriction(); - labelStr.append("minimum cardinality "); + labelStr.append(format("%s ", i18n.text("minimum_cardinality"))); labelStr.append(mcRest.getMinCardinality()); } else if (rest.isMaxCardinalityRestriction()) { MaxCardinalityRestriction mcRest = rest.asMaxCardinalityRestriction(); - labelStr.append("maximum cardinality "); + labelStr.append(format("%s ", i18n.text("maximum_cardinality"))); labelStr.append(mcRest.getMaxCardinality()); } else if (rest.isCardinalityRestriction()) { CardinalityRestriction cRest = rest.asCardinalityRestriction(); - labelStr.append("cardinality "); + labelStr.append(format("%s ", i18n.text("cardinality"))); labelStr.append(cRest.getCardinality()); } return labelStr.toString(); } else if (isBooleanClassExpression(cls)) { StringBuilder labelStr = new StringBuilder("("); if (cls.isComplementClass()) { - labelStr.append("not "); + labelStr.append(format("%s ", i18n.text("not"))); ComplementClass ccls = cls.as(ComplementClass.class); labelStr.append(getLabelForClass(ccls.getOperand(), withPrefix, forPickList)); } else if (cls.isIntersectionClass()) { @@ -153,7 +160,7 @@ public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickLi OntClass operand = operandIt.next(); labelStr.append(getLabelForClass(operand, withPrefix, forPickList)); if (operandIt.hasNext()) { - labelStr.append(" and "); + labelStr.append(format(" %s ", i18n.text("and"))); } } } else if (cls.isUnionClass()) { @@ -163,7 +170,7 @@ public String getLabelForClass(OntClass cls,boolean withPrefix,boolean forPickLi OntClass operand = operandIt.next(); labelStr.append(getLabelForClass(operand, withPrefix, forPickList)); if (operandIt.hasNext()) { - labelStr.append(" or "); + labelStr.append(format(" %s ", i18n.text("or"))); } } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java index 26aabf0be9..813cf27ad1 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java @@ -50,6 +50,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig; +import edu.cornell.mannlib.vitro.webapp.i18n.I18n; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; @@ -611,5 +613,10 @@ public String makePickListName(ResourceBean bean) { } } + @Override + public I18nBundle getI18nBundle() { + // return context based bundle for preferred locales + return I18n.bundle(config.getPreferredLocales()); + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java index 8f07f7301f..ba264f9861 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.MissingResourceException; +import java.util.Objects; import java.util.ResourceBundle; import java.util.SortedSet; import java.util.TreeSet; @@ -20,7 +21,9 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale; +import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.utils.developer.DeveloperSettings; import edu.cornell.mannlib.vitro.webapp.utils.developer.Key; @@ -49,12 +52,27 @@ public class I18n { * This is where the work gets done. Not declared final, so it can be * modified in unit tests. */ - private static I18n instance = new I18n(); + private static I18n instance; + + private final ServletContext ctx; + + protected I18n(ServletContext ctx) { + this.ctx = ctx; + } // ---------------------------------------------------------------------- // Static methods // ---------------------------------------------------------------------- + /** + * This setup method must be called before I18n static methods can be used. + * It is currently called from LocaleSelectionSetup.contextInitialized, which + * should ensure it is called when the context is initialized. + */ + public static void setup(ServletContext ctx) { + I18n.instance = new I18n(ctx); + } + /** * A convenience method to get a bundle and format the text. */ @@ -72,19 +90,26 @@ public static String text(HttpServletRequest req, String key, } /** - * Get a I18nBundle by this name. + * Get a request I18nBundle by this name. */ public static I18nBundle bundle(String bundleName, HttpServletRequest req) { return instance.getBundle(bundleName, req); } /** - * Get the default I18nBundle. + * Get the default request I18nBundle. */ public static I18nBundle bundle(HttpServletRequest req) { return instance.getBundle(DEFAULT_BUNDLE_NAME, req); } + /** + * Get the default context I18nBundle for preferred locales. + */ + public static I18nBundle bundle(List preferredLocales) { + return instance.getBundle(DEFAULT_BUNDLE_NAME, preferredLocales); + } + // ---------------------------------------------------------------------- // The instance // ---------------------------------------------------------------------- @@ -106,25 +131,59 @@ public static I18nBundle bundle(HttpServletRequest req) { * Declared 'protected' so it can be overridden in unit tests. */ protected I18nBundle getBundle(String bundleName, HttpServletRequest req) { - log.debug("Getting bundle '" + bundleName + "'"); + log.debug("Getting request bundle '" + bundleName + "'"); + + checkDevelopmentMode(req); + checkForChangeInThemeDirectory(req); + + Locale locale = req.getLocale(); + + return getBundle(bundleName, locale); + } + + /** + * Get an I18nBundle by this name. The context provides the selectable + * Locale, the application directory, the theme directory and the + * development mode flag. Choosing matching locale from context by + * provided preferred locales. + * + * If the context indicates that the system is in development mode, then the + * cache is cleared on each request. + * + * If the theme directory has changed, the cache is cleared. + * + * Declared 'protected' so it can be overridden in unit tests. + */ + protected I18nBundle getBundle(String bundleName, List preferredLocales) { + log.debug("Getting context bundle '" + bundleName + "'"); + checkDevelopmentMode(); + checkForChangeInThemeDirectory(ctx); + + Locale locale = SelectedLocale.getPreferredLocale(ctx, preferredLocales); + + return getBundle(bundleName, locale); + } + + /** + * Get an I18nBundle by this name, context, and locale. + */ + private I18nBundle getBundle(String bundleName, Locale locale) { I18nLogger i18nLogger = new I18nLogger(); try { - checkDevelopmentMode(req); - checkForChangeInThemeDirectory(req); - String dir = themeDirectory.get(); - ServletContext ctx = req.getSession().getServletContext(); - ResourceBundle.Control control = new ThemeBasedControl(ctx, dir); ResourceBundle rb = ResourceBundle.getBundle(bundleName, - req.getLocale(), control); + locale, control); + return new I18nBundle(bundleName, rb, i18nLogger); } catch (MissingResourceException e) { log.warn("Didn't find text bundle '" + bundleName + "'"); + return I18nBundle.emptyBundle(bundleName, i18nLogger); } catch (Exception e) { log.error("Failed to create text bundle '" + bundleName + "'", e); + return I18nBundle.emptyBundle(bundleName, i18nLogger); } } @@ -139,6 +198,16 @@ private void checkDevelopmentMode(HttpServletRequest req) { } } + /** + * If we are in development mode, clear the cache. + */ + private void checkDevelopmentMode() { + if (DeveloperSettings.getInstance().getBoolean(Key.I18N_DEFEAT_CACHE)) { + log.debug("In development mode - clearing the cache."); + ResourceBundle.clearCache(); + } + } + /** * If the theme directory has changed from before, clear the cache of all * ResourceBundles. @@ -153,6 +222,28 @@ private void checkForChangeInThemeDirectory(HttpServletRequest req) { } } + /** + * If we have a complete model access and the theme directory has changed + * from before, clear the cache of all ResourceBundles. + */ + private void checkForChangeInThemeDirectory(ServletContext ctx) { + WebappDaoFactory wdf = ModelAccess.on(ctx) + .getWebappDaoFactory(); + // Only applicable if context has a complete model access + if (Objects.nonNull(wdf)) { + String currentDir = wdf + .getApplicationDao() + .getApplicationBean() + .getThemeDir(); + String previousDir = themeDirectory.getAndSet(currentDir); + if (!currentDir.equals(previousDir)) { + log.debug("Theme directory changed from '" + previousDir + "' to '" + + currentDir + "' - clearing the cache."); + ResourceBundle.clearCache(); + } + } + } + /** Only clear the cache one time per request. */ private void clearCacheOnRequest(HttpServletRequest req) { if (req.getAttribute(ATTRIBUTE_CACHE_CLEARED) != null) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java index 6530d8aff1..596880edd5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/LocaleSelectionSetup.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; +import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; /** @@ -48,6 +49,10 @@ public void contextInitialized(ServletContextEvent sce) { ss = StartupStatus.getBean(ctx); props = ConfigurationProperties.getBean(sce); + // Instantiate I18n instance to afford access to ServletContext + // when requesting a bundle with or without a VitroRequest + I18n.setup(ctx); + readProperties(); if (isForcing() && hasSelectables()) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java index 4605436a49..ce2bb147d6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/selection/SelectedLocale.java @@ -6,6 +6,8 @@ import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.Objects; +import java.util.Optional; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -61,13 +63,10 @@ public static Locale getOverridingLocale(HttpServletRequest req) { ServletContext ctx = session.getServletContext(); Object ctxInfo = ctx.getAttribute(ATTRIBUTE_NAME); - if (ctxInfo instanceof ContextSelectedLocale) { - Locale forcedLocale = ((ContextSelectedLocale) ctxInfo) - .getForcedLocale(); - if (forcedLocale != null) { - log.debug("Found forced locale in the context: " + forcedLocale); - return forcedLocale; - } + + Optional forcedLocale = getForcedLocale(ctxInfo); + if (forcedLocale.isPresent()) { + return forcedLocale.get(); } Object sessionInfo = session.getAttribute(ATTRIBUTE_NAME); @@ -95,6 +94,49 @@ public static Locale getOverridingLocale(HttpServletRequest req) { return null; } + /** + * Get the overriding Locale to use, which is the first of these to be found: + *
                + *
              • The forced Locale in the servlet context
                • + *
              • The first selectable locale matching a preferred locale
                • + *
              • The first of the preferred locale
                • + *
              • null
                • + *
              + */ + public static Locale getOverridingLocale(ServletContext ctx, List preferredLocales) { + Object ctxInfo = ctx.getAttribute(ATTRIBUTE_NAME); + Optional forcedLocale = getForcedLocale(ctxInfo); + if (forcedLocale.isPresent()) { + return forcedLocale.get(); + } + + if (ctxInfo instanceof ContextSelectedLocale) { + List selectableLocales = ((ContextSelectedLocale) ctxInfo) + .getSelectableLocales(); + + if (Objects.nonNull(selectableLocales) && Objects.nonNull(preferredLocales)) { + for (Locale preferredLocal : preferredLocales) { + for (Locale selectableLocale : selectableLocales) { + if (selectableLocale.equals(preferredLocal)) { + log.debug("Using first matching selectable locale from context: " + + selectableLocale); + return selectableLocale; + } + } + } + } + } + + if (Objects.nonNull(preferredLocales) && !preferredLocales.isEmpty()) { + Locale preferredLocal = preferredLocales.get(0); + log.debug("Using first preferred locale as default: " + + preferredLocal); + return preferredLocal; + } + + return null; + } + /** * Get the current Locale to use, which is the first of these to be found: *
                @@ -121,6 +163,42 @@ public static Locale getCurrentLocale(HttpServletRequest req) { return Locale.getDefault(); } + /** + * Get the preferred Locale to use, which is the first of these to be found: + *
                  + *
                • The forced Locale in the servlet context
                  • + *
                • The first selectable locale matching a preferred locale
                  • + *
                • The first of the preferred locale
                  • + *
                • The default Locale for the JVM
                  • + *
                + */ + public static Locale getPreferredLocale(ServletContext ctx, List preferredLocales) { + Locale overridingLocale = getOverridingLocale(ctx, preferredLocales); + + if (overridingLocale != null) { + return overridingLocale; + } + + log.debug("Using default locale: " + Locale.getDefault()); + return Locale.getDefault(); + } + + /** + * Check for forced locale on the context. + */ + private static Optional getForcedLocale(Object ctxInfo) { + if (ctxInfo instanceof ContextSelectedLocale) { + Locale forcedLocale = ((ContextSelectedLocale) ctxInfo) + .getForcedLocale(); + if (forcedLocale != null) { + log.debug("Found forced locale in the context: " + forcedLocale); + return Optional.of(forcedLocale); + } + } + + return Optional.empty(); + } + /** * Store a list of selectable Locales in the servlet context, so we can * easily build the selection panel in the GUI. Clears any forced locale. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java index 092ad9bc00..01e96c9ccc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/AcceptableLanguages.java @@ -21,7 +21,7 @@ public class AcceptableLanguages extends ArrayList{ * the base language ('aa') will be also added to the list. * @param rawLanguageStrs may not be null */ - public AcceptableLanguages(List rawLanguageStrs) { + public AcceptableLanguages(List rawLanguageStrs) { log.debug("Raw language strings:" + rawLanguageStrs); for (String lang : rawLanguageStrs) { this.add(lang); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java index e8f71124ab..845be6d5fe 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java @@ -4,11 +4,14 @@ import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashSet; import java.util.List; import java.util.Locale; +import java.util.Set; import javax.servlet.ServletRequest; +import org.apache.commons.lang3.LocaleUtils; import org.apache.jena.ontology.OntModel; import org.apache.jena.ontology.OntModelSpec; import org.apache.jena.rdf.model.ModelFactory; @@ -18,6 +21,10 @@ */ public class LanguageFilteringUtils { + private static final String UNDERSCORE = "_"; + private static final String HYPHEN = "-"; + private static final String DEFAULT_LANG_STRING = "en"; + /** * Take an Enumeration of Locale objects, such as we might get from a * request, and convert to a List of langauage strings, such as are needed @@ -30,13 +37,42 @@ public static List localesToLanguages(Enumeration locales) { List langs = new ArrayList<>(); while (locales.hasMoreElements()) { Locale locale = (Locale) locales.nextElement(); - langs.add(locale.toString().replace("_", "-")); + langs.add(locale.toString().replace(UNDERSCORE, HYPHEN)); } if (langs.isEmpty()) { - langs.add("en"); + langs.add(DEFAULT_LANG_STRING); } + return langs; + } + + /** + * Take a List of language strings and convert to a List of Locale. + * + * While converting, change all hyphens (as in RDF language specifiers) to + * under scores (as in Locale names). Ensure language string is lowercase + * and country abbriviation is uppercase. + */ + public static List languagesToLocales(List langs) { + Set locales = new HashSet<>(); + langs.forEach(langStr -> { + String[] langParts = langStr.split(HYPHEN); + if (langParts.length > 2) { + langStr = String.join(UNDERSCORE, langParts[0].toLowerCase(), + langParts[1].toUpperCase(), langParts[2]); + } else if (langParts.length > 1) { + langStr = String.join(UNDERSCORE, langParts[0].toLowerCase(), + langParts[1].toUpperCase()); + } else { + langStr = langParts[0].toLowerCase(); + } + locales.add(LocaleUtils.toLocale(langStr)); + }); + if (locales.isEmpty()) { + locales.add(LocaleUtils.toLocale(DEFAULT_LANG_STRING)); + } + return new ArrayList<>(locales); } /** diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 6596878b28..578c6a4a6d 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -10,7 +10,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java index 9cc824748d..1adb6c694f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java @@ -6,7 +6,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.servlet.ServletContext; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java index 5d43d04b7a..93bc5f8958 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/triplesource/impl/BasicShortTermCombinedTripleSource.java @@ -98,9 +98,11 @@ public OntModelCache getOntModelCache() { @Override public WebappDaoFactoryConfig getWebappDaoFactoryConfig() { List langs = getPreferredLanguages(); + List locales = Collections.list(getPreferredLocales()); WebappDaoFactoryConfig config = new WebappDaoFactoryConfig(); config.setDefaultNamespace(props.getProperty("Vitro.defaultNamespace")); config.setPreferredLanguages(langs); + config.setPreferredLocales(locales); config.setUnderlyingStoreReasoned(isStoreReasoned()); config.setCustomListViewConfigFileMap(getCustomListViewConfigFileMap()); return config; @@ -111,7 +113,6 @@ private List getPreferredLanguages() { return LanguageFilteringUtils.localesToLanguages(getPreferredLocales()); } - @SuppressWarnings("unchecked") private Enumeration getPreferredLocales() { return req.getLocales(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java index 081690415f..89dc8c1bb2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/customlistview/CustomListViewConfigFile.java @@ -20,8 +20,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; -import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Document; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java index 3f0d5ad8aa..d5f69afafa 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; +import org.junit.Before; import org.junit.Test; import org.apache.jena.rdf.model.Model; @@ -23,11 +24,16 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants; - +import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub; import stubs.javax.servlet.http.HttpServletRequestStub; public class ProcessRdfFormTest extends AbstractTestClass{ + @Before + public void useI18nStubBundles() { + I18nStub.setup(); + } + @Test public void basicNewStatementTest() throws Exception{ diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java index 24efa68858..732ae32091 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java @@ -23,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VClassDao; import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; +import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; /** * A minimal implementation of the WebappDaoFactory. @@ -267,4 +268,9 @@ public void close() { throw new RuntimeException("WebappDaoFactory.close() not implemented."); } + @Override + public I18nBundle getI18nBundle() { + throw new RuntimeException("WebappDaoFactory.getI18nBundle() not implemented."); + } + } diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java index 76d3a37275..372eedc695 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/i18n/I18nStub.java @@ -14,6 +14,7 @@ import edu.cornell.mannlib.vitro.webapp.i18n.I18n; import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle; +import stubs.javax.servlet.ServletContextStub; /** * An implementation of I18n for unit tests. Construct a new instance and it @@ -45,6 +46,7 @@ public static void setup() { /** Make it private, so they will use the setup() method. */ private I18nStub() { + super(new ServletContextStub()); // Nothing to initialize. } From 39cafbb88f1730d0aac1935f99f095a3af923e54 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 2 Sep 2020 02:08:48 -0600 Subject: [PATCH 34/52] Ensure that "available langs" include base langs (#185) Resolves: https://jira.lyrasis.org/browse/VIVO-1922 Co-authored-by: Andrew Woods --- .../vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java index 845be6d5fe..2b24d14fe5 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java @@ -80,7 +80,7 @@ public static List languagesToLocales(List langs) { */ public static OntModel wrapOntModelInALanguageFilter(OntModel rawModel, ServletRequest req) { - List languages = localesToLanguages(req.getLocales()); + List languages = new AcceptableLanguages(localesToLanguages(req.getLocales())); return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ModelFactory.createModelForGraph(new LanguageFilteringGraph( rawModel.getGraph(), languages))); From 2442d6dba52282f15395992b7f9578d1cdc92c73 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Fri, 4 Sep 2020 10:35:22 -0600 Subject: [PATCH 35/52] Ensure I18nStub is initialized before pertinent tests (#186) Resolves: https://jira.lyrasis.org/browse/VIVO-1923 Co-authored-by: Andrew Woods --- .../mannlib/vitro/testing/AbstractTestClass.java | 16 +++++++++++++++- .../auth/policy/SelfEditingPolicyTest.java | 2 +- .../auth/policy/SelfEditingPolicy_2_Test.java | 2 +- .../jena/DependentResourceDeleteJenaTest.java | 3 ++- .../vitro/webapp/dao/jena/JenaBaseDaoTest.java | 3 ++- .../webapp/dao/jena/JenaBaseDao_2_Test.java | 2 ++ .../vitro/webapp/dao/jena/MenuDaoJenaTest.java | 4 +++- .../jena/ObjectPropertyStatementDaoJenaTest.java | 3 ++- .../dao/jena/OntModelSegementationTest.java | 4 +++- .../dao/jena/PropertyInstanceDaoJenaTest.java | 3 ++- .../webapp/dao/jena/UserAccountsDaoJenaTest.java | 4 ++++ .../vitro/webapp/dao/jena/VClassDaoTest.java | 4 +++- .../webapp/dao/jena/VClassGroupCacheTest.java | 7 +++++-- .../vitro/webapp/dao/jena/VClassJenaTest.java | 3 ++- .../edit/n3editing/VTwo/ProcessRdfFormTest.java | 9 +-------- .../documentBuilding/ThumbnailImageURLTest.java | 2 +- .../utils/dataGetter/DataGetterUtilsTest.java | 2 +- .../dataGetter/SparqlQueryDataGetterTest.java | 2 +- 18 files changed, 51 insertions(+), 24 deletions(-) diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java index fa5e4fe013..77d669415c 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/testing/AbstractTestClass.java @@ -56,6 +56,7 @@ import org.apache.jena.ontology.OntModelSpec; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; +import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub; /** * A collection of useful routines to help when testing. @@ -85,8 +86,21 @@ public abstract class AbstractTestClass { * {@link Level#INFO}. */ @Before + public void setUp() { + initializeLogging(); + useI18nStubBundles(); + } + @After - public void initializeLogging() { + public void tearDown() { + initializeLogging(); + } + + protected void useI18nStubBundles() { + I18nStub.setup(); + } + + private void initializeLogging() { LogManager.resetConfiguration(); Logger.getRootLogger().addAppender(new ConsoleAppender(patternLayout)); Logger.getRootLogger().setLevel(Level.INFO); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java index 68b0ab4cd4..17ef2333a4 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java @@ -67,7 +67,7 @@ public class SelfEditingPolicyTest extends AbstractTestClass { private OntModel ontModel; @Before - public void setUp() throws Exception { + public void setUp() { ctx = new ServletContextStub(); PropertyRestrictionBeanStub diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java index 044318139c..ce77498684 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java @@ -75,7 +75,7 @@ public class SelfEditingPolicy_2_Test extends AbstractTestClass { @Before - public void setUp() throws Exception { + public void setUp() { ServletContextStub ctx = new ServletContextStub(); PropertyRestrictionBeanStub.getInstance(new String[] { ADMIN_NS }); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java index 2428b56de1..24b98809d5 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJenaTest.java @@ -5,6 +5,7 @@ import java.io.StringReader; import java.util.List; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.apache.jena.rdf.model.Model; @@ -16,7 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -public class DependentResourceDeleteJenaTest { +public class DependentResourceDeleteJenaTest extends AbstractTestClass { String isDependentRelation = " <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java index 01058f799b..8f7c120e16 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoTest.java @@ -6,6 +6,7 @@ import java.io.PrintStream; import java.io.StringReader; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.junit.Test; @@ -35,7 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -public class JenaBaseDaoTest { +public class JenaBaseDaoTest extends AbstractTestClass { String isDependentRelation = " <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java index 9e448c651e..5bbce84bfa 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java @@ -48,6 +48,8 @@ public class JenaBaseDao_2_Test extends AbstractTestClass { @Before public void initializeThings() { + super.setUp(); + ontModel = ModelFactory.createOntologyModel(); prop1 = ontModel.createProperty("property1"); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java index 59a8d8bc5c..f7d5ca528e 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/MenuDaoJenaTest.java @@ -27,7 +27,9 @@ public class MenuDaoJenaTest extends AbstractTestClass { OntModel displayModel; @Before - public void setUp() throws Exception { + public void setUp() { + super.setUp(); + // Suppress error logging. setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java index bc5c8bdef4..6488a107b6 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJenaTest.java @@ -4,12 +4,13 @@ import static org.junit.Assert.*; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Test; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -public class ObjectPropertyStatementDaoJenaTest { +public class ObjectPropertyStatementDaoJenaTest extends AbstractTestClass { /** * Test if jena lib can parse N3 that it generates. diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java index 8867ce9cc3..7800acedf0 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSegementationTest.java @@ -2,6 +2,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.junit.Ignore; @@ -28,11 +29,12 @@ * @author bjl23 * */ -public class OntModelSegementationTest { +public class OntModelSegementationTest extends AbstractTestClass { private WebappDaoFactoryJena wadf; @org.junit.Before public void setUpWebappDaoFactoryJena() { + super.setUp(); wadf = new WebappDaoFactoryJena(new SimpleOntModelSelector()); } diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java index d4b55a5402..76e681466f 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyInstanceDaoJenaTest.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.apache.jena.ontology.OntModel; @@ -20,7 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -public class PropertyInstanceDaoJenaTest { +public class PropertyInstanceDaoJenaTest extends AbstractTestClass { String isDependentRelation = " <"+VitroVocabulary.PROPERTY_STUBOBJECTPROPERTYANNOT+"> \"true\"^^xsd:boolean .\n" ; diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java index e6a3013669..7f755bf426 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java @@ -74,6 +74,8 @@ public class UserAccountsDaoJenaTest extends AbstractTestClass { @Before public void setup() throws IOException { + super.setUp(); + InputStream stream = UserAccountsDaoJenaTest.class .getResourceAsStream(N3_DATA_FILENAME); Model model = ModelFactory.createDefaultModel(); @@ -90,6 +92,8 @@ public void setup() throws IOException { @Before public void createUserAccountValues() { + super.setUp(); + user1 = userAccount(URI_USER1, "email@able.edu", "Zack", "Roberts", "garbage", "" ,"", 0L, false, 5, 12345678L, Status.ACTIVE, "user1", false, collection(URI_ROLE1), false, EMPTY); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java index 4bca1fd7e0..290ead7fde 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoTest.java @@ -6,6 +6,8 @@ import java.util.List; import static org.junit.Assert.*; + +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Test; import org.apache.jena.ontology.ObjectProperty; @@ -24,7 +26,7 @@ * */ -public class VClassDaoTest { +public class VClassDaoTest extends AbstractTestClass { @Test // Test that the VClassDaoJena::updateVClass method will only update the jena model for diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java index 684686a074..6a60adb2dd 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCacheTest.java @@ -4,6 +4,7 @@ import java.io.StringReader; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -14,10 +15,12 @@ import org.apache.jena.rdf.model.Statement; import org.apache.jena.vocabulary.RDFS; -public class VClassGroupCacheTest { +public class VClassGroupCacheTest extends AbstractTestClass { @Before - public void setUp() throws Exception { + public void setUp() { + // Not calling super.setUp() because we do not want to change the logging level + super.useI18nStubBundles(); } @Test diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java index e252292d0c..3aeb732fc2 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassJenaTest.java @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.List; +import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import org.junit.Assert; import org.junit.Test; @@ -49,7 +50,7 @@ * */ -public class VClassJenaTest { +public class VClassJenaTest extends AbstractTestClass { @Test // NIHVIVO-1157 introduced VClassJena.java, a lazy-loading version of VClass.java. diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java index d5f69afafa..56a4b4d7cc 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfFormTest.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; -import org.junit.Before; import org.junit.Test; import org.apache.jena.rdf.model.Model; @@ -24,15 +23,9 @@ import edu.cornell.mannlib.vitro.webapp.dao.InsertException; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo; import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants; -import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub; import stubs.javax.servlet.http.HttpServletRequestStub; -public class ProcessRdfFormTest extends AbstractTestClass{ - - @Before - public void useI18nStubBundles() { - I18nStub.setup(); - } +public class ProcessRdfFormTest extends AbstractTestClass { @Test public void basicNewStatementTest() throws Exception{ diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java index cd33c59f6b..9f304f9986 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java @@ -37,7 +37,7 @@ public class ThumbnailImageURLTest extends AbstractTestClass{ * @throws java.lang.Exception */ @Before - public void setUp() throws Exception { + public void setUp() { setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF); ApplicationStub.setup(new ServletContextStub(), new SearchEngineStub()); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java index 5906724f6c..4dd63f99d0 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterUtilsTest.java @@ -32,7 +32,7 @@ public class DataGetterUtilsTest extends AbstractTestClass{ String dataGetterX = "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#pageDataGetterX"; @Before - public void setUp() throws Exception { + public void setUp() { // Suppress error logging. setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF); diff --git a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java index 8cb9279ef5..a02516e1d4 100644 --- a/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java +++ b/api/src/test/java/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetterTest.java @@ -36,7 +36,7 @@ public class SparqlQueryDataGetterTest extends AbstractTestClass{ VitroRequest vreq; @Before - public void setUp() throws Exception { + public void setUp() { // Suppress error logging. setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF); From 098cf0918bd819e0a58425ec8b8c223074164d6a Mon Sep 17 00:00:00 2001 From: William Welling Date: Fri, 4 Sep 2020 11:36:03 -0500 Subject: [PATCH 36/52] add additional null checks to ensure context is ready for theme change (#187) --- .../main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java index ba264f9861..85f58495de 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/i18n/I18n.java @@ -230,7 +230,9 @@ private void checkForChangeInThemeDirectory(ServletContext ctx) { WebappDaoFactory wdf = ModelAccess.on(ctx) .getWebappDaoFactory(); // Only applicable if context has a complete model access - if (Objects.nonNull(wdf)) { + if (Objects.nonNull(wdf) + && Objects.nonNull(wdf.getApplicationDao()) + && Objects.nonNull(wdf.getApplicationDao().getApplicationBean())) { String currentDir = wdf .getApplicationDao() .getApplicationBean() From d9f8ff9bf95b191ee50d7cba8516134f25bb73cd Mon Sep 17 00:00:00 2001 From: dofeldsc Date: Thu, 24 Sep 2020 23:55:55 +0200 Subject: [PATCH 37/52] [VIVO-1915] i18n - Adding a label with language tag through the "new" manageLabelsForindividualAddForm.ftl does not take the setting for language tag (#184) * Fixed bug when addng a label with language tag through managLabelsForindividualAddForm, re ticket VIVO-1915 * removed the language select for managing multi language labels, ticket vivo-1915 * readded the fix for language selection because of the fr-CA version of the manageLabelsForIndividualftl, ticket vivo-1915 * removed earlier fix, removed comments, modified ManageLabelGenrator, ticket vivo-1915 Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915 --- .../edit/n3editing/VTwo/ProcessRdfForm.java | 1 - .../ManageLabelsForIndividualGenerator.java | 14 +++++++ .../individual/manageLabelsForIndividual.js | 40 +++++-------------- .../individual/manageLabelsForIndividual.ftl | 12 +++++- .../manageLabelsForIndividualAddForm.ftl | 13 ------ 5 files changed, 34 insertions(+), 46 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index c95b0bf5d5..724e6ec118 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -214,7 +214,6 @@ protected void subInValuesToN3( /* * do it only if aLiteral are xstring datatype */ - if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) { String lang = vreq.getLocale().getLanguage(); if (!vreq.getLocale().getCountry().isEmpty()) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java index 15782747b7..d2a109895e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForIndividualGenerator.java @@ -224,6 +224,20 @@ private void addFormSpecificData(EditConfigurationVTwo config, config.addFormSpecificData("displayRemoveLink", (numberExistingLabels > 1)); + // get current selected locale + String rangeLang = vreq.getLocale().getLanguage(); + if (!vreq.getLocale().getCountry().isEmpty()) { + rangeLang += "-" + vreq.getLocale().getCountry(); + } + + // check if locale already has an entry (label) + boolean localeEntryExisting = true; + for (HashMap tmp : availableLocalesForAdd) { + if (tmp.get("code").equals(rangeLang)) localeEntryExisting = false; + } + config.addFormSpecificData("localeEntryExisting", localeEntryExisting); + config.addFormSpecificData("currentSelectedLocale", rangeLang); + //How do we edit? Will need to see config.addFormSpecificData("deleteWebpageUrl", "/edit/primitiveDelete"); diff --git a/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js b/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js index 075a487a23..1510cc219f 100644 --- a/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js +++ b/webapp/src/main/webapp/js/individual/manageLabelsForIndividual.js @@ -35,7 +35,6 @@ var manageLabels = { // Initial page setup. Called only at page load. initPage: function() { - var disableSubmit = true; if(this.submissionErrorsExist == "false") { //hide the form to add label this.addLabelForm.hide(); @@ -44,7 +43,11 @@ var manageLabels = { if(this.numberAvailableLocales == 0) { manageLabels.showFormButtonWrapper.hide(); this.showCancelOnlyButton.show(); - } else { + } else if(manageLabels.localeEntryExisting == "true") { + // if there is already an label for the selected langauge hide the add button + manageLabels.showFormButtonWrapper.hide(); + this.showCancelOnlyButton.show(); + } else{ //if the add label button is visible, don't need cancel only link this.showCancelOnlyButton.hide(); } @@ -53,19 +56,6 @@ var manageLabels = { //Display the form this.onShowAddForm(); - //Also make sure the save button is enabled in case there is a value selected for the drop down - if(this.labelLanguage.val() != "") { - disableSubmit = false; - } - - } - - - - if(disableSubmit) { - //disable submit until user selects a language - this.submit.attr('disabled', 'disabled'); - this.submit.addClass('disabledSubmit'); } this.bindEventListeners(); @@ -74,18 +64,6 @@ var manageLabels = { bindEventListeners: function() { - this.labelLanguage.change( function() { - //if language selected, allow submission, otherwise disallow - var selectedLanguage = manageLabels.labelLanguage.val(); - if(selectedLanguage != "") { - manageLabels.submit.attr('disabled', false); - manageLabels.submit.removeClass('disabledSubmit'); - } else { - manageLabels.submit.attr('disabled', 'disabled'); - manageLabels.submit.addClass('disabledSubmit'); - } - }); - //enable form to add label to be displayed or hidden this.showFormButton.click(function() { //clear the inputs for the label if the button is being clicked @@ -123,9 +101,6 @@ var manageLabels = { clearAddForm:function() { //clear inputs and select manageLabels.addLabelForm.find("input[type='text'],select").val(""); - //set the button for save to be disabled again - manageLabels.submit.attr('disabled', 'disabled'); - manageLabels.submit.addClass('disabledSubmit'); }, onShowAddForm:function() { manageLabels.addLabelForm.show(); @@ -226,12 +201,14 @@ var manageLabels = { var availableLocalesList = []; var listLen = selectLocalesFullList.length; var i; + var showAddButton = false; for(i = 0; i < listLen; i++) { var possibleLanguageInfo = selectLocalesFullList[i]; var possibleLanguageCode = possibleLanguageInfo["code"]; var possibleLangaugeLabel = possibleLanguageInfo["label"]; if(!(possibleLanguageCode in existingLanguages)) { //manageLabels.addLanguageCode(possibleLanguageCode, possibleLanguageLabel); + if (possibleLanguageCode == manageLabels.currentSelectedLocale) showAddButton = true; availableLocalesList.push(possibleLanguageInfo); } } @@ -242,8 +219,9 @@ var manageLabels = { var compB = b["label"]; return compA < compB ? -1 : 1; }); + //Re-show the add button and the form if they were hidden before - if(availableLocalesList.length > 0 && manageLabels.showFormButtonWrapper.is(":hidden")) { + if(availableLocalesList.length > 0 && manageLabels.showFormButtonWrapper.is(":hidden") && showAddButton) { manageLabels.showFormButtonWrapper.show(); //hide the cancel only button manageLabels.showCancelOnlyButton.hide(); diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl index ef345f0a51..24a4effa9f 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividual.ftl @@ -31,6 +31,14 @@ <#else>

                ${i18n().manage_labels_capitalized}

                +<#assign localeEntryExisting = true /> +<#if editConfiguration.pageData.localeEntryExisting?has_content> + <#assign localeEntryExisting = editConfiguration.pageData.localeEntryExisting /> + +<#assign currentSelectedLocale =" " /> +<#if editConfiguration.pageData.currentSelectedLocale?has_content> + <#assign currentSelectedLocale = editConfiguration.pageData.currentSelectedLocale /> + @@ -94,7 +102,9 @@ var customFormData = { individualUri: '${subjectUri!}', submissionErrorsExist: '${submissionErrorsExist}', selectLocalesFullList: selectLocalesFullList, - numberAvailableLocales:${availableLocalesNumber} + numberAvailableLocales:${availableLocalesNumber}, + localeEntryExisting : '${localeEntryExisting?c}', + currentSelectedLocale: '${currentSelectedLocale}' }; var i18nStrings = { errorProcessingLabels: '${i18n().error_processing_labels?js_string}', diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl index a60e30d864..57b23a5522 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl @@ -6,19 +6,6 @@

                - - From f3418732f03dead46bdbb5ac9c24344a935f427c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20L=C3=BChr?= Date: Mon, 28 Sep 2020 12:18:55 +0200 Subject: [PATCH 38/52] - replaced hard coded "or"s with i18n().or --- .../freemarker/edit/forms/autoCompleteObjectPropForm.ftl | 2 +- .../freemarker/edit/forms/defaultAddMissingIndividualForm.ftl | 2 +- .../templates/freemarker/edit/forms/defaultDataPropertyForm.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl index ee1f57911f..70acb946b7 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl @@ -77,7 +77,7 @@

                - or + ${i18n().or} ${i18n().cancel_link}

                diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl index 2bfa211f9d..94efc196af 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl @@ -19,7 +19,7 @@

                - or + ${i18n().or} ${i18n().cancel_link}

                diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl index 61efd558d7..1e3750385a 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl @@ -72,7 +72,7 @@ the default label for default data/object property editing is returned from Edit Configuration Template Model, but that method may not return the correct result for other custom forms--> - or + ${i18n().or} ${i18n().cancel_link} From 284bb4a4cbf55d84b908b536181eb15560c78601 Mon Sep 17 00:00:00 2001 From: dofeldsc Date: Thu, 1 Oct 2020 16:48:49 +0200 Subject: [PATCH 39/52] [VIVO-1925] i18n: Editing labels results in new label (#188) * fixed bug: Editing language labels results in new label, ticket vivo-1925 Resolves: https://jira.lyrasis.org/browse/VIVO-1925 --- .../VTwo/MultiValueEditSubmission.java | 21 +++++++++++--- .../edit/n3editing/VTwo/ProcessRdfForm.java | 29 ++++++++++++++----- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java index ac49d96113..306ebdce78 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java @@ -21,6 +21,7 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.ResourceFactory; import org.apache.jena.vocabulary.XSD; +import org.apache.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral; @@ -180,7 +181,7 @@ public Literal createLiteral(String value, String datatypeUri, String lang) { // } catch (UnsupportedEncodingException e) { // log.error(e, e); // } - } else if ( XSD.xstring.getURI().equals(datatypeUri) ){ + } else if ( XSD.xstring.getURI().equals(datatypeUri) || RDF.dtLangString.getURI().equals(datatypeUri) ){ if( lang != null && lang.length() > 0 ) return ResourceFactory.createLangLiteral(value, lang); } return literalCreationModel.createTypedLiteral(value, datatypeUri); @@ -303,9 +304,21 @@ public void addLiteralToForm(EditConfigurationVTwo editConfig, FieldVTwo field, String rangeLang = field.getRangeLang(); //UQAM Default value try { if (_vreq != null ) { - rangeLang = _vreq.getLocale().getLanguage(); - if (!_vreq.getLocale().getCountry().isEmpty()) { - rangeLang += "-" + _vreq.getLocale().getCountry(); + // only if the request comes from the rdfsLabelGenerator the language should be used + Boolean getLabelLanguage = false; + if (!StringUtils.isBlank(editConfig.formUrl) && editConfig.formUrl.contains("RDFSLabelGenerator")) { + getLabelLanguage = true; + } + // if the language is set in the given Literal, this language-tag should be used and remain the same + // for example when you edit an label with an langauge-tag (no matter which language is selected globally) + if (!StringUtils.isBlank(editConfig.getLiteralsInScope().get("label").get(0).getLanguage()) && getLabelLanguage) + { + rangeLang = editConfig.getLiteralsInScope().get("label").get(0).getLanguage(); + } else { // if the literal has no langauge-tag, use the language which is globally selected + rangeLang = _vreq.getLocale().getLanguage(); + if (!_vreq.getLocale().getCountry().isEmpty()) { + rangeLang += "-" + _vreq.getLocale().getCountry(); + } } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index 724e6ec118..406db61fef 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -26,6 +26,7 @@ import org.apache.jena.shared.Lock; import org.apache.jena.vocabulary.RDF; import org.apache.jena.vocabulary.XSD; +import org.apache.commons.lang3.StringUtils; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.dao.InsertException; @@ -128,7 +129,7 @@ private AdditionsAndRetractions createNewStatements( subInValuesToN3( configuration, submission, requiredN3, optionalN3, null , null, vreq); /* parse N3 to RDF Models, No retractions since all of the statements are new. */ - return parseN3ToChange(requiredN3, optionalN3, null, null, vreq); + return parseN3ToChange(requiredN3, optionalN3, null, null, vreq, null); } /* for a list of N3 strings, substitute in the subject, predicate and object URIs @@ -174,7 +175,7 @@ protected AdditionsAndRetractions editExistingStatements( return parseN3ToChange( N3RequiredAssert,N3OptionalAssert, - N3RequiredRetract, N3OptionalRetract, vreq); + N3RequiredRetract, N3OptionalRetract, vreq, editConfig); } @SuppressWarnings("unchecked") @@ -214,7 +215,10 @@ protected void subInValuesToN3( /* * do it only if aLiteral are xstring datatype */ - if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) { + if (RDF.dtLangString.getURI().equals(aLiteratDT) && !aLiteral.getLanguage().isEmpty()) { + newLiteral = aLiteral; + } + else if (XSD.xstring.getURI().equals(aLiteratDT) || RDF.dtLangString.getURI().equals(aLiteratDT)) { String lang = vreq.getLocale().getLanguage(); if (!vreq.getLocale().getCountry().isEmpty()) { lang += "-" + vreq.getLocale().getCountry(); @@ -299,7 +303,7 @@ public static void applyChangesToWriteModel( protected AdditionsAndRetractions parseN3ToChange( List requiredAdds, List optionalAdds, - List requiredDels, List optionalDels, VitroRequest vreq) throws Exception{ + List requiredDels, List optionalDels, VitroRequest vreq, EditConfigurationVTwo editConfig) throws Exception{ List adds = parseN3ToRDF(requiredAdds, REQUIRED); adds.addAll( parseN3ToRDF(optionalAdds, OPTIONAL)); @@ -308,9 +312,20 @@ protected AdditionsAndRetractions parseN3ToChange( String lingCxt=null; //UQAM Taking into account the linguistic context in retract try { - lingCxt = vreq.getLocale().getLanguage(); - if (!vreq.getLocale().getCountry().isEmpty()) { - lingCxt += "-" + vreq.getLocale().getCountry(); + // only if the request comes from the rdfsLabelGenerator the language should be used + Boolean getLabelLanguage = false; + if (!StringUtils.isBlank(editConfig.formUrl) && editConfig.formUrl.contains("RDFSLabelGenerator")) { + getLabelLanguage = true; + } + // if the language is set in the given Literal, this language-tag should be used and remain the same + // for example when you edit an label with an langauge-tag (no matter which language is selected globally) + if (editConfig != null && !StringUtils.isBlank(editConfig.getLiteralsInScope().get("label").get(0).getLanguage()) && getLabelLanguage) { + lingCxt = editConfig.getLiteralsInScope().get("label").get(0).getLanguage(); + } else { // if the literal has no langauge-tag, use the language which is globally selected + lingCxt = vreq.getLocale().getLanguage(); + if (!vreq.getLocale().getCountry().isEmpty()) { + lingCxt += "-" + vreq.getLocale().getCountry(); + } } } catch (Exception e) { } From f2dd7c151d2ee7cde502c66cba15aa024dc21a67 Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Tue, 6 Oct 2020 17:09:25 -0600 Subject: [PATCH 40/52] Enable lang selection without need for 'available-langs.properties' (#169) * Enable lang selection without need for 'available-langs.properties' Co-authored-by: Andrew Woods --- .../webapp/servlet/setup/FileGraphSetup.java | 13 +++ .../webapp/servlet/setup/RDFFilesLoader.java | 110 +++++++----------- 2 files changed, 54 insertions(+), 69 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java index e49f0e3dfc..80656403b9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.servlet.setup; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess.WhichService.CONTENT; +import static edu.cornell.mannlib.vitro.webapp.servlet.setup.RDFFilesLoader.getEnabledLocales; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -46,6 +47,7 @@ public class FileGraphSetup implements ServletContextListener { private static final Log log = LogFactory.getLog(FileGraphSetup.class); private static final String RDF = "rdf"; + private static final String I18N = "i18n"; private static final String ABOX = "abox"; private static final String TBOX = "tbox"; private static final String FILEGRAPH = "filegraph"; @@ -76,6 +78,12 @@ public void contextInitialized(ServletContextEvent sce) { // ABox files Set paths = getFilegraphPaths(ctx, RDF, ABOX, FILEGRAPH); + // Load ABox files from enabled languages + Set enabledLocales = getEnabledLocales(ctx); + for (String locale : enabledLocales) { + paths.addAll(getFilegraphPaths(ctx, RDF, I18N, locale, ABOX, FILEGRAPH)); + } + cleanupDB(dataset, pathsToURIs(paths, ABOX), ABOX); // Just update the ABox filegraphs in the DB; don't attach them to a base model. @@ -84,6 +92,11 @@ public void contextInitialized(ServletContextEvent sce) { // TBox files paths = getFilegraphPaths(ctx, RDF, TBOX, FILEGRAPH); + // Load TBox files from enabled languages + for (String locale : enabledLocales) { + paths.addAll(getFilegraphPaths(ctx, RDF, I18N, locale, TBOX, FILEGRAPH)); + } + cleanupDB(dataset, pathsToURIs(paths, TBOX),TBOX); OntModel tboxBaseModel = ModelAccess.on(ctx).getOntModel(ModelNames.TBOX_ASSERTIONS); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java index f9055f5e06..1710674260 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java @@ -9,20 +9,13 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Enumeration; -import java.util.LinkedList; +import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; import java.util.Set; import java.util.TreeSet; -import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; -import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; -import edu.cornell.mannlib.vitro.webapp.i18n.VitroResourceBundle; import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale; -import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; -import org.apache.commons.io.FilenameUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,13 +36,12 @@ public class RDFFilesLoader { private static final String DEFAULT_RDF_FORMAT = "RDF/XML"; private static final String RDF = "rdf"; + private static final String I18N = "i18n"; private static final String FIRST_TIME = "firsttime"; private static final String EVERY_TIME = "everytime"; - private static List omittedLocales; - /** - * Path filter that ignores sub-directories, hidden files, markdown and non-enabled language + * Path filter that ignores sub-directories, hidden files and markdown * files. */ private static final DirectoryStream.Filter RDF_FILE_FILTER = new DirectoryStream.Filter() { @@ -66,15 +58,6 @@ public boolean accept(Path p) throws IOException { if (p.toString().endsWith(".md")) { return false; } - // Skip language files that are not enabled - // ..Assumes all language files take the form: path/to/file/name-.extension - String basename = FilenameUtils.getBaseName(p.toString()); - for (String omit : omittedLocales) { - if (basename.endsWith(omit)) { - log.info("Ignoring file not enabled in i18n configuration: " + p); - return false; - } - } return true; } }; @@ -91,7 +74,16 @@ public static void loadFirstTimeFiles(ServletContext ctx, String modelPath, Mode boolean firstTime) { if (firstTime) { String home = locateHomeDirectory(); - Set paths = getPaths(ctx, home, RDF, modelPath, FIRST_TIME); + + // Load common files + Set paths = getPaths(home, RDF, modelPath, FIRST_TIME); + + // Load enabled languages + Set enabledLocales = getEnabledLocales(ctx); + for (String locale : enabledLocales) { + paths.addAll(getPaths(home, RDF, I18N, locale, modelPath, FIRST_TIME)); + } + for (Path p : paths) { log.info("Loading " + relativePath(p, home)); readOntologyFileIntoModel(p, model); @@ -114,7 +106,16 @@ public static void loadEveryTimeFiles(ServletContext ctx, String modelPath, OntM OntModel everytimeModel = ModelFactory .createOntologyModel(OntModelSpec.OWL_MEM); String home = locateHomeDirectory(); - Set paths = getPaths(ctx, home, RDF, modelPath, EVERY_TIME); + + // Load common files + Set paths = getPaths(home, RDF, modelPath, EVERY_TIME); + + // Load enabled languages + Set enabledLocales = getEnabledLocales(ctx); + for (String locale : enabledLocales) { + paths.addAll(getPaths(home, RDF, I18N, locale, modelPath, EVERY_TIME)); + } + for (Path p : paths) { log.info("Loading " + relativePath(p, home)); readOntologyFileIntoModel(p, everytimeModel); @@ -122,6 +123,23 @@ public static void loadEveryTimeFiles(ServletContext ctx, String modelPath, OntM model.addSubModel(everytimeModel); } + public static Set getEnabledLocales(ServletContext ctx) { + Set enabledLocales = new HashSet<>(); + + // Which locales are enabled in runtime.properties? + List locales = SelectedLocale.getSelectableLocales(ctx); + for (Locale locale : locales) { + enabledLocales.add(locale.toLanguageTag().replace('-', '_')); + } + + // If no languages were enabled in runtime.properties, add 'en_US' as the default + if (enabledLocales.isEmpty()) { + enabledLocales.add("en_US"); + } + + return enabledLocales; + } + private static Path relativePath(Path p, String home) { try { return Paths.get(home).relativize(p); @@ -134,10 +152,7 @@ private static Path relativePath(Path p, String home) { * Find the paths to RDF files in this directory. Sub-directories, hidden * files, markdown, and non-enabled language files are ignored. */ - private static Set getPaths(ServletContext ctx, String parentDir, String... strings) { - // Ensure that omitted locales are loaded and available - loadOmittedLocales(ctx); - + private static Set getPaths(String parentDir, String... strings) { Path dir = Paths.get(parentDir, strings); Set paths = new TreeSet<>(); @@ -157,49 +172,6 @@ private static Set getPaths(ServletContext ctx, String parentDir, String.. return paths; } - private static void loadOmittedLocales(ServletContext ctx) { - // Only load if 'omittedLocales' has not been initialized - if (omittedLocales == null) { - omittedLocales = new LinkedList<>(); - List enabledLocales = new LinkedList<>(); - - // Which locales are enabled in runtime.properties? - List locales = SelectedLocale.getSelectableLocales(ctx); - for (Locale locale : locales) { - enabledLocales.add(locale.toLanguageTag().replace('-', '_')); - } - - // Get ResourceBundle that contains listing of all available i18n languages - WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory(); - ApplicationBean app = wadf.getApplicationDao().getApplicationBean(); - String availableLangsFilename = app.getAvailableLangsFile(); - String themeI18nPath = "/not-used"; - String appI18nPath = "/i18n"; - VitroResourceBundle bundle = VitroResourceBundle.getBundle( - availableLangsFilename, ctx, appI18nPath, themeI18nPath, - ResourceBundle.Control.getControl(ResourceBundle.Control.FORMAT_PROPERTIES)); - - // This should not happen - if (bundle == null) { - throw new RuntimeException("Unable to find bundle: " + availableLangsFilename); - } - - // If no languages were enabled in runtime.properties, add 'en_US' as the default - if (enabledLocales.isEmpty()) { - enabledLocales.add("en_US"); - } - - // Omitted locales are the available locales minus the enabled locales - Enumeration langs = bundle.getKeys(); - while (langs.hasMoreElements()) { - String available = (String) langs.nextElement(); - if (!enabledLocales.contains(available)) { - omittedLocales.add(available); - } - } - } - } - private static void readOntologyFileIntoModel(Path p, Model model) { String format = getRdfFormat(p); log.debug("Loading " + p); From 8801ad434afe5d61964ae5ec49059163016b42de Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Thu, 12 Nov 2020 08:28:27 -0700 Subject: [PATCH 41/52] Reduce number of times QuerySolutions are looped in LanguageFilteringRDFService (#194) - No functional change in this update Resolves: https://jira.lyrasis.org/browse/VIVO-1931 Co-authored-by: Andrew Woods --- .../filter/LanguageFilteringRDFService.java | 111 ++++++++++-------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java index 9cd57b4cbc..5e59118dd7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java @@ -8,8 +8,10 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Comparator; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -100,7 +102,16 @@ public InputStream sparqlSelectQuery(String query, s.sparqlSelectQuery(query, RDFService.ResultFormat.JSON)); List solnList = getSolutionList(resultSet); List vars = resultSet.getResultVars(); + + // This block loops all of the Query variables; + // for each QuerySolution, creates a map of the values of the other variables than the current + // 'variable' --> a list of RowIndexedLiterals. + // In this way, all of the QuerySolutions with equal values of their other variables are grouped. + // This map is used subsequently to filter Literals based on lang for (String var : vars) { + Map, List> nonVarToRowIndexedLiterals = new HashMap<>(); + + // First pass of solnList to populate map for (int i = 0; i < solnList.size(); i++) { QuerySolution s = solnList.get(i); if (s == null) { @@ -110,19 +121,28 @@ public InputStream sparqlSelectQuery(String query, if (node == null || !node.isLiteral()) { continue; } - List candidatesForRemoval = - new ArrayList(); - candidatesForRemoval.add(new RowIndexedLiteral(node.asLiteral(), i)); - for (int j = i + 1; j < solnList.size(); j++) { - QuerySolution t = solnList.get(j); - if (t == null) { - continue; - } - if (matchesExceptForVar(s, t, var, vars)) { - candidatesForRemoval.add( - new RowIndexedLiteral(t.getLiteral(var), j)); + + // Create entry representing values other than current 'var' for this QuerySolution + List nonVarList = new ArrayList(vars.size() - 1); + for (String v : vars) { + if (!v.equals(var)) { + nonVarList.add(s.get(v)); } } + + List rowIndexedLiterals = nonVarToRowIndexedLiterals.get(nonVarList); + if (rowIndexedLiterals == null) { + rowIndexedLiterals = new ArrayList(); + } + rowIndexedLiterals.add(new RowIndexedLiteral(node.asLiteral(), i)); + + // Add RowIndexedLiterals to the map + nonVarToRowIndexedLiterals.put(nonVarList, rowIndexedLiterals); + } + + // Second pass of solnList (via the map) to evaluate candidatesForRemoval + for (List key : nonVarToRowIndexedLiterals.keySet()) { + List candidatesForRemoval = nonVarToRowIndexedLiterals.get(key); if (candidatesForRemoval.size() == 1) { continue; } @@ -176,7 +196,7 @@ public void sparqlSelectQuery(String query, ResultSetConsumer consumer) throws R log.debug("sparqlSelectQuery: " + query.replaceAll("\\s+", " ")); s.sparqlSelectQuery(query, new ResultSetConsumer.Chaining(consumer) { List vars; - List solnList = new ArrayList(); + List solnList = new ArrayList<>(); @Override protected void processQuerySolution(QuerySolution qs) { @@ -192,7 +212,15 @@ protected void startProcessing() { protected void endProcessing() { chainStartProcessing(); + // This block loops all of the Query variables; + // for each QuerySolution, creates a map of the values of the other variables than the current + // 'variable' --> a list of RowIndexedLiterals. + // In this way, all of the QuerySolutions with equal values of their other variables are grouped. + // This map is used subsequently to filter Literals based on lang for (String var : vars) { + Map, List> nonVarToRowIndexedLiterals = new HashMap<>(); + + // First pass of solnList to populate map for (int i = 0; i < solnList.size(); i++) { QuerySolution s = solnList.get(i); if (s == null) { @@ -202,19 +230,28 @@ protected void endProcessing() { if (node == null || !node.isLiteral()) { continue; } - List candidatesForRemoval = - new ArrayList(); - candidatesForRemoval.add(new RowIndexedLiteral(node.asLiteral(), i)); - for (int j = i + 1; j < solnList.size(); j++) { - QuerySolution t = solnList.get(j); - if (t == null) { - continue; - } - if (matchesExceptForVar(s, t, var, vars)) { - candidatesForRemoval.add( - new RowIndexedLiteral(t.getLiteral(var), j)); + + // Create entry representing values other than current 'var' for this QuerySolution + List nonVarList = new ArrayList(vars.size() - 1); + for (String v : vars) { + if (!v.equals(var)) { + nonVarList.add(s.get(v)); } } + + List rowIndexedLiterals = nonVarToRowIndexedLiterals.get(nonVarList); + if (rowIndexedLiterals == null) { + rowIndexedLiterals = new ArrayList(); + } + rowIndexedLiterals.add(new RowIndexedLiteral(node.asLiteral(), i)); + + // Add RowIndexedLiterals to the map + nonVarToRowIndexedLiterals.put(nonVarList, rowIndexedLiterals); + } + + // Second pass of solnList (via the map) to evaluate candidatesForRemoval + for (List key : nonVarToRowIndexedLiterals.keySet()) { + List candidatesForRemoval = nonVarToRowIndexedLiterals.get(key); if (candidatesForRemoval.size() == 1) { continue; } @@ -276,34 +313,6 @@ public int getIndex() { } - private boolean matchesExceptForVar(QuerySolution a, QuerySolution b, - String varName, List varList) { - if (varName == null) { - throw new RuntimeException("expected non-null variable nane"); - } - for (String var : varList) { - RDFNode nodea = a.get(var); - RDFNode nodeb = b.get(var); - if (var.equals(varName)) { - if (nodea == null || !nodea.isLiteral() || nodeb == null || !nodeb.isLiteral()) { - return false; - } - } else { - if (nodea == null && nodeb == null) { - continue; - } else if (nodea == null && nodeb != null) { - return false; - } else if (nodeb == null && nodea != null) { - return false; - } - if (!a.get(var).equals(b.get(var))) { - return false; - } - } - } - return true; - } - private List getSolutionList(ResultSet resultSet) { List solnList = new ArrayList(); while (resultSet.hasNext()) { From cd7a2e1f5d400d5a099ad128f8a359287fbe99df Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Tue, 12 Jan 2021 08:43:13 -0700 Subject: [PATCH 42/52] Prevent 'ProcessRdfForm.parseN3ToRDF' from using null linguisticContext (#197) Resolves: https://jira.lyrasis.org/browse/VIVO-1944 Co-authored-by: Andrew Woods --- .../vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java index 406db61fef..9652d72dc7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/ProcessRdfForm.java @@ -346,7 +346,12 @@ protected AdditionsAndRetractions parseN3ToChange( */ protected static List parseN3ToRDF( List n3Strings, N3ParseType parseType, String linguisticContext ) throws Exception { - List errorMessages = new ArrayList(); + // Use non-linguistic version of this method if no linguisticContext is provided + if (linguisticContext == null) { + return parseN3ToRDF(n3Strings, parseType); + } + + List errorMessages = new ArrayList(); List rdfModels = new ArrayList(); for(String n3 : n3Strings){ From 45f752bddc35a8aaeffe0c9034386392f69f8745 Mon Sep 17 00:00:00 2001 From: dofeldsc Date: Thu, 14 Jan 2021 01:26:46 +0100 Subject: [PATCH 43/52] [Vivo 1918] i18n: Reload firsttime files on start-up if changed (#195) Co-authored-by: Andrew Woods --- .../vitro/webapp/modelaccess/ModelNames.java | 14 ++ .../ConfigurationTripleSource.java | 13 +- .../setup/ConfigurationModelsSetup.java | 227 +++++++++++++++++- .../servlet/setup/ContentModelSetup.java | 209 +++++++++++++++- 4 files changed, 450 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelNames.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelNames.java index 245ca9908a..10493a0c34 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelNames.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modelaccess/ModelNames.java @@ -13,20 +13,27 @@ public class ModelNames { public static final String ABOX_ASSERTIONS = "http://vitro.mannlib.cornell.edu/default/vitro-kb-2"; public static final String ABOX_INFERENCES = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf"; public static final String ABOX_UNION = "vitro:aboxOntModel"; + public static final String ABOX_ASSERTIONS_FIRSTTIME_BACKUP = ABOX_ASSERTIONS + "FirsttimeBackup"; public static final String TBOX_ASSERTIONS = "http://vitro.mannlib.cornell.edu/default/asserted-tbox"; public static final String TBOX_INFERENCES = "http://vitro.mannlib.cornell.edu/default/inferred-tbox"; public static final String TBOX_UNION = "vitro:tboxOntModel"; + public static final String TBOX_ASSERTIONS_FIRSTTIME_BACKUP = TBOX_ASSERTIONS + "FirsttimeBackup"; public static final String FULL_ASSERTIONS = "vitro:baseOntModel"; public static final String FULL_INFERENCES = "vitro:inferenceOntModel"; public static final String FULL_UNION = "vitro:jenaOntModel"; public static final String APPLICATION_METADATA = "http://vitro.mannlib.cornell.edu/default/vitro-kb-applicationMetadata"; + public static final String APPLICATION_METADATA_FIRSTTIME_BACKUP = APPLICATION_METADATA + "FirsttimeBackup"; public static final String USER_ACCOUNTS = "http://vitro.mannlib.cornell.edu/default/vitro-kb-userAccounts"; + public static final String USER_ACCOUNTS_FIRSTTIME_BACKUP = USER_ACCOUNTS + "FirsttimeBackup"; public static final String DISPLAY = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata"; + public static final String DISPLAY_FIRSTTIME_BACKUP = DISPLAY + "FirsttimeBackup"; public static final String DISPLAY_TBOX = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadataTBOX"; + public static final String DISPLAY_TBOX_FIRSTTIME_BACKUP = DISPLAY_TBOX + "FirsttimeBackup"; public static final String DISPLAY_DISPLAY = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata-displayModel"; + public static final String DISPLAY_DISPLAY_FIRSTTIME_BACKUP = DISPLAY_DISPLAY + "FirsttimeBackup"; /** * A map of the URIS, keyed by their short names, intended only for display @@ -39,17 +46,24 @@ private static Map populateNamesMap() { map.put("ABOX_ASSERTIONS", ABOX_ASSERTIONS); map.put("ABOX_INFERENCES", ABOX_INFERENCES); map.put("ABOX_UNION", ABOX_UNION); + map.put("ABOX_ASSERTIONS_FIRSTTIME_BACKUP", ABOX_ASSERTIONS_FIRSTTIME_BACKUP); map.put("TBOX_ASSERTIONS", TBOX_ASSERTIONS); map.put("TBOX_INFERENCES", TBOX_INFERENCES); map.put("TBOX_UNION", TBOX_UNION); + map.put("TBOX_ASSERTIONS_FIRSTTIME_BACKUP", TBOX_ASSERTIONS_FIRSTTIME_BACKUP); map.put("FULL_ASSERTIONS", FULL_ASSERTIONS); map.put("FULL_INFERENCES", FULL_INFERENCES); map.put("FULL_UNION", FULL_UNION); map.put("APPLICATION_METADATA", APPLICATION_METADATA); + map.put("APPLICATION_METADATA_FIRSTTIME_BACKUP", APPLICATION_METADATA_FIRSTTIME_BACKUP); map.put("USER_ACCOUNTS", USER_ACCOUNTS); + map.put("USER_ACCOUNTS_FIRSTTIME_BACKUP", USER_ACCOUNTS_FIRSTTIME_BACKUP); map.put("DISPLAY", DISPLAY); + map.put("DISPLAY_FIRSTTIME_BACKUP", DISPLAY_FIRSTTIME_BACKUP); map.put("DISPLAY_TBOX", DISPLAY_TBOX); + map.put("DISPLAY_TBOX_FIRSTTIME_BACKUP", DISPLAY_TBOX_FIRSTTIME_BACKUP); map.put("DISPLAY_DISPLAY", DISPLAY_DISPLAY); + map.put("DISPLAY_DISPLAY_FIRSTTIME_BACKUP", DISPLAY_DISPLAY_FIRSTTIME_BACKUP); return Collections.unmodifiableMap(map); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java index fa1725af57..fe766329ba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/modules/tripleSource/ConfigurationTripleSource.java @@ -6,6 +6,14 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_DISPLAY; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_TBOX; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.USER_ACCOUNTS; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.ABOX_ASSERTIONS_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.APPLICATION_METADATA_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.USER_ACCOUNTS_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_TBOX_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.DISPLAY_DISPLAY_FIRSTTIME_BACKUP; + import org.apache.jena.rdf.model.ModelMaker; @@ -18,7 +26,10 @@ public abstract class ConfigurationTripleSource implements TripleSource { * add memory-mapping. */ protected static final String[] CONFIGURATION_MODELS = { DISPLAY, - DISPLAY_TBOX, DISPLAY_DISPLAY, USER_ACCOUNTS }; + DISPLAY_TBOX, DISPLAY_DISPLAY, USER_ACCOUNTS, ABOX_ASSERTIONS_FIRSTTIME_BACKUP, + TBOX_ASSERTIONS_FIRSTTIME_BACKUP, APPLICATION_METADATA_FIRSTTIME_BACKUP, + USER_ACCOUNTS_FIRSTTIME_BACKUP, DISPLAY_FIRSTTIME_BACKUP, + DISPLAY_TBOX_FIRSTTIME_BACKUP, DISPLAY_DISPLAY_FIRSTTIME_BACKUP }; /** * These decorators are added to a Configuration ModelMaker, regardless of diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java index 7cabec5728..6c6429327f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ConfigurationModelsSetup.java @@ -12,15 +12,30 @@ import javax.servlet.ServletContextListener; import org.apache.jena.ontology.OntModel; +import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.RDFNode; +import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; +import edu.cornell.mannlib.vitro.webapp.rdfservice.adapters.VitroModelFactory; /** * Set up the models that use the CONFIGURATION RDFService. They are all mapped * to memory-based models. */ public class ConfigurationModelsSetup implements ServletContextListener { + private static final Log log = LogFactory.getLog(ConfigurationModelsSetup.class); + @Override public void contextInitialized(ServletContextEvent sce) { ServletContext ctx = sce.getServletContext(); @@ -31,35 +46,225 @@ public void contextInitialized(ServletContextEvent sce) { setupModel(ctx, DISPLAY_TBOX, "displayTbox"); setupModel(ctx, DISPLAY_DISPLAY, "displayDisplay"); setupModel(ctx, USER_ACCOUNTS, "auth"); - ss.info(this, - "Set up the display models and the user accounts model."); + ss.info(this, "Set up the display models and the user accounts model."); } catch (Exception e) { ss.fatal(this, e.getMessage(), e.getCause()); } } - private void setupModel(ServletContext ctx, String modelUri, - String modelPath) { + private void setupModel(ServletContext ctx, String modelUri, String modelPath) { try { OntModel ontModel = ModelAccess.on(ctx).getOntModel(modelUri); - loadFirstTimeFiles(ctx, modelPath, ontModel); + if (ontModel.isEmpty()) { + loadFirstTimeFiles(ctx, modelPath, ontModel); + // backup firsttime files + OntModel baseModelFirsttime = ModelAccess.on(ctx).getOntModel(modelUri + "FirsttimeBackup"); + baseModelFirsttime.add(ontModel); + } else { + // Check if the firsttime files have changed since the firsttime startup, + // if so, then apply the changes but not overwrite the whole user model + applyFirstTimeChanges(ctx, modelPath, modelUri, ontModel); + } + loadEveryTimeFiles(ctx, modelPath, ontModel); } catch (Exception e) { - throw new RuntimeException("Failed to create the '" + modelPath - + "' model (" + modelUri + ").", e); + throw new RuntimeException("Failed to create the '" + modelPath + "' model (" + modelUri + ").", e); } } - private void loadFirstTimeFiles(ServletContext ctx, String modelPath, - OntModel baseModel) { + private void loadFirstTimeFiles(ServletContext ctx, String modelPath, OntModel baseModel) { RDFFilesLoader.loadFirstTimeFiles(ctx, modelPath, baseModel, baseModel.isEmpty()); } - private void loadEveryTimeFiles(ServletContext ctx, String modelPath, - OntModel memoryModel) { + private void loadEveryTimeFiles(ServletContext ctx, String modelPath, OntModel memoryModel) { RDFFilesLoader.loadEveryTimeFiles(ctx, modelPath, memoryModel); } + /* + * Check if the firsttime files have changed since the firsttime startup, if so, + * then apply the changes but not overwrite the whole user model + */ + private void applyFirstTimeChanges(ServletContext ctx, String modelPath, String modelUri, OntModel userModel) { + + log.info("Reload firsttime files on start-up if changed: '" + modelPath +"', URI: '" + modelUri + "'"); + boolean updatedFiles = false; + + // get configuration models from the firsttime start up (backup state) + OntModel baseModelFirsttimeBackup = ModelAccess.on(ctx).getOntModel(modelUri + "FirsttimeBackup"); + + // compare firsttime files with configuration models + log.debug("compare firsttime files with configuration models (backup from first start) for " + modelPath); + + OntModel baseModelFirsttime = VitroModelFactory.createOntologyModel(); + RDFFilesLoader.loadFirstTimeFiles(ctx, modelPath, baseModelFirsttime, true); + + if (baseModelFirsttime.isIsomorphicWith(baseModelFirsttimeBackup)) { + log.debug("They are the same, so do nothing: '" + modelPath + "'"); + } else { + log.debug("They differ:" + modelPath + ", compare values in configuration models with user's triplestore"); + + updatedFiles = applyChanges(baseModelFirsttimeBackup, baseModelFirsttime, userModel, modelPath); + if (updatedFiles) + log.info("The model was updated, " + modelPath); + } + } + + /* + * This method is designed to compare configuration models (baseModel) with firsttime files (newModel): + * if they are the same, stop + * else, if they differ, compare values in configuration models (baseModel) with user's triplestore + * if they are the same, update user's triplestore with value in new firsttime files + * else, if they differ, leave user's triplestore statement alone + * finally, overwrite the configuration models with content of the updated firstime files + * + * @param baseModel The backup firsttime model (from the first startup) + * @param newModel The current state of the firsttime files in the directory + * @param userModel The current state of the user model + * @param modelIdString Just an string for the output for better debugging + * (display, displayTbox, displayDisplay, auth) + */ + private boolean applyChanges(Model baseModel, Model newModel, Model userModel, String modelIdString) { + boolean updatedFiles = false; + StringWriter out = new StringWriter(); + StringWriter out2 = new StringWriter(); + Model difOldNew = baseModel.difference(newModel); + Model difNewOld = newModel.difference(baseModel); + + // remove special cases for display, problem with blank nodes + if (modelIdString.equals("display")) { + + removeBlankTriples(difOldNew); + removeBlankTriples(difNewOld); + } + + if (difOldNew.isEmpty() && difNewOld.isEmpty()) { + // if there is no difference, nothing needs to be done + log.debug("For the " + modelIdString + " model, there is no difference in both directions. So do nothing."); + } else { + // if there is a difference, we need to remove the triples in difOldNew and + // add the triples in difNewOld to the back up firsttime model + + if (!difOldNew.isEmpty()) { + difOldNew.write(out, "TTL"); + log.debug("Difference for " + modelIdString + " (old -> new), these triples should be removed: " + out); + + // Check if the UI-changes Overlap with the changes made in the fristtime-files + checkUiChangesOverlapWithFileChanges(baseModel, userModel, difOldNew); + + // before we remove the triples, we need to compare values in back up firsttime with user's triplestore + // if the triples which should be removed are still in user´s triplestore, remove them + if (userModel.containsAny(difOldNew)) { + log.debug("Some of these triples are in the user triples store, so they will be removed now"); + userModel.remove(difOldNew); + updatedFiles = true; + } + + // remove the triples from the backup firsttime model for the next check + baseModel.remove(difOldNew); + } + if (!difNewOld.isEmpty()) { + difNewOld.write(out2, "TTL"); + log.debug("Difference for " + modelIdString + " (new -> old), these triples should be added: " + out2); + + // Check if the UI-changes Overlap with the changes made in the fristtime-files + checkUiChangesOverlapWithFileChanges(baseModel, userModel, difNewOld); + + // before we add the triples, we need to compare values in back up firsttime with user's triplestore + // if the triples which should be added are not already in user´s triplestore, add them + if (!userModel.containsAll(difNewOld)) { + log.debug("Some of these triples are not in the user triples store, so they will be added now"); + // but only the triples that are no already there + Model tmp = difNewOld.difference(userModel); + userModel.add(tmp); + updatedFiles = true; + } + + // add the triples from the back up firsttime model for the next check + baseModel.add(difNewOld); + } + } + return updatedFiles; + } + + /** + * Check if the UI-changes Overlap with the changes made in the fristtime-files, if they overlap these changes are not applied to the user-model (UI) + * + * @param baseModel firsttime backup model + * @param userModel current state in the system (user/UI-model) + * @param changesModel the changes between firsttime-files and firttime-backup + */ + private void checkUiChangesOverlapWithFileChanges(Model baseModel, Model userModel, Model changesModel) { + log.debug("Beginn check if subtractions from Backup-firsttime model to current state of firsttime-files were changed in user-model (via UI)"); + Model changesUserModel = userModel.difference(baseModel); + List changedInUIandFileStatements = new ArrayList(); + + if(!changesUserModel.isEmpty()) + { + removeBlankTriples(changesUserModel); + + StringWriter out3 = new StringWriter(); + changesUserModel.write(out3, "TTL"); + log.debug("There were changes in the user-model via UI which have also changed in the firsttime files, the following triples will not be updated"); + + // iterate all statements and check if the ones which should be removed were not changed via the UI + StmtIterator iter = changesUserModel.listStatements(); + while (iter.hasNext()) { + Statement stmt = iter.nextStatement(); // get next statement + Resource subject = stmt.getSubject(); // get the subject + Property predicate = stmt.getPredicate(); // get the predicate + RDFNode object = stmt.getObject(); // get the object + + StmtIterator iter2 = changesModel.listStatements(); + + while (iter2.hasNext()) { + Statement stmt2 = iter2.nextStatement(); // get next statement + Resource subject2 = stmt2.getSubject(); // get the subject + Property predicate2 = stmt2.getPredicate(); // get the predicate + RDFNode object2 = stmt2.getObject(); // get the object + + // if subject and predicate are equal but the object differs and the language tag is the same, do not update these triples + // this case indicates an change in the UI, which should not be overwriten from the firsttime files + if(subject.equals(subject2) && predicate.equals(predicate2) && !object.equals(object2) ) { + // if object is an literal, check the language tag + if (object.isLiteral() && object2.isLiteral()) { + // if the langauge tag is the same, remove this triple from the update list + if(object.asLiteral().getLanguage().equals(object2.asLiteral().getLanguage())) { + log.debug("This two triples changed UI and files: \n UI: " + stmt + " \n file: " +stmt2); + changedInUIandFileStatements.add(stmt2); + } + } else { + log.debug("This two triples changed UI and files: \n UI: " + stmt + " \n file: " +stmt2); + changedInUIandFileStatements.add(stmt2); + } + } + } + } + // remove triples which were changed in the user model (UI) from the list + changesModel.remove(changedInUIandFileStatements); + } else { + log.debug("There were no changes in the user-model via UI compared to the backup-firsttime-model"); + } + } + + /** + * Remove all triples where subject or object is blank (Anon) + */ + private void removeBlankTriples(Model model) { + StmtIterator iter = model.listStatements(); + List removeStatement = new ArrayList(); + while (iter.hasNext()) { + Statement stmt = iter.nextStatement(); // get next statement + Resource subject = stmt.getSubject(); // get the subject + RDFNode object = stmt.getObject(); // get the object + + if(subject.isAnon() || object.isAnon()) + { + removeStatement.add(stmt); + } + } + model.remove(removeStatement); + } + @Override public void contextDestroyed(ServletContextEvent sce) { // Nothing to tear down. diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java index 9103ab24e5..2024e59e82 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java @@ -5,9 +5,13 @@ import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.ABOX_ASSERTIONS; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.APPLICATION_METADATA; import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.ABOX_ASSERTIONS_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.TBOX_ASSERTIONS_FIRSTTIME_BACKUP; +import static edu.cornell.mannlib.vitro.webapp.modelaccess.ModelNames.APPLICATION_METADATA_FIRSTTIME_BACKUP; import java.util.ArrayList; import java.util.List; +import java.io.StringWriter; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -17,12 +21,16 @@ import org.apache.jena.ontology.OntModel; import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdf.model.Property; import org.apache.jena.rdf.model.ResIterator; import org.apache.jena.rdf.model.Resource; import org.apache.jena.shared.Lock; import org.apache.jena.util.ResourceUtils; import org.apache.jena.util.iterator.ClosableIterator; import org.apache.jena.vocabulary.RDF; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; +import org.apache.jena.rdf.model.RDFNode; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; import edu.cornell.mannlib.vitro.webapp.modelaccess.ContextModelAccess; @@ -60,20 +68,37 @@ private void setUpJenaDataSource(ServletContext ctx) { Model applicationMetadataModel = models.getOntModel(APPLICATION_METADATA); if (applicationMetadataModel.isEmpty()) { firstTimeStartup = true; - initializeApplicationMetadata(ctx, applicationMetadataModel); + initializeApplicationMetadata(ctx, applicationMetadataModel); + + // backup copy from firsttime files + OntModel applicationMetadataModelFirsttime = models.getOntModel(APPLICATION_METADATA_FIRSTTIME_BACKUP); + applicationMetadataModelFirsttime.add(applicationMetadataModel); + } else { + // check if some of the firsttime files have changed since the first start up and + // if they changed, apply these changes to the user models + applyFirstTimeChanges(ctx); + checkForNamespaceMismatch( applicationMetadataModel, ctx ); } OntModel baseABoxModel = models.getOntModel(ABOX_ASSERTIONS); if (firstTimeStartup) { RDFFilesLoader.loadFirstTimeFiles(ctx, "abox", baseABoxModel, true); + + // backup copy from firsttime files + OntModel baseABoxModelFirsttime = models.getOntModel(ABOX_ASSERTIONS_FIRSTTIME_BACKUP); + baseABoxModelFirsttime.add(baseABoxModel); } RDFFilesLoader.loadEveryTimeFiles(ctx, "abox", baseABoxModel); OntModel baseTBoxModel = models.getOntModel(TBOX_ASSERTIONS); if (firstTimeStartup) { RDFFilesLoader.loadFirstTimeFiles(ctx, "tbox", baseTBoxModel, true); + + // backup copy from firsttime files + OntModel baseTBoxModelFirsttime = models.getOntModel(TBOX_ASSERTIONS_FIRSTTIME_BACKUP); + baseTBoxModelFirsttime.add(baseTBoxModel); } RDFFilesLoader.loadEveryTimeFiles(ctx, "tbox", baseTBoxModel); } @@ -191,6 +216,188 @@ private void renamePortal(Resource portal, String namespace, Model model) { } } + /* + * Check if the firsttime files have changed since the firsttime startup for all ContentModels, + * if so, then apply the changes but not overwrite the whole user model + */ + private void applyFirstTimeChanges(ServletContext ctx) { + + applyFirstTimeChanges(ctx, "applicationMetadata", APPLICATION_METADATA_FIRSTTIME_BACKUP, APPLICATION_METADATA); + + applyFirstTimeChanges(ctx, "abox", ABOX_ASSERTIONS_FIRSTTIME_BACKUP, ABOX_ASSERTIONS); + + applyFirstTimeChanges(ctx, "tbox", TBOX_ASSERTIONS_FIRSTTIME_BACKUP, TBOX_ASSERTIONS); + } + + + /* + * Check if the firsttime files have changed since the firsttime startup for one ContentModel, + * if so, then apply the changes but not overwrite the whole user model + */ + private void applyFirstTimeChanges(ServletContext ctx, String modelPath, String firsttimeBackupModelUri, String userModelUri) { + log.info("Reload firsttime files on start-up if changed: '" + modelPath +"', URI: '" +userModelUri+ "'"); + ContextModelAccess models = ModelAccess.on(ctx); + OntModel firsttimeBackupModel = models.getOntModel(firsttimeBackupModelUri); + + // compare firsttime files with configuration models + log.debug("compare firsttime files with configuration models (backup from first start) for " + modelPath); + OntModel firsttimeFilesModel = VitroModelFactory.createOntologyModel(); + RDFFilesLoader.loadFirstTimeFiles(ctx, modelPath, firsttimeFilesModel, true); + + // special initialization for application metadata model + if (firsttimeBackupModelUri.equals(APPLICATION_METADATA_FIRSTTIME_BACKUP)) { + setPortalUriOnFirstTime(firsttimeFilesModel, ctx); + } + + if ( firsttimeBackupModel.isIsomorphicWith(firsttimeFilesModel) ) { + log.debug("They are the same, so do nothing: '" + modelPath + "'"); + } else { + log.debug("They differ: '" + modelPath + "', compare values in configuration models with user's triplestore"); + OntModel userModel = models.getOntModel(userModelUri); + + // double check the statements (blank notes, etc.) and apply the changes + boolean updatedFiles = applyChanges(firsttimeBackupModel, firsttimeFilesModel, userModel, modelPath); + if (updatedFiles) log.info("The model was updated, " + modelPath); + } + } + + /* + * This method is designed to compare configuration models (baseModel) with firsttime files (newModel): + * if they are the same, stopFirstTime + * else, if they differ, compare values in configuration models (baseModel) with user's triplestore + * if they are the same, update user's triplestore with value in new firsttime files + * else, if they differ, leave user's triplestore statement alone + * finally, overwrite the configuration models with content of the updated firstime files + * + * @param baseModel The backup firsttime model (from the first startup) + * @param newModel The current state of the firsttime files in the directory + * @param userModel The current state of the user model + * @param modelIdString Just an string for the output for better debugging (tbox, abox, applicationMetadata) + */ + private boolean applyChanges(Model baseModel, Model newModel, Model userModel, String modelIdString) { + boolean updatedFiles = false; + StringWriter out = new StringWriter(); + StringWriter out2 = new StringWriter(); + Model difOldNew = baseModel.difference(newModel); + Model difNewOld = newModel.difference(baseModel); + + // special case for "rootTab" triple, do not need an update (is it still used in general? if not remove this case) + if(modelIdString.equals("applicationMetadata")) { + + Property p = userModel.createProperty("http://vitro.mannlib.cornell.edu/ns/vitro/0.7#", "rootTab"); + difOldNew.removeAll(null, p, null); + difNewOld.removeAll(null, p, null); + } + + if (difOldNew.isEmpty() && difNewOld.isEmpty()) { + // if there is no difference, nothing needs to be done + log.debug("For the " + modelIdString + " model, there is no difference in both directions. So do nothing."); + } else { + // if there is a difference, we need to remove the triples in difOldNew and + // add the triples in difNewOld to the back up firsttime model + + if (!difOldNew.isEmpty()) { + difOldNew.write(out, "TTL"); + log.debug("Difference for " + modelIdString + " (old -> new), these triples should be removed: " + out); + + // Check if the UI-changes Overlap with the changes made in the fristtime-files + checkUiChangesOverlapWithFileChanges(baseModel, userModel, difOldNew); + + // before we remove the triples, we need to compare values in back up firsttime with user's triplestore + // if the triples which should be removed are still in user´s triplestore, remove them + if (userModel.containsAny(difOldNew)) { + log.debug("Some of these triples are in the user triples store, so they will be removed now"); + userModel.remove(difOldNew); + updatedFiles = true; + } + + // remove the triples from the back up firsttime model for the next check + baseModel.remove(difOldNew); + + } + if (!difNewOld.isEmpty()) { + difNewOld.write(out2, "TTL"); + log.debug("Difference for " + modelIdString + " (new -> old), these triples should be added: " + out2); + + // Check if the UI-changes Overlap with the changes made in the fristtime-files + checkUiChangesOverlapWithFileChanges(baseModel, userModel, difNewOld); + + // before we add the triples, we need to compare values in back up firsttime with user's triplestore + // if the triples which should be added are not already in user´s triplestore, add them + if (!userModel.containsAll(difNewOld)) { + log.debug("Some of these triples are not in the user triples store, so they will be added now"); + // but only the triples that are no already there + Model tmp = difNewOld.difference(userModel); + userModel.add(tmp); + updatedFiles = true; + } + + // add the triples from the back up firsttime model for the next check + baseModel.add(difNewOld); + } + } + return updatedFiles; + } + + /** + * Check if the UI-changes Overlap with the changes made in the fristtime-files, if they overlap these changes are not applied to the user-model (UI) + * + * @param baseModel firsttime backup model + * @param userModel current state in the system (user/UI-model) + * @param changesModel the changes between firsttime-files and firttime-backup + */ + private void checkUiChangesOverlapWithFileChanges(Model baseModel, Model userModel, Model changesModel) { + log.debug("Beginn check if subtractions from Backup-firsttime model to current state of firsttime-files were changed in user-model (via UI)"); + Model changesUserModel = userModel.difference(baseModel); + List changedInUIandFileStatements = new ArrayList(); + + if(!changesUserModel.isEmpty()) + { + + StringWriter out3 = new StringWriter(); + changesUserModel.write(out3, "TTL"); + log.debug("There were changes in the user-model via UI which have also changed in the firsttime files, the following triples will not be updated"); + + // iterate all statements and check if the ones which should be removed were not changed via the UI + StmtIterator iter = changesUserModel.listStatements(); + while (iter.hasNext()) { + Statement stmt = iter.nextStatement(); // get next statement + Resource subject = stmt.getSubject(); // get the subject + Property predicate = stmt.getPredicate(); // get the predicate + RDFNode object = stmt.getObject(); // get the object + + StmtIterator iter2 = changesModel.listStatements(); + + while (iter2.hasNext()) { + Statement stmt2 = iter2.nextStatement(); // get next statement + Resource subject2 = stmt2.getSubject(); // get the subject + Property predicate2 = stmt2.getPredicate(); // get the predicate + RDFNode object2 = stmt2.getObject(); // get the object + + // if subject and predicate are equal but the object differs and the language tag is the same, do not update these triples + // this case indicates an change in the UI, which should not be overwriten from the firsttime files + if(subject.equals(subject2) && predicate.equals(predicate2) && !object.equals(object2) ) { + // if object is an literal, check the language tag + if (object.isLiteral() && object2.isLiteral()) { + // if the langauge tag is the same, remove this triple from the update list + if(object.asLiteral().getLanguage().equals(object2.asLiteral().getLanguage())) { + log.debug("This two triples changed UI and files: \n UI: " + stmt + " \n file: " +stmt2); + changedInUIandFileStatements.add(stmt2); + } + } else { + log.debug("This two triples changed UI and files: \n UI: " + stmt + " \n file: " +stmt2); + changedInUIandFileStatements.add(stmt2); + } + } + } + } + // remove triples which were changed in the user model (UI) from the list + changesModel.remove(changedInUIandFileStatements); + } else { + log.debug("There were no changes in the user-model via UI compared to the backup-firsttime-model"); + } + } + /* ===================================================================== */ @Override From 3e8d8c00a01d9c8e4777555e3622e9c6491dda4c Mon Sep 17 00:00:00 2001 From: Kampe Date: Tue, 26 Jan 2021 10:32:36 +0100 Subject: [PATCH 44/52] [VIVO-1936] i18n: updated the language comment in runtime.properties --- home/src/main/resources/config/example.runtime.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index a0bf89a4f3..9904a30a57 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -144,9 +144,9 @@ proxy.eligibleTypeList = http://www.w3.org/2002/07/owl#Thing # # A list of supported languages or Locales that the user may choose to -# use instead of the one specified by the browser. Selection images must -# be available in the i18n/images directory of the theme. This affects -# RDF data retrieved from the model, if RDFService.languageFilter is true. +# use instead of the one specified by the browser. The selected language(s) +# must exist in the Vitro-languages repository. This affects RDF data +# retrieved from the model, if RDFService.languageFilter is true. # This also affects the text of pages that have been modified to support # multiple languages. # From 55b37914395408440fc1a94314420c32c7ac283e Mon Sep 17 00:00:00 2001 From: William Welling Date: Mon, 25 Jan 2021 23:17:05 -0600 Subject: [PATCH 45/52] ftl function to capitalize group name affording override --- .../partials/individual/individual-property-group-tabs.ftl | 6 +++--- .../main/webapp/templates/freemarker/lib/lib-properties.ftl | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl index d4ac60e9b9..c5b2d7d2ef 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl @@ -20,11 +20,11 @@ <#assign groupNameHtmlId = "${i18n().properties}" > <#if tabCount = 1 > -
              • ${groupName?capitalize}
                • +
              • ${p.capitalizeGroupName(groupName)}
              •  
                • <#assign tabCount = 2> <#else> -
              • ${groupName?capitalize}
                • +
              • ${p.capitalizeGroupName(groupName)}
              •  
                • @@ -50,7 +50,7 @@ <#if groupName?has_content> <#--the function replaces spaces in the name with underscores, also called for the property group menu--> <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) > - + <#else> diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl index 3e5223fc62..4bcaf0584d 100644 --- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl @@ -342,3 +342,6 @@ name will be used as the label. --> <#return groupName> +<#function capitalizeGroupName propertyGroupName> + <#return propertyGroupName?capitalize> + From 2fc0b9c5c4c3f67fe1836c3b179261202a0e0764 Mon Sep 17 00:00:00 2001 From: "Gross, Benjamin" Date: Tue, 26 Jan 2021 22:05:28 -0700 Subject: [PATCH 46/52] Further i18n for BasicValidationVTwo.java --- .../edit/n3editing/VTwo/BasicValidationVTwo.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java index 463663e3df..1e942aa8e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java @@ -31,6 +31,9 @@ public class BasicValidationVTwo { public final static String REQUIRED_FIELD_EMPTY_MSG = "required_field_empty_msg"; public final static String DATA_NOT_PAST_MSG = "data_not_past_msg"; + public final static String INVALID_DATE_FORM_MSG = "invalid_date_form_msg"; + public final static String FILE_MUST_BE_ENTERED_MSG = "file_must_be_entered_msg"; + public final static String INVALID_URL_MSG = "invalid_url_msg"; private I18nBundle i18n; @@ -162,11 +165,11 @@ public Map validateLiterals(Map> varNamesTo private String validate(String validationType, List fileItems) { if( "nonempty".equalsIgnoreCase(validationType)){ if( fileItems == null || fileItems.size() == 0 ){ - return "a file must be entered for this field."; + return i18n.text(FILE_MUST_BE_ENTERED_MSG); }else{ FileItem fileItem = fileItems.get(0); if( fileItem == null || fileItem.getName() == null || fileItem.getName().length() < 1 || fileItem.getSize() < 0){ - return "a file must be entered for this field."; + return i18n.text(FILE_MUST_BE_ENTERED_MSG); } } } @@ -189,7 +192,7 @@ else if("isDate".equalsIgnoreCase(validationType)){ if( isDate( value)) return SUCCESS; else - return "must be in valid date format mm/dd/yyyy."; + return i18n.text(INVALID_DATE_FORM_MSG); } else if( validationType.indexOf("datatype:") == 0 ) { String datatypeURI = validationType.substring(9); @@ -202,7 +205,7 @@ else if( validationType.indexOf("datatype:") == 0 ) { } else if ("httpUrl".equalsIgnoreCase(validationType)){ //check if it has http or https, we could do more but for now this is all. if(! value.startsWith("http://") && ! value.startsWith("https://") ){ - return "This URL must start with http:// or https://"; + return i18n.text(INVALID_URL_MSG); }else{ return SUCCESS; } From c69e6de18e0488df6cf02e8786b1a0d99b4c1e58 Mon Sep 17 00:00:00 2001 From: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com> Date: Thu, 28 Jan 2021 00:13:03 +0100 Subject: [PATCH 47/52] Fixed DeletePropertyController.java - getting localname of property properly (#200) * Fixed DeletePropertyController.java - getting localname of property properly Resolves: https://jira.lyrasis.org/browse/VIVO-1816 --- .../freemarker/DeletePropertyController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java index c62a2c87ab..18fb4f39f8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java @@ -10,6 +10,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.jena.rdf.model.Property; +import org.apache.jena.rdf.model.ResourceFactory; + import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.AuthorizationRequest; import edu.cornell.mannlib.vitro.webapp.beans.DataProperty; @@ -25,6 +28,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils; import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess; import edu.cornell.mannlib.vitro.webapp.web.URLEncoder; + + /* * Custom deletion controller to which deletion requests from default property form are sent. May be replaced * later with additional features in process rdf form controller or alternative location. @@ -61,14 +66,14 @@ protected ResponseValues processRequest(VitroRequest vreq) { private String getRedirectUrl(VitroRequest vreq) { - // TODO Auto-generated method stub + // TODO Auto-generated method stub String subjectUri = EditConfigurationUtils.getSubjectUri(vreq); String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); - int hashIndex = predicateUri.lastIndexOf("#"); - String localName = predicateUri.substring(hashIndex + 1); + Property prop = ResourceFactory.createProperty(predicateUri); + String localName = prop.getLocalName(); String redirectUrl = "/entity?uri=" + URLEncoder.encode(subjectUri); - return redirectUrl + "#" + URLEncoder.encode(localName); - } + return redirectUrl + "#" + URLEncoder.encode(localName); + } private String handleErrors(VitroRequest vreq) { From 9fb24d25fe82eec25c255fd17184b03552d81a38 Mon Sep 17 00:00:00 2001 From: nicolasdickner Date: Thu, 28 Jan 2021 08:45:04 -0500 Subject: [PATCH 48/52] Removed hardcoded time units by properties calls in dateTimeWithPrecision.ftl --- .../freemarker/edit/dateTimeWithPrecision.ftl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl b/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl index 5f050e0b90..cc00ed6136 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl +++ b/webapp/src/main/webapp/templates/freemarker/edit/dateTimeWithPrecision.ftl @@ -78,9 +78,9 @@ precisionConstants.second -- URI for precision <#if precLevel gte 2> - + required > - + <#assign numDays = 31 /> <#list 1..numDays as currentDay> @@ -101,9 +101,9 @@ precisionConstants.second -- URI for precision <#if precLevel gte 4> <#-- We'll need to make this more flexible to support 24 hour display down the road. For now assuming 12h with am/pm --> - + required > - + <#assign numMinutes = 59 /> <#list 1..numMinutes as currentMinute> @@ -135,9 +135,9 @@ precisionConstants.second -- URI for precision <#if precLevel gte 6> - + <#if datatype?contains("#date") || datatype?contains("Year") > - + <#if datatype?contains("#date") || datatype?contains("Month") > - + <#if datatype?contains("#date") > - + <#if datatype?contains("#dateTime") || datatype?contains("#time") > - + - + - +