From aae6b818c8fabf35e84093446eada27a05fb7403 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Fri, 14 Mar 2014 13:55:08 -0700 Subject: [PATCH] CSPACE-6341: Updated the Report service to use an instance-qualified database name, rather than assuming that the repository name matches the database name. --- .../services/report/nuxeo/ReportDocumentModelHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java index ecd7764db..0cbfb8b43 100644 --- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java +++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java @@ -102,7 +102,7 @@ public class ReportDocumentModelHandler extends DocHandlerBase { private static String REPORTS_STD_GROUPCSID_PARAM = "groupcsid"; private static String REPORTS_STD_CSIDLIST_PARAM = "csidlist"; private static String REPORTS_STD_TENANTID_PARAM = "tenantid"; - + public InputStream invokeReport( ServiceContext ctx, String csid, @@ -404,7 +404,9 @@ public class ReportDocumentModelHandler extends DocHandlerBase { try { String repositoryName = ctx.getRepositoryName(); if (repositoryName != null && repositoryName.trim().isEmpty() == false) { - result = JDBCTools.getConnection(JDBCTools.NUXEO_DATASOURCE_NAME, repositoryName); + String cspaceInstanceId = ServiceMain.getInstance().getCspaceInstanceId(); + String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId); + result = JDBCTools.getConnection(JDBCTools.NUXEO_DATASOURCE_NAME, databaseName); } } catch (Exception e) { Log.error(e); -- 2.47.3