Changeset 3991

Timestamp:

Nov 22, 2007, 2:06:17 PM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #827 Reporters can now be exported through web services. Two new methods in ReporterService? are added, one that exports reporters in a reporters list and one that exports all reports. The reporters are exported to a tab-separated text file.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java (modified) (7 diffs)
• src/test/TestWebservices.java (modified) (1 diff)
• src/webservices/client/java/net/sf/basedb/ws/client/ReporterClient.java (modified) (2 diffs)
• src/webservices/server/net/sf/basedb/ws/server/ReporterService.java (modified) (2 diffs)

trunk/build.xml

@@ -966 +966 @@
       <pathelement location="${core.build}"/>
       <pathelement location="${coreplugins.build}"/>
+      <pathelement location="${web.build}"/>
     </path>
     <path id="webservices.client.classpath" 

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -32 +32 @@
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.DynamicQuery;
+import net.sf.basedb.core.InvalidUseOfNullException;
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.ItemContext;
@@ -211 +212 @@
   */
   private DbControl dc;
-  private int numExported;
+  private String successMessage;
   protected void begin(DbControl dc)
   {
     this.dc = dc;
-    this.numExported = 0;
+    this.successMessage = "";
   }
   
@@ -233 +234 @@
       new ArrayList<ExportedProperty>(columns.size());
     List<String> properties = new ArrayList<String>(columns.size());
-    boolean hasAnnotations = false;
     boolean annotatable = itemType.getItemClass() != null && 
       Annotatable.class.isAssignableFrom(itemType.getItemClass());
@@ -239 +239 @@
     formatter.registerFormatter(Date.class, FormatterFactory.getDateFormatter(sc));
     for (String column : columns)
-    {
-      ExportedProperty ep = ExportedProperty.parse(dc, column, annotatable, formatter);
-      hasAnnotations |= ep.annotationType != null;
+    {     
+      ExportedProperty ep = ExportedProperty.parse(dc, column, annotatable, formatter);     
       exportedProperties.add(ep);
-      properties.add(ep.name);
-    }
-
-    // Open stream for output and set file name and MIME type
-    Writer exportStream = new OutputStreamWriter(out, "UTF-8");
-    // Create export template for outputting the data
-    ExportTemplate template = "xml".equals(format) ? 
-      new XMLTemplate(exportStream, exportedProperties, itemType) : 
-      new PlainTextTemplate(exportStream, exportedProperties, itemType);
-    out.setFilename(itemType.name().toLowerCase()+".export.txt");
-    out.setMimeType(template.getMimeType());
-    
-    // Write start of document and headers
-    template.beginDocument();
-    template.writeHeaders();
+      properties.add(ep.name);      
+    }   
     
     // Get the query from the current context
     ItemContext cc = sc.getCurrentContext(itemType, subContext);
     Query query = cc.getQuery();
-    QueryWrapper queryWrapper = null;
-    ResultIterator result = null;
     Set<Integer>selectedItems = cc.getSelected();
