From b3edf5cb3da989f212e714c02e74cb76d9522c78 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Wed, 2 Nov 2011 20:33:10 +0000 Subject: [PATCH] NIHVIVO-3231 rename resource utility now updates user accounts model --- .../webapp/controller/edit/RefactorOperationController.java | 5 +++++ .../vitro/webapp/servlet/setup/JenaDataSourceSetup.java | 1 + 2 files changed, 6 insertions(+) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java index 092a12cf6..d356e928f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java @@ -59,6 +59,7 @@ import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase; public class RefactorOperationController extends BaseEditController { private static final Log log = LogFactory.getLog(RefactorOperationController.class.getName()); + private static final boolean NOTIFY = true; private String doFixDataTypes(HttpServletRequest request, HttpServletResponse response) { @@ -252,6 +253,10 @@ public class RefactorOperationController extends BaseEditController { dataset.getLock().leaveCriticalSection(); } + renameResourceInModel(ModelContext.getOntModelSelector( + getServletContext()).getUserAccountsModel(), + userURI, oldURIStr, newURIStr, !NOTIFY); + // there are no statements to delete, but we want indexes updated appropriately request.getFullWebappDaoFactory().getIndividualDao().deleteIndividual(oldURIStr); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java index fbd9eafc7..52a40a165 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java @@ -267,6 +267,7 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java WebappDaoFactory wadf = new WebappDaoFactorySDB(unionOms, bds, storeDesc, getDefaultNamespace(ctx), null, null); ctx.setAttribute("webappDaoFactory",wadf); + ModelContext.setOntModelSelector(unionOms, ctx); ModelContext.setUnionOntModelSelector(unionOms, ctx); // assertions and inferences ModelContext.setBaseOntModelSelector(baseOms, ctx); // assertions ModelContext.setInferenceOntModelSelector(inferenceOms, ctx); // inferences