--- parser3/src/main/pa_string.C 2001/04/05 13:19:43 1.70 +++ parser3/src/main/pa_string.C 2001/04/05 18:18:41 1.72 @@ -5,13 +5,11 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_string.C,v 1.70 2001/04/05 13:19:43 paf Exp $ + $Id: pa_string.C,v 1.72 2001/04/05 18:18:41 paf Exp $ */ #include "pa_config_includes.h" -#include - #include "pcre.h" #include "pa_pool.h" @@ -199,7 +197,7 @@ int String::cmp(int& partial, const Stri break; if(pos+a_row->item.size > this_offset) { - if(lang!=UL_UNKNOWN && a_row->item.lang!=lang) + if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) return -1; // wrong lang -- bail out int size_diff= @@ -279,7 +277,7 @@ int String::cmp(int& partial, const char break; if(pos+a_row->item.size > this_offset) { - if(lang!=UL_UNKNOWN && a_row->item.lang!=lang) + if(lang!=UL_UNSPECIFIED && a_row->item.lang!=lang) return -1; // wrong lang -- bail out int size_diff= @@ -491,7 +489,6 @@ static void regex_options(char *options, @verbatim pre-match/match/post-match/1/2/3/... @endverbatim - @test setlocale param to auto.p */ bool String::match(const String *aorigin, const String& regexp, @@ -500,10 +497,8 @@ bool String::match(const String *aorigin Row_action row_action, void *info) const { static const unsigned char *tables=0; { SYNCHRONIZED(true); - if(!tables) { - setlocale(LC_CTYPE, "ru"); + if(!tables) tables=pcre_maketables(); - } } const char *pattern=regexp.cstr(UL_AS_IS); const char *errptr;