eclipse-rdf4jGH-5058: additional parser code (WIP)

core/rio/csvw/src/main/java/org/eclipse/rdf4j/rio/csvw/CSVWParser.java

@@ -343,7 +343,7 @@ private int getAboutIndex(String aboutURL, CellParser[] cellParsers) {
 	}
 
 	/**
-	 * Return root node for standard mode
+	 * Create tablegroup statement and return root node
 	 *
 	 * @param handler
 	 * @return
@@ -355,7 +355,7 @@ private Resource generateTablegroupNode(RDFHandler handler) {
 	}
 
 	/**
-	 * Return root node for standard mode
+	 * Create table statements and return table node
 	 *
 	 * @param handler
 	 * @return
@@ -368,7 +368,7 @@ private Resource generateTableNode(RDFHandler handler, Resource rootNode) {
 	}
 
 	/**
-	 * Return root node for standard mode
+	 * Create row statements and return row node
 	 *
 	 * @param handler
 	 * @return
@@ -382,6 +382,22 @@ private Resource generateRowNode(RDFHandler handler, Resource tableNode, Resourc
 		return node;
 	}
 
+	/**
+	 * Check which cellparsers have placeholders that need to be replaced
+	 * 
+	 * @param cellParsers
+	 * @return 
+	 */
+	private boolean[] havePlaceholders(CellParser[] cellParsers) {
+		boolean[] placeholders = new boolean[cellParsers.length];
+
+		for (int i = 0; i < cellParsers.length; i++) {
+			placeholders[i] &= (cellParsers[i].getAboutPlaceholders() != null);
+			placeholders[i] &= (cellParsers[i].getValuePlaceholders() != null);
+		}
+		return null;
+	}
+
 	/**
 	 * Parse a CSV file
 	 *
@@ -398,6 +414,8 @@ private void parseCSV(Model metadata, RDFHandler handler, URI csvFile, CellParse
 		int aboutIndex = getAboutIndex(aboutURL, cellParsers);
 		String placeholder = (aboutIndex > -1) ? "{" + cellParsers[aboutIndex].getName() + "}" : null;
 
+		boolean[] placeholders = havePlaceholders(cellParsers);
+
 		LOGGER.info("Parsing {}", csvFile);
 
 		Charset encoding = getEncoding(metadata, table);

core/rio/csvw/src/main/java/org/eclipse/rdf4j/rio/csvw/parsers/CellParser.java

@@ -224,6 +224,15 @@ public void setAboutUrl(String aboutUrl) {
 		this.aboutPlaceholders = getPlaceholders(aboutUrl);
 	}
 
+	/**
+	 * Get about placeholders
+	 * 
+	 * @return 
+	 */
+	public String[] getAboutPlaceholders() {
+		return aboutPlaceholders;
+	}
+
 	/**
 	 * Get propertyUrl as IRI
 	 *
@@ -272,6 +281,15 @@ public void setValueUrl(String valueUrl) {
 		this.valuePlaceholders = getPlaceholders(valueUrl);
 	}
 
+	/**
+	 * Get value placeholders
+	 * 
+	 * @return 
+	 */
+	public String[] getValuePlaceholders() {
+		return valuePlaceholders;
+	}
+
 	/**
 	 * Get format
 	 *