-    
-    // The query wrapper allows us to get results from the query in a simplier way
-    if (query instanceof ItemQuery)
-    {
-      queryWrapper = new ItemQueryWrapper(dc, (ItemQuery<BasicItem>)query, itemType);
-    }
-    else if (query instanceof DataQuery)
-    {
-      String entityName = null;
-      if (itemType == Item.RAWDATA)
-      {
-        RawBioAssay rba = RawBioAssay.getById(dc, sc.getCurrentContext(Item.RAWBIOASSAY).getId());
-        entityName = rba.getRawDataType().getEntityName();
-      }
-      queryWrapper = new DataQueryWrapper(dc, (DataQuery<BasicData>)query, itemType, entityName);
-    }
-    else if (query instanceof ReporterScoreQuery)
-    {
-      queryWrapper = new ReporterScoreQueryWrapper(dc, (ReporterScoreQuery)query);
-    }
-    else if (query instanceof DynamicQuery)
-    {
-      DynamicQuery dynamicQuery = (DynamicQuery)query;
-      cc.configureQuery(dc, dynamicQuery, properties);
-      queryWrapper = new DynamicQueryWrapper(dc, dynamicQuery);
+    if (query instanceof DynamicQuery)
+    {     
+      cc.configureQuery(dc, (DynamicQuery)query, properties);
     }
     
     // Configure the query with additional filters depending on which items should be exported
     query.setReturnTotalCount(false);
-    boolean needToStep = false;
+    //boolean needToStep = false;
     int itemsPerStep = Config.getInt("export.max.items", 0);
     // Which of "all", "current page", or "selected" is selected?
     long totalItems = 0;
     if ("all".equals(whichItems))
-    {
-      needToStep = itemsPerStep > 0;
+    { 
       query.setFirstResult(0);
       query.setMaxResults(itemsPerStep);
@@ -337 +298 @@
       query.setParameter("_excludes_", Arrays.asList(Values.getInt(exclude.split(","))), Type.INT);
     }
+    
+    exportProperties(dc, out, format, exportedProperties, itemType, query, progress);
+  }
+  
+  protected void end(boolean success)
+  {
+    this.dc = null;
+  }
+  protected String getSuccessMessage()
+  {
+    return successMessage;
+  }
+  // -------------------------------------------
+  
+  private void initGuiContexts()
+  {
+    for (Item i : Item.values())
+    {
+      if (i.getDataClass() != null)
+      {
+        guiContexts.add(new GuiContext(i, GuiContext.Type.LIST));
+      }
+    }
+    guiContexts.add(new GuiContext(Item.REPORTERSCORE, GuiContext.Type.LIST));
+    guiContexts.add(new GuiContext(Item.SPOTDATA, GuiContext.Type.LIST));
+  }
+  
+  private RequestInformation getConfigureJobParameters(GuiContext context)
+  {
+    if (configureJob == null)
+    {
+      List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
+
+      parameters.add(getFormatParameter());
+      parameters.add(getWhichItemsParameter());
+      parameters.add(getWhichPropertiesParameter());    
+      parameters.add(getSaveAsParameter(null, null, null, false));
+      parameters.add(getOverwriteParameter(null, null));
+      
+      configureJob = new RequestInformation
+      (
+        Request.COMMAND_CONFIGURE_JOB,
+        "Export " + context.getItem(),
+        "Set options for which items and which columns that should be exported.",
+        parameters, "simple_export.jsp"
+      );
+    }
+    return configureJob;
+  }
+  
+  private static final String FORMAT = "format";
+  private PluginParameter<String> getFormatParameter()
+  {
+    String label = "Format";
+    String description = "You may select to export in text or XML format.";
+    Enumeration<String, String> options = new Enumeration<String, String>();
+    options.add("text", "Tab-separated text file");
+    options.add("xml", "XML");
+    PluginParameter<String> formatParameter = new PluginParameter<String>
+      (
+        FORMAT, label, description, "text",
+        new StringParameterType(255, "text", true, 1, 0, 0, options)
+      );
+    return formatParameter;
+  }
+
+  private static final String WHICH_ITEMS = "whichItems";
+  private PluginParameter<String> getWhichItemsParameter()
+  {
+    String label = "Which items?";
+    String description = "Select which items you want to export";
+    Enumeration<String, String> options = new Enumeration<String, String>();
+    options.add("selected", "Selected items");
+    options.add("page", "Current page");
+    options.add("all", "All pages");
+    PluginParameter<String> whichItemsParameter = new PluginParameter<String>
+      (
+        WHICH_ITEMS, label, description, "all",
+        new StringParameterType(255, "all", true, 1, 0, 0, options)
+      );
+    return whichItemsParameter;
+  }
+
+  private static final String WHICH_PROPERTIES = "whichProperties";
+  private PluginParameter<String> getWhichPropertiesParameter()
+  {
+    String label = "Which properties?";
+    String description = "Enter the names of the properties you want to export. " +
+      "Use a colon to separate an optional title from the property name. For example: " +
+      "name:Name of sample";
+    PluginParameter<String> whichPropertiesParameter = new PluginParameter<String>
+      (
+        WHICH_PROPERTIES, label, description, null,
+        new StringParameterType(255, null, true, 0, 0, 0)
+      );
+    return whichPropertiesParameter;
+  }
+  
+  /**
+    Exports properties from a query to an output stream.  
+    The export can be either tab-separated text or XML. 
+      @param dc The DbControl to use when accessing the database
+      @param out Output stream to export to.
+      @param format Use 'xml' to export in XML-format. All other inputs will give a tab-separated format.
+      @param exportedProperties A list of which properties to include in the export.
+      @param itemType Kind of item the export is about 
+      @param query This query is used to get the items to export.
+      @param progress Optional progress reporter to get overview of how the export is proceeding.
+      @throws IOException If anything goes wrong with export to the output stream.
+   */
+  @SuppressWarnings("unchecked")
+  public void exportProperties(DbControl dc, ExportOutputStream out, String format, List<ExportedProperty> exportedProperties, 
+      Item itemType, Query query, ProgressReporter progress)
+    throws IOException
+  {
+    if (dc == null) throw new InvalidUseOfNullException("dc");
+    if (out == null) throw new InvalidUseOfNullException("out");
+    if (exportedProperties == null) throw new InvalidUseOfNullException("exportedProperties");
+    if (itemType == null) throw new InvalidUseOfNullException("itemType");
+    if (query == null) throw new InvalidUseOfNullException("query");
+    
+    this.dc = dc;
+    boolean hasAnnotations = false;
+    int itemsPerStep = Config.getInt("export.max.items", 0);
+    boolean needToStep = query.getMaxResults() > 0 ? (itemsPerStep > 0) : false;
+    long totalItems = query.getMaxResults() == 0 ? query.count(dc) : query.getMaxResults();
+    
+    for (ExportedProperty ep : exportedProperties)
+    {
+      hasAnnotations |= ep.annotationType != null;
+    }
+    QueryWrapper queryWrapper = null;
+    // The query wrapper allows us to get results from the query in a simplier way
+    if (query instanceof ItemQuery)
+    {
+      queryWrapper = new ItemQueryWrapper(dc, (ItemQuery<BasicItem>)query, itemType);
+    }
+    else if (query instanceof DataQuery)
+    {
+      String entityName = null;
+      if (itemType == Item.RAWDATA)
+      {
+        RawBioAssay rba = RawBioAssay.getById(dc, sc.getCurrentContext(Item.RAWBIOASSAY).getId());
+        entityName = rba.getRawDataType().getEntityName();
+      }
+      queryWrapper = new DataQueryWrapper(dc, (DataQuery<BasicData>)query, itemType, entityName);
+    }
+    else if (query instanceof ReporterScoreQuery)
+    {
+      queryWrapper = new ReporterScoreQueryWrapper(dc, (ReporterScoreQuery)query);
+    }
+    else if (query instanceof DynamicQuery)
+    {
+      DynamicQuery dynamicQuery = (DynamicQuery)query;      
+      queryWrapper = new DynamicQueryWrapper(dc, dynamicQuery);
+    }
+    
+    // Open stream for output and set file name and MIME type
+    Writer exportStream = new OutputStreamWriter(out, "UTF-8");
+    // Create export template for outputting the data
+    ExportTemplate template = "xml".equals(format) ? 
+      new XMLTemplate(exportStream, exportedProperties, itemType) : 
+      new PlainTextTemplate(exportStream, exportedProperties, itemType);
+    out.setFilename(itemType.name().toLowerCase()+".export.txt");
+    out.setMimeType(template.getMimeType());
+    
+    // Write start of document and headers
+    template.beginDocument();
+    template.writeHeaders();
+    
+    int numExported = 0;
+    ResultIterator result = null;
     try
     {
@@ -384 +517 @@
       while (needToStep && (numExported % itemsPerStep == 0));
       template.endDocument();
+      successMessage = numExported + " items were exported successfully";
     }
     catch (Exception ex)
@@ -396 +530 @@
     }
   }
