Mickael Boiziot · Mickael Boiziot
Showing 2 changed files Show diff stats
src/main/java/eu/omp/irap/vespa/votable/votabledata/BinaryStreamParser.java
src/main/java/eu/omp/irap/vespa/votable/votabledata/TableDataParser.java
@@ -39,9 +39,6 @@ public final class BinaryStreamParser implements DataParser {
 	/** The logger for the class BinaryStreamParser. */
 	private static final Logger LOGGER = Logger.getLogger(BinaryStreamParser.class.getName());
-	/** The index of the current position in the bytes array. */
-	private int cursor;
-
 	/** The XML nodes of VOTable document, containing the column names. */
 	private List<Field> fieldsNodes;
@@ -61,7 +58,6 @@ public final class BinaryStreamParser implements DataParser {
 	 *      Binary serialization in the VOTable REC.</a>
 	 */
 	public BinaryStreamParser(Stream voStream, List<Field> fieldsNodes) {
-		cursor = 0;
 		this.fieldsNodes = fieldsNodes;
 		String strStream = voStream.getValue().replaceAll("(\\r|\\n)", "");
 		stream = ByteBuffer.wrap(DatatypeConverter.parseBase64Binary(strStream));
@@ -118,7 +114,7 @@ public final class BinaryStreamParser implements DataParser {
 			int colId = nValue % nbColumns;
 			Field column = fieldsNodes.get(colId);
-			rowSize = getRowSize(column);
+			rowSize = getRowSize(column, stream);
 			// May be useful: if arraySize == 0, continue
@@ -126,7 +122,7 @@ public final class BinaryStreamParser implements DataParser {
 				row = new Object[nbColumns];
 			}
-			row[colId] = processDataBlock(column.getDatatype());
+			row[colId] = processDataBlock(column.getDatatype(), rowSize, stream);
 			if (colId == nbColumns - 1) {
 				data.add(row);
@@ -139,11 +135,12 @@ public final class BinaryStreamParser implements DataParser {
 	/**
 	 * @param column The XML node of the VOTable data, containing informations about the column,
 	 *            like the data primitive type.
+	 * @param byteBuffer The stream.
 	 * @return The size of the row, in bytes.
 	 * @throws BufferUnderflowException Can not get the array size because there is no bytes to read
 	 *             in the stream.
 	 */
-	private int getRowSize(Field column) {
+	private static int getRowSize(Field column, ByteBuffer byteBuffer) {
 		DataType dataType = column.getDatatype();
 		int blockSize = getBlockSize(dataType);
 		int arraySize;
@@ -151,7 +148,7 @@ public final class BinaryStreamParser implements DataParser {
 			arraySize = blockSize;
 		} else if ("*".equals(column.getArraysize())) {
 			try {
-				arraySize = stream.getInt() * blockSize;
+				arraySize = byteBuffer.getInt() * blockSize;
 			} catch (BufferUnderflowException e) {
 				LOGGER.log(Level.SEVERE, "No space left on stream, can not get array size", e);
 				throw new BufferUnderflowException();
@@ -167,160 +164,286 @@ public final class BinaryStreamParser implements DataParser {
 	 * @return An object representing the data. It can be any of the primitive type defined in the
 	 *         VOtableREC. See http://www.ivoa.net/documents/REC/VOTable/VOTable-20040811.html#ToC11
 	 */
-	private Object processDataBlock(DataType dataType) {
+	private static Object processDataBlock(DataType dataType, int rowSize, ByteBuffer stream) {
 		Object dataBlock;
 		int blockSize = getBlockSize(dataType);
+		int nbElement = blockSize == 0 ? 0 : rowSize / blockSize;
+		if (nbElement == 0) {
+			return "";
+		}
 		if (dataType.equals(DataType.BOOLEAN)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(new Boolean(stream.getInt() == 0 ? false : true)));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = new Boolean(stream.getInt() == 0 ? false : true);
-			}
+			dataBlock = processBoolean(nbElement, stream);
 		} else if (dataType.equals(DataType.UNSIGNED_BYTE)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.get()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.get();
-			}
+			dataBlock = processUnsignedByte(nbElement, stream);
 		} else if (dataType.equals(DataType.SHORT)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getShort()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.getShort();
-			}
+			dataBlock = processShort(nbElement, stream);
 		} else if (dataType.equals(DataType.INT)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getInt()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.getInt();
-			}
+			dataBlock = processInt(nbElement, stream);
 		} else if (dataType.equals(DataType.LONG)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getLong()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.getLong();
-			}
+			dataBlock = processLong(nbElement, stream);
 		} else if (dataType.equals(DataType.CHAR)) {
-			String value = new String();
-			for (int i = 0; i < rowSize && cursor < stream.capacity()
-					&& stream.position() < stream.limit(); i++) {
-				value += (char) stream.get();
-			}
-			dataBlock = value.trim();
+			dataBlock = processChar(nbElement, stream);
 		} else if (dataType.equals(DataType.UNICODE_CHAR)) {
-			String value = new String();
-			for (int i = 0; i < rowSize && cursor < stream.capacity(); i += 2) {
-				value += stream.getChar();
-			}
-			dataBlock = value.trim();
+			dataBlock = processUnicodeChar(nbElement, stream);
 		} else if (dataType.equals(DataType.FLOAT)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getFloat()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.getFloat();
-			}
+			dataBlock = processFloat(nbElement, stream);
 		} else if (dataType.equals(DataType.DOUBLE)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getDouble()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				dataBlock = stream.getDouble();
-			}
+			dataBlock = processDouble(nbElement, stream);
 		} else if (dataType.equals(DataType.FLOAT_COMPLEX)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getFloat()));
-						sj.add(String.valueOf(stream.getFloat()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				StringJoiner sj = new StringJoiner(" ", "", "");
-				sj.add(String.valueOf(stream.getFloat()));
-				sj.add(String.valueOf(stream.getFloat()));
-				dataBlock = sj.toString();
-			}			
+			dataBlock = processFloatComplex(nbElement, stream);
 		} else if (dataType.equals(DataType.DOUBLE_COMPLEX)) {
-			if (rowSize != blockSize) {
-				int nb = rowSize / blockSize;
-				if (nb == 0) { dataBlock = ""; }
-				else {
-					StringJoiner sj = new StringJoiner(" ", "", "");
-					for (int i = 0; i < nb; i++) {
-						sj.add(String.valueOf(stream.getDouble()));
-						sj.add(String.valueOf(stream.getDouble()));
-					}
-					dataBlock = sj.toString();
-				}
-			} else {
-				StringJoiner sj = new StringJoiner(" ", "", "");
-				sj.add(String.valueOf(stream.getDouble()));
-				sj.add(String.valueOf(stream.getDouble()));
-				dataBlock = sj.toString();
-			}
+			dataBlock = processDoubleComplex(nbElement, stream);
 		} else {
 			BinaryStreamParser.LOGGER.warning("Data type " + dataType + " is not supported.");
 			dataBlock = null;
 		}
 		return dataBlock;
 	}
+
+	/**
+	 * Process a double complex data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processDoubleComplex(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getDouble()));
+				sj.add(String.valueOf(byteBuffer.getDouble()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			sj.add(String.valueOf(byteBuffer.getDouble()));
+			sj.add(String.valueOf(byteBuffer.getDouble()));
+			dataBlock = sj.toString();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a float complex data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processFloatComplex(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getFloat()));
+				sj.add(String.valueOf(byteBuffer.getFloat()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			sj.add(String.valueOf(byteBuffer.getFloat()));
+			sj.add(String.valueOf(byteBuffer.getFloat()));
+			dataBlock = sj.toString();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a double data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processDouble(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getDouble()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.getDouble();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a float data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processFloat(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getFloat()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.getFloat();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a unicode char data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processUnicodeChar(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		String value = new String();
+		for (int i = 0; i < nbElement; i += 2) {
+			value += byteBuffer.getChar();
+		}
+		dataBlock = value.trim();
+		return dataBlock;
+	}
+
+	/**
+	 * Process a char data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processChar(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		String value = new String();
+		for (int i = 0; i < nbElement && byteBuffer.position() < byteBuffer.limit(); i++) {
+			value += (char) byteBuffer.get();
+		}
+		dataBlock = value.trim();
+		return dataBlock;
+	}
+
+	/**
+	 * Process a long data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processLong(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getLong()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.getLong();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a int data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processInt(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getInt()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.getInt();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a short data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processShort(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.getShort()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.getShort();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a unsigned byte data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processUnsignedByte(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(byteBuffer.get()));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = byteBuffer.get();
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Process a boolean data type and return the result.
+	 *
+	 * @param nbElement The number of element inside the byte buffer.
+	 * @param byteBuffer The Byte Buffer used.
+	 * @return The processed data.
+	 */
+	private static Object processBoolean(int nbElement, ByteBuffer byteBuffer) {
+		Object dataBlock;
+		if (nbElement != 1) {
+			StringJoiner sj = new StringJoiner(" ", "", "");
+			for (int i = 0; i < nbElement; i++) {
+				sj.add(String.valueOf(new Boolean(byteBuffer.getInt() == 0 ? false : true)));
+			}
+			dataBlock = sj.toString();
+		} else {
+			dataBlock = new Boolean(byteBuffer.getInt() == 0 ? false : true);
+		}
+		return dataBlock;
+	}
+
+	/**
+	 * Decode then return the value of a TD element base64 encoded.
+	 *
+	 * @param content The content.
+	 * @param field The field.
+	 * @return The decoded value.
+	 */
+	public static Object readTdValue(String content, Field field) {
+		String strStream = content.replaceAll("(\\r|\\n)", "");
+		ByteBuffer stream = ByteBuffer.wrap(
+				DatatypeConverter.parseBase64Binary(strStream));
+		int rowSize = getRowSize(field, stream);
+		return processDataBlock(field.getDatatype(), rowSize, stream);
+	}
+
 }
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
+import eu.omp.irap.vespa.epntapclient.votable.model.EncodingType;
 import eu.omp.irap.vespa.epntapclient.votable.model.Field;
 import eu.omp.irap.vespa.epntapclient.votable.model.TableData;
 import eu.omp.irap.vespa.epntapclient.votable.model.Td;
@@ -58,7 +59,13 @@ public class TableDataParser implements DataParser {
 			Object[] rowRes = new Object[fieldsNodes.size()];
 			List<Td> tds = row.getTD();
 			for (int i = 0; i < fieldsNodes.size(); i++) {
-				rowRes[i] = tds.get(i).getValue().isEmpty() ? "": tds.get(i).getValue();
+				Td td = tds.get(i);
+				if (EncodingType.BASE_64 == td.getEncoding()) {
+					Field field = fieldsNodes.get(i);
+					rowRes[i] = BinaryStreamParser.readTdValue(td.getValue(), field);
+				} else {
+					rowRes[i] = td.getValue().isEmpty() ? "": td.getValue();
+				}
 			}
 			res.add(rowRes);
 		}