Re: [xml] XML Schema mixed content patch

[Adam Dickmeiss <adam indexdata dk>]

Daniel Veillard wrote:

> On Wed, Mar 03, 2004 at 11:08:24AM +0100, Adam Dickmeiss wrote:
>  
>
> > Hi,
> >
> > attached is a patch that makes XML Schema in libxml2 allow non-empty 
> > cdata for mixed complex content.
> >
> > That is it will validate
> > <my>xx</my>
> >
> > when the following XML schema is used
> >
> > <element name='my'>
> > <complexType mixed='true'>
> > </complexType>
> > </element>
> >
> > Adam Dickmeiss,
> > Index Data
> >    
>
>  Thanks, I will look at that, but can you provide a contextual patch ?
> I.e. using diff -c instead of diff
>
>  TIA,
>
>  
Attached.

-- Adam

> Daniel
>
>  

Index: xmlschemas.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/xmlschemas.c,v
retrieving revision 1.51
diff -f -r1.51 xmlschemas.c
a3583
    const xmlChar *mixed;
.
a3604

    mixed = xmlSchemaGetProp(ctxt, node, "mixed");
    if (mixed != NULL)
	type->flags |= XML_SCHEMAS_TYPE_MIXED;

.
a4493

                        if (typeDecl->flags & XML_SCHEMAS_TYPE_MIXED)
                            typeDecl->contentType =
                                XML_SCHEMA_CONTENT_MIXED;
.
a4513
                        if (typeDecl->flags & XML_SCHEMAS_TYPE_MIXED)
                            typeDecl->contentType =
                                XML_SCHEMA_CONTENT_MIXED;
.