Changeset 1640

Timestamp:

May 9, 2012, 2:59:48 PM (10 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #390: Search for subtype and annotation type among proper main item type

Location:

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao

Files:

• Annotationtype.java (modified) (3 diffs)
• Subtype.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Annotationtype.java

@@ -18 +18 @@
 import net.sf.basedb.core.ItemQuery;
 import net.sf.basedb.core.Type;
+import net.sf.basedb.core.query.Expression;
 import net.sf.basedb.core.query.Expressions;
 import net.sf.basedb.core.query.Hql;
@@ -424 +425 @@
     
   /**
-    List all annotation types registered in BASE with a name matching this annotation
-    type definition. Normally, only a single annotation type should be returned.
+    List all annotation types registered in BASE with a name and main item type 
+    matching this annotation type definition. Normally, only a single annotation
+    type should be returned.
   */
   public List<AnnotationType> list(DbControl dc)
@@ -431 +433 @@
     ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
     query.restrict(Restrictions.eq(Hql.property("name"), Expressions.parameter("name", name, Type.STRING)));
+    query.joinPermanent(Hql.innerJoin("itemTypes", "it"));
+    
+    Item[] mt = getMainType();
+    Expression[] mainTypes = new Expression[mt.length];
+    for (int i = 0; i < mainTypes.length; ++i)
+    {
+      mainTypes[i] = Expressions.integer(mt[i].getValue());
+    }
+    query.restrictPermanent(Restrictions.in(Hql.alias("it"), mainTypes));
+
     query.include(Include.ALL);
+    query.setDistinct(true);
     return query.list(dc);
   }

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/Subtype.java

@@ -259 +259 @@
   
   /**
-    List all subtypes registered in BASE with a name matching this subtype
-    definition. Normally, only a single subtype should be returned.
+    List all subtypes registered in BASE with a name and main item type
+    matching this subtype definition. Normally, only a single subtype 
+    should be returned.
   */
   public List<ItemSubtype> list(DbControl dc)
   {
-    ItemQuery<ItemSubtype> query = ItemSubtype.getQuery(null);
+    ItemQuery<ItemSubtype> query = ItemSubtype.getQuery(getMainType());
     query.restrict(
       Restrictions.eq(