Save the old locale (in case the application had set it).

[gedcom-parse.git] / gedcom / multilex.c

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index cff8608f049337a143c1dca78265807dfc7bcdad..471f5ac37fed065a388799f7715662a5ac07777e 100644 (file)
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -1,5 +1,5 @@
 /* The lexer multiplexer for Gedcom.
-   Copyright (C) 2001 The Genes Development Team
+   Copyright (C) 2001,2002 The Genes Development Team
    This file is part of the Gedcom parser library.
    Contributed by Peter Verthez <Peter.Verthez@advalvas.be>, 2001.
 
@@ -24,6 +24,7 @@
 #include "gedcom_internal.h"
 #include "multilex.h"
 #include "encoding.h"
+#include "xref.h"
 
 int line_no;
 
@@ -110,9 +111,9 @@ int gedcom_parse_file(char* file_name)
   int result = 1;
   FILE* file;
   
+  char *save_locale  = setlocale(LC_ALL, NULL);
   char *save_textdom = textdomain(NULL);
-  setlocale(LC_ALL, "");   /* In fact only necessary if main program doesn't
-                             do this */
+  setlocale(LC_ALL, "");
   bindtextdomain(PACKAGE, LOCALEDIR);
   bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING);
   textdomain(PACKAGE);
@@ -128,13 +129,17 @@ int gedcom_parse_file(char* file_name)
     
     if (lexer_init(enc, file)) {
       line_no = 1;
+      make_xref_table();
       result = gedcom_parse();
+      if (result == 0)
+       result = check_xref_table();
     }
     lexer_close();
     fclose(file);
   }
 
   textdomain(save_textdom);
+  setlocale(LC_ALL, save_locale);
   return result;
 }