| OLD | NEW |
| 1 /* | 1 /* |
| 2 * schemas.c : implementation of the XML Schema handling and | 2 * schemas.c : implementation of the XML Schema handling and |
| 3 * schema validity checking | 3 * schema validity checking |
| 4 * | 4 * |
| 5 * See Copyright for the status of this software. | 5 * See Copyright for the status of this software. |
| 6 * | 6 * |
| 7 * Daniel Veillard <veillard@redhat.com> | 7 * Daniel Veillard <veillard@redhat.com> |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 /* | 10 /* |
| (...skipping 24183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 24194 if ((tmpType->builtInType == XML_SCHEMAS_STRING) || | 24194 if ((tmpType->builtInType == XML_SCHEMAS_STRING) || |
| 24195 WXS_IS_ANY_SIMPLE_TYPE(tmpType)) { | 24195 WXS_IS_ANY_SIMPLE_TYPE(tmpType)) { |
| 24196 ws = xmlSchemaGetWhiteSpaceFacetValue(type); | 24196 ws = xmlSchemaGetWhiteSpaceFacetValue(type); |
| 24197 } else | 24197 } else |
| 24198 ws = XML_SCHEMA_WHITESPACE_COLLAPSE; | 24198 ws = XML_SCHEMA_WHITESPACE_COLLAPSE; |
| 24199 /* | 24199 /* |
| 24200 * If the value was not computed (for string or | 24200 * If the value was not computed (for string or |
| 24201 * anySimpleType based types), then use the provided | 24201 * anySimpleType based types), then use the provided |
| 24202 * type. | 24202 * type. |
| 24203 */ | 24203 */ |
| 24204 if (val == NULL) | 24204 if (val != NULL) |
| 24205 » valType = valType; | |
| 24206 else | |
| 24207 valType = xmlSchemaGetValType(val); | 24205 valType = xmlSchemaGetValType(val); |
| 24208 | 24206 |
| 24209 ret = 0; | 24207 ret = 0; |
| 24210 for (facetLink = type->facetSet; facetLink != NULL; | 24208 for (facetLink = type->facetSet; facetLink != NULL; |
| 24211 facetLink = facetLink->next) { | 24209 facetLink = facetLink->next) { |
| 24212 /* | 24210 /* |
| 24213 * Skip the pattern "whiteSpace": it is used to | 24211 * Skip the pattern "whiteSpace": it is used to |
| 24214 * format the character content beforehand. | 24212 * format the character content beforehand. |
| 24215 */ | 24213 */ |
| 24216 switch (facetLink->facet->type) { | 24214 switch (facetLink->facet->type) { |
| (...skipping 4681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 28898 xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt) | 28896 xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt) |
| 28899 { | 28897 { |
| 28900 if (ctxt == NULL) | 28898 if (ctxt == NULL) |
| 28901 return(NULL); | 28899 return(NULL); |
| 28902 return (ctxt->parserCtxt); | 28900 return (ctxt->parserCtxt); |
| 28903 } | 28901 } |
| 28904 | 28902 |
| 28905 #define bottom_xmlschemas | 28903 #define bottom_xmlschemas |
| 28906 #include "elfgcchack.h" | 28904 #include "elfgcchack.h" |
| 28907 #endif /* LIBXML_SCHEMAS_ENABLED */ | 28905 #endif /* LIBXML_SCHEMAS_ENABLED */ |
| OLD | NEW |