diff --git a/data-access/servlet/src/main/java/cutout/DatasetsImpl.java b/data-access/servlet/src/main/java/cutout/DatasetsImpl.java index 8cc07a18350e76e9ca0d1fac2ce1ec11dd845935..d3b3fa66052b06a026a8f2a2f7d4e0ac20840196 100644 --- a/data-access/servlet/src/main/java/cutout/DatasetsImpl.java +++ b/data-access/servlet/src/main/java/cutout/DatasetsImpl.java @@ -78,8 +78,8 @@ class DatasetsImpl implements Datasets if(settings.amqpConn.isHostnameEmpty()) { - LOGGER.info("doMCutout in CLI/ExecCmd not implemented"); - outJson = null; + LOGGER.info("doMCutout with CLI"); + outJson = doCli( JdlMCutout.mcutoutToJson(updatedJsonString) ); } else { @@ -95,6 +95,7 @@ class DatasetsImpl implements Datasets /* ================= ALL ================================== */ + private String doRpc(String InStr) { final String userName = "guest"; @@ -137,6 +138,34 @@ class DatasetsImpl implements Datasets } + + private String doCli(String inStr) + { + + LOGGER.info("doMCutout in CLI/ExecCmd not implemented"); + + /* + List<CutResult> cutResList = new ArrayList<CutResult>(); + + Coord[] coords = Jdl.parseReq(InStr); + + for(Coord coord: coords) + { + CutResult cutResult = doFile(coord.relPathname, coord.hdunum, + coord.pos, coord.band, coord.time, coord.pol, coord.pixels, + coord.countNullValues, coord.extraCards); + + cutResList.add(cutResult); + } + + String outStr = Jdl.encodeToJson(cutResList.toArray()); + */ + + return null;//outStr; + } + + + private String generateSubimgPathname(String relPathname, int hdunum) { String cutfitsname = "vlkb-cutout";