add reference to dataflow in R dataset for sdmx 3. It will be used by…

… the VTL engine R environment

BUILD

@@ -1 +1 @@
-20240320-1037
+20240321-1158

JAVA/src/main/java/it/bancaditalia/oss/sdmx/api/PortableDataSet.java

@@ -57,6 +57,7 @@ public class PortableDataSet<T> implements Serializable
 	private boolean				errorFlag		= false;
 	private boolean				numeric			= false;
 	private String				errorObjects	= null;
+	private String				dataflow		= null;
 
 	private DefaultTableModel	model			= null;
 
@@ -80,6 +81,14 @@ public <U extends T> PortableDataSet(List<PortableTimeSeries<U>> tslist) throws
 		setTimeSeries(tslist);
 	}
 
+	public String getDataflow() {
+		return dataflow;
+	}
+
+	public void setDataflow(String dataflow) {
+		this.dataflow = dataflow;
+	}
+
 	/**
 	 * Returns the index of a column in this dataset given its name.
 	 * 

JAVA/src/main/java/it/bancaditalia/oss/sdmx/client/SdmxClientHandler.java

@@ -461,7 +461,10 @@ public static PortableDataSet<Double> getTimeSeriesTable2(String provider, Strin
 			String attributes, String measures, String updatedAfter, boolean includeHistory)
 			throws SdmxException, DataStructureException
 	{
-		return new PortableDataSet<>(getTimeSeries2(provider, dataflow, tsKey, filter, startTime, endTime, attributes, measures, updatedAfter, includeHistory));
+
+		PortableDataSet<Double> ds = new PortableDataSet<>(getTimeSeries2(provider, dataflow, tsKey, filter, startTime, endTime, attributes, measures, updatedAfter, includeHistory));
+		ds.setDataflow(getFlow(provider, dataflow).getFullIdentifier());
+		return(ds);
 	}
 
 	//valid for sdmx v2 

JAVA/src/main/java/it/bancaditalia/oss/sdmx/parser/v21/CompactDataParser.java

@@ -141,7 +141,6 @@ else if (startElement.getName().getLocalPart().equals(OBS) && data)
 			else if (event.isEndElement() && event.asEndElement().getName().getLocalPart() == (SERIES))
 			{
 				PortableTimeSeries<Double> ts = new PortableTimeSeries<>(dataflow, metadata.getKey(), metadata.getValue(), obs);
-				ts.getAttributesMap().put("dsd", dsd.getFullIdentifier());
 				tsList.putIfAbsent(ts.getName(), ts);
 				obs = new ArrayList<>();
 			}

RJSDMX/R/TSConverter.R

@@ -88,6 +88,7 @@ convertTSList <- function (javaList, plain = F) {
 # convert a java PortableDataSet
 convertTSDF <- function (jtable) {
 	isNumeric <- .jcall(jtable,"Z","isNumeric");
+	dataflow <- .jcall(jtable,"Ljava/lang/String;","getDataflow");
 	time = .jcall(jtable,"[Ljava/lang/String;","getTimeStamps", evalString = TRUE, evalArray = TRUE)
 	values = .jcall(jtable,"[Ljava/lang/Object;","getObservations", evalArray = TRUE)
 	if(isNumeric){
@@ -110,6 +111,7 @@ convertTSDF <- function (jtable) {
 		warning('The results contain errors. Please check the ERROR_OBJECTS attribute')
 	}
 	attr(result, 'IS_NUMERIC') <- isNumeric
+	attr(result, 'dataflow') <- dataflow
 	return(result);
 }