|
[HepData-svn] r1814 - trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pagesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgWed Aug 6 16:13:15 BST 2014
Author: whalley Date: Wed Aug 6 16:13:15 2014 New Revision: 1814 Log: fix for dipslaying individual datasets in the input formatter (as had been done previously in View.java) Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/DoiData.java Modified: trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/DoiData.java ============================================================================== --- trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/DoiData.java Tue Aug 5 17:45:51 2014 (r1813) +++ trunk/hepdata-webapp/src/main/java/cedar/hepdata/webapp/pages/DoiData.java Wed Aug 6 16:13:15 2014 (r1814) @@ -63,7 +63,7 @@ if (fmt.equals("hepml")) return asHepML(); if (fmt.equals("marcxml")) return asMarcXML(); if (fmt.equals("bdms")) return asBDMS(); - if (fmt.equals("input")) return asINPUT(); + if (fmt.equals("input")) return asINPUT(context); if (fmt.equals("plain.txt")) return asPlain(); if (fmt.equals("aida")) return asAIDA(stype); if (fmt.equals("pyroot.py")) return asPyROOT(); @@ -144,11 +144,13 @@ public Object getInputContext() { return formatContext("input"); } - public StreamResponse asINPUT() { - Paper p = getPaper(); - String asINPUT = InputFormatter.format(p); + public StreamResponse asINPUT(EventContext context) { + Paper p = null; + if(context.getCount()==2) { p = getPaper(); } + Set<Dataset> ds = getDatasets(); + String asINPUT = InputFormatter.format(ds, p); if (asINPUT == null) { - asINPUT = "No valid paper specified"; + asINPUT = "No valid paper and dataset specified"; } return new TextStreamResponse("text/plain", asINPUT); }
More information about the HepData-svn mailing list |