Changeset 3816

Timestamp:

Oct 10, 2007, 4:48:17 PM (16 years ago)

Author:

Martin Svensson

Message:

References #492 Start working on services for BioAssaySets? and added a service to get bioassayset in an
experiment.

Location:

branches/webservices/src/webservices

Files:

• client/java/net/sf/basedb/ws/info/ItemInfo.java (modified) (1 diff)
• server/META-INF/services.xml (modified) (1 diff)
• server/net/sf/basedb/ws/server/AbstractRPCService.java (modified) (1 diff)
• server/net/sf/basedb/ws/server/BioAssaySetService.java (added)
• server/net/sf/basedb/ws/server/ExperimentService.java (modified) (2 diffs)

branches/webservices/src/webservices/client/java/net/sf/basedb/ws/info/ItemInfo.java

@@ -26 +26 @@
 import net.sf.basedb.core.Nameable;
 
+/**
+  Class that holds information about a Nameable item sent through web services
+    @author Nicklas, Martin
+    @version 2.5
+ */
 public class ItemInfo 
 {

branches/webservices/src/webservices/server/META-INF/services.xml

@@ -36 +36 @@
     <parameter name="ServiceClass" locked="false">net.sf.basedb.ws.server.ExperimentService</parameter>
   </service>
+  <service name="BioAssaySet" scope="application">
+    <description>
+      This service handles bioassaysets
+    </description>
+    <messageReceivers>
+      <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out" 
+        class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+      <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only" 
+        class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver" />
+    </messageReceivers>
+    <parameter name="ServiceClass" locked="false">net.sf.basedb.ws.server.BioAssaySetService</parameter>
+  </service>
 </serviceGroup>

branches/webservices/src/webservices/server/net/sf/basedb/ws/server/AbstractRPCService.java

@@ -75 +75 @@
   {   
     List<Include> includes = new ArrayList<Include>();
-    
+    qOpt = qOpt == null ? new QueryOptions() : qOpt;
     if (qOpt.getIncludeMine()) includes.add(Include.MINE);
     if (qOpt.getIncludeShared()) includes.add(Include.SHARED);

branches/webservices/src/webservices/server/net/sf/basedb/ws/server/ExperimentService.java

@@ -26 +26 @@
 import net.sf.basedb.core.Affymetrix;
 import net.sf.basedb.core.ArrayDesign;
+import net.sf.basedb.core.BioAssaySet;
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Experiment;
@@ -80 +81 @@
   }
   
+  /**
+    
+      @param ID
+      @param experimentId
+      @param qOpt
+      @return
+   */
+  public ItemInfo[] getBioAssaySet(String ID, int experimentId, QueryOptions qOpt)
+  {
+    List<ItemInfo> bioAssaySetsInfo = new LinkedList<ItemInfo>();
+    SessionControl sc = getSessionControl(ID);
+    DbControl dc = sc.newDbControl();
+    
+    try
+    {
+      Experiment experiment = Experiment.getById(dc, experimentId);
+      ItemQuery<BioAssaySet> query = experiment.getBioAssaySets();
+      query = qOpt != null ? getConfiguredItemQuery(query, qOpt) : query;
+      
+      for (BioAssaySet bas : query.list(dc))
+      {
+        ItemInfo info = new ItemInfo(bas);
+        bioAssaySetsInfo.add(info);
+      }
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    
+    ItemInfo[] ii = new ItemInfo[bioAssaySetsInfo.size()];
+    return bioAssaySetsInfo.toArray(ii);
+  }
+  
   public RawBioAssayInfo[] getRawBioAssays(String ID, int experimentId, QueryOptions qOpt)
   {