XForms bug 285207 - Need to handle inline schema. r=cartman/smaug

extensions/schema-validation/src/nsSchemaValidator.cpp

@@ -107,7 +107,8 @@ NS_IMETHODIMP nsSchemaValidator::ValidateString(const nsAString & aValue,
   printf("\n --------- nsSchemaValidator::ValidateString called ---------");
 #endif
 
-  if (aValue.IsEmpty() || aType.IsEmpty() || aNamespace.IsEmpty())
+  // empty namespace is valid
+  if (aValue.IsEmpty() || aType.IsEmpty())
     return NS_ERROR_NOT_AVAILABLE;
 
   // no schemas loaded and type is not builtin, abort

extensions/xforms/nsXFormsModelElement.cpp

@@ -786,17 +786,20 @@ nsXFormsModelElement::GetTypeForControl(nsIXFormsControl  *aControl,
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsXFormsSchemaValidator validator;
-  nsCOMPtr<nsISchema> schema = do_QueryInterface(mSchemas);
+  nsCOMPtr<nsISchemaCollection> schemaColl = do_QueryInterface(mSchemas);
+  nsCOMPtr<nsISchema> schema;
+  schemaColl->GetSchema(schemaTypeNamespace, getter_AddRefs(schema));
   validator.LoadSchema(schema);
+
   return validator.GetType(schemaTypeName, schemaTypeNamespace, aType);
 }
 
 /* static */ nsresult
-nsXFormsModelElement::GetTypeAndNSFromNode(nsIDOMNode *aInstanceData, 
+nsXFormsModelElement::GetTypeAndNSFromNode(nsIDOMNode *aInstanceData,
                                            nsAString &aType, nsAString &aNSUri)
 {
   nsAutoString schemaTypePrefix;
-  nsresult rv = nsXFormsUtils::ParseTypeFromNode(aInstanceData, aType, 
+  nsresult rv = nsXFormsUtils::ParseTypeFromNode(aInstanceData, aType,
                                                  schemaTypePrefix);
 
   if(rv == NS_ERROR_NOT_AVAILABLE) {
@@ -805,11 +808,15 @@ nsXFormsModelElement::GetTypeAndNSFromNode(nsIDOMNode *aInstanceData,
     aType.Assign(NS_LITERAL_STRING("string"));
     rv = NS_OK;
   } else {
-    // get the namespace url from the prefix
-    nsCOMPtr<nsIDOM3Node> domNode3 = do_QueryInterface(mElement, &rv);
-    NS_ENSURE_SUCCESS(rv, rv);
-  
-    rv = domNode3->LookupNamespaceURI(schemaTypePrefix, aNSUri);
+    if (schemaTypePrefix.IsEmpty()) {
+      aNSUri.AssignLiteral("");
+    } else {
+      // get the namespace url from the prefix
+      nsCOMPtr<nsIDOM3Node> domNode3 = do_QueryInterface(mElement, &rv);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = domNode3->LookupNamespaceURI(schemaTypePrefix, aNSUri);
+    }
   }
   return rv;
 }
@@ -905,7 +912,9 @@ nsXFormsModelElement::ValidateNode(nsIDOMNode *aInstanceNode, PRBool *aResult)
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsXFormsSchemaValidator validator;
-  nsCOMPtr<nsISchema> schema = do_QueryInterface(mSchemas);
+  nsCOMPtr<nsISchemaCollection> schemaColl = do_QueryInterface(mSchemas);
+  nsCOMPtr<nsISchema> schema;
+  schemaColl->GetSchema(schemaTypeNamespace, getter_AddRefs(schema));
   validator.LoadSchema(schema);
 
   nsAutoString value;
@@ -1076,6 +1085,38 @@ nsXFormsModelElement::BackupOrRestoreInstanceData(PRBool restore)
 nsresult
 nsXFormsModelElement::FinishConstruction()
 {
+  // process inline schemas that aren't referenced via the schema attribute
+  nsCOMPtr<nsIDOMNodeList> children;
+  mElement->GetChildNodes(getter_AddRefs(children));
+
+  if (children) {
+    PRUint32 childCount = 0;
+    children->GetLength(&childCount);
+
+    nsCOMPtr<nsIDOMNode> node;
+    nsCOMPtr<nsIDOMElement> element;
+    nsAutoString nsURI, localName, targetNamespace;
+
+    for (PRUint32 i = 0; i < childCount; ++i) {
+      children->Item(i, getter_AddRefs(node));
+
+      element = do_QueryInterface(node);
+      if (!element)
+        continue;
+
+      node->GetNamespaceURI(nsURI);
+      node->GetLocalName(localName);
+      if (nsURI.EqualsLiteral(NS_NAMESPACE_XML_SCHEMA) &&
+          localName.EqualsLiteral("schema")) {
+        // we don't have to check if the schema was already added because
+        // nsSchemaLoader::ProcessSchemaElement takes care of that.
+        nsCOMPtr<nsISchema> schema;
+        nsresult rv = mSchemas->ProcessSchemaElement(element, nsnull,
+                                                     getter_AddRefs(schema));
+      }
+    }
+  }
+
   // 3. if applicable, initialize P3P
 
   // 4. construct instance data from initial instance data.  apply all
@@ -1128,7 +1169,7 @@ nsXFormsModelElement::MaybeNotifyCompletion()
     NS_NOTREACHED("no model list property");
     return;
   }
-  
+
   PRInt32 i;
 
   // Nothing to be done if any model is incomplete or hasn't seen

extensions/xforms/nsXFormsUtils.cpp

@@ -1082,14 +1082,17 @@ nsXFormsUtils::ParseTypeFromNode(nsIDOMNode *aInstanceData,
 
   // split type (ns:type) into namespace and type.
   PRInt32 separator = typeAttribute.FindChar(':');
-  if ((separator == kNotFound) || 
-      ((PRUint32) separator == typeAttribute.Length())) {
+  if ((PRUint32) separator == typeAttribute.Length()) {
     return NS_ERROR_UNEXPECTED;
-  // xxx send error to console
+    // xxx send error to console
+  } else if (separator == kNotFound) {
+    // no namespace prefix, which is valid;
+    aNSPrefix.AssignLiteral("");
+    aType.Assign(typeAttribute);
+  } else {
+    aNSPrefix.Assign(Substring(typeAttribute, 0, separator));
+    aType.Assign(Substring(typeAttribute, ++separator, typeAttribute.Length()));
   }
 
-  aNSPrefix.Assign(Substring(typeAttribute, 0, separator));
-  aType.Assign(Substring(typeAttribute, ++separator, typeAttribute.Length()));
-
   return NS_OK;
 }