dcm4che, a DICOM Implementation in JAVA

Revision: 17779
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17779&view=rev
Author:   javawilli
Date:     2013-05-08 11:11:00 +0000 (Wed, 08 May 2013)
Log Message:
-----------
[#DCMEE-1932] Improve "StoreDuplicatesIfDifferentMD5"

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/FileBean.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PatientBean.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/interfaces/FileDTO.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesCmd.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesOfSeriesCmd2.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-storescp-xmbean.xml
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScpService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/FileBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/FileBean.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/FileBean.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -313,6 +313,7 @@
         if (inst != null) {
             retval.setSopInstanceUID(inst.getSopIuid());
             retval.setSopClassUID(inst.getSopCuid());
+            retval.setExternalRetrieveAET(inst.getExternalRetrieveAET());
         }
         return retval;
     }

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PatientBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PatientBean.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/PatientBean.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -1002,6 +1002,8 @@
     private Dataset findOtherPIDByIssuer(String issuer, DcmElement opidsq) {
         for (int i = 0, n = opidsq.countItems(); i < n; i++) {
             Dataset opid = opidsq.getItem(i);
+            if (opid == null || opid.isEmpty() || !opid.containsValue(Tags.IssuerOfPatientID))
+                continue;
             if (opid.getString(Tags.IssuerOfPatientID).equals(issuer)) {
                     return opid;
             }

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/entity/StudyBean.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -698,13 +698,20 @@
             } catch (FinderException e) {
                 throw new EJBException(e);
             }
-            if (eAetSet.size() == 1)
+            if (eAetSet.size() == 1) {
                 aet = (String) eAetSet.iterator().next();
+            } else {
+                log.warn("Update ExternalRetrieveAET - Study pk="+this.getPk()+" Number of extRetrAets != 1:"+eAetSet.size());
+            }
+        } else {
+            log.warn("Update ExternalRetrieveAET - Study pk="+this.getPk()+" getNumberOfStudyRelatedInstances() < 1:"+getNumberOfStudyRelatedInstances());
         }
         if (aet == null ? getExternalRetrieveAET() == null 
                 : aet.equals(getExternalRetrieveAET())) {
             return false;
         }
+        if (log.isDebugEnabled())
+            log.debug("Update ExternalRetrieveAET - Study pk="+this.getPk()+" extRetrAET:"+aet);
         setExternalRetrieveAET(aet);
         return true;
     }

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/interfaces/FileDTO.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/interfaces/FileDTO.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/interfaces/FileDTO.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -56,6 +56,8 @@
     private long fspk;
 
     private String aet;
+    
+    private String extRetrieveAET;
 
     private String userInfo;
 
@@ -114,6 +116,14 @@
         this.aet = aet;
     }
 
+    public final String getExternalRetrieveAET() {
+        return extRetrieveAET;
+    }
+
+    public final void setExternalRetrieveAET(String aet) {
+        this.extRetrieveAET = aet;
+    }
+
     public final String getUserInfo() {
         return userInfo;
     }

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesCmd.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesCmd.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesCmd.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -56,12 +56,12 @@
 public final class QueryFilesCmd extends BaseReadCmd {
 
     private static final String QueryFilesByUIDCmd = "SELECT f.pk, f.filepath, f.file_md5, f.file_status, "
-            + "fs.fs_group_id, fs.dirpath, fs.retrieve_aet, fs.availability, fs.user_info, i.sop_cuid, i.sop_iuid "
+            + "fs.fs_group_id, fs.dirpath, fs.retrieve_aet, fs.availability, fs.user_info, i.sop_cuid, i.sop_iuid, i.ext_retr_aet "
             + "FROM files f, filesystem fs, instance i "
             + "WHERE f.filesystem_fk = fs.pk AND f.instance_fk = i.pk AND i.sop_iuid=?";
 
     private static final String QueryLinkedFilesCmd = "SELECT f.pk, f.filepath, f.file_md5, f.file_status, "
-            + "fs.fs_group_id, fs.dirpath, fs.retrieve_aet, fs.availability, fs.user_info, i.sop_cuid, i.sop_iuid "
+            + "fs.fs_group_id, fs.dirpath, fs.retrieve_aet, fs.availability, fs.user_info, i.sop_cuid, i.sop_iuid, i.ext_retr_aet "
             + "FROM files f, filesystem fs, instance i, files f2 "
             + "WHERE f.filesystem_fk = fs.pk AND f.instance_fk = i.pk AND f.instance_fk = f2.instance_fk and f2.pk=?";
 
@@ -94,6 +94,7 @@
         dto.setUserInfo(rs.getString(9));
         dto.setSopClassUID(rs.getString(10));
         dto.setSopInstanceUID(rs.getString(11));
+        dto.setExternalRetrieveAET(rs.getString(12));
         return dto;
     }
 

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesOfSeriesCmd2.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesOfSeriesCmd2.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/jdbc/QueryFilesOfSeriesCmd2.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -57,7 +57,7 @@
     private static final String SQL = "SELECT f.pk, f.filepath, f.file_md5, "
             + "f.file_status, fs.fs_group_id, fs.dirpath, fs.retrieve_aet, "
             + "fs.availability, fs.user_info, i.sop_cuid, i.sop_iuid, "
-            + "s.num_instances "
+            + "s.num_instances, i.ext_retr_aet "
             + "FROM files f, filesystem fs, instance i, series s "
             + "WHERE f.filesystem_fk = fs.pk AND f.instance_fk = i.pk "
             + "AND i.series_fk = s.pk AND s.series_iuid=?";
@@ -113,6 +113,7 @@
         dto.setSopClassUID(rs.getString(10));
         dto.setSopInstanceUID(rs.getString(11));
         numberOfSeriesRelatedInstances = rs.getInt(12);
+        dto.setExternalRetrieveAET(rs.getString(13));
         return dto;
     }
 }

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-storescp-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-storescp-xmbean.xml	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/etc/conf/xmdesc/dcm4chee-storescp-xmbean.xml	2013-05-08 11:11:00 UTC (rev 17779)
@@ -583,6 +583,19 @@
       </descriptors>
    </attribute>
    <attribute access="read-write"
+      getMethod="isDontStoreDuplicateIfFromExternalRetrieveAET"
+      setMethod="setDontStoreDuplicateIfFromExternalRetrieveAET">
+      <description><![CDATA[Dont store a duplicate object if the object is sent from external retrieve AET.
+      If enabled, the StoreDuplicatesIfDifferentMD5 and StoreDuplicatesIfDifferentHost has no effect if
+      CallingAET of store request is the external retrieve AET of the existing instance.]]>
+      </description>
+      <name>DontStoreDuplicateIfFromExternalRetrieveAET</name>
+      <type>boolean</type>
+      <descriptors>
+         <value value="true"/>
+      </descriptors>
+   </attribute>
+   <attribute access="read-write"
       getMethod="isStoreDuplicateIfDiffHost"
       setMethod="setStoreDuplicateIfDiffHost">
       <description><![CDATA[Store duplicate objects if the existing files are <b>NOT</b> located 

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -179,6 +179,7 @@
     private int maxCountUpdateDatabaseRetries = 0;
 
     private boolean storeDuplicateIfDiffMD5 = true;
+    private boolean dontStoreDuplicateIfFromExternalRetrieveAET = true;
 
     private boolean storeDuplicateIfDiffHost = true;
 
@@ -402,6 +403,15 @@
         this.storeDuplicateIfDiffMD5 = storeDuplicate;
     }
 
+    public boolean isDontStoreDuplicateIfFromExternalRetrieveAET() {
+        return dontStoreDuplicateIfFromExternalRetrieveAET;
+    }
+
+    public void setDontStoreDuplicateIfFromExternalRetrieveAET(
+            boolean b) {
+        this.dontStoreDuplicateIfFromExternalRetrieveAET = b;
+    }
+
     public final CompressionRules getCompressionRules() {
         return compressionRules;
     }
@@ -661,7 +671,7 @@
                 perfMon.stop(activeAssoc, rq,
                         PerfCounterEnum.C_STORE_SCP_OBJ_STORE);
             }
