--- parser3/src/main/pa_string.C	2001/04/04 10:50:36	1.69
+++ parser3/src/main/pa_string.C	2001/04/05 13:27:14	1.71
@@ -5,13 +5,15 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_string.C,v 1.69 2001/04/04 10:50:36 paf Exp $
+	$Id: pa_string.C,v 1.71 2001/04/05 13:27:14 paf Exp $
 */
 
 #include "pa_config_includes.h"
 
 #include <locale.h>
 
+#include "pcre.h"
+
 #include "pa_pool.h"
 #include "pa_string.h"
 #include "pa_hash.h"
@@ -22,8 +24,6 @@
 #include "pa_table.h"
 #include "pa_threads.h"
 
-#include "pcre.h"
-
 //#include "pa_sapi.h"
 
 // String
@@ -199,7 +199,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 +279,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=