-  
-  protected void end(boolean success)
-  {
-    this.dc = null;
-  }
-  protected String getSuccessMessage()
-  {
-    return numExported + " items were exported successfully";
-  }
-  // -------------------------------------------
-  
-  private void initGuiContexts()
-  {
-    for (Item i : Item.values())
-    {
-      if (i.getDataClass() != null)
-      {
-        guiContexts.add(new GuiContext(i, GuiContext.Type.LIST));
-      }
-    }
-    guiContexts.add(new GuiContext(Item.REPORTERSCORE, GuiContext.Type.LIST));
-    guiContexts.add(new GuiContext(Item.SPOTDATA, GuiContext.Type.LIST));
-  }
-  
-  private RequestInformation getConfigureJobParameters(GuiContext context)
-  {
-    if (configureJob == null)
-    {
-      List<PluginParameter<?>> parameters = new ArrayList<PluginParameter<?>>();
-
-      parameters.add(getFormatParameter());
-      parameters.add(getWhichItemsParameter());
-      parameters.add(getWhichPropertiesParameter());    
-      parameters.add(getSaveAsParameter(null, null, null, false));
-      parameters.add(getOverwriteParameter(null, null));
-      
-      configureJob = new RequestInformation
-      (
-        Request.COMMAND_CONFIGURE_JOB,
-        "Export " + context.getItem(),
-        "Set options for which items and which columns that should be exported.",
-        parameters, "simple_export.jsp"
-      );
-    }
-    return configureJob;
-  }
-  
-  private static final String FORMAT = "format";
-  private PluginParameter<String> getFormatParameter()
-  {
-    String label = "Format";
-    String description = "You may select to export in text or XML format.";
-    Enumeration<String, String> options = new Enumeration<String, String>();
-    options.add("text", "Tab-separated text file");
-    options.add("xml", "XML");
-    PluginParameter<String> formatParameter = new PluginParameter<String>
-      (
-        FORMAT, label, description, "text",
-        new StringParameterType(255, "text", true, 1, 0, 0, options)
-      );
-    return formatParameter;
-  }
-
-  private static final String WHICH_ITEMS = "whichItems";
-  private PluginParameter<String> getWhichItemsParameter()
-  {
-    String label = "Which items?";
-    String description = "Select which items you want to export";
-    Enumeration<String, String> options = new Enumeration<String, String>();
-    options.add("selected", "Selected items");
-    options.add("page", "Current page");
-    options.add("all", "All pages");
-    PluginParameter<String> whichItemsParameter = new PluginParameter<String>
-      (
-        WHICH_ITEMS, label, description, "all",
-        new StringParameterType(255, "all", true, 1, 0, 0, options)
-      );
-    return whichItemsParameter;
-  }
-
-  private static final String WHICH_PROPERTIES = "whichProperties";
-  private PluginParameter<String> getWhichPropertiesParameter()
-  {
-    String label = "Which properties?";
-    String description = "Enter the names of the properties you want to export. " +
-      "Use a colon to separate an optional title from the property name. For example: " +
-      "name:Name of sample";
-    PluginParameter<String> whichPropertiesParameter = new PluginParameter<String>
-      (
-        WHICH_PROPERTIES, label, description, null,
-        new StringParameterType(255, null, true, 0, 0, 0)
-      );
-    return whichPropertiesParameter;
-  }
-  
 }

