quad patterns support (not implemented yet)

hdt-java-cli/src/main/java/org/rdfhdt/hdt/tools/HdtSearch.java

@@ -32,13 +32,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.rdfhdt.hdt.dictionary.Dictionary;
+import org.rdfhdt.hdt.dictionary.DictionarySection;
 import org.rdfhdt.hdt.exceptions.NotFoundException;
 import org.rdfhdt.hdt.exceptions.ParserException;
 import org.rdfhdt.hdt.hdt.HDT;
 import org.rdfhdt.hdt.hdt.HDTManager;
 import org.rdfhdt.hdt.hdt.HDTVersion;
 import org.rdfhdt.hdt.listener.ProgressListener;
 import org.rdfhdt.hdt.options.HDTOptions;
+import org.rdfhdt.hdt.quad.QuadString;
 import org.rdfhdt.hdt.triples.IteratorTripleString;
 import org.rdfhdt.hdt.triples.TripleString;
 import org.rdfhdt.hdt.util.StopWatch;
@@ -79,7 +82,14 @@ public class HdtSearch {
 	@Parameter(names = "-memory", description = "Load the whole file into main memory. Ensures fastest querying.")
 	public boolean loadInMemory;
 
-	protected static void iterate(HDT hdt, CharSequence subject, CharSequence predicate, CharSequence object) throws NotFoundException {
+	protected static void iterate(
+		HDT hdt,
+		boolean isHDTQ,
+		CharSequence subject,
+		CharSequence predicate,
+		CharSequence object,
+		CharSequence graph
+	) throws NotFoundException {
 		StopWatch iterateTime = new StopWatch();
 		int count;
 
@@ -118,34 +128,58 @@ private void help() {
 	 * Read from a line, where each component is separated by space.
 	 * @param line line to parse
 	 */
-	private static void parseTriplePattern(TripleString dest, String line) throws ParserException {
+	private static void parseTriplePattern(QuadString dest, String line, boolean isHDTQ) throws ParserException {
 		int split, posa, posb;
+		ParserException ex = new ParserException(
+			isHDTQ
+			? "Make sure that you included four terms."
+			: "Make sure that you included three terms."
+		); // Not found, error.
 		dest.clear();
 
 		// SET SUBJECT
 		posa = 0;
 		posb = split = line.indexOf(' ', posa);
 
-		if(posb==-1) throw new ParserException("Make sure that you included three terms."); // Not found, error.
+		if(posb==-1) throw ex;
 
 		dest.setSubject(UnicodeEscape.unescapeString(line.substring(posa, posb)));
 
 		// SET PREDICATE
 		posa = split+1;
 		posb = split = line.indexOf(' ', posa);
 
-		if(posb==-1) throw new ParserException("Make sure that you included three terms.");
+		if(posb==-1) throw ex;
 
 		dest.setPredicate(UnicodeEscape.unescapeString(line.substring(posa, posb)));
 
-		// SET OBJECT
-		posa = split+1;
-		posb = line.length();
-
-		if(line.charAt(posb-1)=='.') posb--;	// Remove trailing <space> <dot> from NTRIPLES.
-		if(line.charAt(posb-1)==' ') posb--;
-
-		dest.setObject(UnicodeEscape.unescapeString(line.substring(posa, posb)));
+		if (isHDTQ) {
+			// SET OBJECT
+			posa = split+1;
+			posb = split = line.indexOf(' ', posa);
+
+			if(posb==-1) throw ex;
+
+			dest.setObject(UnicodeEscape.unescapeString(line.substring(posa, posb)));
+
+			// SET GRAPH
+			posa = split+1;
+			posb = line.length();
+
+			if(line.charAt(posb-1)=='.') posb--;
+			if(line.charAt(posb-1)==' ') posb--;
+
+			dest.setGraph(UnicodeEscape.unescapeString(line.substring(posa, posb)));
+		} else {
+			// SET OBJECT
+			posa = split+1;
+			posb = line.length();
+
+			if(line.charAt(posb-1)=='.') posb--;	// Remove trailing <space> <dot> from NTRIPLES.
+			if(line.charAt(posb-1)==' ') posb--;
+
+			dest.setObject(UnicodeEscape.unescapeString(line.substring(posa, posb)));
+		}
 	}
 
 	public void execute() throws IOException {
@@ -169,10 +203,12 @@ public void execute() throws IOException {
 		} else {
 			hdt= HDTManager.mapIndexedHDT(hdtInput, spec, listenerConsole);
 		}
+		Dictionary dict = hdt.getDictionary();
+		boolean isHDTQ = dict.supportGraphs();
 
 		BufferedReader in = new BufferedReader(new InputStreamReader(System.in, UTF_8));
 		try {
-			TripleString triplePattern = new TripleString();
+			QuadString triplePattern = new QuadString();
 
 			while(true) {
 				System.out.print(">> ");
@@ -187,10 +223,21 @@ public void execute() throws IOException {
 				}
 
 				try {
-					parseTriplePattern(triplePattern, line);
-					System.out.println("Query: |"+triplePattern.getSubject()+"| |"+triplePattern.getPredicate()+"| |" + triplePattern.getObject()+"|");
+					parseTriplePattern(triplePattern, line, isHDTQ);
+					if (isHDTQ) {
+						System.out.println("Query: |"+triplePattern.getSubject()+"| |"+triplePattern.getPredicate()+"| |" + triplePattern.getObject()+"| |" + triplePattern.getGraph()+"|");
+					} else {
+						System.out.println("Query: |"+triplePattern.getSubject()+"| |"+triplePattern.getPredicate()+"| |" + triplePattern.getObject()+"|");
+					}
 
-					iterate(hdt,triplePattern.getSubject(),triplePattern.getPredicate(),triplePattern.getObject());
+					iterate(
+						hdt,
+						isHDTQ,
+						triplePattern.getSubject(),
+						triplePattern.getPredicate(),
+						triplePattern.getObject(),
+						triplePattern.getGraph()
+					);
 				} catch (ParserException e) {
 					System.err.println("Could not parse triple pattern: "+e.getMessage());
 					help();