Changeset 4620

Timestamp:

Oct 31, 2008, 9:54:10 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #394: Make it possible to export and properly query values in components

The query problem was solved by using # instead of . to separate paths in a component. The export problem was solved by introducing a new interface (ComponentData?) that all components must implement.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Metadata.java (modified) (5 diffs)
• src/core/net/sf/basedb/core/data/ColoringData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/ComponentData.java (added)
• src/core/net/sf/basedb/core/query/Hql.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlElementsExpression.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlIndexExpression.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlInnerJoin.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlLeftJoin.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlPropertyExpression.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/HqlSizeExpression.java (modified) (1 diff)
• src/core/net/sf/basedb/core/query/ReporterListExpression.java (modified) (1 diff)
• www/views/formulas/list_formulas.jsp (modified) (6 diffs)

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

@@ -26 +26 @@
 import net.sf.basedb.core.data.BasicData;
 import net.sf.basedb.core.data.BatchableData;
+import net.sf.basedb.core.data.ComponentData;
+
 import java.util.Date;
 import java.util.Collection;
@@ -35 +37 @@
 
 import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.type.ComponentType;
 import org.hibernate.EntityMode;
 
@@ -288 +291 @@
     if (item == null) throw new InvalidUseOfNullException("item");
     if (propertyName == null) throw new InvalidUseOfNullException("propertyName");
-    String[] propertyPath = propertyName.split("\\.");
+    String[] propertyPath = propertyName.split("\\.|\\#");
     ClassMetadata currentClassMetadata = classMetadata;
     String currentIdProperty = currentClassMetadata.getIdentifierPropertyName();
@@ -333 +336 @@
           currentIdProperty = currentClassMetadata.getIdentifierPropertyName();
         }
+        
         if (propertyPath[i].equals(currentIdProperty))
         {
           value = currentClassMetadata.getIdentifier(data, EntityMode.POJO);
+        }
+        else if (value instanceof ComponentData)
+        {
+          ComponentType type = (ComponentType)currentClassMetadata.getPropertyType(propertyPath[i-1]);
+          data = value;
+          // There is no get-by-name method, we need to find the index
+          String[] subProperties = type.getPropertyNames();
+          for (int index = 0; index < subProperties.length; ++index)
+          {
+            if (subProperties[index].equals(propertyPath[i]))
+            {
+              value = type.getPropertyValue(data, index, EntityMode.POJO);
+              break;
+            }
+          }
         }
         else
@@ -392 +411 @@
     return value;
   }
