From cba000c58bce5de124a3339843e3f87340e9cbfd Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 17 May 2013 14:15:25 -0400 Subject: [PATCH] VIVO-82 Use ModelAccess to get or set the BaseOntModel a.k.a the Base Full model, or AssertionsModel --- webapp/web/admin/conceptRepair.jsp | 3 ++- webapp/web/admin/removeBadRestrictions.jsp | 5 +++-- webapp/web/admin/removeResourceDescription.jsp | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp index f8d0796cb..301b105e3 100644 --- a/webapp/web/admin/conceptRepair.jsp +++ b/webapp/web/admin/conceptRepair.jsp @@ -3,6 +3,7 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %> +<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%> <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> @@ -21,7 +22,7 @@ " FILTER(afn:bnode(?bnode) = \"" + conceptIdStr + "\")\n" + "}"; - OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel"); + OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel(); Model conceptDescription = ModelFactory.createDefaultModel(); try { ontModel.enterCriticalSection(Lock.READ); diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp index 6954e50d0..18e8e78d8 100644 --- a/webapp/web/admin/removeBadRestrictions.jsp +++ b/webapp/web/admin/removeBadRestrictions.jsp @@ -4,12 +4,13 @@ <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%> <% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %> <% if (request.getParameter("execute") != null) { - OntModel ontModel = (OntModel) getServletContext().getAttribute(JenaBaseDao.ASSERTIONS_ONT_MODEL_ATTRIBUTE_NAME); + OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel(); int results = doRemoval(ontModel); request.setAttribute("removalCount", results); } @@ -66,7 +67,7 @@ " FILTER(afn:bnode(?bnode) = \"" + bnodeId + "\")\n" + "}"; - OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel"); + OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel(); Model conceptDescription = ModelFactory.createDefaultModel(); try { ontModel.enterCriticalSection(Lock.READ); diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp index 080fb5f63..874e1f0cb 100644 --- a/webapp/web/admin/removeResourceDescription.jsp +++ b/webapp/web/admin/removeResourceDescription.jsp @@ -6,6 +6,7 @@ <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %> <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %> +<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%> <% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %> @@ -16,7 +17,7 @@ String describeQueryStr = "DESCRIBE <" + resourceURIStr + ">"; - OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel"); + OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel(); Model resourceDescription = ModelFactory.createDefaultModel(); try { ontModel.enterCriticalSection(Lock.READ);