-            if (md5sum != null && ignoreDuplicate(duplicates, md5sum)) {
+            if (md5sum != null && ignoreDuplicate(duplicates, md5sum, callingAET)) {
                 log.info("Received Instance[uid=" + iuid
                         + "] already exists - ignored");
                 if (!dcm4cheeURIReferenced) {
@@ -1047,11 +1057,12 @@
         return false;
     }
 
-    private boolean ignoreDuplicate(List duplicates, byte[] md5sum) {
+    private boolean ignoreDuplicate(List duplicates, byte[] md5sum, String callingAET) {
         for (int i = 0, n = duplicates.size(); i < n; ++i) {
             FileDTO dto = (FileDTO) duplicates.get(i);
-            if (storeDuplicateIfDiffMD5
-                    && !Arrays.equals(md5sum, dto.getFileMd5()))
+            if (dontStoreDuplicateIfFromExternalRetrieveAET && callingAET.equals(dto.getExternalRetrieveAET()))
+                return true;
+            if (storeDuplicateIfDiffMD5 && !Arrays.equals(md5sum, dto.getFileMd5()))
                 continue;
             if (storeDuplicateIfDiffHost
                     && !service.isFileSystemGroupLocalAccessable(

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScpService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScpService.java	2013-05-07 22:00:29 UTC (rev 17778)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScpService.java	2013-05-08 11:11:00 UTC (rev 17779)
@@ -577,6 +577,14 @@
         scp.setStoreDuplicateIfDiffMD5(storeDuplicate);
     }
 
+    public boolean isDontStoreDuplicateIfFromExternalRetrieveAET() {
+        return scp.isDontStoreDuplicateIfFromExternalRetrieveAET();
+    }
+
+    public void setDontStoreDuplicateIfFromExternalRetrieveAET(boolean b) {
+        scp.setDontStoreDuplicateIfFromExternalRetrieveAET(b);
+    }
+
     public final String getCompressionRules() {
         return scp.getCompressionRules().toString();
     }

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

Revision: 17778
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17778&view=rev
Author:   mdoris
Date:     2013-05-07 22:00:29 +0000 (Tue, 07 May 2013)
Log Message:
-----------
[DCMEE-1964] Changes visibility of the method. Coded by Mike reviewed by Greg.

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java

Modified: dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java	2013-05-07 13:37:53 UTC (rev 17777)
+++ dcm4chee/dcm4chee-arc/branches/AGILITY_DEV/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/storescp/StoreScp.java	2013-05-07 22:00:29 UTC (rev 17778)
@@ -1148,8 +1148,7 @@
         }
     }
 
-    Storage getStorage(Association assoc) throws RemoteException,
-    CreateException, HomeFactoryException {
+    protected Storage getStorage(Association assoc) throws RemoteException, CreateException, HomeFactoryException {
         Storage store = (Storage) assoc.getProperty(StorageHome.JNDI_NAME);
         if (store == null) {
             store = service.getStorage();

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

Revision: 17777
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17777&view=rev
Author:   javawilli
Date:     2013-05-07 13:37:53 +0000 (Tue, 07 May 2013)
Log Message:
-----------
[#DCMEE-1963] Add DEBUG logging of HL7 ACK response.

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/HL7ServerService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/HL7ServerService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/HL7ServerService.java	2013-05-07 08:42:35 UTC (rev 17776)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/HL7ServerService.java	2013-05-07 13:37:53 UTC (rev 17777)
@@ -406,6 +406,11 @@
                 t.setParameter("TextMessage", msg == null ? "Exception:"+hl7ex.getCause() : msg );
             }
             t.transform(new DocumentSource(document), new SAXResult(hl7out));
+            if (log.isDebugEnabled()) {
+                StringWriter out = new StringWriter(200);
+                t.transform(new DocumentSource(document), new StreamResult(out));
+                log.debug("Sent HL7 acknowledge:"+out.toString());
+            }
         } catch (Exception e) {
             log.error("Failed to acknowlege message", e);
         }

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

Revision: 17776
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17776&view=rev
Author:   javawilli
Date:     2013-05-07 08:42:35 +0000 (Tue, 07 May 2013)
Log Message:
-----------
Add license text

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common/ActionOrder.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common/ActionOrder.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common/ActionOrder.java	2013-05-07 07:55:48 UTC (rev 17775)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb/src/java/org/dcm4chex/archive/common/ActionOrder.java	2013-05-07 08:42:35 UTC (rev 17776)
@@ -1,3 +1,40 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is part of dcm4che, an implementation of DICOM(TM) in
+ * Java(TM), available at http://sourceforge.net/projects/dcm4che.
+ *
+ * The Initial Developer of the Original Code is
+ * Agfa HealthCare.
+ * Portions created by the Initial Developer are Copyright (C) 2006-2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * See listed authors below.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 package org.dcm4chex.archive.common;
 
 /**

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

Revision: 17775
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17775&view=rev
Author:   javawilli
Date:     2013-05-07 07:55:48 +0000 (Tue, 07 May 2013)
Log Message:
-----------
[#DCMEE-1956] Order Update is not performed together with status update according to RAD TF, vol 2 ch. 4.13.4.2.1

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/etc/conf/xmdesc/dcm4chee-hl7orm-xmbean.xml
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORMService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/etc/conf/xmdesc/dcm4chee-hl7orm-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/etc/conf/xmdesc/dcm4chee-hl7orm-xmbean.xml	2013-05-06 12:53:48 UTC (rev 17774)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/etc/conf/xmdesc/dcm4chee-hl7orm-xmbean.xml	2013-05-07 07:55:48 UTC (rev 17775)
@@ -44,6 +44,7 @@
       entry = orderContol [ '(' orderStatus ')' ] ':' operation<br/>
       operation = 'NW' (* create worklist item(s) *)<br/>
           | 'XO' (* update worklist item(s) *)<br/>
+          | 'XO(' ('SCHEDULED' | 'COMPLETED') ')' (* update worklist item(s) and set status *)<br/>
           | 'CA' (* remove worklist item(s) *)<br/>
           | 'SC(' ('SCHEDULED' | 'ARRIVED' | 'READY' | 'STARTED' | 'COMPLETED' | 'DISCONTINUED') ')' (* update status of worklist item(s) *)<br/>
           | 'NOOP' (* no operation *)</p>
@@ -55,6 +56,8 @@
          <value value="
          NW:NW
          XO:XO
+         XO(SC):XO(SCHEDULED)
+		 XO(CM):XO(COMPLETED)
          CA:CA
          OC:CA
          DC:SC(DISCONTINUED)

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORMService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORMService.java	2013-05-06 12:53:48 UTC (rev 17774)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-hl7/src/java/org/dcm4chex/archive/hl7/ORMService.java	2013-05-07 07:55:48 UTC (rev 17775)
@@ -84,7 +84,7 @@
     private TemplatesDelegate aeTemplates = new TemplatesDelegate(this);
     private static final String MWL2STORE_XSL = "mwl-cfindrsp2cstorerq.xsl";
 
-    private static final String[] OP_CODES = { "NW", "XO", "CA", "NOOP",
+    private static final String[] OP_CODES = { "NW", "XO", "XO(SCHEDULED)", "XO(COMPLETED)", "CA", "NOOP",
         "SC(SCHEDULED)", "SC(ARRIVED)", "SC(READY)", "SC(STARTED)",
         "SC(COMPLETED)", "SC(DISCONTINUED)" };
     
@@ -93,12 +93,14 @@
     private static final int NW = 0;
 
     private static final int XO = 1;
+    private static final int XO_SC = 2;
+    private static final int XO_CM = 3;
 
-    private static final int CA = 2;
+    private static final int CA = 4;
 
-    private static final int NOOP = 3;
+    private static final int NOOP = 5;
     
-    private static final int SC_OFF = 4;
+    private static final int SC_OFF = 6;
 
     private List<String> orderControls;
     
@@ -250,14 +252,23 @@
                 sps = spsSq.getItem(i);
                 ds.putSQ(Tags.SPSSeq).addItem(sps);
                 adjustAttributes(ds);
+                String status = null;
                 opIdx = op.length == 1 ? 0 : i;
                 switch (op[opIdx]) {
                 case NW:
                 	processNW(ds, mwlManager);
                     break;
                 case XO:
-                	processXO(ds, mwlManager);
-                	break;
+                    processXO(ds, mwlManager);
+                    break;
+                case XO_SC:
+                    processXO(ds, mwlManager);
+                    status = SPSStatus.toString(SPSStatus.SCHEDULED);
+                    break;
+                case XO_CM:
+                    processXO(ds, mwlManager);
+                    status = SPSStatus.toString(SPSStatus.COMPLETED);
+                    break;
                 case CA:
                 	processCA(ds, mwlManager);
                 	break;
@@ -265,10 +276,13 @@
                     log("NOOP", ds);
                     break;
                 default:
-                    sps.putCS(Tags.SPSStatus, SPSStatus.toString(op[opIdx]-SC_OFF));
-                    updateSPSStatus(ds, mwlManager, createMissingOrderOnStatusChange);
+                    status = SPSStatus.toString(op[opIdx]-SC_OFF);
                     break;
                 }
+                if (status != null) {
+                    sps.putCS(Tags.SPSStatus, status);
+                    updateSPSStatus(ds, mwlManager, createMissingOrderOnStatusChange);
+                }
             }
         } catch (HL7Exception e) {
             throw e;

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

Revision: 17774
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17774&view=rev
Author:   javawilli
Date:     2013-05-06 12:53:48 +0000 (Mon, 06 May 2013)
Log Message:
-----------
[#DCMEE-1945] showDeleterCriteria method output in FSGroup Output cannot handle string array DeleteStudyOnlyIfCopyOnFileSystemOfFileSystemGroup

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java	2013-05-03 17:09:29 UTC (rev 17773)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java	2013-05-06 12:53:48 UTC (rev 17774)
@@ -561,7 +561,7 @@
         if (externalRetrievable)
             sb.append("\n  ").append(++i).append(") External Retrievable");
         if (copyOnFSGroup != null)
-            sb.append("\n  ").append(++i).append(") Copy on Filesystem Group "+copyOnFSGroup);
+            sb.append("\n  ").append(++i).append(") Copy on Filesystem Group "+StringUtils.toString(copyOnFSGroup,','));
         if (copyArchived)
             sb.append("\n  ").append(++i).append(") Copy must be archived");
         if (copyOnReadOnlyFS)

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

Revision: 17761
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17761&view=rev
Author:   waveform
Date:     2013-04-23 22:44:37 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
[#DCMEE-1958] Widen access to ContentEditServices' lookupX methods

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java

Property Changed:
----------------
    dcm4chee/dcm4chee-arc/branches/20110113_AG/
    dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/


Property changes on: dcm4chee/dcm4chee-arc/branches/20110113_AG
___________________________________________________________________
Modified: svn:mergeinfo
   - /dcm4chee/dcm4chee-arc/trunk:16914,17417,17460,17462,17595,17641-17642,17644,17651,17742,17745,17754
   + /dcm4chee/dcm4chee-arc/trunk:16914,17417,17460,17462,17595,17641-17642,17644,17651,17742,17745,17754,17760


Property changes on: dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar
___________________________________________________________________
Modified: svn:mergeinfo
   - /dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar:14795,14812-14813,16551,16751,16848,16914,17193,17460,17575,17578,17595,17641-17642,17651,17742,17745,17754
   + /dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar:14795,14812-14813,16551,16751,16848,16914,17193,17460,17575,17578,17595,17641-17642,17651,17742,17745,17754,17760

Modified: dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java	2013-04-23 22:39:39 UTC (rev 17760)
+++ dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java	2013-04-23 22:44:37 UTC (rev 17761)
@@ -747,8 +747,7 @@
         lookupPrivateManager().deletePrivatePatient(patPk);
     }
 
-    public void deleteStudy(long studyPk) throws RemoteException,
-    HomeFactoryException, CreateException, FinderException {
+    public void deleteStudy(long studyPk) throws Exception {
         if (log.isDebugEnabled())
             log.debug("delete Study from trash. pk:" + studyPk);
         lookupPrivateManager().deletePrivateStudy(studyPk);
@@ -856,7 +855,7 @@
         this.sendSeriesUpdatedNotifications(dsStdyMgt, "Move instances");
     }
 
-    private ContentEdit lookupContentEdit() throws HomeFactoryException,
+    protected ContentEdit lookupContentEdit() throws HomeFactoryException,
     RemoteException, CreateException {
         if (contentEdit != null)
             return contentEdit;
@@ -866,7 +865,7 @@
         return contentEdit;
     }
 
-    private ContentManager lookupContentManager() throws HomeFactoryException,
+    protected ContentManager lookupContentManager() throws HomeFactoryException,
     RemoteException, CreateException {
         if (contentMgr != null)
             return contentMgr;
@@ -877,7 +876,7 @@
         return contentMgr;
     }
 
-    private PrivateManager lookupPrivateManager() throws HomeFactoryException,
+    protected PrivateManager lookupPrivateManager() throws HomeFactoryException,
     RemoteException, CreateException {
         if (privateMgr != null)
             return privateMgr;

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

Revision: 17772
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17772&view=rev
Author:   nroduit
Date:     2013-05-03 09:10:31 +0000 (Fri, 03 May 2013)
Log Message:
-----------
Allow multiple UIDs

Modified Paths:
--------------
    weasis/weasis_dcm4chee/trunk/3.0.0/pom.xml
    weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/BuildManifest.java
    weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/WeasisLauncher.java

Modified: weasis/weasis_dcm4chee/trunk/3.0.0/pom.xml
===================================================================
--- weasis/weasis_dcm4chee/trunk/3.0.0/pom.xml	2013-04-29 16:14:03 UTC (rev 17771)
+++ weasis/weasis_dcm4chee/trunk/3.0.0/pom.xml	2013-05-03 09:10:31 UTC (rev 17772)
@@ -66,7 +66,7 @@
 		<dependency>
 			<groupId>org.weasis</groupId>
 			<artifactId>weasis-dicom-operations</artifactId>
-			<version>0.7.2</version>
+			<version>0.7.4-SNAPSHOT</version>
 			<classifier>lite</classifier>
 			<exclusions>
 				<exclusion>

Modified: weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/BuildManifest.java
===================================================================
--- weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/BuildManifest.java	2013-04-29 16:14:03 UTC (rev 17771)
+++ weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/BuildManifest.java	2013-05-03 09:10:31 UTC (rev 17772)
@@ -27,12 +27,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.weasis.dicom.BuildManifestDcmQR;
 import org.weasis.dicom.DicomNode;
-import org.weasis.dicom.util.EncryptUtils;
 import org.weasis.launcher.wado.Patient;
-import org.weasis.launcher.wado.Series;
-import org.weasis.launcher.wado.Study;
 import org.weasis.launcher.wado.WadoParameters;
 import org.weasis.launcher.wado.WadoQuery;
 import org.weasis.launcher.wado.WadoQueryException;
@@ -128,7 +124,7 @@
             DicomNode dicomSource = new DicomNode(pacsAET, pacsHost, pacsPort);
             String componentAET = dynamicProps.getProperty("aet", "WEASIS");
             boolean acceptNoImage = Boolean.valueOf(dynamicProps.getProperty("accept.noimage"));
-            List<Patient> patients = getPatientList(request, dicomSource, componentAET);
+            List<Patient> patients = WeasisLauncher.getPatientList(request, dicomSource, componentAET);
 
             if ((patients == null || patients.size() < 1) && !acceptNoImage) {
                 logger.warn("No data has been found!");
@@ -239,104 +235,4 @@
         logger.debug("logRequestInfo(HttpServletRequest) - getServletPath : {}", request.getServletPath());
     }
 
-    private List<Patient> getPatientList(HttpServletRequest request, DicomNode dicomSource, String componentAET) {
-        String pat = request.getParameter(PatientID);
-        String stu = request.getParameter(StudyUID);
-        String anb = request.getParameter(AccessionNumber);
-        String ser = request.getParameter(SeriesUID);
-        String obj = request.getParameter(ObjectUID);
-        List<Patient> patients = null;
-        try {
-            String key = WeasisLauncher.pacsProperties.getProperty("encrypt.key", null);
-
-            if (obj != null && isRequestIDAllowed(ObjectUID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromSopInstanceUID(dicomSource, componentAET, decrypt(obj, key, ObjectUID));
-                if (!isValidateAllIDs(ObjectUID, patients, request)) {
-                    return null;
-                }
-            } else if (ser != null && isRequestIDAllowed(SeriesUID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromSeriesInstanceUID(dicomSource, componentAET,
-                        decrypt(ser, key, SeriesUID));
-                if (!isValidateAllIDs(SeriesUID, patients, request)) {
-                    return null;
-                }
-            } else if (anb != null && isRequestIDAllowed(AccessionNumber)) {
-                patients =
-                    BuildManifestDcmQR.buildFromStudyAccessionNumber(dicomSource, componentAET,
-                        decrypt(anb, key, AccessionNumber));
-                if (!isValidateAllIDs(AccessionNumber, patients, request)) {
-                    return null;
-                }
-            } else if (stu != null && isRequestIDAllowed(StudyUID)) {
-                patients =
-                    BuildManifestDcmQR
-                        .buildFromStudyInstanceUID(dicomSource, componentAET, decrypt(stu, key, StudyUID));
-                if (!isValidateAllIDs(StudyUID, patients, request)) {
-                    return null;
-                }
-            } else if (pat != null && isRequestIDAllowed(PatientID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromPatientID(dicomSource, componentAET, decrypt(pat, key, PatientID));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return patients;
-    }
-
-    private String decrypt(String message, String key, String level) {
-        if (key != null) {
-            String decrypt = EncryptUtils.decrypt(message, key);
-            logger.debug("Decrypt {}: {} to {}", new Object[] { level, message, decrypt });
-            return decrypt;
-        }
-        return message;
-    }
-
-    private boolean isRequestIDAllowed(String id) {
-        if (id != null) {
-            return Boolean.valueOf(WeasisLauncher.pacsProperties.getProperty(id));
-        }
-        return false;
-    }
-
-    private boolean isValidateAllIDs(String id, List<Patient> patients, HttpServletRequest request) {
-        if (id != null && patients != null && patients.size() == 1) {
-            Patient patient = patients.get(0);
-            String ids = WeasisLauncher.pacsProperties.getProperty("request." + id);
-            if (ids != null) {
-                for (String val : ids.split(",")) {
-                    if (val.trim().equals(PatientID)) {
-                        if (!patient.getPatientID().equals(request.getParameter(PatientID))) {
-                            return false;
-                        }
-                    } else if (val.trim().equals(StudyUID)) {
-                        for (Study study : patient.getStudies()) {
-                            if (!study.getStudyID().equals(request.getParameter(StudyUID))) {
-                                return false;
-                            }
-                        }
-                    } else if (val.trim().equals(AccessionNumber)) {
-                        for (Study study : patient.getStudies()) {
-                            if (!study.getAccessionNumber().equals(request.getParameter(AccessionNumber))) {
-                                return false;
-                            }
-                        }
-                    } else if (val.trim().equals(SeriesUID)) {
-                        for (Study study : patient.getStudies()) {
-                            for (Series series : study.getSeriesList()) {
-                                if (!series.getSeriesInstanceUID().equals(request.getParameter(SeriesUID))) {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
 }

Modified: weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/WeasisLauncher.java
===================================================================
--- weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/WeasisLauncher.java	2013-04-29 16:14:03 UTC (rev 17771)
+++ weasis/weasis_dcm4chee/trunk/3.0.0/src/main/java/org/weasis/servlet/WeasisLauncher.java	2013-05-03 09:10:31 UTC (rev 17772)
@@ -17,6 +17,7 @@
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
@@ -301,55 +302,136 @@
         logger.debug("logRequestInfo(HttpServletRequest) - getServletPath : {}", request.getServletPath());
     }
 
-    private List<Patient> getPatientList(HttpServletRequest request, DicomNode dicomSource, String componentAET) {
-        String pat = request.getParameter(PatientID);
-        String stu = request.getParameter(StudyUID);
-        String anb = request.getParameter(AccessionNumber);
-        String ser = request.getParameter(SeriesUID);
-        String obj = request.getParameter(ObjectUID);
-        List<Patient> patients = null;
+    static List<Patient> getPatientList(HttpServletRequest request, DicomNode dicomSource, String componentAET) {
+        String[] pat = request.getParameterValues(PatientID);
+        String[] stu = request.getParameterValues(StudyUID);
+        String[] anb = request.getParameterValues(AccessionNumber);
+        String[] ser = request.getParameterValues(SeriesUID);
+        String[] obj = request.getParameterValues(ObjectUID);
+
+        final List<Patient> patientList = new ArrayList<Patient>();
         try {
-            String key = pacsProperties.getProperty("encrypt.key", null);
+            String key = WeasisLauncher.pacsProperties.getProperty("encrypt.key", null);
 
-            if (obj != null && isRequestIDAllowed(ObjectUID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromSopInstanceUID(dicomSource, componentAET, decrypt(obj, key, ObjectUID));
-                if (!isValidateAllIDs(ObjectUID, patients, request)) {
+            if (obj != null && obj.length > 0 && isRequestIDAllowed(ObjectUID)) {
+                for (String id : obj) {
+                    BuildManifestDcmQR.buildFromSopInstanceUID(patientList, dicomSource, componentAET,
+                        decrypt(id, key, ObjectUID));
+                }
+                if (!isValidateAllIDs(ObjectUID, key, patientList, pat, stu, anb, ser)) {
                     return null;
                 }
-            } else if (ser != null && isRequestIDAllowed(SeriesUID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromSeriesInstanceUID(dicomSource, componentAET,
-                        decrypt(ser, key, SeriesUID));
-                if (!isValidateAllIDs(SeriesUID, patients, request)) {
+            } else if (ser != null && ser.length > 0 && isRequestIDAllowed(SeriesUID)) {
+                for (String id : ser) {
+                    BuildManifestDcmQR.buildFromSeriesInstanceUID(patientList, dicomSource, componentAET,
+                        decrypt(id, key, SeriesUID));
+                }
+                if (!isValidateAllIDs(SeriesUID, key, patientList, pat, stu, anb, null)) {
                     return null;
                 }
-            } else if (anb != null && isRequestIDAllowed(AccessionNumber)) {
-                patients =
-                    BuildManifestDcmQR.buildFromStudyAccessionNumber(dicomSource, componentAET,
-                        decrypt(anb, key, AccessionNumber));
-                if (!isValidateAllIDs(AccessionNumber, patients, request)) {
+            } else if (anb != null && anb.length > 0 && isRequestIDAllowed(AccessionNumber)) {
+                for (String id : anb) {
+                    BuildManifestDcmQR.buildFromStudyAccessionNumber(patientList, dicomSource, componentAET,
+                        decrypt(id, key, AccessionNumber));
+                }
+                if (!isValidateAllIDs(AccessionNumber, key, patientList, pat, null, null, null)) {
                     return null;
                 }
-            } else if (stu != null && isRequestIDAllowed(StudyUID)) {
-                patients =
-                    BuildManifestDcmQR
-                        .buildFromStudyInstanceUID(dicomSource, componentAET, decrypt(stu, key, StudyUID));
-                if (!isValidateAllIDs(StudyUID, patients, request)) {
+            } else if (stu != null && stu.length > 0 && isRequestIDAllowed(StudyUID)) {
+                for (String id : stu) {
+                    BuildManifestDcmQR.buildFromStudyInstanceUID(patientList, dicomSource, componentAET,
+                        decrypt(id, key, StudyUID));
+                }
+                if (!isValidateAllIDs(StudyUID, key, patientList, pat, null, null, null)) {
                     return null;
                 }
-            } else if (pat != null && isRequestIDAllowed(PatientID)) {
-                patients =
-                    BuildManifestDcmQR.buildFromPatientID(dicomSource, componentAET, decrypt(pat, key, PatientID));
+            } else if (pat != null && pat.length > 0 && isRequestIDAllowed(PatientID)) {
+                for (String id : pat) {
+                    BuildManifestDcmQR.buildFromPatientID(patientList, dicomSource, componentAET,
+                        decrypt(id, key, PatientID));
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
 
-        return patients;
+        return patientList;
     }
 
-    private String decrypt(String message, String key, String level) {
+    private static boolean isValidateAllIDs(String id, String key, List<Patient> patientList, String[] pat,
+        String[] stu, String[] anb, String[] ser) {
+        if (id != null && patientList != null && patientList.size() > 0) {
+            String ids = pacsProperties.getProperty("request." + id);
+            if (ids != null) {
+                for (String val : ids.split(",")) {
+                    if (val.trim().equals(PatientID)) {
+                        if (pat == null) {
+                            return false;
+                        }
+                        List<String> list = new ArrayList<String>(pat.length);
+                        for (String s : pat) {
+                            list.add(decrypt(s, key, PatientID));
+                        }
+                        for (Patient p : patientList) {
+                            if (!list.contains(p.getPatientID())) {
+                                return false;
+                            }
+                        }
+                    } else if (val.trim().equals(StudyUID)) {
+                        if (stu == null) {
+                            return false;
+                        }
+                        List<String> list = new ArrayList<String>(stu.length);
+                        for (String s : stu) {
+                            list.add(decrypt(s, key, StudyUID));
+                        }
+                        for (Patient p : patientList) {
+                            for (Study study : p.getStudies()) {
+                                if (!list.contains(study.getStudyID())) {
+                                    return false;
+                                }
+                            }
+                        }
+                    } else if (val.trim().equals(AccessionNumber)) {
+                        if (anb == null) {
+                            return false;
+                        }
+                        List<String> list = new ArrayList<String>(anb.length);
+                        for (String s : anb) {
+                            list.add(decrypt(s, key, AccessionNumber));
+                        }
+                        for (Patient p : patientList) {
+                            for (Study study : p.getStudies()) {
+                                if (!list.contains(study.getAccessionNumber())) {
+                                    return false;
+                                }
+                            }
+                        }
+                    } else if (val.trim().equals(SeriesUID)) {
+                        if (ser == null) {
+                            return false;
+                        }
+                        List<String> list = new ArrayList<String>(ser.length);
+                        for (String s : ser) {
+                            list.add(decrypt(s, key, SeriesUID));
+                        }
+                        for (Patient p : patientList) {
+                            for (Study study : p.getStudies()) {
+                                for (Series series : study.getSeriesList()) {
+                                    if (!list.contains(series.getSeriesInstanceUID())) {
+                                        return false;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    static String decrypt(String message, String key, String level) {
         if (key != null) {
             String decrypt = EncryptUtils.decrypt(message, key);
             logger.debug("Decrypt {}: {} to {}", new Object[] { level, message, decrypt });
@@ -358,14 +440,14 @@
         return message;
     }
 
-    private boolean isRequestIDAllowed(String id) {
+    private static boolean isRequestIDAllowed(String id) {
         if (id != null) {
             return Boolean.valueOf(pacsProperties.getProperty(id));
         }
         return false;
     }
 
-    private boolean isValidateAllIDs(String id, List<Patient> patients, HttpServletRequest request) {
+    static boolean isValidateAllIDs(String id, List<Patient> patients, HttpServletRequest request) {
         if (id != null && patients != null && patients.size() == 1) {
             Patient patient = patients.get(0);
             String ids = pacsProperties.getProperty("request." + id);

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

Revision: 17771
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17771&view=rev
Author:   laura_peters
Date:     2013-04-29 16:14:03 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[DCM-562][DCM-563] Porting fixes from trunk to branch:
Applying an inverting presentation lut to an image with pixel padding inverts the padding to white." 
Another array out of bounds exception caused by using a "black" pixel value which is too big for inverse (Monochrome1) images with pixel padding and inverting them.
Pixel padding with non-1 slope can go white

Modified Paths:
--------------
    dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java
    dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java

Modified: dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java
===================================================================
--- dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java	2013-04-29 09:01:18 UTC (rev 17770)
+++ dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java	2013-04-29 16:14:03 UTC (rev 17771)
@@ -760,14 +760,15 @@
             int outBits, float slope, float intercept, DicomObject voiLut,
             boolean inverse, short[] pval2out, Integer pixelPaddingValue,
             Integer pixelPaddingRange) {
+        boolean padInvert = (pval2out!=null && pval2out[0] < pval2out[pval2out.length-1]);
         return createLut(inBits, signed, slope, intercept, voiLut,
-                pixelPaddingValue, pixelPaddingRange, inverse).scale(outBits, inverse,
+                pixelPaddingValue, pixelPaddingRange, inverse, padInvert).scale(outBits, inverse,
                 pval2out);
     }
 
     private static LookupTable createLut(int inBits, boolean signed,
             float slope, float intercept, DicomObject voiLut,
-            Integer pixelPaddingValue, Integer pixelPaddingRange, boolean inverse) {
+            Integer pixelPaddingValue, Integer pixelPaddingRange, boolean inverse, boolean padInvert) {
         log.debug("Creating slope/intercept LUT with V-LUT " + slope + "/" + intercept);
         if (slope == 1) {
             LookupTable lut = createLut(inBits, signed, voiLut,
@@ -801,7 +802,8 @@
         
         GenericNumericArray dataArray = GenericNumericArray.create(data);
         Integer[] minMaxPixelPadding = getMinMaxPixelPadding(pixelPaddingValue, pixelPaddingRange);
-        applyPixelPadding(dataArray, 0, minMaxPixelPadding[0], minMaxPixelPadding[1], off);
+        int padVal = (inverse ^ padInvert) ? ((1 << 16) -1) : 0;
+        applyPixelPadding(dataArray, padVal, minMaxPixelPadding[0], minMaxPixelPadding[1], off);
         
         return new ShortLookupTable(inBits, signed, off, vlut.outBits, 
                 (short[]) dataArray.getArray());
@@ -992,8 +994,9 @@
             int outBits, float slope, float intercept, DicomObject voiLut,
             DicomObject pLut, boolean inverse, short[] pval2out,
             Integer pixelPaddingValue, Integer pixelPaddingRange) {
+        boolean padInvert = (pval2out!=null && pval2out[0] < pval2out[pval2out.length-1]);
         LookupTable vlut = createLut(inBits, signed, slope, intercept, voiLut,
-                pixelPaddingValue, pixelPaddingRange, inverse);
+                pixelPaddingValue, pixelPaddingRange, inverse, padInvert);
         LookupTable plut = createLut(0, false, pLut, null, null, inverse);
         return vlut.combine(plut, outBits, inverse, pval2out);
     }
@@ -1452,7 +1455,12 @@
         }
         if(maxPad-offset+1<0 ) return;
         if( minPad-offset > array.length() ) return;
+        // Make sure overlapping ranges only affect the part actually in the lut.
+        if( minPad-offset < 0 ) minPad = offset;
+        if( maxPad-offset+1 >= array.length() ) maxPad = array.length()+offset-2;
         
+        log.debug("applyPixelPadding padValue="+padValue+" minPad="+minPad+" maxPad="+maxPad+" offset="+offset+" array.length="+array.length());
+        
         array.fillRange(minPad-offset, maxPad-offset+1, padValue);
     }
 

Modified: dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java
===================================================================
--- dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java	2013-04-29 09:01:18 UTC (rev 17770)
+++ dcm4che2/branches/AGILITY_RC/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java	2013-04-29 16:14:03 UTC (rev 17771)
@@ -267,6 +267,9 @@
             if (inverse) {
                 tmp = outMax - tmp;
             }
+            if( tmp<0 ) {
+                tmp=0;
+            }
             if (pval2out != null) {
                 tmp = (pval2out[tmp] & 0xffff) >>> pval2outShift;
             }

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

Revision: 17770
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17770&view=rev
Author:   awsjn
Date:     2013-04-29 09:01:18 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[#WEB-944] Teaching-Files: Support searching by creation-date interval 

Modified Paths:
--------------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilter.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterKey.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterValue.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCUtilities.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/widgets/TCAjaxComboBox.java
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCPanel.html
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCSearchPanel.html
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/css/tc-layout.css
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/tc-jquery-ui.js
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package.properties
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_de.properties
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_ja.properties

Added Paths:
-----------
    dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/jquery-ui-datepicker-de.js

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilter.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilter.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilter.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -39,6 +39,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -139,6 +140,30 @@
                 diagnosisConfirmed != null ? TCQueryFilterValue
                         .create(diagnosisConfirmed) : null);
     }
+    
+    public Date getCreationDateFrom() {
+    	Object[] dates = getValues(TCQueryFilterKey.CreationDate);
+    	if (dates!=null && dates.length>0) {
+    		return (Date) dates[0];
+    	}
+    	return null;
+    }
+    
+    public Date getCreationDateUntil() {
+    	Object[] dates = getValues(TCQueryFilterKey.CreationDate);
+    	if (dates!=null && dates.length>1) {
+    		return (Date) dates[1];
+    	}
+    	return null;
+    }
+    
+    public void setCreationDate(Date fromDate, Date untilDate) {
+    	TCQueryFilterValue<Date> value = null;
+    	if (fromDate!=null || untilDate!=null) {
+    		value = TCQueryFilterValue.create(fromDate, untilDate);
+    	}
+    	putValue(TCQueryFilterKey.CreationDate, value);
+    }
 
     public String getDiscussion() {
         return (String) getValue(TCQueryFilterKey.Discussion);

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterKey.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterKey.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterKey.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -66,12 +66,18 @@
             "Patient Age"), PatientSex("AGFAIMPAXEE", "TF102",
             "Patient Sex"), PatientSpecies("AGFAIMPAXEE", "TF103",
             "Patient Species"), BibliographicReference("AGFAIMPAXEE", "TF005",
-            "Bibliographic Reference"), Title("AGFAIMPAXEE", "TF001", "Title");
+            "Bibliographic Reference"), Title("AGFAIMPAXEE", "TF001", "Title"),
+            CreationDate(Tag.ContentDate);
 
     private Code code;
-
+    private int dicomTag;
     private boolean supportsCodeValue;
 
+    private TCQueryFilterKey(int dicomTag) {
+        this.dicomTag = dicomTag;
+        this.supportsCodeValue = false;
+    }
+    
     private TCQueryFilterKey(String designator, String value, String meaning) {
         this(designator, value, meaning, false);
     }
@@ -81,6 +87,10 @@
         this.code = createCode(designator, value, meaning);
         this.supportsCodeValue = supportsCodeValue;
     }
+    
+    public int getDicomTag() {
+    	return dicomTag;
+    }
 
     public Code getCode() {
         return code;

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterValue.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterValue.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/tc/TCQueryFilterValue.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -40,6 +40,8 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
@@ -324,7 +326,64 @@
             }
         };
     }
+    
+    public static TCQueryFilterValue<Date> create(Date from) {
+    	return create(from, null);
+    }
+    
+    @SuppressWarnings("serial")
+	public static TCQueryFilterValue<Date> create(Date from, Date until) {
+    	if (from==null) {
+    		from = new Date(0);
+    	}
+    	if (until==null) {
+    		until = new Date();
+    	}
+    	
+        return new TCQueryFilterValue<Date>(from, until) {
+            @Override
+            public QueryParam[] appendSQLWhereConstraint(TCQueryFilterKey key,
+                    StringBuilder sb, boolean multipleValueORConcat) {
 
+            	Date from = getValues()[0];
+            	Date until = getValues()[1];
+            	
+            	if (from.after(until)) {
+            		Date tmp = from;
+            		from = until;
+            		until = tmp;
+            	}
+            	
+            	Calendar calFrom = Calendar.getInstance();
+            	calFrom.setTime(from);
+                calFrom.set(Calendar.HOUR_OF_DAY, 0);
+                calFrom.set(Calendar.MINUTE, 0);
+                calFrom.set(Calendar.SECOND, 0);
+                calFrom.set(Calendar.MILLISECOND, 0);
+                
+            	Calendar calUntil = Calendar.getInstance();
+            	calUntil.setTime(until);
+                calUntil.set(Calendar.HOUR_OF_DAY, 23);
+                calUntil.set(Calendar.MINUTE, 59);
+                calUntil.set(Calendar.SECOND, 59);
+                calUntil.set(Calendar.MILLISECOND, 999);
+
+                QueryParam fromParam = new QueryParam(
+                		"fromDate", calFrom.getTime());
+                QueryParam untilParam = new QueryParam(
+                		"untilDate", calUntil.getTime());
+                
+                if (key.getDicomTag()==Tag.ContentDate) {
+                	sb.append("(instance.contentDateTime BETWEEN :").append(fromParam.getKey())
+                	.append(" AND :").append(untilParam.getKey()).append(")");
+                	return new QueryParam[] { fromParam, untilParam };
+                }
+            	
+            	return new QueryParam[0];
+            }
+        };
+    }
+
     private static Code createCode(String designator, String value,
             String meaning) {
         DicomObject dataset = new BasicDicomObject();

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCSearchPanel.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -37,7 +37,14 @@
  * ***** END LICENSE BLOCK ***** */
 package org.dcm4chee.web.war.tc;
 
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -47,14 +54,19 @@
 import org.apache.wicket.ajax.IAjaxCallDecorator;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow.WindowClosedCallback;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioGroup;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.Model;
@@ -67,6 +79,7 @@
 import org.dcm4chee.web.dao.tc.TCQueryFilterValue;
 import org.dcm4chee.web.war.common.AutoSelectInputTextBehaviour;
 import org.dcm4chee.web.war.tc.TCUtilities.NullDropDownItem;
+import org.dcm4chee.web.war.tc.widgets.TCAjaxComboBox;
 import org.dcm4chee.web.war.tc.widgets.TCMaskingAjaxDecorator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,6 +92,9 @@
 public abstract class TCSearchPanel extends Panel {
 
     private static final long serialVersionUID = 1L;
+    
+	private static final SimpleDateFormat dfDE = new SimpleDateFormat("dd.MM.yyyy");
+	private static final SimpleDateFormat dfDefault = new SimpleDateFormat("MM/dd/yyyy");
 
     private static final Logger log = LoggerFactory
             .getLogger(TCSearchPanel.class);
@@ -91,11 +107,21 @@
 
     private boolean showAdvancedOptions = false;
 
-    public TCSearchPanel(final String id) {
+    @SuppressWarnings({ "serial" })
+	public TCSearchPanel(final String id) {
         super(id, new Model<TCQueryFilter>(new TCQueryFilter()));
 
         setOutputMarkupId(true);
         
+        final DateSpanSearchItem dateSpanItem = new DateSpanSearchItem();
+        final DateSpanDialog dateSpanDialog = new DateSpanDialog(dateSpanItem);
+        final List<IDateSearchItem> dateItems = new ArrayList<IDateSearchItem>();
+        dateItems.addAll(Arrays.asList(NotOlderThanSearchItem.values()));
+        dateItems.add(dateSpanItem);
+        
+        Form<?> dateSpanDialogOuterForm = new Form<Void>("date-input-dialog-outer-form");
+        dateSpanDialogOuterForm.add(dateSpanDialog);
+        
         final TCInput keywordInput = TCUtilities.createInput(
                 "keywordInput", TCQueryFilterKey.Keyword, getFilterValue(TCQueryFilterKey.Keyword), true);
         final TCInput anatomyInput = TCUtilities.createInput(
@@ -134,7 +160,46 @@
                 new Model<TCQueryFilterValue.YesNo>(),
                 Arrays.asList(TCQueryFilterValue.YesNo.values()), true,
                 "tc.yesno", NullDropDownItem.All);
+		final TCAjaxComboBox<IDateSearchItem> dateBox = new TCAjaxComboBox<IDateSearchItem>(
+        		"dateChoice", dateItems, new IChoiceRenderer<IDateSearchItem>() {
+        			public String getIdValue(IDateSearchItem item, int index) {
+        				return item.getId();
+        			}
+        			public String getDisplayValue(IDateSearchItem item) {
+        				return item.getLabel(getSession().getLocale());
+        			}
+        		}) {
+        	@Override
+        	protected IDateSearchItem convertValue(String svalue) {
+        		if (TCUtilities.equals(dateSpanItem.getLabel(getSession().getLocale()),svalue)) {
+        			return dateSpanItem;
+        		}
+        		else {
+        			return NotOlderThanSearchItem.valueForLabel(
+        					svalue, getSession().getLocale());
+        		}
+        	}
+        	@Override
+        	protected boolean shallCommitValue(IDateSearchItem oldValue, IDateSearchItem newValue, AjaxRequestTarget target) {
+        		if (dateSpanItem==newValue) {
+        			final Component c = this;
+        			dateSpanDialog.setWindowClosedCallback(new WindowClosedCallback() {
+        				@Override
+        				public void onClose(AjaxRequestTarget target) {
+        			        target.appendJavascript(getDateBoxInitUIJavascript(
+        			        		c.getMarkupId(true), dateSpanItem, false));
+        				}
+        			});
+        			dateSpanDialog.show(target);
+            		return true;
+        		}
 
+        		return super.shallCommitValue(oldValue, newValue, target);
+        	}
+        };
+        TCUtilities.addOnDomReadyJavascript(dateBox, getDateBoxInitUIJavascript(
+        		dateBox.getMarkupId(), dateSpanItem, true));
+        
         final RadioGroup<Option> optionGroup = new RadioGroup<Option>(
                 "optionGroup", new Model<Option>());
         optionGroup.add(new Radio<Option>("historyOption", new Model<Option>(
@@ -191,6 +256,15 @@
 	                    filter.setLevel(levelChoice.getModelObject());
 	                    filter.setDiagnosisConfirmed(diagnosisConfirmedChoice
 	                            .getModelObject());
+	                    
+	                    IDateSearchItem dateItem = dateBox.getModelObject();
+	                    if (dateItem==null) {
+	                    	filter.setCreationDate(null, null);
+	                    }
+	                    else {
+	                    	filter.setCreationDate(dateItem.getFromDate(), 
+	                    			dateItem.getUntilDate());
+	                    }
 	
 	                    Option selectedOption = optionGroup.getModelObject();
 	                    if (selectedOption != null) {
@@ -233,12 +307,6 @@
                 } catch (Throwable t) {
                     log.error("Searching for teaching-files failed!", t);
                 }
-                
-                if (target!=null)
-                {
-                	target.addComponent(form);
-                	target.appendJavascript("initUI($('#" + TCSearchPanel.this.getMarkupId(true) + "'));");
-                }
             }
 
             @Override
@@ -286,6 +354,7 @@
                 patientSexChoice.setModelObject(null);
                 categoryChoice.setModelObject(null);
                 diagnosisConfirmedChoice.setModelObject(null);
+                dateBox.setModelObject(null);
                 textText.setModelObject(null);
                 optionGroup.setModelObject(null);
 
@@ -320,6 +389,7 @@
         wmc.add(categoryChoice);
         wmc.add(levelChoice);
         wmc.add(diagnosisConfirmedChoice);
+        wmc.add(dateBox);
         wmc.add(optionGroup);
         wmc.add(textText);
         wmc.add(resetBtn);
@@ -372,6 +442,7 @@
 
         form.add(advancedOptionsToggleLink);
 
+        add(dateSpanDialogOuterForm);
         add(form);
 
         add(new AjaxFallbackLink<Object>("searchToggle") {
@@ -425,4 +496,265 @@
         TCQueryFilter filter = (TCQueryFilter) getDefaultModelObject();
         return filter != null ? filter.getValue(key) : null;
     }
+    
+	private String getDateBoxInitUIJavascript(String markupId, DateSpanSearchItem dateSpanItem, boolean initUI) {
+		StringBuilder js = new StringBuilder();
+		if (initUI) {
+			js.append("$('#").append(markupId).append("').combobox();");
+		}
+        js.append("if ($('#").append(markupId).append(" option:selected').text()==='").append(
+        		dateSpanItem.getLabel(getSession().getLocale())).append("') {");
+        js.append("$('#").append(markupId).append("').siblings('span').children('input').val('").append(
+        		dateSpanItem.getFromUntilString(getSession().getLocale())).append("');");
+        js.append("};");
+        return js.toString();
+	}
+    
+    public static interface IDateSearchItem extends Serializable {
+    	String getId();
+    	String getLabel(Locale locale);
+    	Date getFromDate();
+    	Date getUntilDate();
+    }
+    
+    public static enum NotOlderThanSearchItem implements IDateSearchItem {
+    	DAYS7(Calendar.DATE,-7), DAYS14(Calendar.DATE,-14), 
+    	MONTHS1(Calendar.MONTH,-1), MONTHS3(Calendar.MONTH,-3), MONTHS6(Calendar.MONTH,-6),
+    	YEARS1(Calendar.YEAR,-1), YEARS5(Calendar.YEAR,-5), YEARS10(Calendar.YEAR,-10);
+    	private static final transient Date now = new Date();
+    	private transient Calendar cal = Calendar.getInstance();
+    	private int calField;
+    	private int amount;
+    	private NotOlderThanSearchItem(int calField, int amount) {
+    		this.calField = calField;
+    		this.amount = amount;
+    	}
+    	public static NotOlderThanSearchItem valueForLabel(String label, Locale locale) {
+    		for (NotOlderThanSearchItem item : values()) {
+    			if (item.getLabel(locale).equals(label)) {
+    				return item;
+    			}
+    		}
+    		return null;
+    	}
+    	@Override
+    	public String getId() {
+    		return name();
+    	}
+    	@Override
+    	public String getLabel(Locale locale) {
+    		return toString();
+    	}
+    	@Override
+    	public Date getFromDate() {
+    		cal.setTime(now);
+    		cal.add(calField, amount);
+    		return cal.getTime();
+    	}
+    	@Override
+    	public Date getUntilDate() {
+    		return now;
+    	}
+    	@Override
+    	public String toString() {
+    		return TCUtilities.getLocalizedString("tc.search."+name().toLowerCase()+".text");
+    	}
+    }
+    
+    @SuppressWarnings("serial")
+	public static class DateSpanSearchItem implements IDateSearchItem {
+    	public static final String ID = "USER_DEFINED";
+    	private Date now = new Date();
+    	private Date fromDate = now;
+    	private Date untilDate = now;
+    	@Override
+    	public Date getFromDate() {
+    		return fromDate;
+    	}
+    	@Override
+    	public Date getUntilDate() {
+    		return untilDate;
+    	}
+    	@Override
+    	public String getId() {
+    		return ID;
+    	}
+    	@Override
+    	public String getLabel(Locale locale) {
+    		return TCUtilities.getLocalizedString("tc.search.datespan.text");
+    	}
+    	public void setFromDate(Date date) {
+    		fromDate = date==null ? now : date;
+    	}
+    	public void setUntilDate(Date date) {
+    		untilDate = date==null ? now : date;
+    	}
+    	public String getFromString(Locale locale) {
+			String lang = locale.getLanguage();
+			if (Locale.GERMAN.getLanguage().equalsIgnoreCase(lang)) {
+	    		return dfDE.format(fromDate);
+			}
+			else {
+	    		return dfDefault.format(fromDate);
+			}
+    	}
+    	public String getUntilString(Locale locale) {
+			String lang = locale.getLanguage();
+			if (Locale.GERMAN.getLanguage().equalsIgnoreCase(lang)) {
+	    		return dfDE.format(untilDate);
+			}
+			else {
+	    		return dfDefault.format(untilDate);
+			}
+    	}
+    	public String getFromUntilString(Locale locale) {
+			StringBuilder s = new StringBuilder();
+			s.append(getFromString(locale));
+			s.append("-");
+			s.append(getUntilString(locale));
+    		return s.toString();
+    	}
+    	@Override
+    	public String toString() {
+    		return getId();
+    	}
+    }
+    
+    
+    @SuppressWarnings("serial")
+	private class DateSpanDialog extends ModalWindow {
+    	private DateSpanSearchItem item;
+    	private DateSpanContentFragment fragment;
+    	public DateSpanDialog(DateSpanSearchItem item)
+    	{
+    		super("date-input-dialog");
+    		this.item = item;
+    		setTitle(TCUtilities.getLocalizedString(
+    				"tc.search.datespan.dialog.title"));
+    		setInitialHeight(140);
+    		setInitialWidth(350);
+    		setContent(fragment = 
+    				new DateSpanContentFragment(getContentId()));
+    	}
+    	
+    	@Override
+    	public void close(AjaxRequestTarget target) {
+			item.setFromDate(fragment.getFromDate());
+			item.setUntilDate(fragment.getUntilDate());
+			super.close(target);
+    	}
+
+    	private class DateSpanContentFragment extends Fragment
+    	{
+    		private Model<String> fromModel = new Model<String>(
+    				item.getFromString(getSession().getLocale()));
+    		private Model<String> untilModel = new Model<String>(
+    				item.getUntilString(getSession().getLocale()));
+    		
+			public DateSpanContentFragment(final String id)
+    		{
+    			super(id, "date-input-dialog-content", TCSearchPanel.this);
+    			setOutputMarkupId(true);
+    			
+    			final TextField<String> fromField = new TextField<String>(
+    					"date-input-dialog-from-input", fromModel);
+    			final TextField<String> untilField = new TextField<String>(
+    					"date-input-dialog-until-input", untilModel);
+    			fromField.setOutputMarkupId(true);
+    			untilField.setOutputMarkupId(true);
+    			
+    			Form<Void> form = new Form<Void>("date-input-dialog-inner-form");
+    			form.setOutputMarkupId(true);
+    			form.add(new Label("date-input-dialog-from-label", 
+    					TCUtilities.getLocalizedString("tc.search.fromdate.text")));
+    			form.add(fromField);
+    			form.add(new Label("date-input-dialog-until-label", 
+    					TCUtilities.getLocalizedString("tc.search.untildate.text")));
+    			form.add(untilField);
+    			form.add(new AjaxSubmitLink("date-input-dialog-ok-btn") {
+						@Override
+						public void onSubmit(AjaxRequestTarget target, Form<?> form)
+	    				{
+	    					close(target);
+	    				}
+	    			}
+    				.add(new Label("date-input-dialog-ok-btn-text",
+    						TCUtilities.getLocalizedString("tc.dialog.ok.text")))
+    			);
+    			
+    			add(form);
+    			
+    			TCUtilities.addOnDomReadyJavascript(this, 
+    					getInitDatePickerJavascript(fromField.getMarkupId(true)));
+    			TCUtilities.addOnDomReadyJavascript(this, 
+    					getInitDatePickerJavascript(untilField.getMarkupId(true)));
+    			TCUtilities.addInitUIOnDomReadyJavascript(form);
+    		}
+			
+			public Date getFromDate() {
+				return getDateForDatePickerFormat(fromModel.getObject());
+			}
+			
+			public Date getUntilDate() {
+				return getDateForDatePickerFormat(untilModel.getObject());
+			}
+			
+			private Date getDateForDatePickerFormat(String formattedDate) {
+				try {
+					String lang = getSession().getLocale().getLanguage();
+					if (Locale.GERMAN.getLanguage().equalsIgnoreCase(lang)) {
+						return dfDE.parse(formattedDate);
+					}
+					else {
+						return dfDefault.parse(formattedDate);
+					}
+				}
+				catch (Exception e) {
+					log.error(null, e);
+					return new Date();
+				}
+			}
+			
+			private String getDatePickerFormatOfCurrentLocale() {
+				String lang = getSession().getLocale().getLanguage();
+				if (Locale.GERMAN.getLanguage().equalsIgnoreCase(lang)) {
+					return "dd.mm.yy";
+				}
+				else {
+					return "mm/dd/yy";
+				}
+			}
+			
+			private String getDatePickerRegionOfCurrentLocale() {
+				String lang = getSession().getLocale().getLanguage();
+				if (Locale.GERMAN.getLanguage().equalsIgnoreCase(lang)) {
+					return "de";
+				}
+				else {
+					return "";
+				}
+			}
+			
+			private String getInitDatePickerJavascript(String markupId) {
+    			StringBuilder js = new StringBuilder();
+    			js.append("$('#").append(markupId).append("').datepicker(");
+    			js.append("$.datepicker.regional['");
+    			js.append(getDatePickerRegionOfCurrentLocale()).append("']);");
+    			js.append("$('#").append(markupId).append("').datepicker('option', {");
+    			js.append("showOn: 'button',");
+    			js.append("buttonImageOnly: false,");
+    			js.append("showOtherMonths: true,");
+    			js.append("selectOtherMonths: true,");
+    			js.append("showButtonPanel: true,");
+    			js.append("changeMonth: true,");
+    			js.append("changeYear: true,");
+    			js.append("dateFormat: '").append(getDatePickerFormatOfCurrentLocale()).append("',");
+    			js.append("})");
+    			js.append(".next('button').text('').button({icons:{primary : 'ui-icon-calendar'}, text: false}).addClass('ui-combobox-toggle');");
+    			js.append("$('#").append(markupId).append("').select('.hasDatePicker').removeClass('ui-corner-all').addClass('ui-corner-left');");
+    			js.append("$('#").append(markupId).append("').select('.hasDatePicker').siblings('button').removeClass('ui-corner-all').addClass('ui-corner-right');");
+    			return js.toString();
+			}
+    	}
+    }
 }

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCUtilities.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCUtilities.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/TCUtilities.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -15,7 +15,9 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.IAjaxCallDecorator;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.behavior.AbstractBehavior;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.IHeaderResponse;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.ChoiceRenderer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -475,6 +477,29 @@
     {
     	c.add(new TCToolTipAppender(msgKey));
     }
+	
+	
+	public static void initUI(Component parent, AjaxRequestTarget target) {
+		target.appendJavascript(getInitUIJavascript(parent));
+	}
+	
+	
+	public static void addInitUIOnDomReadyJavascript(Component parent) {
+		addOnDomReadyJavascript(parent, getInitUIJavascript(parent));
+	}
+	
+	
+	@SuppressWarnings("serial")
+	public static void addOnDomReadyJavascript(Component c, final String js) {
+		if (js!=null) {
+			c.add(new AbstractBehavior() {
+				@Override
+				public void renderHead(IHeaderResponse response) {
+					response.renderOnDomReadyJavascript(js);
+				}
+			});
+		}
+	}
     
     
     public static TCPanel findMainPanel(Component c) {
@@ -488,6 +513,20 @@
     }
     
     
+    public static String getInitUIJavascript(Component parent) {
+    	String parentMarkupId = parent!=null && parent.getOutputMarkupId() ? 
+    			parent.getMarkupId(true) : null;
+    	if (parentMarkupId!=null) {
+    		return new StringBuilder().append("initUIByMarkupId('").append(
+    				parentMarkupId).append("');").toString();
+    	}
+    	else {
+    		log.error("Unable to init jquery UI without markup id!");
+    		return null;
+    	}
+    }
+    
+    
     public static interface TCChangeListener<T> extends Serializable
     {
         public void valueChanged(T value);

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/widgets/TCAjaxComboBox.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/widgets/TCAjaxComboBox.java	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/tc/widgets/TCAjaxComboBox.java	2013-04-29 09:01:18 UTC (rev 17770)
@@ -11,6 +11,7 @@
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.dcm4chee.web.war.tc.TCUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,10 +61,25 @@
     	tag.put(CALLBACK_URL_KEY, selectionChangedBehavior.getCallbackUrl());
     	tag.put(INITIAL_VALUE_KEY, getDefaultModelObjectAsString());
     }
+    
+    @Override
+    public void validate() {
+    	/* don't include AJAX based component in default form processing */
+    }
+    
+    @Override
+    public void updateModel() {
+    	/* don't include AJAX based component in default form processing */
+    }
 	
 	protected abstract T convertValue(String value) throws Exception;
 	
+	protected boolean shallCommitValue(T oldValue, T newValue, AjaxRequestTarget target) {
+		 return !TCUtilities.equals(oldValue, newValue);
+	}
+	
     private class SelectionChangedBehavior extends AbstractDefaultAjaxBehavior {
+		@SuppressWarnings("unchecked")
 		@Override
     	public void respond(AjaxRequestTarget target) {
 			try {
@@ -73,8 +89,11 @@
 	    			String valueString2 = new String(valueString.getBytes("ISO-8859-1"),"UTF-8");
 	    			value = convertValue(valueString2);
 	    		}
-	    		setDefaultModelObject(value);
-	    		valueChanged(value);
+
+	    		if (shallCommitValue((T)getDefaultModelObject(), value, target)) {
+	    			setDefaultModelObject(value);
+		    		valueChanged(value);
+	    		}
 			}
 			catch (Exception e) {
 				log.error("Unable to update model: Value conversion failed!", e);

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCPanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCPanel.html	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCPanel.html	2013-04-29 09:01:18 UTC (rev 17770)
@@ -6,6 +6,7 @@
 	    <title>Teaching-Files</title>
 	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/jquery-min.js" type="text/javascript"></script>
 	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/jquery-ui-min.js" type="text/javascript"></script>
+	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/jquery-ui-datepicker-de.js" type="text/javascript"></script>
 	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/jquery-lazyload-min.js" type="text/javascript"></script>
 	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/jquery-dotdotdot-min.js" type="text/javascript"></script>
 	    <script src="resources/org.dcm4chee.web.war.tc.TCPanel/js/tc-jquery-ui.js" type="text/javascript"></script>

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCSearchPanel.html
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCSearchPanel.html	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/TCSearchPanel.html	2013-04-29 09:01:18 UTC (rev 17770)
@@ -5,6 +5,9 @@
 </head>
 <body>
     <wicket:panel>
+    	<form wicket:id="date-input-dialog-outer-form">
+    		<div wicket:id="date-input-dialog"/>
+    	</form>
         <div class="search-area-header ui-widget-header">
             <wicket:message key="tc.search.header.text"/>
             <span class="search-toggle-area">
@@ -17,7 +20,7 @@
 			<div class="keyword-area">
 				<wicket:message key="tc.keyword.text" />
 				<div wicket:id="keywordInput" style="display: inline-block; vertical-align:middle" />
-				<button wicket:id="doSearchBtn" type="submit" class="button" style="height:28px">
+				<button wicket:id="doSearchBtn" type="submit" class="button">
 					<img wicket:id="doSearchImg" alt="Search" /> <span
 						wicket:id="doSearchText" />
 				</button>
@@ -30,7 +33,7 @@
 			</div>
 			<div wicket:id="advancedOptions" class="advanced-options-area">
 			     <table><tr>
-			        <td>
+			        <td valign="top">
 			     	<div class="code-table-area">
 						<table class="code-table">
 							<tr>
@@ -76,7 +79,7 @@
 						</table>
 					</div>
 					</td>
-					<td>
+					<td valign="top">
 					<div class="choice-table-area">
 	                    <table class="choice-table">
 	                        <tr>
@@ -119,11 +122,19 @@
 	                               <select wicket:id="diagnosisConfirmedChoice" class="ui-combobox"/>
 	                            </td>
 	                        </tr>
+	                        <tr>
+	                            <td style="text-align:right">
+	                               <wicket:message key="tc.content.date.text" />
+	                            </td>
+	                            <td style="text-align:left">
+	                               <select wicket:id="dateChoice" class="ui-combobox"/>
+	                            </td>
+	                        </tr>
 	                    </table>
 	                </div>
 	                </td>
-	                <td>
-	                <div class="text-table-area">
+	                <td valign="top">
+	                <div class="text-table-area" style="margin-top:2px;">
                         <div class="free-text-area"> 
                             <wicket:message key="tc.search.freetext.text"/> 
                             <input wicket:id="textText" type="text" class="ui-textfield" 
@@ -188,4 +199,29 @@
 		</form>
 	</wicket:panel> 
 </body>
+<wicket:fragment wicket:id="date-input-dialog-content">
+	<form wicket:id="date-input-dialog-inner-form">
+		<div style="text-align:center; margin:10px">
+			<div style="margin-top:20px;margin-right:30px;">
+				<span wicket:id="date-input-dialog-from-label" style="display:inline-block; width:35px; text-align:left;"/>
+				<span class="ui-combobox-base">
+					<input wicket:id="date-input-dialog-from-input" readonly="readonly" 
+						class="ui-combobox-input-readonly ui-textfield"></input>
+				</span>
+			</div>
+			<div style="margin-top:4px;margin-right:30px;">
+				<span wicket:id="date-input-dialog-until-label" style="display:inline-block; width:35px; text-align:left;"/>
+				<span class="ui-combobox-base">
+					<input wicket:id="date-input-dialog-until-input" readonly="readonly" 
+						class="ui-combobox-input-readonly ui-textfield"></input>
+				</span>
+			</div>
+			<div style="text-align:center; margin-top:20px;">
+				<button wicket:id="date-input-dialog-ok-btn" type="submit" class="button">
+					<span wicket:id="date-input-dialog-ok-btn-text"/>
+				</button>
+			</div>
+		</div>
+	</form>
+</wicket:fragment>
 </html>
\ No newline at end of file

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/css/tc-layout.css
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/css/tc-layout.css	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/css/tc-layout.css	2013-04-29 09:01:18 UTC (rev 17770)
@@ -34,6 +34,14 @@
     padding: 0.3em;
 }
 
+.search-form .ui-input, .search-form .ui-widget-content .ui-input,
+.search-form .ui-input-readonly, .search-form .ui-widget-content .ui-input-readonly,
+.search-form .ui-combobox-input-readonly, .search-form .ui-widget-content .ui-combobox-input-readonly
+.search-form .ui-button-text-only, .search-form .ui-button-text
+{
+    padding: 0.1em 0.3em;
+}
+
 .ui-spinner 
 {
 	vertical-align: baseline;
@@ -277,7 +285,7 @@
 {
 	margin-left: 0.5em;
 	margin-right: 0.5em;
-	padding-bottom: 1em;
+	padding-bottom: 0.5em;
 	border-top: 1px solid transparent;
 }
 

Added: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/jquery-ui-datepicker-de.js
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/jquery-ui-datepicker-de.js	                        (rev 0)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/jquery-ui-datepicker-de.js	2013-04-29 09:01:18 UTC (rev 17770)
@@ -0,0 +1,23 @@
+/* German initialisation for the jQuery UI date picker plugin. */
+/* Written by Milian Wolff (mail@...). */
+jQuery(function($){
+	$.datepicker.regional['de'] = {
+		closeText: 'Schließen',
+		prevText: '&#x3C;Zurück',
+		nextText: 'Vor&#x3E;',
+		currentText: 'Heute',
+		monthNames: ['Januar','Februar','März','April','Mai','Juni',
+		'Juli','August','September','Oktober','November','Dezember'],
+		monthNamesShort: ['Jan','Feb','Mär','Apr','Mai','Jun',
+		'Jul','Aug','Sep','Okt','Nov','Dez'],
+		dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'],
+		dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'],
+		weekHeader: 'KW',
+		dateFormat: 'dd.mm.yy',
+		firstDay: 1,
+		isRTL: false,
+		showMonthAfterYear: false,
+		yearSuffix: ''};
+	$.datepicker.setDefaults($.datepicker.regional['de']);
+});

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/tc-jquery-ui.js
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/tc-jquery-ui.js	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/js/tc-jquery-ui.js	2013-04-29 09:01:18 UTC (rev 17770)
@@ -182,17 +182,15 @@
 				response( select.children( "option" ).map(function() {
 					var text = $( this ).text();
 					if ( this.value && ( !request.term || matcher.test(text) ) )
-						return {
-						label: text.replace(
-								new RegExp(
-										"(?![^&;]+;)(?!<[^<>]*)(" +
+						return { 
+							label: text.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" +
 												$.ui.autocomplete.escapeRegex(request.term) +
 												")(?![^<>]*>)(?![^&;]+;)", "gi"
 								), "<strong>$1</strong>" ),
-								value: text,
-								option: this
+							value: text,
+							option: this
 					};
-				}) );
+				}));
 			},
 			select: function( event, ui ) {
 				ui.item.option.selected = true;
@@ -200,17 +198,22 @@
 					item: ui.item.option
 				});
 			},
-			change: function( event, ui ) {
+			close: function( event, ui) {
 				if (wicketCallbackURL) {
 					var url = wicketCallbackURL;
 					if (url.indexOf('?')==-1) {
-						url += '?selectedValue=';
+						url += '?';
 					}
 					else {
-						url += '&selectedValue=';
+						url += '&';
 					}
-					wicketAjaxGet(url + input.val(),function(){},function(){});
+
+					url += 'selectedValue=' + $(input).val();
+					
+					wicketAjaxGet(url,function(){},function(){});
 				}
+			},
+			change: function( event, ui ) {
 				//if ( !ui.item )
 				//  return removeIfInvalid( this );
 			}
@@ -431,10 +434,10 @@
 
 
 function style(parent) {
+	styleTextFields(parent);
+	styleTextAreas(parent);
 	styleButtons(parent);
 	styleComboBoxes(parent);
-	styleTextFields(parent);
-	styleTextAreas(parent);
 	styleYearSpinners(parent);
 	styleMonthSpinners(parent);
 }
@@ -444,3 +447,8 @@
 	style(parent);
 };
 
+
+function initUIByMarkupId(markupId) {
+	initUI($('#'+markupId));
+}
+

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package.properties	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package.properties	2013-04-29 09:01:18 UTC (rev 17770)
@@ -1,10 +1,10 @@
 #Created by JInto - http://www.guh-software.de
-#Thu Apr 18 09:47:00 CEST 2013
+#Mon Apr 29 09:31:39 CEST 2013
 tc.abstract.text=Abstract\:
 tc.anatomy.text=Anatomy\:
 tc.author.affiliation.text=Affiliation\:
 tc.author.contact.text=Contact\:
-tc.author.name.text=\ Name\:
+tc.author.name.text=Name\:
 tc.case.edit.text=Open and edit case...
 tc.case.open.text=Open case...
 tc.case.text=Case
@@ -20,6 +20,7 @@
 tc.category.text=Category\:
 tc.category.ultrasound=Ultrasound
 tc.category.vascularandinterventional=Vascular And Interventional
+tc.content.date.text=Creation Date\:
 tc.details.errordetails.title=Parsing Teaching-File failed\!
 tc.details.header.title=Teaching-File Details
 tc.details.nodetails.title=No Teaching-File Selected
@@ -149,13 +150,25 @@
 tc.search.author.affiliation.text=Author Affiliation
 tc.search.author.contact.text=Author Contact
 tc.search.author.name.text=Author Name
+tc.search.datespan.dialog.title=Date range
+tc.search.datespan.text=User defined...
+tc.search.days14.text=Since max. 14 days
+tc.search.days7.text=Since max. 7 days
 tc.search.dosearch.text=Search
 tc.search.freetext.text=Text\:
+tc.search.fromdate.text=From\:
 tc.search.header.text=Search for Teaching-Files
+tc.search.months1.text=Since max. 1 month
+tc.search.months3.text=Since max. 3 months
+tc.search.months6.text=Since max. 6 months
 tc.search.null.text=All
 tc.search.patient.species.text=Ethnic Group
 tc.search.reset.text=Reset
 tc.search.title.text=Title
+tc.search.untildate.text=Until\:
+tc.search.years1.text=Since max. 1 year
+tc.search.years10.text=Since max. 10 years
+tc.search.years5.text=Since max. 5 years
 tc.searchToggle.hide.tooltip=Collapse Search
 tc.searchToggle.show.tooltip=Expand Search
 tc.tabTitle=Teaching-Files

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_de.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_de.properties	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_de.properties	2013-04-29 09:01:18 UTC (rev 17770)
@@ -1,5 +1,5 @@
 #Created by JInto - http://www.guh-software.de
-#Thu Apr 18 09:47:00 CEST 2013
+#Mon Apr 29 09:31:39 CEST 2013
 tc.abstract.text=Kurzfassung\:
 tc.anatomy.text=Anatomie\:
 tc.author.affiliation.text=Organisation\:
@@ -20,6 +20,7 @@
 tc.category.text=Kategorie\:
 tc.category.ultrasound=Ultraschall
 tc.category.vascularandinterventional=Vaskul\u00E4r und Interventionell
+tc.content.date.text=Erstellungsdatum\:
 tc.details.errordetails.title=Fehler beim Parsen des Teaching-Files\!
 tc.details.header.title=Teaching-File Inhalt
 tc.details.nodetails.title=Kein Teaching-File ausgew\u00E4hlt
@@ -149,13 +150,25 @@
 tc.search.author.affiliation.text=Autor Organisation
 tc.search.author.contact.text=Autor Kontakt
 tc.search.author.name.text=Autor Name
+tc.search.datespan.dialog.title=Zeitspanne definieren
+tc.search.datespan.text=Benutzerdefiniert...
+tc.search.days14.text=Vor max. 14 Tagen
+tc.search.days7.text=Vor max. 7 Tagen
 tc.search.dosearch.text=Suchen
 tc.search.freetext.text=Text\:
+tc.search.fromdate.text=Von\:
 tc.search.header.text=Nach Teaching-Files suchen
+tc.search.months1.text=Vor max. 1 Monat
+tc.search.months3.text=Vor max. 3 Monaten
+tc.search.months6.text=Vor max. 6 Monaten
 tc.search.null.text=Alle
 tc.search.patient.species.text=Ethnische Herkunft
 tc.search.reset.text=Zur\u00FCcksetzen
 tc.search.title.text=Titel
+tc.search.untildate.text=Bis\:
+tc.search.years1.text=Vor max. 1 Jahr
+tc.search.years10.text=Vor max. 10 Jahren
+tc.search.years5.text=Vor max. 5 Jahren
 tc.searchToggle.hide.tooltip=Suche einblenden
 tc.searchToggle.show.tooltip=Suche ausblenden
 tc.tabTitle=Teaching-Files

Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_ja.properties
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_ja.properties	2013-04-26 20:20:07 UTC (rev 17769)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/resources/org/dcm4chee/web/war/tc/package_ja.properties	2013-04-29 09:01:18 UTC (rev 17770)
@@ -1,5 +1,5 @@
 #Created by JInto - http://www.guh-software.de
-#Thu Apr 18 09:47:00 CEST 2013
+#Thu Apr 25 13:24:42 CEST 2013
 tc.abstract.text=
 tc.anatomy.text=
 tc.author.affiliation.text=
@@ -20,6 +20,7 @@
 tc.category.text=
 tc.category.ultrasound=
 tc.category.vascularandinterventional=
+tc.content.date.text=
 tc.details.errordetails.title=
 tc.details.header.title=
 tc.details.nodetails.title=
@@ -149,13 +150,25 @@
 tc.search.author.affiliation.text=
 tc.search.author.contact.text=
 tc.search.author.name.text=
+tc.search.datespan.dialog.title=
+tc.search.datespan.text=
+tc.search.days14.text=
+tc.search.days7.text=
 tc.search.dosearch.text=
 tc.search.freetext.text=
+tc.search.fromdate.text=
 tc.search.header.text=
+tc.search.months1.text=
+tc.search.months3.text=
+tc.search.months6.text=
 tc.search.null.text=
 tc.search.patient.species.text=
 tc.search.reset.text=
 tc.search.title.text=
+tc.search.untildate.text=
+tc.search.years1.text=
+tc.search.years10.text=
+tc.search.years5.text=
 tc.searchToggle.hide.tooltip=
 tc.searchToggle.show.tooltip=
 tc.tabTitle=

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

Revision: 17766
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17766&view=rev
Author:   wayfarer3130
Date:     2013-04-25 20:59:52 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
[#DCM-562] Fix a pixel padding/voi lut/rescale slope issue throwing an array out of bounds exception.

Modified Paths:
--------------
    dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java

Modified: dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java
===================================================================
--- dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java	2013-04-25 18:51:53 UTC (rev 17765)
+++ dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/LookupTable.java	2013-04-25 20:59:52 UTC (rev 17766)
@@ -1452,6 +1452,9 @@
         }
         if(maxPad-offset+1<0 ) return;
         if( minPad-offset > array.length() ) return;
+        // Make sure overlapping ranges only affect the part actually in the lut.
+        if( minPad-offset < 0 ) minPad = offset;
+        if( maxPad-offset+1 >= array.length() ) maxPad = array.length()+offset-2;
         
         array.fillRange(minPad-offset, maxPad-offset+1, padValue);
     }

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

Revision: 17768
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17768&view=rev
Author:   wayfarer3130
Date:     2013-04-26 18:17:45 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
[#DCM-563] Another array out of bounds exception caused by using a "black" pixel value which is too big for inverse (Monochrome1) images with pixel padding and inverting them.

Modified Paths:
--------------
    dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java

Modified: dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java
===================================================================
--- dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java	2013-04-26 16:52:15 UTC (rev 17767)
+++ dcm4che2/trunk/dcm4che-image/src/main/java/org/dcm4che2/image/ShortLookupTable.java	2013-04-26 18:17:45 UTC (rev 17768)
@@ -267,6 +267,9 @@
             if (inverse) {
                 tmp = outMax - tmp;
             }
+            if( tmp<0 ) {
+                tmp=0;
+            }
             if (pval2out != null) {
                 tmp = (pval2out[tmp] & 0xffff) >>> pval2outShift;
             }

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

Revision: 17765
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17765&view=rev
Author:   achung
Date:     2013-04-25 18:51:53 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
[#DCMEE-1960] Allow study to change patient to another existing patient

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java

Property Changed:
----------------
    dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb/


Property changes on: dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb
___________________________________________________________________
Modified: svn:mergeinfo
   - /dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb:17576,17644
   + /dcm4chee/dcm4chee-arc/branches/20120831_AG/dcm4jboss-ejb:17759
/dcm4chee/dcm4chee-arc/trunk/dcm4jboss-ejb:17576,17644

Modified: dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java	2013-04-25 18:28:14 UTC (rev 17764)
+++ dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java	2013-04-25 18:51:53 UTC (rev 17765)
@@ -149,6 +149,15 @@
         studyHome.create(ds, findOrCreatePatient(ds, matching));
     }
 
+    private PatientLocal findPatient(Dataset ds,
+            PatientMatching matching) throws FinderException, CreateException {
+        try {
+            return patHome.selectPatient(ds, matching, true);
+        } catch (ObjectNotFoundException onfe) {
+            return null;
+        }
+    }
+    
     private PatientLocal findOrCreatePatient(Dataset ds,
             PatientMatching matching) throws FinderException, CreateException {
         try {
@@ -220,27 +229,58 @@
     /**
      * @ejb.interface-method
      */
-    public void updatePatientOnly(String iuid, Dataset ds, Dataset modAttrs)
+    public void updatePatientOnly(String iuid, Dataset ds, Dataset modAttrs, PatientMatching matching)
             throws DcmServiceException {
         try {
             PatientLocal patient = getStudy(iuid).getPatient();
-            Dataset origModAttrs = (modAttrs == null)?null: DcmObjectFactory.getInstance().newDataset(); 	
-            if(patient.updateAttributes(ds, origModAttrs)) {
-                AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
-            }   
+            Dataset origModAttrs = (modAttrs == null) ? null : DcmObjectFactory.getInstance().newDataset();
+            
+        	// Existing patient with same PID and ISSUER
+        	PatientLocal lookForExisting = findOrCreatePatient(ds, matching);
+        	if (lookForExisting != null && lookForExisting.getPk() != patient.getPk()) {
+        		// Move Studies to new patient
+        		StudyLocal study = getStudy(iuid);
+        		study.setPatient(lookForExisting);
+
+        		Dataset oldDs = patient.getAttributes(false);
+        		Dataset newDs = lookForExisting.getAttributes(false);
+        		
+        		AttrUtils.updateAttributes(oldDs, newDs, origModAttrs, log);
+
+        		DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+                Dataset item = el.addNewItem();
+                item.putAll(origModAttrs);                
+        		AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
+
+        	} else {
+                DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+                Dataset item = el.addNewItem();
+                            
+                if(patient.updateAttributes(ds, origModAttrs)) {                
+                	item.putAll(origModAttrs);                
+                    AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
+                }        		
+        	}
+                        
+   
         } catch (Exception e) {
             throw new EJBException(e);
         }
     }
-     
+    
     /**
      * @ejb.interface-method
      */
     public void updateStudyOnly(String iuid, Dataset ds, Dataset modAttrs) throws DcmServiceException {
         try {
             StudyLocal study = getStudy(iuid);
-            Dataset origModAttrs = (modAttrs== null)?null:DcmObjectFactory.getInstance().newDataset(); 	
+            Dataset origModAttrs = (modAttrs== null)?null:DcmObjectFactory.getInstance().newDataset();
+            
+            DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+            Dataset item = el.addNewItem();
+            
             if(study.updateAttributes(ds, origModAttrs) ) {
+                item.putAll(origModAttrs);
                 AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getStudyAttributeFilter());
             }
         }

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

Revision: 17764
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17764&view=rev
Author:   husond
Date:     2013-04-25 18:28:14 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
[#DCMEE-1959] log MB scheduled for deletion along with study count

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java

Modified: dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java	2013-04-25 08:19:35 UTC (rev 17763)
+++ dcm4chee/dcm4chee-arc/branches/20110113_AG/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/AbstractDeleterService.java	2013-04-25 18:28:14 UTC (rev 17764)
@@ -425,9 +425,9 @@
             }
             log.info("Check file system group " + fsGroup
                     + " for deletion of studies");
-            int countStudies = 0;
+            long[] countResult = new long[]{0,0};
             if (maxNotAccessedFor > 0) {
-                countStudies = scheduleStudiesForDeletion(fsMgt,
+                countResult = scheduleStudiesForDeletion(fsMgt,
                         System.currentTimeMillis() - maxNotAccessedFor,
                         Long.MAX_VALUE);
             }
@@ -440,22 +440,27 @@
 				log.info("Try to free " + sizeToDel
 						+ " of disk space on file system group "
 						+ fsGroup);
-                    countStudies += scheduleStudiesForDeletion(fsMgt,
+				    long[] tmpResult = scheduleStudiesForDeletion(fsMgt,
                             System.currentTimeMillis() - minNotAccessedFor,
                             sizeToDel);
+                countResult[0] += tmpResult[0];
+                countResult[1] += tmpResult[1];
                 }
             }
-            if (countStudies > 0) {
-			log.info("Scheduled " + countStudies
-					+ " studies for deletion on file system group "
-					+ fsGroup);
+            
+            if (countResult[1] > 0) {
+                if ( log.isInfoEnabled() ) {
+                    log.info("Scheduled " + countResult[1] + " studies / " + FileUtils.formatSize(countResult[0])
+                             + " for deletion on file system group " + fsGroup);
+                }
             }
-            return countStudies;
+            return (int)countResult[1];
     }
 
-    private int scheduleStudiesForDeletion(FileSystemMgt2 fsMgt,
+    private long[] scheduleStudiesForDeletion(FileSystemMgt2 fsMgt,
             long notAccessedAfter, long sizeToDel0) throws Exception {
         int countStudies = 0;
+        long totalSizeDeleted = 0;
         long minAccessTime = 0;
         long sizeToDel = sizeToDel0;
         do {
@@ -480,6 +485,7 @@
             if (result[0] != 0) {
                 sizeToDel -= result[0];
                 countStudies += result[1];
+                totalSizeDeleted += result[0];
             }
             if (deleteOrdersAndAccessTime.deleteStudyOrders.size() == 0 && 
                     minAccessTime == deleteOrdersAndAccessTime.maxAccessTime) {
@@ -493,7 +499,7 @@
             log.warn("No study found for clean up filesystem group "+getFileSystemGroupIDForDeleter()+"! Please check your configuration!");
             log.warn(showDeleterCriteria());
         }
-        return countStudies;
+        return new long[]{totalSizeDeleted,countStudies};
     }
 
     private long[] markAndScheduleDeleteOrders(Collection<DeleteStudyOrder> orders, long maxSize) throws Exception {

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

Revision: 17763
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17763&view=rev
Author:   gunterze
Date:     2013-04-25 08:19:35 +0000 (Thu, 25 Apr 2013)
Log Message:
-----------
[#DCMOLD-250] May run into a StackOverflow when the object has an extra Sequence Delimitation Tag after the pixel data

Modified Paths:
--------------
    dcm4che14/trunk/samples/java/DcmRcv.java
    dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmObjectHandlerImpl.java

Modified: dcm4che14/trunk/samples/java/DcmRcv.java
===================================================================
--- dcm4che14/trunk/samples/java/DcmRcv.java	2013-04-24 17:04:02 UTC (rev 17762)
+++ dcm4che14/trunk/samples/java/DcmRcv.java	2013-04-25 08:19:35 UTC (rev 17763)
@@ -361,18 +361,19 @@
             if (parser.getReadTag() != Tags.PixelData) {
                 return;
             }
+            long pos = parser.getStreamPosition();
             int len = parser.getReadLength();
             ds.writeHeader(out, encParam,
                     parser.getReadTag(),
                     parser.getReadVR(),
                     len);
             if (len == -1) {
-                parser.parseHeader();
+                pos += parser.parseHeader();
                 while (parser.getReadTag() == Tags.Item) {
-                    len = parser.getReadLength();
+                    pos += len = parser.getReadLength();
                     ds.writeHeader(out, encParam, Tags.Item, VRs.NONE, len);
                     out.copyFrom(in, len);
-                    parser.parseHeader();
+                    pos += parser.parseHeader();
                 }
                 ds.writeHeader(
                         out,
@@ -382,7 +383,9 @@
                         0);                
             } else {
                 out.copyFrom(in, len);
+                pos += len;
             }
+            parser.setStreamPosition(pos);
             parser.parseDataset(decParam, -1);
             ds.subSet(Tags.PixelData, -1).writeDataset(out, encParam);
         } finally {

Modified: dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmObjectHandlerImpl.java
===================================================================
--- dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmObjectHandlerImpl.java	2013-04-24 17:04:02 UTC (rev 17762)
+++ dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmObjectHandlerImpl.java	2013-04-25 08:19:35 UTC (rev 17763)
@@ -38,12 +38,14 @@
 
 package org.dcm4cheri.data;
 
+import org.apache.log4j.Logger;
 import org.dcm4che.data.Command;
 import org.dcm4che.data.Dataset;
 import org.dcm4che.data.DcmDecodeParam;
 import org.dcm4che.data.DcmElement;
 import org.dcm4che.data.DcmObject;
 import org.dcm4che.data.FileMetaInfo;
+import org.dcm4che.dict.Tags;
 import org.dcm4che.dict.VRs;
 
 import java.io.IOException;
@@ -58,6 +60,8 @@
  */
 class DcmObjectHandlerImpl implements org.dcm4che.data.DcmHandler {
 
+    private static final Logger log = Logger.getLogger(DcmObjectHandlerImpl.class);
+
     private final DcmObject result;
     private ByteOrder byteOrder = ByteOrder.LITTLE_ENDIAN;
     private DcmObject curDcmObject;
@@ -143,9 +147,13 @@
     }
     
     public void value(byte[] data, int start, int length) throws IOException {
-        curDcmObject.putXX(tag, vr,
-                ByteBuffer.wrap(data, start, length).order(byteOrder))
-                .setStreamPosition(pos);
+        if (vr != VRs.NONE)
+            curDcmObject.putXX(tag, vr,
+                    ByteBuffer.wrap(data, start, length).order(byteOrder))
+                    .setStreamPosition(pos);
+        else
+            log.warn("Ignore unexpected attribute " + Tags.toString(tag) 
+                + " #" + length + " at stream position " + pos);
     }
     
 

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

Revision: 17757
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17757&view=rev
Author:   kinsonatagfa
Date:     2013-04-23 05:33:19 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
[DCMEE-1957] Checked if the extra tag is Item Tag, Item Delimitation Tag or Sequence Delimitation Item Tag. If true, then skip it because it is extra. Otherwise, parse the tag as usual.

Modified Paths:
--------------
    dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmParserImpl.java

Modified: dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmParserImpl.java
===================================================================
--- dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmParserImpl.java	2013-04-23 05:17:01 UTC (rev 17756)
+++ dcm4che14/trunk/src/java/org/dcm4cheri/data/DcmParserImpl.java	2013-04-23 05:33:19 UTC (rev 17757)
@@ -654,8 +654,16 @@
                                 + ", value length [" + (rLen&0xffffffffL)
                                 + "] exceeds maximal supported length ["
                                 + maxValLen + "]");
-                    readValue();
-                    lread += rLen;
+                    
+                    if (rVR == VRs.NONE &&
+                    		(rTag == Tags.Item || rTag == Tags.ItemDelimitationItem || rTag == Tags.SeqDelimitationItem))
+                    {
+                    	log.warn("Received extra item tag, item delimitation tag or sequence delimitation tag. Ignoring.");
+                    }
+                    else {
+                    	readValue();
+                        lread += rLen;	
+                    }
                 }
                 if (handler != null && unBuf == null)
                     handler.endElement();

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

Revision: 17760
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17760&view=rev
Author:   waveform
Date:     2013-04-23 22:39:39 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
[#DCMEE-1958] Widen access to ContentEditServices' lookupX methods

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java	2013-04-23 21:44:25 UTC (rev 17759)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/mbean/ContentEditService.java	2013-04-23 22:39:39 UTC (rev 17760)
@@ -758,8 +758,7 @@
         lookupPrivateManager().deletePrivatePatient(patPk);
     }
 
-    public void deleteStudy(long studyPk) throws RemoteException,
-    HomeFactoryException, CreateException, FinderException {
+    public void deleteStudy(long studyPk) throws Exception {
         if (log.isDebugEnabled())
             log.debug("delete Study from trash. pk:" + studyPk);
         lookupPrivateManager().deletePrivateStudy(studyPk);
@@ -867,7 +866,7 @@
         this.sendSeriesUpdatedNotifications(dsStdyMgt, "Move instances");
     }
 
-    private ContentEdit lookupContentEdit() throws HomeFactoryException,
+    protected ContentEdit lookupContentEdit() throws HomeFactoryException,
     RemoteException, CreateException {
         if (contentEdit != null)
             return contentEdit;
@@ -877,7 +876,7 @@
         return contentEdit;
     }
 
-    private ContentManager lookupContentManager() throws HomeFactoryException,
+    protected ContentManager lookupContentManager() throws HomeFactoryException,
     RemoteException, CreateException {
         if (contentMgr != null)
             return contentMgr;

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

Revision: 17759
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17759&view=rev
Author:   bchenagfa
Date:     2013-04-23 21:44:25 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Handling of patient update to existing patient. as well as better modAttribues handling. artf136725

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/branches/20120831_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java

Modified: dcm4chee/dcm4chee-arc/branches/20120831_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java
===================================================================
--- dcm4chee/dcm4chee-arc/branches/20120831_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java	2013-04-23 05:47:43 UTC (rev 17758)
+++ dcm4chee/dcm4chee-arc/branches/20120831_AG/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java	2013-04-23 21:44:25 UTC (rev 17759)
@@ -149,6 +149,15 @@
         studyHome.create(ds, findOrCreatePatient(ds, matching));
     }
 
+    private PatientLocal findPatient(Dataset ds,
+            PatientMatching matching) throws FinderException, CreateException {
+        try {
+            return patHome.selectPatient(ds, matching, true);
+        } catch (ObjectNotFoundException onfe) {
+            return null;
+        }
+    }
+    
     private PatientLocal findOrCreatePatient(Dataset ds,
             PatientMatching matching) throws FinderException, CreateException {
         try {
@@ -220,27 +229,58 @@
     /**
      * @ejb.interface-method
      */
-    public void updatePatientOnly(String iuid, Dataset ds, Dataset modAttrs)
+    public void updatePatientOnly(String iuid, Dataset ds, Dataset modAttrs, PatientMatching matching)
             throws DcmServiceException {
         try {
             PatientLocal patient = getStudy(iuid).getPatient();
-            Dataset origModAttrs = (modAttrs == null)?null: DcmObjectFactory.getInstance().newDataset(); 	
-            if(patient.updateAttributes(ds, origModAttrs)) {
-                AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
-            }   
+            Dataset origModAttrs = (modAttrs == null) ? null : DcmObjectFactory.getInstance().newDataset();
+            
+        	// Existing patient with same PID and ISSUER
+        	PatientLocal lookForExisting = findOrCreatePatient(ds, matching);
+        	if (lookForExisting != null && lookForExisting.getPk() != patient.getPk()) {
+        		// Move Studies to new patient
+        		StudyLocal study = getStudy(iuid);
+        		study.setPatient(lookForExisting);
+
+        		Dataset oldDs = patient.getAttributes(false);
+        		Dataset newDs = lookForExisting.getAttributes(false);
+        		
+        		AttrUtils.updateAttributes(oldDs, newDs, origModAttrs, log);
+
+        		DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+                Dataset item = el.addNewItem();
+                item.putAll(origModAttrs);                
+        		AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
+
+        	} else {
+                DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+                Dataset item = el.addNewItem();
+                            
+                if(patient.updateAttributes(ds, origModAttrs)) {                
+                	item.putAll(origModAttrs);                
+                    AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getPatientAttributeFilter());
+                }        		
+        	}
+                        
+   
         } catch (Exception e) {
             throw new EJBException(e);
         }
     }
-     
+    
     /**
      * @ejb.interface-method
      */
     public void updateStudyOnly(String iuid, Dataset ds, Dataset modAttrs) throws DcmServiceException {
         try {
             StudyLocal study = getStudy(iuid);
-            Dataset origModAttrs = (modAttrs== null)?null:DcmObjectFactory.getInstance().newDataset(); 	
+            Dataset origModAttrs = (modAttrs== null)?null:DcmObjectFactory.getInstance().newDataset();
+            
+            DcmElement el = modAttrs.putSQ(Tags.OriginalAttributesSeq);
+            Dataset item = el.addNewItem();
+            
             if(study.updateAttributes(ds, origModAttrs) ) {
+                item.putAll(origModAttrs);
                 AttrUtils.fetchModifiedAttributes(ds, origModAttrs, modAttrs, AttributeFilter.getStudyAttributeFilter());
             }
         }

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

Revision: 17758
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=17758&view=rev
Author:   kinsonatagfa
Date:     2013-04-23 05:47:43 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
[DCMEE-1955] Add extension point to allow processing before applying C-Find response stylesheet.

Modified Paths:
--------------
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/FindScp.java
    dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/QueryRetrieveScpService.java

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/FindScp.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/FindScp.java	2013-04-23 05:33:19 UTC (rev 17757)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/FindScp.java	2013-04-23 05:47:43 UTC (rev 17758)
@@ -433,6 +433,7 @@
                     coerceTpl = service.getCoercionTemplates(callingAET, 
                             RESULT_XSL);
                 }
+                service.preCoercionProcessing(data, Command.C_FIND_RSP, assoc.getAssociation());
                 Dataset coerce = service.getCoercionAttributesFor(
                         a, RESULT_XSL, data, coerceTpl);
                 if (coerce != null) {

Modified: dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/QueryRetrieveScpService.java
===================================================================
--- dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/QueryRetrieveScpService.java	2013-04-23 05:33:19 UTC (rev 17757)
+++ dcm4chee/dcm4chee-arc/trunk/dcm4jboss-sar/src/java/org/dcm4chex/archive/dcm/qrscp/QueryRetrieveScpService.java	2013-04-23 05:47:43 UTC (rev 17758)
@@ -1894,6 +1894,13 @@
         // Extension Point for customized QueryRetrieveScpService
     }
 
+    void preCoercionProcessing(Dataset ds, int command, Association assoc) throws Exception {
+        doPreCoercionProcessing(ds,command,assoc);
+    }
+    protected void doPreCoercionProcessing(Dataset ds, int command, Association assoc) throws Exception {
+        // Extension Point for customized QueryRetrieveScpService
+    }
+    
 	public int getRetrieveRspStatusForNoMatchingInstanceToRetrieve() {
 		return retrieveRspStatusForNoMatchingInstanceToRetrieve;
 	}

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