[dcm4che-commits] CVS: dcm4jboss/src/java/service/org/dcm4chex/service/auditlog IHEYr4.java,1.1,1.2 InstancesAction.java,1.1,1.2 RnodeParam.java,1.1,1.2

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

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

Modified Files:
	IHEYr4.java InstancesAction.java RnodeParam.java 
Log Message:
add Query/Retrieve Audit Log


Index: IHEYr4.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/service/org/dcm4chex/service/auditlog/IHEYr4.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IHEYr4.java	28 Aug 2002 08:52:48 -0000	1.1
--- IHEYr4.java	28 Aug 2002 21:44:15 -0000	1.2
***************
*** 120,123 ****
--- 120,130 ----
      }
      
+     public static IHEYr4 newSecurityAlert(
+             String alertType, User user, String description,
+             String host, long millis) {
+         return new IHEYr4(
+             new SecurityAlert(alertType, user, description), host, millis);
+     }
+     
      // Methods -------------------------------------------------------
      public String toString() {

Index: InstancesAction.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/service/org/dcm4chex/service/auditlog/InstancesAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstancesAction.java	28 Aug 2002 08:52:48 -0000	1.1
--- InstancesAction.java	28 Aug 2002 21:44:15 -0000	1.2
***************
*** 23,27 ****
  package org.dcm4chex.service.auditlog;
  
! import java.util.ArrayList;
  
  /**
--- 23,28 ----
  package org.dcm4chex.service.auditlog;
  
! import java.util.Iterator;
! import java.util.LinkedHashSet;
  
  /**
***************
*** 48,61 ****
      private String objectAction;
      private String accessionNumber;
!     private ArrayList suids = new ArrayList();
      private Patient patient;
      private User user;
!     private ArrayList cuids = new ArrayList();
!     private int numberOfInstances = -1;
      private String mppsUID;
      
      // Constructors --------------------------------------------------
!     protected InstancesAction(
!             String objectAction, String suid, Patient patient) {
          this.objectAction = objectAction;
          addSUID(suid);
--- 49,61 ----
      private String objectAction;
      private String accessionNumber;
!     private LinkedHashSet suids = new LinkedHashSet(3);
      private Patient patient;
      private User user;
!     private LinkedHashSet cuids = new LinkedHashSet(7);
!     private int numberOfInstances = 0;
      private String mppsUID;
      
      // Constructors --------------------------------------------------
!     public InstancesAction(String objectAction, String suid, Patient patient) {
          this.objectAction = objectAction;
          addSUID(suid);
***************
*** 63,66 ****
--- 63,71 ----
      }
      
+     public InstancesAction(String objectAction, String suid,
+             String patientID, String patientName) {
+         this(objectAction, suid, new Patient(patientID, patientName));
+     }
+     
      // Methods -------------------------------------------------------
      public final void setAccessionNumber(String accessionNumber) {
***************
*** 69,77 ****
      
      public final void addSUID(String suid) {
!         this.suids.add(suid);
      }
  
      public final void addCUID(String cuid) {
!         this.cuids.add(cuid);
      }
      
--- 74,94 ----
      
      public final void addSUID(String suid) {
!         suids.add(suid);
      }
  
+     public final String[] listSUIDs() {
+         return (String[]) suids.toArray(new String[suids.size()]);
+     }
+     
      public final void addCUID(String cuid) {
!         cuids.add(cuid);
!     }
!     
!     public final void clearCUIDs() {
!         cuids.clear();
!     }
!     
!     public final String[] listCUIDs() {
!         return (String[]) cuids.toArray(new String[cuids.size()]);
      }
      
***************
*** 92,95 ****
--- 109,116 ----
      }
      
+     public final String getMppsUID() {
+         return mppsUID;
+     }
+ 
      public void writeTo(StringBuffer sb) {
          sb.append("<ObjectAction>")
***************
*** 101,107 ****
                .append("</AccessionNumber>");
          }
!         for (int i = 0, n = suids.size(); i < n; ++i) {
              sb.append("<SUID>")
!               .append(suids.get(i))
                .append("</SUID>");
          }
--- 122,128 ----
                .append("</AccessionNumber>");
          }
!         for (Iterator it = suids.iterator(); it.hasNext();) {
              sb.append("<SUID>")
!               .append(it.next())
                .append("</SUID>");
          }
***************
*** 110,120 ****
              user.writeTo(sb);
          }
!         for (int i = 0, n = cuids.size(); i < n; ++i) {
              sb.append("<CUID>")
!               .append(cuids.get(i))
                .append("</CUID>");
          }
              
!         if (numberOfInstances >= 0) {
              sb.append("<NumberOfInstances>")
                .append(numberOfInstances)
--- 131,141 ----
              user.writeTo(sb);
          }
!         for (Iterator it = cuids.iterator(); it.hasNext();) {
              sb.append("<CUID>")
!               .append(it.next())
                .append("</CUID>");
          }
              
!         if (numberOfInstances > 0) {
              sb.append("<NumberOfInstances>")
                .append(numberOfInstances)

Index: RnodeParam.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss/src/java/service/org/dcm4chex/service/auditlog/RnodeParam.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RnodeParam.java	28 Aug 2002 08:52:48 -0000	1.1
--- RnodeParam.java	28 Aug 2002 21:44:15 -0000	1.2
***************
*** 23,26 ****
--- 23,29 ----
  package org.dcm4chex.service.auditlog;
  
+ import java.net.InetAddress;
+ import java.net.Socket;
+ 
  /**
   * <description>
***************
*** 53,56 ****
--- 56,74 ----
          this.hname = hname;
          this.aet = aet;
+     }
+ 
+     public RnodeParam(Socket s, String aet) {
+         InetAddress addr = s.getInetAddress();
+         this.ip = addr.getHostAddress();
+         this.hname = toHname(addr.getHostName());
+         this.aet = aet;
+     }
+         
+     private final String toHname(String name) {
+         if (Character.isDigit(name.charAt(0))) {
+             return null;
+         }
+         int pos = name.indexOf('.');
+         return pos == -1 ? name : name.substring(0,pos);
      }