changed flow

src/amend_manager/DatasetComparisonDao.java

@@ -47,8 +47,9 @@ public void add(DatasetComparison comp) {
 			stmt.executeUpdate();
 		}
 		catch (SQLException e) {
-			e.printStackTrace();
-			LOGGER.error("Cannot add a new dataset comparison=" + comp, e);
+
+			//e.printStackTrace();
+			//LOGGER.error("Cannot add a new dataset comparison=" + comp, e);
 		}
 	}
 

src/amend_manager/ReportImporter.java

@@ -53,25 +53,15 @@ public abstract class ReportImporter {
 	 * @param versionField name of the field which contains the dataset version
 	 * using the format value.version, as FR1704.01 (senderDatasetId.version)
 	 */
-	public ReportImporter(DatasetList datasetVersions, 
-			String rowIdField, String versionField, IReportService reportService, 
+	public ReportImporter(String rowIdField, String versionField, IReportService reportService, 
 			ITableDaoService daoService) {
 
 		this.processedDatasets = 1;
 
-		this.datasetVersions = datasetVersions;
 		this.rowIdField = rowIdField;
 		this.versionField =  versionField;
 		this.daoService = daoService;
 		this.reportService = reportService;
-
-		// get the sender id of the dataset versions
-		if (!datasetVersions.isEmpty()) {
-			senderDatasetId = datasetVersions.get(0).getDecomposedSenderId();
-		}
-		else {
-			throw new IllegalArgumentException("Cannot import an empty dataset list");
-		}
 	}
 
 	/**
@@ -123,6 +113,18 @@ private Dataset download(Dataset dataset) throws XMLStreamException, IOException
 		return populatedDataset;
 	}
 
+	public void setDatasetVersions(DatasetList datasetVersions) {
+		this.datasetVersions = datasetVersions;
+
+		// get the sender id of the dataset versions
+		if (!datasetVersions.isEmpty()) {
+			senderDatasetId = datasetVersions.get(0).getDecomposedSenderId();
+		}
+		else {
+			throw new IllegalArgumentException("Cannot import an empty dataset list");
+		}
+	}
+
 	/**
 	 * Import an entire report (composed of several dataset versions)
 	 * The amendment is also managed here
@@ -222,6 +224,25 @@ public void importReport() throws DetailedSOAPException, XMLStreamException, IOE
 		LOGGER.info("Report downloader ended for report=" + senderDatasetId);
 	}
 
+	/**
+	 * Import a dataset from an .xml file. Note that amendments are not processed
+	 * with this method, therefore it can be used only with the first
+	 * version of a report.
+	 * @param file
+	 * @throws XMLStreamException
+	 * @throws IOException
+	 * @throws FormulaException
+	 * @throws ParseException
+	 */
+	public void importFirstDatasetVersion(File file) throws XMLStreamException, IOException, 
+		FormulaException, ParseException {
+
+		this.importDatasetFile(file);
+		Dataset d = reportService.datasetFromFile(file);
+		importDatasetMetadata(d);
+		this.createLocalReport();
+	}
+
 	/**
 	 * Import a single dataset version into the database
 	 * @param dataset

src/formula/ColumnFormula.java

@@ -86,4 +86,9 @@ public String solve(TableRow row) throws FormulaException {
 
 		return solvedFormula;
 	}
+
+	@Override
+	public String toString() {
+		return "column=" + columnId + "; formula=" + formula + "; fieldType=" + fieldType;
+	}
 }

src/formula/Formula.java

@@ -124,8 +124,8 @@ public String solve() throws FormulaException {
 	}
 
 	private void print(String value, String header) {
-		//if (column.equals("sampArea") && fieldHeader.equals("mandatory"))
-			//LOGGER.debug("Solving formula=" + value + " Solving formulas=" + header);
+		//if (column.equals("contextId") && fieldHeader.equals("labelFormula"))
+		//	LOGGER.debug("Solving formula=" + value + " Solving formulas=" + header);
 
 		//if ((column.equals("sampAnId")) && fieldHeader.equals("labelFormula"))
 		//	System.out.println("column " + column + " " + header + " => " + value);

src/i18n_messages/rcl_messages_en.properties

@@ -108,6 +108,9 @@ ack.invalid=ERR804: The status is not valid, found status %s1.
 # ack log KO but no log errors found
 ack.ko.no.errors=ERR806: Refresh status failed. Unknown error occurred. Please contact %s1.
 
+# s1: ack error
+ack.discarded=ERR807: The message was discarded with the following error: %s1
+
 ack.processing=WARN500: Dataset still in processing.
 
 # s1: error

src/providers/ReportService.java

@@ -18,6 +18,7 @@
 
 import ack.DcfAck;
 import ack.IDcfAckLog;
+import ack.MessageValResCode;
 import amend_manager.ReportXmlBuilder;
 import app_config.AppPaths;
 import app_config.BooleanValue;
@@ -736,51 +737,47 @@ public Message refreshStatus(Report report) {
 			return m;
 		}
 
-		// if ack is ready then check if the report status
-		// is the same as the one in the get dataset list
-		if (ack.isReady()) {
+		if (!ack.isReady()) {
+			// warn the user, the ack cannot be retrieved yet
+			String title = Messages.get("warning.title");
+			String message = Messages.get("ack.processing");
+			int style = SWT.ICON_INFORMATION;
+			Message m = Warnings.create(title, message, style);
+			m.setCode("WARN500");
+			return m;
+		}
+
+		IDcfAckLog log = ack.getLog();
+
+		boolean discarded = ack.getLog().getMessageValResCode() == MessageValResCode.DISCARDED;
+
+		// if discarded or KO
+		if (discarded || !log.isOk()) {
 
-			IDcfAckLog log = ack.getLog();
+			// mark status as failed
+			RCLDatasetStatus failedStatus = RCLDatasetStatus.getFailedVersionOf(
+					report.getRCLStatus());
+
+			if (failedStatus != null) {
+				report.setStatus(failedStatus);
+
+				// permanently save data
+				daoService.update(report);
+			}
 
-			// if TRXOK
-			if (log.isOk()) {
+			if (discarded) {
 
-				this.updateStatusWithAck(report, ack);
+				String title = Messages.get("error.title");
+				String message = Messages.get("ack.discarded", 
+						ack.getLog().getMessageValResText());
 
-				RCLDatasetStatus status = RCLDatasetStatus
-						.fromDcfStatus(log.getDatasetStatus());
+				int style = SWT.ICON_ERROR;
+				Message m = Warnings.create(title, message, style);
+				m.setCode("ERR807");
 
-				// if no dataset retrieved for the current report
-				if (!status.existsInDCF()) {
-
-					// warn the user, the ack cannot be retrieved yet
-					String title = Messages.get("success.title");
-					String message = Messages.get("ack.invalid", 
-							status.getLabel());
-					int style = SWT.ICON_ERROR;
-
-					Message m = Warnings.create(title, message, style);
-					m.setCode("ERR804");
-
-					return m;
-				}
-
-				return alignReportStatusWithDCF(report);
+				return m;
 			}
-			else {
-
-				// mark the status of the report accordingly
-				// since the refresh status discovered a TRXKO ack
-				RCLDatasetStatus failedStatus = RCLDatasetStatus.getFailedVersionOf(
-						report.getRCLStatus());
-
-				if (failedStatus != null) {
-					report.setStatus(failedStatus);
-
-					// permanently save data
-					daoService.update(report);
-				}
-
+			else if (!log.isOk()) {
 
 				// errors
 				if (log.hasErrors()) {
@@ -799,16 +796,30 @@ public Message refreshStatus(Report report) {
 				}
 			}
 		}
-		else {
+
+		// here log can only be OK
+
+		this.updateStatusWithAck(report, ack);
+
+		RCLDatasetStatus status = RCLDatasetStatus
+				.fromDcfStatus(log.getDatasetStatus());
+
+		// if no dataset retrieved for the current report
+		if (!status.existsInDCF()) {
 
 			// warn the user, the ack cannot be retrieved yet
-			String title = Messages.get("warning.title");
-			String message = Messages.get("ack.processing");
-			int style = SWT.ICON_INFORMATION;
+			String title = Messages.get("error.title");
+			String message = Messages.get("ack.invalid", 
+					status.getLabel());
+			int style = SWT.ICON_ERROR;
+
 			Message m = Warnings.create(title, message, style);
-			m.setCode("WARN500");
+			m.setCode("ERR804");
+
 			return m;
 		}
+
+		return alignReportStatusWithDCF(report);
 	}
 
 	/**

src/report/Report.java

@@ -75,7 +75,7 @@ public RCLDatasetStatus getRCLStatus() {
 	}
 
 	public void setStatus(String status) {
-		this.put(AppPaths.REPORT_PREVIOUS_STATUS, this.getRCLStatus().getLabel());
+		this.put(AppPaths.REPORT_PREVIOUS_STATUS, this.getRCLStatus().getStatus());
 		this.put(AppPaths.REPORT_STATUS, status);
 	}
 

src/table_database/TableDao.java

@@ -365,7 +365,12 @@ public TableRow getByResultSet(TableSchema schema, ResultSet rs, boolean solveFo
 			}
 			else {
 
-				String value = rs.getString(column.getId());
+				String value = null;
+
+				try {
+					value = rs.getString(column.getId());
+				}
+				catch(SQLException e) {}
 
 				// if no value go to the next field
 				if (value == null)