[Bedework-commit] calendarapi r244 - trunk/calCore/src/org/bedework/calcore/hibernate

[svnadmin at bedework.org]

Author: douglm
Date: 2007-03-31 23:40:25 -0400 (Sat, 31 Mar 2007)
New Revision: 244

Modified:
   trunk/calCore/src/org/bedework/calcore/hibernate/Filters.java
Log:
Changes to make category matching work


Modified: trunk/calCore/src/org/bedework/calcore/hibernate/Filters.java
===================================================================
--- trunk/calCore/src/org/bedework/calcore/hibernate/Filters.java	2007-03-30 17:52:10 UTC (rev 243)
+++ trunk/calCore/src/org/bedework/calcore/hibernate/Filters.java	2007-04-01 03:40:25 UTC (rev 244)
@@ -361,6 +361,10 @@
           String fld = "joined_" + pi.getField();
           String subfld = "value";
 
+          if (pi.getPindex() == PropertyInfoIndex.CATEGORIES) {
+            subfld = "word.value";
+          }
+
           doObject((BwObjectFilter)pf, fld, subfld);
         } else {
           qseg.append("(:");
@@ -514,7 +518,7 @@
         sess.setEntity(parPrefix + qi, o);
       } else {
         if (!of.getExact()) {
-          sess.setParameter(parPrefix + qi, "%" + o + "%");
+          sess.setString(parPrefix + qi, "%" + o + "%");
         } else {
           sess.setParameter(parPrefix + qi, o);
         }