1 files changed, 78 insertions, 77 deletions
diff --git a/Swiften/Parser/PayloadParsers/FormParser.cpp b/Swiften/Parser/PayloadParsers/FormParser.cpp
index 2df0a85..7c29189 100644
--- a/Swiften/Parser/PayloadParsers/FormParser.cpp
+++ b/Swiften/Parser/PayloadParsers/FormParser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -10,7 +10,7 @@
 
 namespace Swift {
 
-FormParser::FormParser() : level_(TopLevel), parsingItem_(false), parsingReported_(false) {
+FormParser::FormParser() : level_(TopLevel), parsingItem_(false), parsingReported_(false), parsingOption_(false) {
 }
 
 void FormParser::handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes) {
@@ -36,67 +36,62 @@ void FormParser::handleStartElement(const std::string& element, const std::strin
 		else if (element == "instructions") {
 			currentText_.clear();
 		}
-		else if (element == "field") {
-			std::string type;
-			FormField::ref correspondingReportedField;
-			if (!parsingItem_) {
-				type = attributes.getAttribute("type");
-			} else {
-				foreach(FormField::ref field, getPayloadInternal()->getReportedFields()) {
-					if (field->getName() == attributes.getAttribute("var")) {
-						correspondingReportedField = field;
-						break;
-					}
-				}
-			}
-			if (type == "boolean" || boost::dynamic_pointer_cast<BooleanFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = BooleanFormFieldParseHelper::create();
-			}
-			else if (type == "fixed" || boost::dynamic_pointer_cast<FixedFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = FixedFormFieldParseHelper::create();
+		else if (element == "reported") {
+			parsingReported_ = true;
+		}
+		else if (element == "item") {
+			parsingItem_ = true;
+		}
+	}
+	else if (level_ == FieldLevel && currentField_) {
+		currentText_.clear();
+		if (element == "option") {
+			currentOptionLabel_ = attributes.getAttribute("label");
+			currentOptionValue_ = "";
+			parsingOption_ = true;
+		}
+	}
+	if (level_ >= PayloadLevel) {
+		if (element == "field") {
+			currentField_ = boost::make_shared<FormField>();
+			std::string type = attributes.getAttribute("type");
+			FormField::Type fieldType = FormField::UnknownType;
+			if (type == "boolean") {
+				fieldType = FormField::BooleanType; 
 			}
-			else if (type == "hidden" || boost::dynamic_pointer_cast<HiddenFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = HiddenFormFieldParseHelper::create();
+			if (type == "fixed") {
+				fieldType = FormField::FixedType; 
 			}
-			else if (type == "jid-multi" || boost::dynamic_pointer_cast<JIDMultiFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = JIDMultiFormFieldParseHelper::create();
+			if (type == "hidden") {
+				fieldType = FormField::HiddenType; 
 			}
-			else if (type == "jid-single" || boost::dynamic_pointer_cast<JIDSingleFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = JIDSingleFormFieldParseHelper::create();
+			if (type == "list-single") {
+				fieldType = FormField::ListSingleType; 
 			}
-			else if (type == "list-multi" || boost::dynamic_pointer_cast<ListMultiFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = ListMultiFormFieldParseHelper::create();
+			if (type == "text-multi") {
+				fieldType = FormField::TextMultiType; 
 			}
-			else if (type == "list-single" || boost::dynamic_pointer_cast<ListSingleFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = ListSingleFormFieldParseHelper::create();
+			if (type == "text-private") {
+				fieldType = FormField::TextPrivateType; 
 			}
-			else if (type == "text-multi" || boost::dynamic_pointer_cast<TextMultiFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = TextMultiFormFieldParseHelper::create();
+			if (type == "text-single") {
+				fieldType = FormField::TextSingleType; 
 			}
-			else if (type == "text-private" || boost::dynamic_pointer_cast<TextPrivateFormField>(correspondingReportedField)) {
-				currentFieldParseHelper_ = TextPrivateFormFieldParseHelper::create();
+			if (type == "jid-single") {
+				fieldType = FormField::JIDSingleType; 
 			}
-			else /*if (type == "text-single") || undefined */ {
-				currentFieldParseHelper_ = TextSingleFormFieldParseHelper::create();
+			if (type == "jid-multi") {
+				fieldType = FormField::JIDMultiType; 
 			}
-			if (currentFieldParseHelper_) {
-				currentFieldParseHelper_->getField()->setName(attributes.getAttribute("var"));
-				currentFieldParseHelper_->getField()->setLabel(attributes.getAttribute("label"));
+			if (type == "list-multi") {
+				fieldType = FormField::ListMultiType; 
 			}
+			currentField_->setType(fieldType);
+			currentField_->setName(attributes.getAttribute("var"));
+			currentField_->setLabel(attributes.getAttribute("label"));
 		}
-		else if (element == "reported") {
-			parsingReported_ = true;
-			level_ = PayloadLevel - 1;
-		}
-		else if (element == "item") {
-			parsingItem_ = true;
-			level_ = PayloadLevel - 1;
-		}
-	}
-	else if (level_ == FieldLevel && currentFieldParseHelper_) {
-		currentText_.clear();
-		if (element == "option") {
-			currentOptionLabel_ = attributes.getAttribute("label");
+		else if (element == "value") {
+			currentText_.clear();
 		}
 	}
 	++level_;
@@ -123,42 +118,48 @@ void FormParser::handleEndElement(const std::string& element, const std::string&
 				getPayloadInternal()->setInstructions(currentInstructions + "\n" + currentText_);
 			}
 		}
-		else if (element == "field") {
-			if (currentFieldParseHelper_) {
-				if (parsingReported_) {
-					getPayloadInternal()->addReportedField(currentFieldParseHelper_->getField());
-				} else if (parsingItem_) {
-					currentFields_.push_back(currentFieldParseHelper_->getField());
-				} else {
-					getPayloadInternal()->addField(currentFieldParseHelper_->getField());
-				}
-				currentFieldParseHelper_.reset();
-			}
+		else if (element == "reported") {
+			parsingReported_ = false;
+		}
+		else if (element == "item") {
+			parsingItem_ = false;
+			getPayloadInternal()->addItem(currentFields_);
+			currentFields_.clear();
 		}
 	}
-	else if (level_ == FieldLevel && currentFieldParseHelper_) {
+	else if (currentField_) {
 		if (element == "required") {
-			currentFieldParseHelper_->getField()->setRequired(true);
+			currentField_->setRequired(true);
 		}
 		else if (element == "desc") {
-			currentFieldParseHelper_->getField()->setDescription(currentText_);
+			currentField_->setDescription(currentText_);
 		}
 		else if (element == "option") {
-			currentFieldParseHelper_->getField()->addOption(FormField::Option(currentOptionLabel_, currentText_));
+			currentField_->addOption(FormField::Option(currentOptionLabel_, currentOptionValue_));
+			parsingOption_ = false;
 		}
 		else if (element == "value") {
-			currentFieldParseHelper_->addValue(currentText_);
+			if (parsingOption_) {
+				currentOptionValue_ = currentText_;
+			}
+			else {
+				currentField_->addValue(currentText_);
+			}
 		}
 	}
-	if (element == "reported") {
-		parsingReported_ = false;
-		level_++;
-	}
-	else if (element == "item") {
-		parsingItem_ = false;
-		level_++;
-		getPayloadInternal()->addItem(currentFields_);
-		currentFields_.clear();
+	if (level_ >= PayloadLevel && currentField_) {
+		if (element == "field") {
+			if (parsingReported_) {
+				getPayloadInternal()->addReportedField(currentField_);
+			} 
+			else if (parsingItem_) {
+				currentFields_.push_back(currentField_);
+			} 
+			else {
+				getPayloadInternal()->addField(currentField_);
+			}
+			currentField_.reset();
+		}
 	}
 }