List<CQLPrefix> prefixes, List<ModifierSet> sortkeys) {
b.indent(level).append("<triple>\n");
renderPrefixes(b, level + 1, prefixes);
- ms.toXCQLInternal(b, level + 1, "boolean");
+ ms.toXCQLInternal(b, level + 1, "boolean", "value");
b.indent(level + 1).append("<leftOperand>\n");
left.toXCQLInternal(b, level + 2);
b.indent(level + 1).append("</leftOperand>\n");
if (p.name != null)
b.indent(level + 2).append("<name>").
append(p.name).append("</name>\n");
- b.indent(level + 2).append("<identifier>").append(p.identifier).
- append("</identifier>\n");
- b.indent(level+1).append("</prefix>\n");
+ b.indent(level + 2).append("<identifier>").
+ append(p.identifier).append("</identifier>\n");
+ b.indent(level+1).append("</prefix>\n");
}
b.indent(level).append("</prefixes>\n");
}
b.indent(level).append("<sortKeys>\n");
for (int i = 0; i < sortkeys.size(); i++) {
ModifierSet key = sortkeys.get(i);
- b.append(key.sortKeyToXCQL(level+1));
+ key.toXCQLInternal(b, level+1, "key", "index");
}
b.indent(level).append("</sortKeys>\n");
}
List<ModifierSet> sortkeys) {
if (sortkeys != null)
throw new Error("CQLRelation.toXCQL() called with sortkeys");
- ms.toXCQLInternal(b, level, "relation");
+ ms.toXCQLInternal(b, level, "relation", "value");
}
@Override
return value;
}
- protected XCQLBuilder toXCQLInternal(XCQLBuilder b, int level, String relationElement) {
+ void toXCQLInternal(XCQLBuilder b, int level, String relationElement) {
b.indent(level).append("<modifier>\n");
b.indent(level + 1).append("<type>");
b.xq(type).append("</type>\n");
b.indent(level + 1).append("<value>");
b.xq(value).append("</value>\n");
}
- return b.indent(level).append("</modifier>\n");
+ b.indent(level).append("</modifier>\n");
}
public String toCQL() {
return modifiers;
}
- public String toXCQL(int level, String topLevelElement) {
- return "";//underlyingToXCQL(level, topLevelElement, "value");
- }
-
- public String sortKeyToXCQL(int level) {
- return "";//underlyingToXCQL(level, "key", "index");
- }
-
- protected XCQLBuilder toXCQLInternal(XCQLBuilder b, int level,
- String topLevelElement) {
- return toXCQLInternal(b, level, topLevelElement, "value");
- }
-
- private XCQLBuilder toXCQLInternal(XCQLBuilder b, int level,
+ void toXCQLInternal(XCQLBuilder b, int level,
String topLevelElement, String valueElement) {
b.indent(level).append("<").append(topLevelElement).
append(">\n").indent(level + 1).append("<").
b.indent(level + 1).append("</modifiers>\n");
}
b.indent(level).append("</").append(topLevelElement).append(">\n");
- return b;
}
public String toCQL() {