[dcm4che-commits] CVS: dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session PatientUpdateBean.java,1.12,1.13 MediaComposerBean.java,1.17,1.18 StudyMgtBean.java,1.2,1.3 StorageBean.java,1.42,1.43 MPPSManagerBean.java,1.12,1.13

[Franz W. <jav...@us...>]

Update of /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4457/src/java/org/dcm4chex/archive/ejb/session

Modified Files:
	PatientUpdateBean.java MediaComposerBean.java 
	StudyMgtBean.java StorageBean.java MPPSManagerBean.java 
Log Message:
Trashfolder support (hidden field) implemented

Index: PatientUpdateBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/PatientUpdateBean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PatientUpdateBean.java	27 Jun 2005 09:38:51 -0000	1.12
--- PatientUpdateBean.java	29 Sep 2005 15:56:58 -0000	1.13
***************
*** 88,91 ****
--- 88,92 ----
          dominantPat.getGsps().addAll(priorPat.getGsps());
          priorPat.setMergedWith(dominantPat);
+         dominantPat.updateDerivedFields();
      }
  

Index: MediaComposerBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MediaComposerBean.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MediaComposerBean.java	4 Aug 2005 09:47:37 -0000	1.17
--- MediaComposerBean.java	29 Sep 2005 15:56:58 -0000	1.18
***************
*** 552,556 ****
      	while ( iter.hasNext() ) {
      		final SeriesLocal ser = ( (SeriesLocal) iter.next() );
! 			ser.updateDerivedFields(false, false, false, true, false);
      	}
      	Collection studies = studyHome.findStudiesOnMedia( media );
--- 552,556 ----
      	while ( iter.hasNext() ) {
      		final SeriesLocal ser = ( (SeriesLocal) iter.next() );
! 			ser.updateDerivedFields(false, false, false, true, false, false);
      	}
      	Collection studies = studyHome.findStudiesOnMedia( media );
***************
*** 558,562 ****
      	while ( iter.hasNext() ){
      		final StudyLocal sty = ( (StudyLocal) iter.next());
! 			sty.updateDerivedFields(false, false, false, true, false, false);
      	}
      }
--- 558,562 ----
      	while ( iter.hasNext() ){
      		final StudyLocal sty = ( (StudyLocal) iter.next());
! 			sty.updateDerivedFields(false, false, false, true, false, false, false);
      	}
      }
***************
*** 581,585 ****
      	while ( iter.hasNext() ) {
      		SeriesLocal ser = (SeriesLocal) iter.next();
! 			ser.updateDerivedFields(false, false, false, true, true);
      	}
      	if ( log.isDebugEnabled() ) log.debug( "Series updated after media "+filesetId+" was deleted!");
--- 581,585 ----
      	while ( iter.hasNext() ) {
      		SeriesLocal ser = (SeriesLocal) iter.next();
! 			ser.updateDerivedFields(false, false, false, true, true, false);
      	}
      	if ( log.isDebugEnabled() ) log.debug( "Series updated after media "+filesetId+" was deleted!");
***************
*** 587,591 ****
      	while ( iter.hasNext() ){
      		StudyLocal sty = (StudyLocal) iter.next();
!     		sty.updateDerivedFields(false, false, false, true, true, false);
       	}
      	if ( log.isDebugEnabled() ) log.debug( "Studies updated after media "+filesetId+" was deleted!");
--- 587,591 ----
      	while ( iter.hasNext() ){
      		StudyLocal sty = (StudyLocal) iter.next();
!     		sty.updateDerivedFields(false, false, false, true, true, false, false);
       	}
      	if ( log.isDebugEnabled() ) log.debug( "Studies updated after media "+filesetId+" was deleted!");

Index: StudyMgtBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StudyMgtBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StudyMgtBean.java	22 Jun 2005 08:08:36 -0000	1.2
--- StudyMgtBean.java	29 Sep 2005 15:56:58 -0000	1.3
***************
*** 213,217 ****
  			String iuid = (String) it.next();
  			StudyLocal study = studyHome.findByStudyIuid(iuid);
! 			study.updateDerivedFields(true, true, true, true, true, true);
  		}
  	}
--- 213,217 ----
  			String iuid = (String) it.next();
  			StudyLocal study = studyHome.findByStudyIuid(iuid);
! 			study.updateDerivedFields(true, true, true, true, true, true, true);
  		}
  	}
***************
*** 222,226 ****
  			String iuid = (String) it.next();
  			SeriesLocal series = seriesHome.findBySeriesIuid(iuid);
