Add selection by SOP Class UID (affected and requested) and command field.

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@33595 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStandard.java

@@ -2,6 +2,8 @@ package net.ihe.gazelle.proxy.dao;
 
 import java.util.Date;
 
+import javax.persistence.Column;
+
 import net.ihe.gazelle.hql.HQLQueryBuilder;
 import net.ihe.gazelle.hql.paths.HQLSafePathBasic;
 import net.ihe.gazelle.hql.restrictions.HQLRestrictions;
@@ -141,7 +143,7 @@ public class MessageFilterStandard<T extends AbstractMessage> implements Message
 	}
 
 	public void reset() {
-		messageType = ChannelType.HTTP;
+		messageType = getMessageType();
 		initiatorIP = null;
 		initiatorPort = null;
 		responderIP = null;
@@ -176,17 +178,18 @@ public class MessageFilterStandard<T extends AbstractMessage> implements Message
 			abstractMessageQuery.dateReceived().ge(dateFrom);
 		}
 		if (dateTo != null) {
-			abstractMessageQuery.dateReceived().le(dateFrom);
+			abstractMessageQuery.dateReceived().le(dateTo);
 		}
 
 		if (messageType == ChannelType.DICOM) {
 			DicomMessageQuery dicomMessageQuery = new DicomMessageQuery(criteria);
-			// addEq(dicomMessageQuery.affectedSopClassUID(),
-			// dicomAffectedSopClassUID);
-			// addEq(dicomMessageQuery.requestedSopClassUID(),
-			// dicomRequestedSopClassUID);
-			// addEq(dicomMessageQuery.commandField(), dicomCommandField);
+			 addEq(dicomMessageQuery.infoAffectedSOPClassUID(),
+			 dicomAffectedSopClassUID);
+			 addEq(dicomMessageQuery.infoRequestedSOPClassUID(),
+			 dicomRequestedSopClassUID);
+			 addEq(dicomMessageQuery.infoCommandField(), dicomCommandField);
 		}
+		
 
 	}