[dcm4che-commits] SF.net SVN: dcm4che:[15708] dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/ src/main/java/org/dcm4chee/web/war

[<rob...@us...>]

Revision: 15708
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15708&view=rev
Author:   robertdavid
Date:     2011-07-25 14:43:03 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
[#WEB-309] Dicom object display on file level in folder - fixed file resolution

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java	2011-07-25 14:42:09 UTC (rev 15707)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/ae/AEListPanel.java	2011-07-25 14:43:03 UTC (rev 15708)
@@ -230,7 +230,7 @@
                     .add(new TooltipBehaviour("ae."))
                     .add(new SecurityBehavior(getModuleName() + ":editAETLink"))
                 );
-                    
+
                 AjaxLink<?> removeAET = new AjaxLink<Object>("removeAET") {
     
                     private static final long serialVersionUID = 1L;

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-07-25 14:42:09 UTC (rev 15707)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java	2011-07-25 14:43:03 UTC (rev 15708)
@@ -152,6 +152,7 @@
 import org.dcm4chee.web.common.markup.modal.MessageWindow;
 import org.dcm4chee.web.common.secure.SecureSession;
 import org.dcm4chee.web.common.secure.SecurityBehavior;
+import org.dcm4chee.web.common.util.FileUtils;
 import org.dcm4chee.web.common.validators.UIDValidator;
 import org.dcm4chee.web.common.webview.link.WebviewerLinkProvider;
 import org.dcm4chee.web.dao.folder.StudyListFilter;
@@ -2199,7 +2200,7 @@
                 DicomInputStream dis = null;
                 try {
                     final File file = fsID.startsWith("tar:") ? TarRetrieveDelegate.getInstance().retrieveFileFromTar(fsID, fileID) :
-                        new File(fsID, fileID);
+                        FileUtils.resolve(new File(fsID, fileID));
                     dis =new DicomInputStream(file);
                     modalWindow.setContent(new DicomObjectPanel("content", dis.readDicomObject(), true));
                     modalWindow.setTitle(new StringResourceModel("folder.dcmfileview.title", 
@@ -2226,7 +2227,7 @@
         image.add(new ImageSizeBehaviour("vertical-align: middle;"));
         if (tooltip != null) image.add(tooltip);
         displayLink.add(image);
-        displayLink.setVisible(fsID.startsWith("tar:") || new File(fsID, fileID).exists());
+        displayLink.setVisible(fsID.startsWith("tar:") || FileUtils.resolve(new File(fsID, fileID)).exists());
         return displayLink;
     }
 
@@ -2424,7 +2425,6 @@
                     model.getAttributeValueAsString(Tag.PatientName)
             ));
         } else if (model.levelOfModel() > 0 && model.levelOfModel() < 5) {
-            System.out.println("level is: " + model.levelOfModel());
             switch (model.levelOfModel()) {
                 case 2: {model = model.getParent(); break;}
                 case 3: {model = model.getParent().getParent(); break;}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.