From: <jav...@us...> - 2010-05-28 08:52:19
|
Revision: 13430 http://dcm4che.svn.sourceforge.net/dcm4che/?rev=13430&view=rev Author: javawilli Date: 2010-05-28 08:52:12 +0000 (Fri, 28 May 2010) Log Message: ----------- [#WEB-95] Restore from trash failed. Modified Paths: -------------- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java =================================================================== --- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java 2010-05-28 08:46:01 UTC (rev 13429) +++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java 2010-05-28 08:52:12 UTC (rev 13430) @@ -397,12 +397,12 @@ @SuppressWarnings("unchecked") public List<PrivateFile> getFilesForEntity(long pk, Class<? extends BaseEntity> clazz) { - String query = "SELECT DISTINCT f FROM PrivateFile f LEFT JOIN FETCH f.fileSystem fs LEFT JOIN FETCH f.instance i "; + String query = "SELECT DISTINCT f FROM PrivateFile f LEFT JOIN FETCH f.fileSystem fs "; if (clazz.equals(PrivateInstance.class)) - query += "WHERE i.pk = :pk"; + query += "WHERE f.instance.pk = :pk"; else { - query += "LEFT JOIN i.series se "; + query += "LEFT JOIN f.instance.series se "; if (clazz.equals(PrivateSeries.class)) query += "WHERE se.pk = :pk"; Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java =================================================================== --- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java 2010-05-28 08:46:01 UTC (rev 13429) +++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java 2010-05-28 08:52:12 UTC (rev 13430) @@ -262,7 +262,6 @@ @Override public void onConfirmation(AjaxRequestTarget target, PrivSelectedEntities selected) { - try { FileImportOrder fio = new FileImportOrder(); List<PrivateFile> files = getFilesToRestore(); @@ -278,7 +277,6 @@ file.setMD5Sum(privateFile.getFileMD5()); file.setTransferSyntaxUID(privateFile.getTransferSyntaxUID()); Instance instance = new Instance(); - instance.setAttributes(privateFile.getInstance().getAttributes()); file.setInstance(instance); fio.addFile(file, dio); } @@ -288,7 +286,7 @@ this.setStatus(new StringResourceModel("trash.restoreDone", TrashListPage.this,null)); } catch (Exception e) { - log.error("Exception restoring entry: :"+e.getMessage()); + log.error("Exception restoring entry:"+e.getMessage(), e); this.setStatus(new StringResourceModel("trash.restoreFailed", TrashListPage.this,null)); } viewport.getPatients().clear(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |