[sword-devel] SWBasicFilter::addEsccapeSubstitute

[Helmer Krämer]

This is a multi-part message in MIME format.

--Multipart_Thu__7_Mar_2002_09:11:08_+0100_08287448
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit

On Wed, 6 Mar 2002 23:56:48 +0100
Joachim Ansorg <jansorg@gmx.de> wrote:

> Hi!
> 
> Commentaries like Rieger or MAK use the ThML/HTML escpae strings for umlauts 
> etc.
> Although I use 
>   setEscapeStart("&");
>   setEscapeEnd(";");
>   addEscapeStringSubstitute("auml", "ä");
>   addEscapeStringSubstitute("uuml", "ü");
>   addEscapeStringSubstitute("ouml", "ö");
> neither the escape code nor the umlauts appear in the text. Does sombody know 
> why this is happening? Maybe some other filter strips them out or does 
> SWBasicFilter::ProcessText not work correctly?

Hi,

dunno if I'm completely right but I think the problem is the way
SWBasicFilter::substituteEscapeString works when escStringCaseSensitive
is set to false (which is the default).

In this case, the EscapeString is converted to uppercase before 
being inserted into escSubMap, but substituteEscapeString doesn't 
do this conversion when checking wether an EscapeString is in that
map or not.

Same thing for substituteTokens.

The attached patch is an attempt to fix this, so would you like to 
try if the patch solves your problems?

-- Helmer



--Multipart_Thu__7_Mar_2002_09:11:08_+0100_08287448
Content-Type: application/octet-stream;
 name="patch"
Content-Disposition: attachment;
 filename="patch"
Content-Transfer-Encoding: base64

SW5kZXg6IHNyYy9tb2R1bGVzL2ZpbHRlcnMvc3diYXNpY2ZpbHRlci5jcHAKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpS
Q1MgZmlsZTogL3Vzci9sb2NhbC9jdnNyb290L3N3b3JkL3NyYy9tb2R1bGVzL2ZpbHRlcnMvc3di
YXNpY2ZpbHRlci5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTYKZGlmZiAtdyAtdSAtcCAt
cjEuMTYgc3diYXNpY2ZpbHRlci5jcHAKLS0tIHNyYy9tb2R1bGVzL2ZpbHRlcnMvc3diYXNpY2Zp
bHRlci5jcHAJNCBNYXIgMjAwMiAwMTo1Njo0NCAtMDAwMAkxLjE2CisrKyBzcmMvbW9kdWxlcy9m
aWx0ZXJzL3N3YmFzaWNmaWx0ZXIuY3BwCTcgTWFyIDIwMDIgMDk6MDY6MjQgLTAwMDAKQEAgLTEy
MCw3ICsxMjAsMTYgQEAgdm9pZCBTV0Jhc2ljRmlsdGVyOjpwdXNoU3RyaW5nKGNoYXIgKipidQog
CiBib29sIFNXQmFzaWNGaWx0ZXI6OnN1YnN0aXR1dGVUb2tlbihjaGFyICoqYnVmLCBjb25zdCBj
aGFyICp0b2tlbikgewogCUR1YWxTdHJpbmdNYXA6Oml0ZXJhdG9yIGl0OworCisJaWYgKCF0b2tl
bkNhc2VTZW5zaXRpdmUpIHsKKwkgICAgICAgIGNoYXIgKnRtcDsKKwkJc3Rkc3RyKCZ0bXAsIHRv
a2VuKTsKKwkJdG91cHBlcnN0cih0bXApOworCQlpdCA9IHRva2VuU3ViTWFwLmZpbmQodG1wKTsK
KwkJZGVsZXRlIFtdIHRtcDsKKwl9IGVsc2UKIAlpdCA9IHRva2VuU3ViTWFwLmZpbmQodG9rZW4p
OworCiAJaWYgKGl0ICE9IHRva2VuU3ViTWFwLmVuZCgpKSB7CiAJCXB1c2hTdHJpbmcoYnVmLCBp
dC0+c2Vjb25kLmNfc3RyKCkpOwogCQlyZXR1cm4gdHJ1ZTsKQEAgLTEzMSw3ICsxNDAsMTYgQEAg
Ym9vbCBTV0Jhc2ljRmlsdGVyOjpzdWJzdGl0dXRlVG9rZW4oY2hhcgogCiBib29sIFNXQmFzaWNG
aWx0ZXI6OnN1YnN0aXR1dGVFc2NhcGVTdHJpbmcoY2hhciAqKmJ1ZiwgY29uc3QgY2hhciAqZXNj
U3RyaW5nKSB7CiAJRHVhbFN0cmluZ01hcDo6aXRlcmF0b3IgaXQ7CisKKwlpZiAoIWVzY1N0cmlu
Z0Nhc2VTZW5zaXRpdmUpIHsKKwkgICAgICAgIGNoYXIgKnRtcDsKKwkJc3Rkc3RyKCZ0bXAsIGVz
Y1N0cmluZyk7CisJCXRvdXBwZXJzdHIodG1wKTsKKwkJaXQgPSBlc2NTdWJNYXAuZmluZCh0bXAp
OworCQlkZWxldGUgW10gdG1wOworCX0gZWxzZSAKIAlpdCA9IGVzY1N1Yk1hcC5maW5kKGVzY1N0
cmluZyk7CisKIAlpZiAoaXQgIT0gZXNjU3ViTWFwLmVuZCgpKSB7CiAJCXB1c2hTdHJpbmcoYnVm
LCBpdC0+c2Vjb25kLmNfc3RyKCkpOwogCQlyZXR1cm4gdHJ1ZTsK

--Multipart_Thu__7_Mar_2002_09:11:08_+0100_08287448--