diff --git a/src/main/java/org/gcube/application/perform/service/rest/Performance.java b/src/main/java/org/gcube/application/perform/service/rest/Performance.java index 6a91295..d692e8d 100644 --- a/src/main/java/org/gcube/application/perform/service/rest/Performance.java +++ b/src/main/java/org/gcube/application/perform/service/rest/Performance.java @@ -59,7 +59,7 @@ public class Performance { request.addAreas(InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.AREA_PARAMETER, false)); request.addQuarters(InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.QUARTER_PARAMETER, false)); - List farmidsString=InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.FARM_ID_PARAMETER, true); + List farmidsString=InterfaceCommons.getParameter(parameters, ServiceConstants.Performance.FARM_ID_PARAMETER, false); log.debug("FARMIDS : ",farmidsString); for(String s:farmidsString) { log.debug("Parsing {} ",s); diff --git a/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Anagraphic.properties index 20ee020..22760e3 100644 --- a/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/GROW_OUT_AGGREGATED_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Anagraphic.properties index 20ee020..22760e3 100644 --- a/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/GROW_OUT_AGGREGATED_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL/Anagraphic.properties index f1e7c43..8ec9474 100644 --- a/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/GROW_OUT_INDIVIDUAL_anagraphic.csv diff --git a/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties index 4446733..79e29ac 100644 --- a/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/GROW_OUT_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/GROW_OUT_INDIVIDUAL_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/HATCHERY_AGGREGATED/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/HATCHERY_AGGREGATED/Anagraphic.properties index 75d1b74..21680d7 100644 --- a/src/main/webapp/WEB-INF/schema/HATCHERY_AGGREGATED/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/HATCHERY_AGGREGATED/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/HATCHERY_AGGREGATED_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL/Anagraphic.properties index 47d5661..3b7928d 100644 --- a/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/HATCHERY_INDIVIDUAL_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties index b459de7..06edd62 100644 --- a/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/HATCHERY_INDIVIDUAL_CLOSED_BATCHES/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/HATCHERY_INDIVIDUAL_CLOSED_BATCHES_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/PRE_ONGROWING/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/PRE_ONGROWING/Anagraphic.properties index 1492575..52cd5db 100644 --- a/src/main/webapp/WEB-INF/schema/PRE_ONGROWING/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/PRE_ONGROWING/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/PRE_ONGROWING_anagraphic.csv \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/schema/PRE_ONGROWING_CLOSED_BATCHES/Anagraphic.properties b/src/main/webapp/WEB-INF/schema/PRE_ONGROWING_CLOSED_BATCHES/Anagraphic.properties index 1492575..52cd5db 100644 --- a/src/main/webapp/WEB-INF/schema/PRE_ONGROWING_CLOSED_BATCHES/Anagraphic.properties +++ b/src/main/webapp/WEB-INF/schema/PRE_ONGROWING_CLOSED_BATCHES/Anagraphic.properties @@ -1,3 +1,4 @@ description=AnagraphicTable routine=internal_routine_id +enable_analysis=false csv=csv/PRE_ONGROWING_anagraphic.csv \ No newline at end of file diff --git a/src/test/java/org/gcube/application/perform/service/PerformanceTest.java b/src/test/java/org/gcube/application/perform/service/PerformanceTest.java index c4f5517..b9b93b6 100644 --- a/src/test/java/org/gcube/application/perform/service/PerformanceTest.java +++ b/src/test/java/org/gcube/application/perform/service/PerformanceTest.java @@ -30,15 +30,15 @@ public class PerformanceTest extends CommonTest{ File folder= Files.createTempDir(); -// for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) { - AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL"); + for(AnalysisType analysis:PerformanceManagerImpl.getAnalysisConfiguration().keySet()) { +// AnalysisType analysis=new AnalysisType("GROW_OUT_INDIVIDUAL","GROW_OUT_INDIVIDUAL"); WebTarget target= target(ServiceConstants.Performance.PATH). // queryParam(ServiceConstants.Performance.AREA_PARAMETER, "A1","A2"). //// queryParam(ServiceConstants.Performance.QUARTER_PARAMETER, "Q1","Q2"). // queryParam(ServiceConstants.Performance.SPECIES_ID_PARAMETER, "Gadilidae","Tonno"). // queryParam(ServiceConstants.Performance.PERIOD_PARAMETER, "First","Spring"). - queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "12682549"). +// queryParam(ServiceConstants.Performance.FARM_ID_PARAMETER, "12682549"). queryParam(ServiceConstants.Performance.BATCH_TYPE_PARAMETER, analysis.getId()); System.out.println(target.getUri()); @@ -58,7 +58,7 @@ public class PerformanceTest extends CommonTest{ // System.out.println(analysis.getId()+" "+resp.getStatus() + " : "+ resp.readEntity(String.class)); -// } + } System.out.println("Wrote to : "+ folder.getAbsolutePath()); }