diff --git a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
index 2c46e7d4c7293420a12358eeab232eb4b118ce6b..ae7ce6ce5c95b3d6449c26d82e7a4d14a204d45e 100644
--- a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
+++ b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
@@ -164,8 +164,27 @@ public class ServletCutout extends HttpServlet
String cutAbsPathname = settings.fitsPaths.cutouts() + "/"
+ generateSubimgPathname(resolver.relPathname(), resolver.hdunum());
- return vlkb.doFile(resolver.relPathname(), resolver.hdunum(),
- pos, band, time, pol, pixels, countNullValues, extraCards, cutAbsPathname);
+ vlkb.doFile(resolver.relPathname(), resolver.hdunum(),
+ pos, band, time, pol, pixels, cutAbsPathname);
+
+
+ // VLKB specific: null-value-count and extra-cards
+
+ CutResult cutResult = new CutResult();
+
+ cutResult.fileName = cutAbsPathname;
+ cutResult.fileSize = Files.size(Paths.get(cutAbsPathname));
+ if(countNullValues)
+ {
+ cutResult.nullValueCount = vlkb.doCountNullValues(cutAbsPathname, 1);
+ }
+ if(extraCards == null || (extraCards.length < 1))
+ {
+ LOGGER.finer("Adding extraCards to cut-file implemented only in VlkbAmql");
+ }
+ cutResult.pixels = null;
+
+ return cutResult;
}
diff --git a/data-access/servlet/src/main/java/mcutout/VlkbCli.java b/data-access/servlet/src/main/java/mcutout/VlkbCli.java
index 64835336eb53d466808d75bbf140b382f405766d..95cb73ee3abec186ce04db046bf36b08bf0c8538 100644
--- a/data-access/servlet/src/main/java/mcutout/VlkbCli.java
+++ b/data-access/servlet/src/main/java/mcutout/VlkbCli.java
@@ -87,21 +87,32 @@ class VlkbCli implements Vlkb
return new CutResult();
}
-
- public CutResult doFile(String relPathname, int hdunum,
+ public CutResult doFileAmqp(String relPathname, int hdunum,
Pos pos, Band band, Time time, Pol pol, String pixels,
boolean countNullValues, FitsCard[] extraCards,
+ String cutAbsPathname)
+ throws IOException, InterruptedException
+ {
+ LOGGER.fine("trace doFileAmqp by CLI is NOT IMPLEMENTED (only by AMQP)");
+
+ return new CutResult();
+ }
+
+
+
+ public void doFile(String relPathname, int hdunum,
+ Pos pos, Band band, Time time, Pol pol, String pixels,
+ /*boolean countNullValues, FitsCard[] extraCards,*/
String cutAbsPathname)
throws IOException, InterruptedException
{
- LOGGER.fine("trace: " + pos.toString() );
- LOGGER.finer("Using doStream() to local file : " + cutAbsPathname);
+ LOGGER.fine("trace: " + cutAbsPathname );
try(OutputStream fileOutputStream = new FileOutputStream(new File(cutAbsPathname)))
{
- soda.doStream(relPathname, hdunum, pos, band, time, pol, pixels,fileOutputStream);
+ soda.doStream(relPathname, hdunum, pos, band, time, pol, pixels, fileOutputStream);
}
-
+/*
CutResult cutResult = new CutResult();
cutResult.fileName = cutAbsPathname;
@@ -117,7 +128,7 @@ class VlkbCli implements Vlkb
cutResult.pixels = null;
return cutResult;
- }
+*/ }
public MCutResult doMCutout(String jdlJson, String workDir)
@@ -194,10 +205,9 @@ class VlkbCli implements Vlkb
String cutAbsPathname = workDir + "/"
+ generateSubimgPathname(ix, relPathname, hdunum, MAX_FILENAME_LEN);
- CutResult cutResult = doFile(relPathname, hdunum, pos, band, time, pol, pixels,
- countNullValues, extraCards, cutAbsPathname);
+ doFile(relPathname, hdunum, pos, band, time, pol, pixels, cutAbsPathname);
- cut.content = cutResult.fileName;
+ cut.content = cutAbsPathname;
cut.contentType = MCutResult.Cut.ContentType.FILENAME;
}
catch(MultiValuedParamNotSupported ex)
@@ -325,7 +335,7 @@ class VlkbCli implements Vlkb
}
- private NullValueCount doCountNullValues(String absPathname, int hdunum)
+ public NullValueCount doCountNullValues(String absPathname, int hdunum)
throws IOException, InterruptedException
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/data-access/servlet/src/main/java/vlkb/Vlkb.java b/data-access/servlet/src/main/java/vlkb/Vlkb.java
index 1bde2e778c5d8153e308561543758c70c6e9b23d..032ef41db64b764d3317fb8f4b7ad1de8b8e70a6 100644
--- a/data-access/servlet/src/main/java/vlkb/Vlkb.java
+++ b/data-access/servlet/src/main/java/vlkb/Vlkb.java
@@ -13,20 +13,30 @@ import vo.parameter.*;
public interface Vlkb
{
- public CutResult doFile(String relPathname, int hdunum,
+ public void doFile(String relPathname, int hdunum,
Pos pos, Band band, Time time, Pol pol, String pixels,
- boolean countNullValues, FitsCard[] extraCards,
- String cutAbsPathname)
+ String cutAbsPathname)
throws IOException, InterruptedException;
-
public MCutResult doMCutout(String jdlJson, String workDir)
throws IOException, InterruptedException;
-
public CutResult doMerge(String[] idArr, Coord coord, boolean countNullValues)
throws FileNotFoundException, IOException;
+
+
+ // misc
+
+ NullValueCount doCountNullValues(String absPathname, int hdunum)
+ throws IOException, InterruptedException;
+
+ // deprecated - used only in VlkbAmqp
+ public CutResult doFileAmqp(String relPathname, int hdunum,
+ Pos pos, Band band, Time time, Pol pol, String pixels,
+ boolean countNullValues, FitsCard[] extraCards,
+ String cutAbsPathname)
+ throws IOException, InterruptedException;
}
diff --git a/data-access/servlet/src/main/java/vlkb/VlkbAmqp.java b/data-access/servlet/src/main/java/vlkb/VlkbAmqp.java
index dddeec9236db94ff20a4254d958b6c49e4301976..4b4fe76d8d9dc2cd880a48eb133af792af767377 100644
--- a/data-access/servlet/src/main/java/vlkb/VlkbAmqp.java
+++ b/data-access/servlet/src/main/java/vlkb/VlkbAmqp.java
@@ -64,451 +64,465 @@ class VlkbAmqp implements Vlkb
}
+ public NullValueCount doCountNullValues(String absPathname, int hdunum)
+ throws IOException, InterruptedException
+ {
+ LOGGER.fine("trace: not implemented; TB deprecated");
+ return new NullValueCount();
+ }
- public CutResult doMerge(String[] idArr, Coord coord, boolean countNullValues)
- throws FileNotFoundException, IOException
- {
- LOGGER.fine("trace");
+ public CutResult doMerge(String[] idArr, Coord coord, boolean countNullValues)
+ throws FileNotFoundException, IOException
+ {
+ LOGGER.fine("trace");
- return merge(idArr, coord, countNullValues);
- }
+ return merge(idArr, coord, countNullValues);
+ }
- ///////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////////////
+ public void doFile(String relPathname, int hdunum,
+ Pos pos, Band band, Time time, Pol pol, String pixels,
+ /*boolean countNullValues, FitsCard[] extraCards,*/ String dummyCutAbsPathname)
+ throws IOException, InterruptedException
+ {
+ ;// only placehoder for compatibility with Vlkb.java interface,
+ //Amqp support is deprecated
+ }
- public CutResult doFile(String relPathname, int hdunum,
- Pos pos, Band band, Time time, Pol pol, String pixels,
- boolean countNullValues, FitsCard[] extraCards, String dummyCutAbsPathname)
- throws IOException, InterruptedException
- {
- LOGGER.fine("trace: " + pos.toString() );
+ public CutResult doFileAmqp(String relPathname, int hdunum,
+ Pos pos, Band band, Time time, Pol pol, String pixels,
+ boolean countNullValues, FitsCard[] extraCards, String dummyCutAbsPathname)
+ throws IOException, InterruptedException
+ {
+ LOGGER.fine("trace: " + pos.toString() );
- CutResult cutResult = new CutResult();
+ CutResult cutResult = new CutResult();
- LOGGER.finer("Using AMQP");
+ LOGGER.finer("Using AMQP");
- JsonEncoder jReq = new JsonEncoder();
- jReq.add(relPathname, hdunum);
- jReq.add(pos);
- jReq.add(band);
- jReq.add(time);
- jReq.add(pol);
+ JsonEncoder jReq = new JsonEncoder();
+ jReq.add(relPathname, hdunum);
+ jReq.add(pos);
+ jReq.add(band);
+ jReq.add(time);
+ jReq.add(pol);
- // jReq.add(pixels), FIXME implement to supoort PIXLES in vlkb-legacy by AMQP
+ // jReq.add(pixels), FIXME implement to supoort PIXLES in vlkb-legacy by AMQP
- jReq.add(countNullValues);
- jReq.add(extraCards);
+ jReq.add(countNullValues);
+ jReq.add(extraCards);
- String outJson = RpcOverAmqp.doRpc( settings.amqpConn, jReq.toString() );
+ String outJson = RpcOverAmqp.doRpc( settings.amqpConn, jReq.toString() );
- cutResult = JsonDecoder.responseFromCutoutJson( outJson );
+ cutResult = JsonDecoder.responseFromCutoutJson( outJson );
- return cutResult;
- }
+ return cutResult;
+ }
- private CutResult doFileById(String id, Pos pos, Band band, Time time, Pol pol, String pixels,
- boolean countNullValues, Subsurvey[] subsurveys)
- throws IOException, InterruptedException
- {
- LOGGER.fine("trace");
+ private CutResult doFileById(String id, Pos pos, Band band, Time time, Pol pol, String pixels,
+ boolean countNullValues, Subsurvey[] subsurveys)
+ throws IOException, InterruptedException
+ {
+ LOGGER.fine("trace");
- FitsCard[] extraCards = null;
+ FitsCard[] extraCards = null;
- this.resolver.resolve(id);
- String relPathname = this.resolver.relPathname();
- int hdunum = this.resolver.hdunum();
- String subsurveyId = this.resolver.obsCollection();
+ this.resolver.resolve(id);
+ String relPathname = this.resolver.relPathname();
+ int hdunum = this.resolver.hdunum();
+ String subsurveyId = this.resolver.obsCollection();
- if(subsurveyId != null)
- {
- extraCards = Subsurvey.subsurveysFindCards(subsurveys, subsurveyId);
- }
- else
- {
- LOGGER.finer("Resolver returns subsurveyId null: no extraCards loaded.");
- }
+ if(subsurveyId != null)
+ {
+ extraCards = Subsurvey.subsurveysFindCards(subsurveys, subsurveyId);
+ }
+ else
+ {
+ LOGGER.finer("Resolver returns subsurveyId null: no extraCards loaded.");
+ }
- final String DEFAULT_TIME_SYSTEM = "MJD_UTC"; // FIXME take from confif file
+ final String DEFAULT_TIME_SYSTEM = "MJD_UTC"; // FIXME take from confif file
- CutResult cutResult = doFile(relPathname, hdunum, pos, band, time, pol, pixels,
- countNullValues, extraCards, null);
+ CutResult cutResult = doFileAmqp(relPathname, hdunum, pos, band, time, pol, pixels,
+ countNullValues, extraCards, null);
- return cutResult;
- }
+ return cutResult;
+ }
- ///////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////////////
- public MCutResult doMCutout(String jdlJson, String workDir)
- throws IOException
- {
- LOGGER.fine("trace");
+ public MCutResult doMCutout(String jdlJson, String workDir)
+ throws IOException
+ {
+ LOGGER.fine("trace");
- MCutResult mCutResult;
+ MCutResult mCutResult;
- LOGGER.finer("doMCutout over AMQP");
- String updatedJsonString = JdlMCutout.resolveAndUpdateJsonRequest(jdlJson, settings, subsurveys);
- LOGGER.finest("doMCutout over AMQP : " + updatedJsonString);
- String outJson = RpcOverAmqp.doRpc(settings.amqpConn, JdlMCutout.mcutoutToJson(updatedJsonString) );
- mCutResult = JdlMCutout.responseFromMCutoutJson(outJson);
+ LOGGER.finer("doMCutout over AMQP");
+ String updatedJsonString = JdlMCutout.resolveAndUpdateJsonRequest(jdlJson, settings, subsurveys);
+ LOGGER.finest("doMCutout over AMQP : " + updatedJsonString);
+ String outJson = RpcOverAmqp.doRpc(settings.amqpConn, JdlMCutout.mcutoutToJson(updatedJsonString) );
+ mCutResult = JdlMCutout.responseFromMCutoutJson(outJson);
- return mCutResult;
- }
+ return mCutResult;
+ }
- /* ================= MERGE =============================== */
+ /* ================= MERGE =============================== */
- private String generateSubimgPathname(String relPathname, int hdunum)
- {
- String cutfitsname = "vlkb-cutout";
-
- Instant instant = Instant.now() ;
- String timestamp = instant.toString().replace(":","-").replace(".","_");
-
- String tempPathname1 = relPathname.replaceAll("/","-");
- String tempPathname2 = tempPathname1.replaceAll(" ","_");
-
- if(hdunum == 1)
- {
- return cutfitsname + "_" + timestamp + "_" + tempPathname2;
- }
- else
- {
- String extnum = "EXT" + String.valueOf(hdunum-1);
- return cutfitsname + "_" + timestamp + "_" + extnum + "_" + tempPathname2;
- }
- }
+ private String generateSubimgPathname(String relPathname, int hdunum)
+ {
+ String cutfitsname = "vlkb-cutout";
+ Instant instant = Instant.now() ;
+ String timestamp = instant.toString().replace(":","-").replace(".","_");
+ String tempPathname1 = relPathname.replaceAll("/","-");
+ String tempPathname2 = tempPathname1.replaceAll(" ","_");
- private CutResult cutout(
- String publisherDid, Coord coord,
- boolean countNullValues)
- {
- // ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);
- Resolver rsl = resolver;//new ResolverFromId();//settings.dbConn, subsurveys);
- rsl.resolve(publisherDid);
+ if(hdunum == 1)
+ {
+ return cutfitsname + "_" + timestamp + "_" + tempPathname2;
+ }
+ else
+ {
+ String extnum = "EXT" + String.valueOf(hdunum-1);
+ return cutfitsname + "_" + timestamp + "_" + extnum + "_" + tempPathname2;
+ }
+ }
- FitsCard[] extraCards = null;
- //Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//rsl.subsurveyId);
- String absSubimgPathname = settings.fitsPaths.cutouts() + "/"
- + generateSubimgPathname(rsl.relPathname(), rsl.hdunum());
- LOGGER.finest("absSubimgPathname: " + absSubimgPathname);
- LOGGER.finer("Using AMQP");
- JsonEncoder jReq = new JsonEncoder();
- jReq.add(rsl.relPathname(), rsl.hdunum());
- jReq.add(coord.pos);
- jReq.add(coord.band);
- jReq.add(coord.time);
- jReq.add(coord.pol);
+ private CutResult cutout(
+ String publisherDid, Coord coord,
+ boolean countNullValues)
+ {
+ // ResolverByObsCore rsl = new ResolverByObsCore(settings.dbConn, subsurveys);
+ Resolver rsl = resolver;//new ResolverFromId();//settings.dbConn, subsurveys);
+ rsl.resolve(publisherDid);
- // jReq.add(pixels), FIXME implement to supoort PIXLES in vlkb-legacy by AMQP
+ FitsCard[] extraCards = null;
+ //Subsurvey.subsurveysFindCards(subsurveys, rsl.obsCollection());//rsl.subsurveyId);
+ String absSubimgPathname = settings.fitsPaths.cutouts() + "/"
+ + generateSubimgPathname(rsl.relPathname(), rsl.hdunum());
+ LOGGER.finest("absSubimgPathname: " + absSubimgPathname);
- jReq.add(countNullValues);
- jReq.add(extraCards);
+ LOGGER.finer("Using AMQP");
- String inJson = jReq.toString();
+ JsonEncoder jReq = new JsonEncoder();
+ jReq.add(rsl.relPathname(), rsl.hdunum());
+ jReq.add(coord.pos);
+ jReq.add(coord.band);
+ jReq.add(coord.time);
+ jReq.add(coord.pol);
- return JsonDecoder.responseFromCutoutJson( RpcOverAmqp.doRpc(settings.amqpConn, inJson) );
- }
+ // jReq.add(pixels), FIXME implement to supoort PIXLES in vlkb-legacy by AMQP
+ jReq.add(countNullValues);
+ jReq.add(extraCards);
- protected CutResult merge(String[] pubdids, Coord coord, Boolean countNullValues)
- {
- LOGGER.fine("trace");
+ String inJson = jReq.toString();
- ArrayList<CutResult> allresults = new ArrayList<CutResult>();
+ return JsonDecoder.responseFromCutoutJson( RpcOverAmqp.doRpc(settings.amqpConn, inJson) );
+ }
- // 1. Decode pubdid's from inputs.pubdid and cutout on each
- CutResult[] allCutResults = do_cutouts(
- pubdids, coord,
- countNullValues);
+ protected CutResult merge(String[] pubdids, Coord coord, Boolean countNullValues)
+ {
+ LOGGER.fine("trace");
- allresults.addAll(Arrays.asList(allCutResults));
+ ArrayList<CutResult> allresults = new ArrayList<CutResult>();
+ // 1. Decode pubdid's from inputs.pubdid and cutout on each
- String[] allCutPathnames = selectCutPathnames(allCutResults);
+ CutResult[] allCutResults = do_cutouts(
+ pubdids, coord,
+ countNullValues);
- if( allCutPathnames.length <= 0 ){
- LOGGER.warning("No cutout created.");
- return null;
- }
- if( allCutPathnames.length != pubdids.length ) {
- LOGGER.warning("Number of cubes found and number of cutouts created do not match.");
- }
+ allresults.addAll(Arrays.asList(allCutResults));
- try
- {
- // 2. regridding (closest neighbour interpolation) for files to be merged
- Regrid grid = new Regrid();
- int dim = grid.dimensions(allCutPathnames);
- if( dim > 2 ) {
- Boolean changed = grid.regrid_vel2(allCutPathnames);
- if(changed){
- //allresults.add("MSG Keywords CDELT3, CRVAL3 were adjusted for merge regridding.");
- LOGGER.finer("MSG Keywords CDELT3, CRVAL3 were adjusted for merge regridding.");
- }
- }
+ String[] allCutPathnames = selectCutPathnames(allCutResults);
- // 3. Merge cut-files
+ if( allCutPathnames.length <= 0 ){
+ LOGGER.warning("No cutout created.");
+ return null;
+ }
+ if( allCutPathnames.length != pubdids.length ) {
+ LOGGER.warning("Number of cubes found and number of cutouts created do not match.");
+ }
- //String[] strar_results = mergefiles_parallel(id, logFileName, // logfileName
- //String[] strar_results = mergefiles_split_execution(id, logFileName, // logfileName
- CutResult strar_results = mergefiles(
- String.valueOf(dim), // prefix: "2D" or "3D"
- allCutPathnames); // files to merge
+ try
+ {
+ // 2. regridding (closest neighbour interpolation) for files to be merged
- allresults.addAll(Arrays.asList(strar_results));
+ Regrid grid = new Regrid();
+ int dim = grid.dimensions(allCutPathnames);
+ if( dim > 2 ) {
+ Boolean changed = grid.regrid_vel2(allCutPathnames);
+ if(changed){
+ //allresults.add("MSG Keywords CDELT3, CRVAL3 were adjusted for merge regridding.");
+ LOGGER.finer("MSG Keywords CDELT3, CRVAL3 were adjusted for merge regridding.");
+ }
+ }
- }
- catch(Exception e)
- {
- LOGGER.log(Level.SEVERE, "merge:",e);
- //allresults.add(
- // "MSG System error. Report time, your IP-number, and the exact request-URL string to service administrator.");
- }
+ // 3. Merge cut-files
- CutResult[] dlkArr = allresults.toArray(new CutResult[allresults.size()]);
- return dlkArr[0]; // FIXME should return only datalink for the merged file not all cutout files?
- }
+ //String[] strar_results = mergefiles_parallel(id, logFileName, // logfileName
+ //String[] strar_results = mergefiles_split_execution(id, logFileName, // logfileName
+ CutResult strar_results = mergefiles(
+ String.valueOf(dim), // prefix: "2D" or "3D"
+ allCutPathnames); // files to merge
+
+ allresults.addAll(Arrays.asList(strar_results));
+
+ }
+ catch(Exception e)
+ {
+ LOGGER.log(Level.SEVERE, "merge:",e);
+ //allresults.add(
+ // "MSG System error. Report time, your IP-number, and the exact request-URL string to service administrator.");
+ }
+
+ CutResult[] dlkArr = allresults.toArray(new CutResult[allresults.size()]);
+ return dlkArr[0]; // FIXME should return only datalink for the merged file not all cutout files?
+ }
- protected CutResult[] do_cutouts(
- String[] publisherDids, Coord coord,
- Boolean countNullValues)
- {
- ArrayList<CutResult> allresults = new ArrayList<CutResult>();
- if(publisherDids.length <= 0)
- return null; // no cube found
+ protected CutResult[] do_cutouts(
+ String[] publisherDids, Coord coord,
+ Boolean countNullValues)
+ {
+ ArrayList<CutResult> allresults = new ArrayList<CutResult>();
+ if(publisherDids.length <= 0)
+ return null; // no cube found
- for(String publisherDid : publisherDids)
- {
- CutResult cutout_results_table = cutout(
- publisherDid, coord,
- countNullValues);
+ for(String publisherDid : publisherDids)
+ {
+ CutResult cutout_results_table = cutout(
+ publisherDid, coord,
+ countNullValues);
- allresults.addAll(Arrays.asList(cutout_results_table));
- }
+ allresults.addAll(Arrays.asList(cutout_results_table));
+ }
- return allresults.toArray(new CutResult[allresults.size()]);
- }
+ return allresults.toArray(new CutResult[allresults.size()]);
+ }
- protected CutResult mergefiles(
- String prefix, // IN prefix added after filename-start-word
- String[] filestomerge) // IN abs path with filenames to be merged
- {
- LOGGER.fine("trace");
+ protected CutResult mergefiles(
+ String prefix, // IN prefix added after filename-start-word
+ String[] filestomerge) // IN abs path with filenames to be merged
+ {
+ LOGGER.fine("trace");
- String InJson = JsonEncoderMerge.mergefilesToJson( prefix, filestomerge);
- String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
- return JsonDecoder.responseFromCutoutJson( OutJson );
- }
+ String InJson = JsonEncoderMerge.mergefilesToJson( prefix, filestomerge);
+ String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
+ return JsonDecoder.responseFromCutoutJson( OutJson );
+ }
- // BEGIN parallel
+ // BEGIN parallel
+
+ protected String[] mergefiles_parallel(
+ String jobId, // IN any identifier to be guaranteed distinct
+ String logfilename, // IN logfilename without path
+ String prefix, // IN prefix added after filename-start-word
+ String[] filestomerge) // IN abs path with filenames to be merged
+ {
+ LOGGER.fine("trace");
+
+ String[] responseCH = mergefiles_common_header(jobId, logfilename, prefix, filestomerge);
+ for(String sentence : responseCH) VlkbAmqp.LOGGER.finest("responseCmnHdr: " + sentence);
+ // check if response errored -> abort with 500: Internal Server Error & log details
+
+ int threadsCount = filestomerge.length;
+ Thread threadArr[] = new Thread[threadsCount];
+ Reproject reprojectArr[] = new Reproject[threadsCount];
+ int i;
+ for(i=0; i<threadsCount; i++)
+ //for(String file : filestomerge)
+ {
+ String file = filestomerge[i];
+ reprojectArr[i] = new Reproject(this, jobId, prefix, file);
+ threadArr[i] = new Thread(reprojectArr[i], "reproject: " + String.valueOf(i));
+
+ threadArr[i].start();
+ }
+
+ // wait until all threads finished
+
+ for(i=0; i<threadsCount; i++)
+ //for(Thread thread : threadArr)
+ {
+ try
+ {
+ threadArr[i].join();
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
- protected String[] mergefiles_parallel(
- String jobId, // IN any identifier to be guaranteed distinct
- String logfilename, // IN logfilename without path
- String prefix, // IN prefix added after filename-start-word
- String[] filestomerge) // IN abs path with filenames to be merged
- {
- LOGGER.fine("trace");
-
- String[] responseCH = mergefiles_common_header(jobId, logfilename, prefix, filestomerge);
- for(String sentence : responseCH) VlkbAmqp.LOGGER.finest("responseCmnHdr: " + sentence);
- // check if response errored -> abort with 500: Internal Server Error & log details
-
- int threadsCount = filestomerge.length;
- Thread threadArr[] = new Thread[threadsCount];
- Reproject reprojectArr[] = new Reproject[threadsCount];
- int i;
- for(i=0; i<threadsCount; i++)
- //for(String file : filestomerge)
- {
- String file = filestomerge[i];
- reprojectArr[i] = new Reproject(this, jobId, prefix, file);
- threadArr[i] = new Thread(reprojectArr[i], "reproject: " + String.valueOf(i));
-
- threadArr[i].start();
- }
-
- // wait until all threads finished
-
- for(i=0; i<threadsCount; i++)
- //for(Thread thread : threadArr)
- {
- try
- {
- threadArr[i].join();
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
-
-
- for(String sentence : reprojectArr[i].response) VlkbAmqp.LOGGER.finest("response[" + String.valueOf(i) + "]: " + sentence);
- if(!isResponseOk(reprojectArr[i].response))
- {
- ;// FIXME response incorrect -> abort merge-job, free resources
- // if incorrect paarams -> respond HTTP.WRONG REQUEST
- // if other error -> respond HTTP.INTRNAL ERRR & log
- }
- }
-
- String[] response = mergefiles_add_reprojected(jobId, prefix);
- // check if response errored -> abort with 500: Internal Server Error & log details
-
- return response;
- }
- private boolean isResponseOk(String[] response)
- {
- // FIXME implement!
- return true;
- }
+ for(String sentence : reprojectArr[i].response) VlkbAmqp.LOGGER.finest("response[" + String.valueOf(i) + "]: " + sentence);
+ if(!isResponseOk(reprojectArr[i].response))
+ {
+ ;// FIXME response incorrect -> abort merge-job, free resources
+ // if incorrect paarams -> respond HTTP.WRONG REQUEST
+ // if other error -> respond HTTP.INTRNAL ERRR & log
+ }
+ }
+ String[] response = mergefiles_add_reprojected(jobId, prefix);
+ // check if response errored -> abort with 500: Internal Server Error & log details
+ return response;
+ }
+ private boolean isResponseOk(String[] response)
+ {
+ // FIXME implement!
+ return true;
+ }
- protected String[] mergefiles_split_execution(
- String jobId, // IN any identifier to be guaranteed distinct
- String logfilename, // IN logfilename without path
- String prefix, // IN prefix added after filename-start-word
- String[] filestomerge) // IN abs path with filenames to be merged
- {
- LOGGER.fine("trace");
- String[] responseCH = mergefiles_common_header(jobId, logfilename, prefix, filestomerge);
- // check if response errored -> abort with 500: Internal Server Error & log details
- for(String file : filestomerge)// FIXME parallelize on threads & join
- {
- String[] response = mergefiles_reproject(jobId, prefix, file);
- // check if response errored -> abort with: 500: Internal Server Error & log details
- }
- String[] response = mergefiles_add_reprojected(jobId, prefix);
- // check if response errored -> abort with 500: Internal Server Error & log details
+ protected String[] mergefiles_split_execution(
+ String jobId, // IN any identifier to be guaranteed distinct
+ String logfilename, // IN logfilename without path
+ String prefix, // IN prefix added after filename-start-word
+ String[] filestomerge) // IN abs path with filenames to be merged
+ {
+ LOGGER.fine("trace");
- return response;
- }
+ String[] responseCH = mergefiles_common_header(jobId, logfilename, prefix, filestomerge);
+ // check if response errored -> abort with 500: Internal Server Error & log details
+
+ for(String file : filestomerge)// FIXME parallelize on threads & join
+ {
+ String[] response = mergefiles_reproject(jobId, prefix, file);
+ // check if response errored -> abort with: 500: Internal Server Error & log details
+ }
+
+ String[] response = mergefiles_add_reprojected(jobId, prefix);
+ // check if response errored -> abort with 500: Internal Server Error & log details
+
+ return response;
+ }
+
+ protected String[] mergefiles_common_header(
+ String jobId, // IN jobId to distinguish parallel executed requests
+ String logfilename, // IN logfilename without path
+ String prefix, // IN prefix added after filename-start-word
+ String[] filestomerge) // IN abs path with filenames to be merged
+ {
+ LOGGER.fine("trace");
+
+ String InJson = JsonEncoderMerge.mergefilesCommonHeaderToJson(jobId, prefix, filestomerge);
+ String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
+ String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
+
+ return results;
+ }
+
+
+ protected String[] mergefiles_reproject(
+ String jobId, // IN jobId to distinguish parallel executed requests
+ String prefix, // IN prefix added after filename-start-word
+ String fitsfilename) // IN logfilename without path
+ {
+ LOGGER.fine("trace");
+
+ String InJson = JsonEncoderMerge.mergefilesReprojectToJson(jobId, prefix, fitsfilename);
+ String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
+ String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
+
+ return results;
+ }
+
+
+ protected String[] mergefiles_add_reprojected(
+ String jobId, // IN jobId to distinguish parallel executed requests
+ String prefix) // IN prefix added after filename-start-word
+ {
+ LOGGER.fine("trace");
+
+ String InJson = JsonEncoderMerge.mergefilesAddReprojectedToJson(jobId, prefix);
+ String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
+ String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
+
+ return results;
+ }
+
+ // END parallel
- protected String[] mergefiles_common_header(
- String jobId, // IN jobId to distinguish parallel executed requests
- String logfilename, // IN logfilename without path
- String prefix, // IN prefix added after filename-start-word
- String[] filestomerge) // IN abs path with filenames to be merged
- {
- LOGGER.fine("trace");
- String InJson = JsonEncoderMerge.mergefilesCommonHeaderToJson(jobId, prefix, filestomerge);
- String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
- String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
- return results;
- }
- protected String[] mergefiles_reproject(
- String jobId, // IN jobId to distinguish parallel executed requests
- String prefix, // IN prefix added after filename-start-word
- String fitsfilename) // IN logfilename without path
- {
- LOGGER.fine("trace");
+ // returns selected data in list of strings:
+ // -- from cutout: the cutout filename (server local)
+ private String[] selectCutPathnames(CutResult[] results) {
+
+ LOGGER.fine("trace");
- String InJson = JsonEncoderMerge.mergefilesReprojectToJson(jobId, prefix, fitsfilename);
- String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
- String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
+ // return only data (without MSG's LOG's etc)
+ ArrayList<String> data = new ArrayList<String>();
- return results;
- }
-
-
- protected String[] mergefiles_add_reprojected(
- String jobId, // IN jobId to distinguish parallel executed requests
- String prefix) // IN prefix added after filename-start-word
- {
- LOGGER.fine("trace");
+ // sanity check - move after doFunc call (here covered by exception)
+ // FIXME consider catch null-pointer-exception
+ if(results == null) {
+ LOGGER.finest("selectCutPathnames: results-table is null.");
+ return null;
+ }
- String InJson = JsonEncoderMerge.mergefilesAddReprojectedToJson(jobId, prefix);
- String OutJson = RpcOverAmqp.doRpc(settings.amqpConn, InJson);
- String[] results = null; // FIXME JsonDecoder.responseFromJson(OutJson);
+ for (CutResult res : results) {
- return results;
- }
+ /*/ protect substring() calls below;
+ // FIXME consider catch exception index-out-of-bounds
+ if(res.length() < 3) {
+ LOGGER.warning("Assert(Results.toXML): results msg shorter then 3 chars : " + res);
+ continue;
+ }
- // END parallel
-
-
-
-
-
- // returns selected data in list of strings:
- // -- from cutout: the cutout filename (server local)
- private String[] selectCutPathnames(CutResult[] results) {
-
- LOGGER.fine("trace");
-
- // return only data (without MSG's LOG's etc)
- ArrayList<String> data = new ArrayList<String>();
-
- // sanity check - move after doFunc call (here covered by exception)
- // FIXME consider catch null-pointer-exception
- if(results == null) {
- LOGGER.finest("selectCutPathnames: results-table is null.");
- return null;
- }
-
- for (CutResult res : results) {
-
- /*/ protect substring() calls below;
- // FIXME consider catch exception index-out-of-bounds
- if(res.length() < 3) {
- LOGGER.warning("Assert(Results.toXML): results msg shorter then 3 chars : " + res);
- continue;
- }
-
- // decode msg type
- switch(res.substring(0,3)){
- case "URL": // from cutout: the cutout filename for download
- String localfname = res.substring(4);//.replaceAll(FITScutpath, "");
- String[] ssfn = localfname.split(":");
- //String[] ssfn = localfname.substring(4).split(":");
- LOGGER.finest("ssfn[0]: " + ssfn[0]);
- LOGGER.finest("ssfn[1]: " + ssfn[1]);
- data.add(ssfn[1]);
- //data.add(localfname);
- break;
- case "NVS": // from cutout : NVS_nn:nn:nn
- case "MSG":
- case "LOG":
- case "CUT": // from cutout: the file which was cut
- case "HID": // from search
- // no data, do nothing
- break;
- default:
- LOGGER.severe("Assert(Results.toXML): results msg has unhandled msgtype code : " + res);
- }*/
- data.add(res.fileName);
- }
-
- return data.toArray(new String[data.size()]);
- }
+ // decode msg type
+ switch(res.substring(0,3)){
+ case "URL": // from cutout: the cutout filename for download
+ String localfname = res.substring(4);//.replaceAll(FITScutpath, "");
+ String[] ssfn = localfname.split(":");
+ //String[] ssfn = localfname.substring(4).split(":");
+ LOGGER.finest("ssfn[0]: " + ssfn[0]);
+ LOGGER.finest("ssfn[1]: " + ssfn[1]);
+ data.add(ssfn[1]);
+ //data.add(localfname);
+ break;
+ case "NVS": // from cutout : NVS_nn:nn:nn
+ case "MSG":
+ case "LOG":
+ case "CUT": // from cutout: the file which was cut
+ case "HID": // from search
+ // no data, do nothing
+ break;
+ default:
+ LOGGER.severe("Assert(Results.toXML): results msg has unhandled msgtype code : " + res);
+ }*/
+ data.add(res.fileName);
+ }
+
+ return data.toArray(new String[data.size()]);
+ }
}