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

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

Revision: 15681
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15681&view=rev
Author:   robertdavid
Date:     2011-07-13 09:17:50 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
[#WEB-33] Add DICOM export - bugfix for calculating objects to export

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java	2011-07-13 08:13:53 UTC (rev 15680)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/ExportPage.java	2011-07-13 09:17:50 UTC (rev 15681)
@@ -147,9 +147,13 @@
     
     private static Logger log = LoggerFactory.getLogger(ExportPage.class);
     
+    List<PatientModel> list;
+    
     public ExportPage(List<PatientModel> list) {
         super();        
         
+        this.list = list;
+        
         StudyPermissionHelper studyPermissionHelper = StudyPermissionHelper.get(); 
         if (ExportPage.BaseCSS != null)
             add(CSSPackageResource.getHeaderContribution(ExportPage.BaseCSS));
@@ -337,8 +341,6 @@
             @Override
             protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                 System.out.println("DOWNLOAD");
-//                getSession().setMetaData(LAST_DESTINATION_AET_ATTRIBUTE, destinationAET);
-//                exportSelected();
                 download();
             }
         }.setOutputMarkupId(true));
@@ -390,32 +392,19 @@
     // TODO: 
     private void download() {
         
-//        StudyListLocal dao = (StudyListLocal)
-//            JNDIUtils.lookup(StudyListLocal.JNDI_NAME);
-//
-//        for (MoveRequest mr : exportInfo.requests) {
-//            Set<String> instances = new HashSet<String>();
-//            
-//            for (String studyUID : mr.studyIUIDs)
-//                
-//                dao.
-//                for (Study s : dao.findStudiesOfPatient(, false, StudyPermissionHelper.get().applyStudyPermissions() ? 
-//                        StudyPermissionHelper.get().getDicomRoles() : null))
-//                    System.out.println(s);
+        StudyListLocal dao = (StudyListLocal) JNDIUtils.lookup(StudyListLocal.JNDI_NAME);
+        
+        
+        ArrayList<MoveRequest> requests = new ArrayList<MoveRequest>(list.size());
+        
+        for (PatientModel pat : list) {
+//            if (pat.isSelected()) {
+//                prepareStudiesOfPatientRequests(pat);
+//            } else {
+//                prepareStudyRequests(pat.getStudies());
 //            }
-//            
-////            List<Instance> findInstancesOfSeries(long pk);
-//            
-//            
-//            System.out.println("EXPORTING: " + mr.toString());
-//            System.out.println("Patient: " + mr.patId);
-//            for (String s : mr.studyIUIDs)
-//                System.out.println("Study: " + s.toString());
-//            for (String se : mr.seriesIUIDs)
-//                System.out.println("Series: " + se.toString());
-//            for (String i : mr.sopIUIDs)
-//                System.out.println("Study: " + i.toString());
-//        }
+        }
+
     }
 
     private String[] toArray(List<String> l) {
@@ -541,12 +530,12 @@
                     NOTnrStudy++;
             }
             if (pat.isSelected()) {
-                if (allowed == studies.size())
+                if (allowed == studies.size()) 
                     nrPat++;
                 else {
                     NOTnrPat++;
+                    nrStudy += allowed;
                 }
-                nrStudy += allowed;
             }
 
             log.debug("Selected for export: Studies of Patient:{} StudyUIDs:{}", pat.getId(), uids);


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