From c241e8780088624f369379ba87215a475276b201 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Thu, 5 May 2011 12:44:28 +0200 Subject: Fix separator error in tokenlists. --- lib/xmerl/src/xmerl_scan.erl | 2 +- lib/xmerl/src/xmerl_xsd.erl | 2 +- lib/xmerl/src/xmerl_xsd_type.erl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl index 3a5164d154..22eb641a02 100644 --- a/lib/xmerl/src/xmerl_scan.erl +++ b/lib/xmerl/src/xmerl_scan.erl @@ -3918,7 +3918,7 @@ schemaLocations(#xmlElement{attributes=Atts,xmlbase=_Base}) -> case lists:dropwhile(Pred,Atts) of [#xmlAttribute{value=Paths}|_] -> - case string:tokens(Paths," ") of + case string:tokens(Paths," \n\t\r") of L when length(L) > 0 -> case length(L) rem 2 of 0 -> diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl index bd24db5389..1f0793bc58 100644 --- a/lib/xmerl/src/xmerl_xsd.erl +++ b/lib/xmerl/src/xmerl_xsd.erl @@ -2921,7 +2921,7 @@ schemaLocations(El=#xmlElement{attributes=Atts},S) -> [] -> S; [#xmlAttribute{value=Paths}|_] -> - case string:tokens(Paths," ") of + case string:tokens(Paths," \n\t\r") of L when length(L) > 0 -> case length(L) rem 2 of 0 -> diff --git a/lib/xmerl/src/xmerl_xsd_type.erl b/lib/xmerl/src/xmerl_xsd_type.erl index 19951f030f..9352f4185d 100644 --- a/lib/xmerl/src/xmerl_xsd_type.erl +++ b/lib/xmerl/src/xmerl_xsd_type.erl @@ -612,7 +612,7 @@ check_NMTOKEN2([H|T]) -> check_NMTOKEN2(T). check_NMTOKENS(Value) -> - TokList = string:tokens(Value," "), + TokList = string:tokens(Value," \n\t\r"), lists:foreach(fun check_NMTOKEN/1,TokList), {ok,Value}. @@ -645,7 +645,7 @@ check_ENTITIES(Value) -> check_list_type(Value,fun check_ENTITY/1). check_list_type(Value,BaseTypeFun) -> - Tokens = string:tokens(Value," "), + Tokens = string:tokens(Value," \n\t\r"), lists:foreach(BaseTypeFun,Tokens), {ok,Value}. -- cgit v1.2.3