X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=mythtv%2Fmonitor%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fmythtv%2FRecordingDatabase.java;h=aafa25378cc4259536cdf43af141efbe933995aa;hb=cf25a3646c663c5aadbd2de8c23840550b18125b;hp=e4badfba898e40f01857b15d5ef86a8fdec18112;hpb=bf4a315eb93a73f42247b84379e62e86a78c10bb;p=utils

diff --git a/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
index e4badfba..aafa2537 100644
--- a/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
+++ b/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
@@ -16,49 +16,30 @@
 
 package org.wamblee.mythtv;
 
-import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.criterion.Expression;
-import org.springframework.orm.hibernate3.HibernateCallback;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-import org.springframework.orm.jpa.JpaTemplate;
-import org.springframework.orm.jpa.support.JpaDaoSupport;
 
 /**
  * 
  */
-public class RecordingDatabase extends JpaDaoSupport {
+public class RecordingDatabase {
     
     private static final Log LOG = LogFactory.getLog(RecordingDatabase.class);
-
-    public RecordingDatabase() { 
-        // Empty
-    }
     
-    public void init() {  
-        /* 
-        for (Recording recording: (List<Recording>)getHibernateTemplate().loadAll(Recording.class) ) { 
-            LOG.info("Found recording " + recording);
-        }
-        LOG.info("After listing recordings");
-        */
+    private EntityManager _entityManager; 
+
+    public RecordingDatabase(EntityManager aEntityManager) { 
+        _entityManager = aEntityManager; 
     }
     
     public Recording findRecording(final String aName) {
-        JpaTemplate jpaTemplate = getJpaTemplate();
-        EntityManager entityManager = jpaTemplate.getEntityManager();
-        Query query = entityManager.createQuery(
-                "from org.wamblee.mythtv.Recording where basename = ?1");
+        Query query = _entityManager.createQuery(
+                "select r from Recording r where r.basename = ?1");
         query.setParameter(1, aName);
         List<Recording> result = query.getResultList();
         if ( result.size() > 1 ) { 
@@ -71,8 +52,6 @@ public class RecordingDatabase extends JpaDaoSupport {
     }
     
     public void update(Recording aRecording) { 
-        // Update is not required since the whole task of updating the 
-        // directory structure occurs within a single transaction. 
-        // Therefore, modifications to recordings are automatically persisted. 
+        _entityManager.merge(aRecording);
     }
 }