[dcm4che-commits] CVS: dcm4jboss/src/java/ejb/org/dcm4chex/ejb/session RetrieveBean.java,1.2,1.3 StorageBean.java,1.2,1.3

[gunter z. <gun...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss/src/java/ejb/org/dcm4chex/ejb/session
In directory usw-pr-cvs1:/tmp/cvs-serv14922/src/java/ejb/org/dcm4chex/ejb/session

Modified Files:
	RetrieveBean.java StorageBean.java 
Log Message:
add Query/Retrieve Audit Log


Index: RetrieveBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/ejb/org/dcm4chex/ejb/session/RetrieveBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RetrieveBean.java	7 Aug 2002 14:43:59 -0000	1.2
--- RetrieveBean.java	28 Aug 2002 21:44:15 -0000	1.3
***************
*** 26,31 ****
  import org.dcm4chex.ejb.interfaces.AELocalHome;
  import org.dcm4chex.ejb.interfaces.AEData;
! import org.dcm4chex.ejb.interfaces.InstanceURLData;
! import org.dcm4chex.ejb.sql.URLQueryCmd;
  
  import org.dcm4che.data.Dataset;
--- 26,31 ----
  import org.dcm4chex.ejb.interfaces.AELocalHome;
  import org.dcm4chex.ejb.interfaces.AEData;
! import org.dcm4chex.ejb.interfaces.RetrieveData;
! import org.dcm4chex.ejb.sql.RetrieveCmd;
  
  import org.dcm4che.data.Dataset;
***************
*** 81,85 ****
      
      // Variables -----------------------------------------------------
!     private URLQueryCmd cmd = null;
      private AELocalHome aeHome;
      
--- 81,85 ----
      
      // Variables -----------------------------------------------------
!     private RetrieveCmd cmd = null;
      private AELocalHome aeHome;
      
***************
*** 101,105 ****
      * @ejb:interface-method 
      */
!     public InstanceURLData[] execute(Dataset keys)
      throws DcmValueException {
          cmd.execute(keys);
--- 101,105 ----
      * @ejb:interface-method 
      */
!     public RetrieveData[] execute(Dataset keys)
      throws DcmValueException {
          cmd.execute(keys);
***************
*** 108,112 ****
      
      public void ejbCreate() throws CreateException {
!         cmd = new URLQueryCmd();
      }
      
--- 108,112 ----
      
      public void ejbCreate() throws CreateException {
!         cmd = new RetrieveCmd();
      }
      

Index: StorageBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/ejb/org/dcm4chex/ejb/session/StorageBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StorageBean.java	7 Aug 2002 14:43:59 -0000	1.2
--- StorageBean.java	28 Aug 2002 21:44:15 -0000	1.3
***************
*** 25,33 ****
  import org.dcm4chex.ejb.interfaces.VerifyingObserverCodeLocalHome;
  import org.dcm4chex.ejb.interfaces.StorageData;
! import org.dcm4chex.ejb.interfaces.InstanceURLData;
  
  import org.dcm4che.dict.Tags;
  import org.dcm4che.data.Dataset;
  import org.dcm4che.data.DcmElement;
  import org.dcm4che.data.DcmValueException;
  
--- 25,34 ----
  import org.dcm4chex.ejb.interfaces.VerifyingObserverCodeLocalHome;
  import org.dcm4chex.ejb.interfaces.StorageData;
! import org.dcm4chex.ejb.interfaces.RetrieveData;
  
  import org.dcm4che.dict.Tags;
  import org.dcm4che.data.Dataset;
  import org.dcm4che.data.DcmElement;
+ import org.dcm4che.data.DcmObjectFactory;
  import org.dcm4che.data.DcmValueException;
  
***************
*** 66,69 ****
--- 67,72 ----
  public abstract class StorageBean implements SessionBean {
      private static final Logger log = Logger.getLogger(StorageBean.class);
+     private static final DcmObjectFactory dsFact = 
+         DcmObjectFactory.getInstance();
      
      private PatientLocalHome patientHome;
***************
*** 220,231 ****
       * @ejb:interface-method
       */
!     public InstanceURLData findInstance(String uid)
      throws FinderException {
          try {
              InstanceLocal instance = instanceHome.findBySopInstanceUID(uid);
!             return new InstanceURLData(
!                 instance.getSopInstanceUID(),
!                 instance.getSopClassUID(),
!                 instance.getUrl());
         } catch (ObjectNotFoundException onfe) {
             return null;
--- 223,234 ----
       * @ejb:interface-method
       */
!     public RetrieveData findInstance(String uid)
      throws FinderException {
          try {
              InstanceLocal instance = instanceHome.findBySopInstanceUID(uid);
!             Dataset ds = dsFact.newDataset();
!             ds.putUI(Tags.SOPInstanceUID, instance.getSopInstanceUID());
!             ds.putUI(Tags.SOPClassUID, instance.getSopClassUID());
!             return new RetrieveData(ds, instance.getUrl());
         } catch (ObjectNotFoundException onfe) {
             return null;