- prompt rnc updated

diff --git a/src/output/OutXML.cc b/src/output/OutXML.cc
index 76afb59..a8eb5d1 100644 (file)
--- a/src/output/OutXML.cc
+++ b/src/output/OutXML.cc
@@ -199,7 +199,7 @@ void OutXML::prompt(PromptId id,
        ansit != answers.end(); ++ansit)
   {
     string answer = *ansit;
-    cout << "<answer";
+    cout << "<option";
     //if (is_default) // TODO
     //  cout << " default=\"1\"";
     cout << " value=\"" << xml_encode(answer) << "\"";

diff --git a/src/output/xmlout.rnc b/src/output/xmlout.rnc
index 31c8d2a..d60018c 100644 (file)
--- a/src/output/xmlout.rnc
+++ b/src/output/xmlout.rnc
@@ -13,9 +13,11 @@ stream-element =
       update-status-element* |
       install-summary-element* |
       repo-list-element? |
-      solver-problem-element* |
       list-element? |
-      info-element?
+      info-element? |
+
+      # random text can appear between tags - this text should be ignored
+      text
     )+
   }
 
@@ -60,7 +62,11 @@ message-element =
 prompt-element =
   element prompt {
     attribute id { xsd:integer },
-    text
+    text,
+    element option {
+      attribute default { xsd:boolean }?,
+      attribute value { xsd:string }
+    }*
   }
 
 update-status-element =
@@ -114,9 +120,6 @@ repo-list-element =
     }*
   }
 
-solver-problem-element =
-  element solver-problem { empty } # TODO
-
 list-element =
   element list { empty } # TODO