[r2003-11-24 09:13:02 by szach] - use Ns.mk_ascii

- recognize mixed attribute

Original author: szach
Date: 2003-11-24 09:13:02+00:00

schema/schema_parser.ml

@@ -397,12 +397,13 @@ let rec parse_complex_type (resolver: resolver) n =
   else  (* neither simpleContent nor complexContent *)
     let base = anyType in
     let uses = parse_attribute_uses resolver `Restriction base n in
+    let mixed = _has_attribute "mixed" n && (_attribute "mixed" n = "true") in
     let content_type =
       match find_particle n with
       | None -> CT_empty
       | Some pnode ->
           let particle = parse_particle resolver pnode in
-          CT_model (particle, false)
+          CT_model (particle, mixed)
     in
     complex name anyType `Restriction uses content_type
 
@@ -548,7 +549,7 @@ class lazy_resolver =
     method targetNamespace =
       match targetNamespace with
       | None -> Ns.empty
-      | Some s -> Ns.mk_latin1 s
+      | Some s -> Ns.mk_ascii s
 
       (* qualify names of entities before registering them with defined
        * targetNamespace, if any *)