first working tests for paper submission

Change-Id: I32e94943628f6b781e63f3dde9d9488ddb27f857

Author: physikerwelt

src/main/java/de/tuberlin/dima/schubotz/mathmlquerygenerator/XQueryGenerator.java

@@ -113,15 +113,30 @@ public String toString () {
 		}
 
 
-		return getHeader() + "for $x in $m//*:" +
+		return getString( mainElement, fixedConstraints, qvarConstraintString );
+
+	}
+
+	public String getString (Node mainElement, String fixedConstraints, String qvarConstraintString) {
+		String out = getHeader();
+		out += "for $x in $m//*:" +
 			(new NdLst( mainElement.getChildNodes() )).item( 0 ).getLocalName() + "\n" +
-			fixedConstraints + "\n" +
-			"where" + "\n" +
-			lengthConstraint +
-			(((qvarConstraintString.length() > 0) && (lengthConstraint.length() > 0)) ? " and " : "") +
-			qvarConstraintString + "\n" +
-			"return" + "\n" + getFooter();
+			fixedConstraints + "\n";
+		out +=	getConstraings( qvarConstraintString );
+		out +=
+				"return" + "\n" + getFooter();
+		return out;
+	}
 
+	private String getConstraings (String qvarConstraintString) {
+		String  out = lengthConstraint +
+			(((qvarConstraintString.length() > 0) && (lengthConstraint.length() > 0)) ? " and " : "") +
+			qvarConstraintString ;
+		if (out.trim().length()>0){
+			return "where" + "\n" + out +"\n";
+		} else {
+			return "";
+		}
 	}
 
 	private String generateConstraint (Node node) {
@@ -168,9 +183,7 @@ private String generateConstraint (Node node, boolean isRoot) {
 
 				} else if ( child.getNodeType() == Node.TEXT_NODE ) {
 					out = "./text() = '" + child.getNodeValue().trim() + "'";
-				} else {
-                    System.out.println(child.getNodeType());
-                }
+				}
 			}
 		}
 		if ( !isRoot ) {