trunk/src/test/TestWebservices.java

@@ -613 +613 @@
           "--No extended properties were received");
       
-      write("--Test of getReporterLists OK");
+      if (listInfo.length > 0 && extPropertyInfos.length > 0)
+      {       
+        System.out.print("--Download of reporters in reporterlist '" + listInfo[0].getName() +"'...." );
+        File receivedFile = new File(listInfo[0].getName() + ".txt");
+        OutputStream out = new FileOutputStream(receivedFile);
+         
+        InputStream in = reporterClient.downloadReportersInList(listInfo[0].getId(), extPropertyInfos, new QueryOptions());
+        
+        if (in == null)
+        {
+          write ("FAILED InputStream==null");
+          ok = false;
+        }
+        else
+        {
+          FileUtil.copy(in, out);
+          in.close();
+          out.close();
+          write("OK; size=" + receivedFile.length() + " bytes");
+          receivedFile.delete();
+        }
+        
+        receivedFile = null;
+        out = null;
+        
+        //Test to receive reporters from service, at most 50 reporters        
+        System.out.print("--Download of reporters....");        
+        receivedFile = new File("ReporterFile.txt");
+        out = new FileOutputStream(receivedFile);
+        in = null;
+        QueryOptions qOpt = new QueryOptions();
+        in = reporterClient.downloadReporters(extPropertyInfos, qOpt);
+        
+        if (in == null)
+        {
+          write ("FAILED InputStream==null");
+          ok = false;
+        }
+        else
+        {
+          FileUtil.copy(in, out);
+          in.close();
+          out.close();
+          write("OK; size=" + receivedFile.length() + " bytes");
+          receivedFile.delete();
+        }
+      }
+        
+      write("--Test of ReporterService OK");
     }
     catch (Throwable t)

