From bf8e2b477813d2302525e06fdf1eca4dabecf5f4 Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 11 Nov 2013 15:28:35 -0500 Subject: [PATCH 1/2] editLink macro was referencing displayNames rather than rangeURIs --- .../templates/freemarker/lib/lib-properties.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl index d5b5ec9c2..efb98f2a8 100644 --- a/webapp/web/templates/freemarker/lib/lib-properties.ftl +++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl @@ -171,22 +171,22 @@ name will be used as the label. --> <#macro editingLinks propertyLocalName propertyName statement editable rangeUri=""> <#if editable > <#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")> - <@editLink propertyLocalName propertyName statement /> + <@editLink propertyLocalName propertyName statement rangeUri/> <@deleteLink propertyLocalName propertyName statement /> -<#macro editLink propertyLocalName propertyName statement> +<#macro editLink propertyLocalName propertyName statement rangeUri=""> <#if propertyLocalName?contains("ARG_2000028")> - <#if propertyName?contains("mailing address")> + <#if rangeUri?contains("Address")> <#local url = statement.editUrl + "&addressUri=" + "${statement.address!}"> - <#elseif propertyName?contains("phone") || propertyName?contains("fax")> + <#elseif rangeUri?contains("Telephone") || rangeUri?contains("Fax")> <#local url = statement.editUrl + "&phoneUri=" + "${statement.phone!}"> - <#elseif propertyName?contains("primary email") || propertyName?contains("additional emails")> + <#elseif rangeUri?contains("Work") || rangeUri?contains("Email")> <#local url = statement.editUrl + "&emailUri=" + "${statement.email!}"> - <#elseif propertyName?contains("full name")> + <#elseif rangeUri?contains("Name")> <#local url = statement.editUrl + "&fullNameUri=" + "${statement.fullName!}"> - <#elseif propertyName?contains("preferred title")> + <#elseif rangeUri?contains("Title")> <#local url = statement.editUrl + "&titleUri=" + "${statement.title!}"> <#else> From fc90df70f3ad8709e87cc8b479a4de1e23b9c5ab Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Mon, 11 Nov 2013 16:03:46 -0500 Subject: [PATCH 2/2] VIVO-511 allowing only 1 complete migration --- .../vitro/webapp/ontology/update/KnowledgeBaseUpdater.java | 4 +++- .../vitro/webapp/servlet/setup/UpdateKnowledgeBase.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java index 3e685ed1e..a64025294 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/ontology/update/KnowledgeBaseUpdater.java @@ -346,7 +346,9 @@ public class KnowledgeBaseUpdater { } public static boolean isUpdatableABoxGraph(String graphName) { - return (!graphName.contains("tbox") && !graphName.contains("filegraph")); + return (graphName != null && !graphName.contains("tbox") + && !graphName.contains("filegraph") + && !graphName.contains("x-arq:UnionGraph")); } /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java index 0f739dd5d..8c8f53533 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java @@ -141,7 +141,7 @@ public class UpdateKnowledgeBase implements ServletContextListener { KnowledgeBaseUpdater ontologyUpdater = new KnowledgeBaseUpdater(settings); boolean requiredUpdate = ontologyUpdater.updateRequired(ctx); - if(!JenaDataSourceSetupBase.isFirstStartup()) { + if(requiredUpdate && !JenaDataSourceSetupBase.isFirstStartup()) { try { ctx.setAttribute(KBM_REQURIED_AT_STARTUP, Boolean.TRUE); migrationChangesMade = ontologyUpdater.update(ctx);