query is now JPA query.

diff --git a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
index da7220de36fa58427899eb84501e58ba32fcb844..a1e7844e7203d8d449d5db60eb9adf2c4f0ba5e2 100644 (file)
--- a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
+++ b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/Recording.java
@@ -54,13 +54,6 @@ public class Recording implements Serializable {
     protected Recording() {
         // Empty
     }
-
-    /**
-     * @return the channel
-     */
-    //@Id
-    //@ManyToOne(targetEntity=Channel.class)
-    //@JoinColumn(name="chanid")
     
     /**
      * @return the id

diff --git a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
index e4badfba898e40f01857b15d5ef86a8fdec18112..cf7bc5f502b052954d2096c0b42cac69f4fe3696 100644 (file)
--- a/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
+++ b/trunk/mythtv/monitor/src/main/java/org/wamblee/mythtv/RecordingDatabase.java
@@ -58,7 +58,7 @@ public class RecordingDatabase extends JpaDaoSupport {
         JpaTemplate jpaTemplate = getJpaTemplate();
         EntityManager entityManager = jpaTemplate.getEntityManager();
         Query query = entityManager.createQuery(
-                "from org.wamblee.mythtv.Recording where basename = ?1");
+                "select r from Recording r where r.basename = ?1");
         query.setParameter(1, aName);
         List<Recording> result = query.getResultList();
         if ( result.size() > 1 ) {