------------------------------------------------------------ revno: 7657 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Sat 2012-07-21 16:01:44 +0200 message: Impl xml and csv data view for sql views modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java
-- lp:dhis2 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
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java 2012-05-28 14:25:12 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java 2012-07-21 14:01:44 +0000 @@ -27,9 +27,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import javax.servlet.http.HttpServletResponse; + +import org.hisp.dhis.api.utils.ContextUtils; +import org.hisp.dhis.api.utils.ContextUtils.CacheStrategy; +import org.hisp.dhis.common.Grid; import org.hisp.dhis.sqlview.SqlView; +import org.hisp.dhis.sqlview.SqlViewService; +import org.hisp.dhis.system.grid.GridUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; /** * @author Morten Olav Hansen <[email protected]> @@ -40,4 +50,34 @@ extends AbstractCrudController<SqlView> { public static final String RESOURCE_PATH = "/sqlViews"; + + @Autowired + private SqlViewService sqlViewService; + + @Autowired + private ContextUtils contextUtils; + + @RequestMapping( value = "/{uid}/data", method = RequestMethod.GET ) + public void getViewXml( @PathVariable( "uid" ) String uid, HttpServletResponse response ) throws Exception + { + SqlView sqlView = sqlViewService.getSqlViewByUid( uid ); + + Grid grid = sqlViewService.getDataSqlViewGrid( sqlView ); + + contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_XML, CacheStrategy.RESPECT_SYSTEM_SETTING, "sqlview.xml", false ); + + GridUtils.toXml( grid, response.getOutputStream() ); + } + + @RequestMapping( value = "/{uid}/data.csv", method = RequestMethod.GET ) + public void getViewCsv( @PathVariable( "uid" ) String uid, HttpServletResponse response ) throws Exception + { + SqlView sqlView = sqlViewService.getSqlViewByUid( uid ); + + Grid grid = sqlViewService.getDataSqlViewGrid( sqlView ); + + contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_CSV, CacheStrategy.RESPECT_SYSTEM_SETTING, "sqlview.csv", true ); + + GridUtils.toCsv( grid, response.getOutputStream() ); + } }
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