trunk/src/webservices/client/java/net/sf/basedb/ws/client/ReporterClient.java

@@ -25 +25 @@
 
 import net.sf.basedb.info.ExtendedPropertyInfo;
+import net.sf.basedb.info.QueryOptions;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
+import org.apache.axis2.client.Options;
+import org.apache.axis2.rpc.client.RPCServiceClient;
 
 /**
@@ -61 +68 @@
   }
 
+  /**
+    Gets an input stream for a file with info about 
+    reporters in a reporter list. 
+      @param reporterListId Id of the reporter list to export and download.
+      @param extPropInfo An array of ExtendedPropertyInfo objects to include in the export/download.
+      @return InputStream object to the exported data.
+      @throws IOException If something goes wrong with the input stream
+   */
+  public InputStream downloadReportersInList(int reporterListId, ExtendedPropertyInfo[] extPropInfo, QueryOptions qOpt)
+    throws IOException
+  {
+    RPCServiceClient service = getService();
+    Options options = service.getOptions();   
+    options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
+    options.setTimeOutInMilliSeconds(10000);
+    service.setOptions(options);
+    return invokeFileBlocking
+      (
+        "downloadReportersInList", 
+        session.getId(), 
+        reporterListId,
+        extPropInfo,
+        qOpt
+      );
+  }
+  
+  public InputStream downloadReporters(ExtendedPropertyInfo[] extPropInfo, QueryOptions qOpt)
+    throws IOException
+  {
+    RPCServiceClient service = getService();
+    Options options = service.getOptions();   
+    options.setProperty(Constants.Configuration.ENABLE_MTOM, Constants.VALUE_TRUE);
+    options.setTimeOutInMilliSeconds(10000);
+    service.setOptions(options);
+    return invokeFileBlocking
+      (
+        "downloadReporters", 
+        session.getId(),
+        extPropInfo,
+        qOpt
+      );
+  }
+
 }

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

@@ -24 +24 @@
 package net.sf.basedb.ws.server;
 
+import net.sf.basedb.clients.web.formatter.FormatterFactory;
+import net.sf.basedb.clients.web.plugins.ExportedProperty;
+import net.sf.basedb.clients.web.plugins.SimpleExport;
+import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.ExtendedProperties;
 import net.sf.basedb.core.ExtendedProperty;
+import net.sf.basedb.core.Item;
+import net.sf.basedb.core.Reporter;
+import net.sf.basedb.core.ReporterList;
+import net.sf.basedb.core.ReporterScoreQuery;
+import net.sf.basedb.core.SessionControl;
+import net.sf.basedb.core.plugin.ExportOutputStream;
+import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Query;
 import net.sf.basedb.info.ExtendedPropertyInfo;
