Changeset 4008

Timestamp:

Nov 27, 2007, 2:02:55 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #846: Add query parameters to QueryOptions?

Location:

trunk/src

Files:

• info/net/sf/basedb/info/QueryOptions.java (modified) (2 diffs)
• info/net/sf/basedb/info/QueryParameter.java (added)
• test/TestWebservices.java (modified) (2 diffs)
• webservices/server/net/sf/basedb/ws/server/ServicesUtil.java (modified) (2 diffs)

trunk/src/info/net/sf/basedb/info/QueryOptions.java

@@ -70 +70 @@
   
   private boolean includeNotRemoved = true;
+  
+  private QueryParameter[] parameters;
   
   /**
@@ -270 +272 @@
     this.prefix = prefix;
   }
+  
+  /**
+    Get the parameters used in this query.
+    @return An array of query parameters, may be null or empty if no
+      parameters are used
+  */
+  public QueryParameter[] getParameters()
+  {
+    return parameters;
+  }
+  
+  /**
+    Set the parmeters to use in this query.
+    @param parameters An array of query parameters, may be null or empty
+      if not parameters are used
+  */
+  public void setParameters(QueryParameter[] parameters)
+  {
+    this.parameters = parameters;
+  }
+  
 }

trunk/src/test/TestWebservices.java

@@ -43 +43 @@
 import net.sf.basedb.info.ProjectInfo;
 import net.sf.basedb.info.QueryOptions;
+import net.sf.basedb.info.QueryParameter;
 import net.sf.basedb.info.RawBioAssayInfo;
 import net.sf.basedb.info.ReporterListInfo;
@@ -525 +526 @@
       //Tests ProjectClient.getProjects(QueryOptions qOpt)
       QueryOptions qOpt = new QueryOptions();
+      qOpt.setRestrictionWithPrefix("$valueType = :vt", "$");
+      qOpt.setParameters(new QueryParameter[]{ new QueryParameter("vt", Type.STRING.getValue()) });
       AnnotationTypeInfo[] infos = atClient.getAnnotationTypes(null, qOpt);
       

trunk/src/webservices/server/net/sf/basedb/ws/server/ServicesUtil.java

@@ -32 +32 @@
 import net.sf.basedb.core.Include;
 import net.sf.basedb.core.ItemQuery;
+import net.sf.basedb.core.Type;
 import net.sf.basedb.core.query.Hql;
 import net.sf.basedb.info.AnnotationInfo;
 import net.sf.basedb.info.QueryOptions;
+import net.sf.basedb.info.QueryParameter;
 import net.sf.basedb.info.ToTransferable;
 import net.sf.basedb.info.Transferable;
@@ -74 +76 @@
     {
       query.restrict(Hql.restriction(qOpt.getRestriction(), qOpt.getRestrictionPrefix()));
+    }
+    QueryParameter[] parameters = qOpt.getParameters();
+    if (parameters != null && parameters.length > 0)
+    {
+      for (QueryParameter qp : parameters)
+      {
+        Type valueType = Type.valueOf(qp.getType());
+        Object value = valueType.parseString(qp.getValue());
+        query.setParameter(qp.getName(), value, valueType);
+      }
     }
     return query;