Commits

Yaw Anokwa committed 191b405

add <output> support in items

Comments (0)

Files changed (1)

core/src/org/javarosa/xform/parse/XFormParser.java

 		labelUA.addElement(REF_ATTR);
 		valueUA.addElement(FORM_ATTR);
 		
-		
-		String label = null;
+		String labelInnerText = null;
 		String textRef = null;
 		String value = null;
 
 				if(XFormUtils.showUnusedAttributeWarning(child, labelUA)){
 					System.out.println(XFormUtils.unusedAttWarning(child, labelUA));
 				}
-				label = getXMLText(child, true);
+				labelInnerText = getLabel(child);
 				String ref = child.getAttributeValue("", REF_ATTR);
 
 				if (ref != null) {
 			}
 		}
 		
-		if (textRef == null && label == null) {
+		if (textRef == null && labelInnerText == null) {
 			throw new XFormParseException("<item> without proper <label>",e);
 		}
 		if (value == null) {
 		if (textRef != null) {
 			q.addSelectChoice(new SelectChoice(textRef, value));
 		} else {
-			q.addSelectChoice(new SelectChoice(null,label, value, false));
+			q.addSelectChoice(new SelectChoice(null,labelInnerText, value, false));
 		}
 		
 		//print unused attribute warning message for parent element