! 			series.updateDerivedFields(true, true, true, true, true);
  		}
  	}
--- 222,226 ----
  			String iuid = (String) it.next();
  			SeriesLocal series = seriesHome.findBySeriesIuid(iuid);
! 			series.updateDerivedFields(true, true, true, true, true, true);
  		}
  	}

Index: StorageBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/StorageBean.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** StorageBean.java	20 Sep 2005 13:14:59 -0000	1.42
--- StorageBean.java	29 Sep 2005 15:56:58 -0000	1.43
***************
*** 407,415 ****
          for (Iterator series = seriesSet.iterator(); series.hasNext();) {
              final SeriesLocal ser = seriesHome.findBySeriesIuid((String) series.next());
! 			ser.updateDerivedFields(false, false, true, false, false);
          }
          for (Iterator studies = studySet.iterator(); studies.hasNext();) {
              final StudyLocal study = studyHome.findByStudyIuid((String) studies.next());
! 			study.updateDerivedFields(false, false, true, false, false, false);
          }
      }
--- 407,415 ----
          for (Iterator series = seriesSet.iterator(); series.hasNext();) {
              final SeriesLocal ser = seriesHome.findBySeriesIuid((String) series.next());
! 			ser.updateDerivedFields(false, false, true, false, false, true);
          }
          for (Iterator studies = studySet.iterator(); studies.hasNext();) {
              final StudyLocal study = studyHome.findByStudyIuid((String) studies.next());
! 			study.updateDerivedFields(false, false, true, false, false, false, true);
          }
      }
***************
*** 429,433 ****
      public void updateStudy(String iuid) throws FinderException {
          final StudyLocal study = studyHome.findByStudyIuid(iuid);
! 		study.updateDerivedFields(true, true, false, true, true, true);
      }
      
--- 429,436 ----
      public void updateStudy(String iuid) throws FinderException {
          final StudyLocal study = studyHome.findByStudyIuid(iuid);
! 		study.updateDerivedFields(true, true, false, true, true, true, false);
! 		if ( study.updateDerivedFields(false, false, false, false, false, false, true) )
! 			study.getPatient().updateDerivedFields();
! 		
      }
      
***************
*** 437,441 ****
      public void updateSeries(String iuid) throws FinderException {
          final SeriesLocal series = seriesHome.findBySeriesIuid(iuid);
!         series.updateDerivedFields(true, true, false, true, true);
      }
  }
\ No newline at end of file
--- 440,444 ----
      public void updateSeries(String iuid) throws FinderException {
          final SeriesLocal series = seriesHome.findBySeriesIuid(iuid);
!         series.updateDerivedFields(true, true, false, true, true, true);
      }
  }
\ No newline at end of file

Index: MPPSManagerBean.java
===================================================================
RCS file: /cvsroot/dcm4che/dcm4jboss-ejb/src/java/org/dcm4chex/archive/ejb/session/MPPSManagerBean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MPPSManagerBean.java	13 Apr 2005 15:54:54 -0000	1.12
--- MPPSManagerBean.java	29 Sep 2005 15:56:58 -0000	1.13
***************
*** 32,35 ****
--- 32,36 ----
  import org.dcm4chex.archive.ejb.interfaces.PatientLocalHome;
  import org.dcm4chex.archive.ejb.interfaces.SeriesLocal;
+ import org.dcm4chex.archive.ejb.interfaces.StudyLocal;
  
  /**
***************
*** 179,187 ****
              for (Iterator it = c.iterator(); it.hasNext();) {
                  ser = (SeriesLocal) it.next();
!                 ser.setHidden(true);
              }
              if (ser != null)
                  try {
!                     ser.getStudy().updateDerivedFields(true, true, true, true, true, true);
                  } catch (FinderException e1) {
                      throw new DcmServiceException(Status.ProcessingFailure, e1);
--- 180,192 ----
              for (Iterator it = c.iterator(); it.hasNext();) {
                  ser = (SeriesLocal) it.next();
!                 ser.markDeleted(true);
              }
              if (ser != null)
                  try {
!                 	StudyLocal study = ser.getStudy();
!                 	if ( study.getSeries().size() == 1)
!                 		study.setHidden(true);
!                 	else
!                 		study.updateDerivedFields(true, true, true, true, true, true, true);
                  } catch (FinderException e1) {
                      throw new DcmServiceException(Status.ProcessingFailure, e1);