+import net.sf.basedb.info.QueryOptions;
+import net.sf.basedb.util.formatter.MultiFormatter;
+import net.sf.basedb.util.formatter.ToStringFormatter;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+
+import javax.activation.DataSource;
+
+import org.apache.axiom.om.OMElement;
 
 /**
@@ -57 +80 @@
     }
   }
+  
+  /**
+    Gets an input stream to exported data from a reporter list.
+      @param ID Id of an active session.
+      @param reporterListId Id of the reporter list to download reporters information from.
+      @param extPropInfos The extended property to include in the download.
+      @return java.io.InputStream object to the exported data.
+      @throws Exception If something goes wrong with the export.
+   */
+  public OMElement downloadReportersInList(String ID, int reporterListId, ExtendedPropertyInfo[] extPropInfos, QueryOptions qOpt)
+    throws Exception
+  {   
+    SessionControl sc = getSessionControl(ID);
+    DbControl dc = sc.newDbControl();
+    
+    ExportOutputStream eos = null;
+    File exportFile = null;   
+    OMElement elementWithAttachment = null;
+    String elementName = "exportFile";
+    String format = "text";
+    Item itemType = Item.REPORTERSCORE;
+    
+    boolean annotatable = false;
+    MultiFormatter formatter = new MultiFormatter(new ToStringFormatter(), true);
+    formatter.registerFormatter(Date.class, FormatterFactory.getDateFormatter(sc));
+    List<ExportedProperty> exportedProperties = new ArrayList<ExportedProperty>(extPropInfos.length);   
+    //Fill the list with properties to export, name, external id and reporter type are always included.
+    exportedProperties.add(ExportedProperty.parse(dc, "reporter.name:Name", annotatable, formatter));
+    exportedProperties.add(ExportedProperty.parse(dc, "reporter.externalId:External ID", annotatable, formatter));
+    exportedProperties.add(ExportedProperty.parse(dc, "reporter.reporterType.name:Reporter type", annotatable, formatter));
+    exportedProperties.add(ExportedProperty.parse(dc, "score:Score", annotatable, formatter));
+    for (int i=0; i<extPropInfos.length; i++)
+    {
+      String propertyString = "reporter."+extPropInfos[i].getName() + ":" + extPropInfos[i].getTitle();
+      ExportedProperty ep = ExportedProperty.parse(dc, propertyString, annotatable, formatter);
+      exportedProperties.add(ep);
+    } 
+    
+    //Get and configure the query that select the reporters in the reporter list.
+    ReporterList reporterList = ReporterList.getById(dc, reporterListId);
+    ReporterScoreQuery query = reporterList.getReporterScores();
+    if (qOpt != null && qOpt.getRestriction() != null)
+    {
+      query.restrict(Hql.restriction(qOpt.getRestriction(), qOpt.getRestrictionPrefix()));
+    }
+    
+    //Do the export to a temporary file and attach this file to the message that will be returned to the client.
+    try
+    {
+      SimpleExport exporter = new SimpleExport();
+      exportFile = File.createTempFile("ReporterListFile", null);
+      eos = new ExportOutputStream(new FileOutputStream(exportFile));     
+      exporter.exportProperties(dc, eos, format, exportedProperties, itemType, query, null);
+      eos.close();
+      
+      DataSource source = new TempFileDataSource(exportFile, "text/plain");
+      elementWithAttachment = attachFile(source, elementName);
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    return elementWithAttachment; 
+  }
+  
+  public OMElement downloadReporters(String ID, ExtendedPropertyInfo[] extPropInfos, QueryOptions qOpt)
+    throws Exception
+  {
+    SessionControl sc = getSessionControl(ID);
+    DbControl dc = sc.newDbControl();
+    
+    ExportOutputStream eos = null;
+    File exportFile = null;   
+    OMElement elementWithAttachment = null;
+    String elementName = "exportFile";
+    String format = "text";
+    Item itemType = Item.REPORTER;
+    
+    boolean annotatable = false;
+    MultiFormatter formatter = new MultiFormatter(new ToStringFormatter(), true);
+    formatter.registerFormatter(Date.class, FormatterFactory.getDateFormatter(sc));
+    List<ExportedProperty> exportedProperties = new ArrayList<ExportedProperty>(extPropInfos.length);   
+    //Fill the list with properties to export, name, external id and reporter type are always included.
+    exportedProperties.add(ExportedProperty.parse(dc, "name:Name", annotatable, formatter));
+    exportedProperties.add(ExportedProperty.parse(dc, "externalId:External ID", annotatable, formatter));
+    exportedProperties.add(ExportedProperty.parse(dc, "reporterType.name:Reporter type", annotatable, formatter));
+    for (int i=0; i<extPropInfos.length; i++)
+    {
+      String propertyString = extPropInfos[i].getName() + ":" + extPropInfos[i].getTitle();
+      ExportedProperty ep = ExportedProperty.parse(dc, propertyString, annotatable, formatter);
+      exportedProperties.add(ep);
+    } 
+    
+    Query query = Reporter.getQuery();    
+    if (qOpt != null && qOpt.getRestriction() != null)
+    {
+      query.restrict(Hql.restriction(qOpt.getRestriction(), qOpt.getRestrictionPrefix()));
+    }
+    
+    //Do the export to a temporary file and attach this file to the message that will be returned to the client.
+    try
+    {
+      SimpleExport exporter = new SimpleExport();
+      exportFile = File.createTempFile("ReporterFile", null);
+      eos = new ExportOutputStream(new FileOutputStream(exportFile));     
+      exporter.exportProperties(dc, eos, format, exportedProperties, itemType, query, null);
+      eos.close();      
+      DataSource source = new TempFileDataSource(exportFile, "text/plain");
+      elementWithAttachment = attachFile(source, elementName);
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
+    return elementWithAttachment;
+  }
 }