-
+  
   public String toString()
   {

trunk/src/core/net/sf/basedb/core/data/ColoringData.java

@@ -32 +32 @@
 */
 public class ColoringData
+  implements ComponentData
 {
 

trunk/src/core/net/sf/basedb/core/query/Hql.java

@@ -54 +54 @@
   
   /**
-    A property can only contain the characters a-zA-Z0-9 and period(.)
-    It cannot begin or end with a period and cannot have two periods in a sequence.
-  */
-  public static final Pattern PROPERTY_REGEXP = Pattern.compile("[a-zA-Z0-9]+(\\.[a-zA-Z0-9]+)*");
+    A property can only contain the characters a-zA-Z0-9, period(.) or hash (#)
+    It cannot begin or end with a period/hash and cannot have two periods/hashes in a sequence.
+    A hash indicates a path to a component while a period indicates a path to another
+    entity.
+  */
+  public static final Pattern PROPERTY_REGEXP = Pattern.compile("[a-zA-Z0-9]+((\\.|\\#)[a-zA-Z0-9]+)*");
 
   /**

trunk/src/core/net/sf/basedb/core/query/HqlElementsExpression.java

@@ -63 +63 @@
     if (query.getQueryType() == QueryType.HQL)
     {
-      return "elements("+(alias == null ? query.getRootAlias() : alias) + (property == null ? "" : "." +property)+")";
+      return "elements("+(alias == null ? query.getRootAlias() : alias) + 
+        (property == null ? "" : "." +property.replace("#", "."))+")";
     }
     else

trunk/src/core/net/sf/basedb/core/query/HqlIndexExpression.java

@@ -62 +62 @@
     if (query.getQueryType() == QueryType.HQL)
     {
-      return "index("+(alias == null ? query.getRootAlias() : alias) + (property == null ? "" : "." +property)+")";
+      return "index("+(alias == null ? query.getRootAlias() : alias) + 
+        (property == null ? "" : "." +property.replace("#", "."))+")";
     }
     else

trunk/src/core/net/sf/basedb/core/query/HqlInnerJoin.java

@@ -72 +72 @@
       // Count queries can't use the fetch parameter; they are not selecting the root item
       return "INNER JOIN " + (fetch && !query.isCounting() ? "FETCH " : "") +
-        (alias == null ? query.getRootAlias() : alias) + "." + property + " " + joinedAlias +
+        (alias == null ? query.getRootAlias() : alias) + "." + property.replace("#", ".") + " " + joinedAlias +
         (on == null ? "" : " WITH " + on.toQl(query, dc));
     }

trunk/src/core/net/sf/basedb/core/query/HqlLeftJoin.java

@@ -72 +72 @@
     {
       return "LEFT JOIN " + (fetch && !query.isCounting() ? "FETCH " : "") +
-        (alias == null ? query.getRootAlias() : alias) + "." + property + " " + joinedAlias +
+        (alias == null ? query.getRootAlias() : alias) + "." + property.replace("#", ".") + " " + joinedAlias +
         (on == null ? "" : " WITH " + on.toQl(query, dc));
     }

trunk/src/core/net/sf/basedb/core/query/HqlPropertyExpression.java

@@ -61 +61 @@
     if (query.getQueryType() == QueryType.HQL)
     {
-      return (alias == null ? query.getRootAlias() : alias) + (property == null ? "" : "." +property);
+      return (alias == null ? query.getRootAlias() : alias) + 
+        (property == null ? "" : "." +property.replace("#", "."));
     }
     else

trunk/src/core/net/sf/basedb/core/query/HqlSizeExpression.java

@@ -64 +64 @@
     {
       return "size("+(alias == null ? query.getRootAlias() : alias) + 
-        (property == null ? "" : "." +property)+")";
+        (property == null ? "" : "." +property.replace("#", "."))+")";
     }
     else

trunk/src/core/net/sf/basedb/core/query/ReporterListExpression.java

@@ -101 +101 @@
     else if (query.getQueryType() == QueryType.HQL && hqlMode)
     {
-      return tableAlias + "." + property;
+      return tableAlias + "." + property.replace("#", ".");
     }
     else

trunk/www/views/formulas/list_formulas.jsp

@@ -97 +97 @@
   try
   {
-    final ItemQuery<Formula> query = Base.getConfiguredQuery(cc, false, Formula.getQuery(), mode);
+    final ItemQuery<Formula> query = Base.getConfiguredQuery(dc, cc, true, Formula.getQuery(), mode);
     formulas = query.iterate(dc);
   }
@@ -107 +107 @@
   int numListed = 0;
   %>
+  
   <base:page title="<%=title==null ? "Formulas" : title%>" type="<%=mode.getPageType()%>">
   <base:head scripts="menu.js,table.js" styles="menu.css,table.css">
@@ -298 +299 @@
       <tbl:columndef 
         id="useColors"
-        property="coloring.usingColors"
+        property="coloring#usingColors"
         datatype="boolean"
         title="Use colors"
@@ -307 +308 @@
       <tbl:columndef 
         id="logarithmic"
-        property="coloring.logarithmic"
+        property="coloring#logarithmic"
         datatype="boolean"
         title="Logarithmic"
         sortable="true" 
         filterable="true"
-        exportable="false"
+        exportable="true"
       />
       <tbl:columndef 
         id="minValue"
-        property="coloring.minValue"
+        property="coloring#minValue"
         datatype="float"
         title="Min value"
@@ -325 +326 @@
       <tbl:columndef 
         id="midValue"
-        property="coloring.midValue"
+        property="coloring#midValue"
         datatype="float"
         title="Mid value"
@@ -334 +335 @@
       <tbl:columndef 
         id="maxValue"
-        property="coloring.maxValue"
+        property="coloring#maxValue"
         datatype="float"
         title="Max value"