git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application/perform-service@177312 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/application/perform/service/engine/dm/DMUtils.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.gcube.application.perform.service.engine.model.importer.ImportRoutineDescriptor;
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.data.analysis.dataminermanagercl.server.DataMinerService;
 import org.gcube.data.analysis.dataminermanagercl.server.dmservice.SClient;
 import org.gcube.data.analysis.dataminermanagercl.server.monitor.DMMonitor;
@@ -26,6 +27,7 @@ public class DMUtils {
 
 	public static SClient getClient() throws DMException {
 		try {
+			
 			return new DataMinerService().getClient();
 		}catch(Exception e) {
 			throw new DMException(e);

src/main/java/org/gcube/application/perform/service/engine/impl/PerformanceManagerImpl.java

@@ -163,6 +163,7 @@ public class PerformanceManagerImpl implements PerformanceManager{
 		log.debug("Removing imports replaced by {} ",last);
 
 		DBQueryDescriptor desc=new DBQueryDescriptor().
+				add(DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),last.getFarmId()).
 				add(DBField.ImportRoutine.fields.get(ImportRoutine.BATCH_TYPE),last.getBatch_type()).
 				add(DBField.ImportRoutine.fields.get(ImportRoutine.SOURCE_URL),last.getSourceUrl()).
 				add(DBField.ImportRoutine.fields.get(ImportRoutine.ID),last.getId()).

src/main/java/org/gcube/application/perform/service/engine/impl/Queries.java

@@ -39,11 +39,14 @@ public class Queries {
 	
 	
 	public static final Query GET_OLDER_EQUIVALENT_IMPORT_ROUTINE=new Query("Select * from "+ImportRoutine.TABLE+" WHERE "
+			+ImportRoutine.FARM_ID+"=? AND "
 			+ImportRoutine.BATCH_TYPE+"=? AND "
 			+ImportRoutine.SOURCE_URL+"=? AND "
 			+ImportRoutine.ID+"<>? AND "
 			+"("+ImportRoutine.END+"<? OR "+ImportRoutine.END+" IS NULL) ",
-			new DBField[]{DBField.ImportRoutine.fields.get(ImportRoutine.BATCH_TYPE),
+			new DBField[]{
+					DBField.ImportRoutine.fields.get(ImportRoutine.FARM_ID),
+					DBField.ImportRoutine.fields.get(ImportRoutine.BATCH_TYPE),
 					DBField.ImportRoutine.fields.get(ImportRoutine.SOURCE_URL),
 					DBField.ImportRoutine.fields.get(ImportRoutine.ID),
 					DBField.ImportRoutine.fields.get(ImportRoutine.END)});

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Annual.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_annual.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,year
-report_labels=FARM,AREA
+report_labels=FARM,AREA,YEAR

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Antibiotics.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_antibiotics.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,disease
-report_labels=FARM,AREA
+report_labels=FARM,AREA,DISEASE

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/Antiparasitic.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_antiparasitic.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,disease_1
-report_labels=FARM,AREA
+report_labels=FARM,AREA,DISEASE

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED/LethalIncidents.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_lethalincidents.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,type_of_animal
-report_labels=FARM,AREA
+report_labels=FARM,AREA,ANIMAL_TYPE

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Annual.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_annual.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,year
-report_labels=FARM,AREA
+report_labels=FARM,AREA,YEAR

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Antibiotics.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_antibiotics.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,disease
-report_labels=FARM,AREA
+report_labels=FARM,AREA,DISEASE

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/Antiparasitic.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_antiparasitic.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,disease_1
-report_labels=FARM,AREA
+report_labels=FARM,AREA,DISEASE

src/main/webapp/WEB-INF/schema/GROW_OUT_AGGREGATED_CLOSED_BATCHES/LethalIncidents.properties

@@ -3,5 +3,5 @@ farm=farmid
 routine=internal_routine_id
 csv=csv/GROW_OUT_AGGREGATED_lethalincidents.csv
 enable_analysis=true
-report_fields=farmid,area
+report_fields=farmid,area,type_of_animal
-report_labels=FARM,AREA
+report_labels=FARM,AREA,ANIMAL_TYPE

src/test/java/org/gcube/application/perform/service/ImportTests.java

@@ -29,11 +29,11 @@ public class ImportTests extends CommonTest{
 		System.out.println(target.getUri());
 		Response resp=target.request().post(null);
 		System.out.println("Status : "+resp.getStatus() );	
-//		try {
+		try {
-//			Thread.sleep(1000*60*10);
+			Thread.sleep(1000*60*10);
-//		} catch (InterruptedException e) {
+		} catch (InterruptedException e) {
-//			
+			
-//		}
+		}
 	}
 
 	

src/test/java/org/gcube/application/perform/service/PerformanceTest.java

@@ -38,7 +38,7 @@ public class PerformanceTest extends CommonTest{
 ////					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, "12682101").
 					queryParam(ServiceConstants.Performance.BATCH_TYPE_PARAMETER, analysis.getId());
 
 			System.out.println(target.getUri());