[UniTime-cvs] UniTime/JavaSource/org/unitime/timetable/model EventContact.java, 1.7, 1.8 ChangeLog.java, 1.14, 1.15

[Stephanie S. <say...@us...>]

Update of /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21021/JavaSource/org/unitime/timetable/model

Modified Files:
	EventContact.java ChangeLog.java 
Log Message:
Added support for one time Event loads through the xml interface.  The event load can be used to populate the event system with the events from a different system.  The event load process does not check for duplicate events.  Therefore if an event already exists in the Event system and an xml file with the same event is load, then the event will exist two times in the event system.

Index: ChangeLog.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/ChangeLog.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog.java	29 Jul 2008 20:19:34 -0000	1.14
--- ChangeLog.java	28 Jan 2009 18:50:12 -0000	1.15
***************
*** 137,141 ****
          EXAM_INFO,
          EXAM_SOLVER,
!         EVENT_EDIT
      }
      
--- 137,142 ----
          EXAM_INFO,
          EXAM_SOLVER,
!         EVENT_EDIT,
!         DATA_IMPORT_EVENTS
      }
      

Index: EventContact.java
===================================================================
RCS file: /cvsroot/unitime/UniTime/JavaSource/org/unitime/timetable/model/EventContact.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EventContact.java	6 Aug 2008 01:52:33 -0000	1.7
--- EventContact.java	28 Jan 2009 18:50:12 -0000	1.8
***************
*** 22,25 ****
--- 22,26 ----
  import java.util.List;
  
+ import org.hibernate.FlushMode;
  import org.unitime.timetable.model.base.BaseEventContact;
  import org.unitime.timetable.model.dao.EventContactDAO;
***************
*** 61,65 ****
  	    return (EventContact)new EventContactDAO().getSession().
  	        createQuery("select c from EventContact c where c.externalUniqueId=:externalUniqueId").
! 	        setString("externalUniqueId", externalUniqueId).uniqueResult();
  	}
  
--- 62,68 ----
  	    return (EventContact)new EventContactDAO().getSession().
  	        createQuery("select c from EventContact c where c.externalUniqueId=:externalUniqueId").
! 	        setString("externalUniqueId", externalUniqueId).
! 	        setFlushMode(FlushMode.MANUAL).
! 	        uniqueResult();
  	}