Changeset 4607

Timestamp:

Oct 28, 2008, 9:16:02 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1129: Filtering of child/parent items in table listing

Added support in core and test case for experiments in raw bioassays list is done.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/AbstractQuery.java (modified) (1 diff)
• src/core/net/sf/basedb/core/ItemContext.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/PropertyFilter.java (modified) (6 diffs)
• www/views/rawbioassays/list_rawbioassays.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/AbstractQuery.java

@@ -488 +488 @@
   public String toString()
   {
-    return this.getClass().getSimpleName() + ": " + getMainQuery(null, !isReadonly());
+    return getMainQuery(null, !isReadonly());
   }
   // -------------------------------------------

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -1056 +1056 @@
         try
         {
-          Restriction r = filter.getRestriction(dc);
+          Restriction r = filter.getRestriction(dc, query);
           if (r != null)
           {
@@ -1066 +1066 @@
               String filterProperty = filter.getProperty();
               int dotIndex = filterProperty == null ? -1 : filterProperty.lastIndexOf(".");
-              if (dotIndex >= 0 && !filterProperty.startsWith("$") && !filterProperty.startsWith("£"))
+              if (dotIndex >= 0 && !filterProperty.startsWith("$") && !filterProperty.startsWith("£") && !filterProperty.startsWith("&"))
               {
                 leftJoins.add(filterProperty.substring(0, dotIndex));
@@ -1099 +1099 @@
       {
         boolean fetch = selectOrderBy && sortedProperties.contains(property);
-        if (property.startsWith("@") || property.startsWith("£")) 
+        if (property.startsWith("@") || property.startsWith("£") || property.startsWith("&")) 
         {
           property = property.substring(1);

trunk/src/core/net/sf/basedb/core/PropertyFilter.java

@@ -27 +27 @@
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import net.sf.basedb.core.data.AnnotationTypeData;
@@ -32 +34 @@
 import net.sf.basedb.core.data.ReporterData;
 import net.sf.basedb.core.data.UnitData;
+import net.sf.basedb.core.query.EntityQuery;
+import net.sf.basedb.core.query.Query;
 import net.sf.basedb.core.query.Restriction;
 import net.sf.basedb.core.query.Restrictions;
@@ -64 +68 @@
    */
   private final String value_separator = "|";
+  
+  private final Pattern ENTITY_COLLECTION = Pattern.compile("\\&([\\w\\.]+)\\((.+)\\)");
   
   private final String property;
@@ -379 +385 @@
   
   /**
-    This method will fail if used to filter on reporter lists.
-    @deprecated Use {@link #getRestriction(DbControl)} instead
+    This method will fail if used to filter on reporter lists or collections.
+    @deprecated Use {@link #getRestriction(DbControl, EntityQuery)} instead
   */
   public Restriction getRestriction()
   {
-    return getRestriction(null);
+    return getRestriction(null, null);
+  }
+
+  /**
+    This method will fail if used to filter on collections.
+    @deprecated Use {@link #getRestriction(DbControl, EntityQuery)} instead
+  */
+  public Restriction getRestriction(DbControl dc)
+  {
+    return getRestriction(dc, null);
   }
 
@@ -407 +422 @@
     we always use an IN restriction, ignoring the specified operator.
     <p>
+    If the property starts with & it is a collection of entities. The property
+    must end with a property name from the entity in the collection within paranthesis.
+    Eg. &experiments(name). The filter is applied as a subquery.
+    <p>
     The property may also start with $@.
     @return The restriction
     @since 2.8
   */
-  public Restriction getRestriction(DbControl dc)
+  public Restriction getRestriction(DbControl dc, EntityQuery query)
   {
     
@@ -562 +581 @@
         }
       }
+      else if (property != null && property.startsWith("&"))
+      {
+        // Property is an entity collection: collection(filter-property)
+        Matcher m = ENTITY_COLLECTION.matcher(property);
+        if (!m.matches()) 
+        {
+          throw new InvalidDataException("Invalid collection filter: " + property);
+        }
+        String entityCollection = m.group(1);
+        String collectionFilter = m.group(2);
+        
+        /*
+          We are going to create a subquery like:
+          root-entity = ANY(
+            SELECT root-entity FROM root-entity
+            LEFT JOIN collection-path cp 
+            WHERE cp.filter-property ........
+          )
+        */
+        Query subquery = new AbstractEntityQuery(query.getItemType(), null, false, null)
+        {};
+        // LEFT JOIN the parts in the collection path
+        String[] cPath = entityCollection.split("\\.");
+        String thisAlias = null;
+        for (int i = 0; i < cPath.length; ++i)
+        {
+          String nextAlias = "cp" + i;
+          subquery.join(Hql.leftJoin(thisAlias, cPath[i], nextAlias, null, false));
+          thisAlias = nextAlias;
+        }
+        
+        // Restrict the subquery
+        PropertyFilter pp = new PropertyFilter("$" + thisAlias + "." + collectionFilter, 
+            operator, getValue(), getValueType());
+        subquery.restrict(pp.getRestriction(dc, query));
+        
+        // Create the main restriction
+        restriction = Restrictions.eq(Hql.alias(query.getRootAlias()), 
+            Expressions.any(subquery));
+      }
       else
-      {
+      {   
         Expression propertyExpression = Hql.property(alias, property);
         if (getValueType() == Type.DATE)

trunk/www/views/rawbioassays/list_rawbioassays.jsp

@@ -424 +424 @@
         id="experiments"
         title="Experiments"
+        property="&experiments(name)"
+        datatype="string"
+        filterable="true"
       />
       <tbl:columndef