dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 176
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-04-16 12:07:33 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/CSVExportPipeThread.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/CSVExportPipeThread.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/CSVExportPipeThread.java	2009-04-16 09:53:17 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/CSVExportPipeThread.java	2009-04-16 10:07:33 +0000
@@ -92,10 +92,6 @@
             
             log.info( "Export finished" );
         }
-        catch ( Exception ex )
-        {
-            throw new RuntimeException( ex );
-        }
         finally
         {
             StreamUtils.closeWriter( writer );

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java	2009-04-16 09:53:17 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java	2009-04-16 10:07:33 +0000
@@ -71,11 +71,7 @@
         params.getReportTables().add( id );
         
         inputStream = exportService.exportData( params );
-        /*
-        int l = 0;
-        while ( ( l = inputStream.read() ) != -1 )
-            System.out.println( l);
-        */
+        
         fileName = "ReportTable.zip";
         
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml	2009-04-16 09:53:17 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/xwork.xml	2009-04-16 10:07:33 +0000
@@ -228,7 +228,7 @@
     
     <action name="getTableDataExport" class="org.hisp.dhis.reporting.tablecreator.action.GetTableDataExportAction">
       <result name="success" type="stream">
-        <param name="contentType">text/plain</param>
+        <param name="contentType">application/zip</param>
         <param name="inputName">inputStream</param>
         <param name="contentDisposition">filename="${fileName}"</param>
         <param name="bufferSize">10240</param>



--
Trunk
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.