X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=ec7c35c45a5ec34bbcce01fed3d8ba92923c3097;hb=349d849a4f6cfad7a5f2badcda0e3c5799f0302f;hp=3772e858a0c97f34dad08a3abd1d3a1a0d751a17;hpb=0d11e282c6948aad8f0d15eb86020eabfd5a59ba;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 3772e85..ec7c35c 100644
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -116,12 +116,13 @@ int determine_encoding(FILE* f)
   }
 }
 
-static int init_called = 0;
+int init_called = 0;
 
 void gedcom_init()
 {
   init_called = 1;
   update_gconv_search_path();
+  setlocale(LC_ALL, "");
 }
 
 int gedcom_parse_file(const char* file_name)
@@ -129,31 +130,24 @@ int gedcom_parse_file(const char* file_name)
   ENCODING enc;
   int result = 1;
   FILE* file;
-  char *locale, *save_locale, *save_textdom;
+  char *textdom, *save_textdom;
 
-  locale = setlocale(LC_ALL, NULL);
-  if (! locale) {
-    gedcom_error(_("Could not retrieve locale information"));
+  textdom = textdomain(NULL);
+  if (!textdom) {
+    gedcom_error(_("Could not retrieve text domain: %s"), strerror(errno));
     return result;
   }
   
-  save_locale  = strdup(locale);
-  if (! save_locale) {
+  save_textdom = strdup(textdom);
+  if (! save_textdom) {
     MEMORY_ERROR;
     return result;
   }
   
-  save_textdom = textdomain(NULL);
-  if (!save_textdom) {
-    gedcom_error(_("Could not retrieve locale domain: %s"), strerror(errno));
-    return result;
-  }
-  
-  if (! setlocale(LC_ALL, "")
-      || ! bindtextdomain(PACKAGE, LOCALEDIR)
+  if (! bindtextdomain(PACKAGE, LOCALEDIR)
       || ! bind_textdomain_codeset(PACKAGE, INTERNAL_ENCODING)
       || ! textdomain(PACKAGE)) {
-    gedcom_error(_("Could not set locale: %s"), strerror(errno));
+    gedcom_error(_("Could not set text domain: %s"), strerror(errno));
     return result;
   }
 
@@ -171,7 +165,7 @@ int gedcom_parse_file(const char* file_name)
       enc = determine_encoding(file);
       
       if (lexer_init(enc, file)) {
-	line_no = 1;
+	line_no = 0;
 	make_xref_table();
 	result = gedcom_parse();
 	line_no = 0;
@@ -183,26 +177,49 @@ int gedcom_parse_file(const char* file_name)
     }
   }
 
-  if (! textdomain(save_textdom)
-      || ! setlocale(LC_ALL, save_locale)) {
-    gedcom_error(_("Could not restore locale: %s"), strerror(errno));
+  if (! textdomain(save_textdom)) {
+    gedcom_error(_("Could not restore text domain: %s"), strerror(errno));
     return result;
   }
-  free(save_locale);
   return result;
 }
 
 int gedcom_new_model()
 {
   int result = 1;
-  char* filename = (char*) malloc(strlen(PKGDATADIR) + strlen(NEW_MODEL_FILE)
-				  + 2);
-  if (!filename)
-    MEMORY_ERROR;
+  FILE* file;
+
+  file = fopen(NEW_MODEL_FILE, "r");
+  if (file) {
+    fclose(file);
+    result = gedcom_parse_file(NEW_MODEL_FILE);
+  }
   else {
-    sprintf(filename, "%s/%s", PKGDATADIR, NEW_MODEL_FILE);
-    result = gedcom_parse(filename);
-    free(filename);
+    char* filename = (char*) malloc(strlen(PKGDATADIR) + strlen(NEW_MODEL_FILE)
+				    + 2);
+    if (!filename)
+      MEMORY_ERROR;
+    else {
+      sprintf(filename, "%s/%s", PKGDATADIR, NEW_MODEL_FILE);
+      result = gedcom_parse_file(filename);
+      free(filename);
+    }
   }
   return result;
 }
+
+int gedcom_check_version(int major, int minor, int patch)
+{
+  if (major < GEDCOM_PARSE_VERSION_MAJOR)
+    return 1;
+  else if (major > GEDCOM_PARSE_VERSION_MAJOR)
+    return 0;
+  else if (minor < GEDCOM_PARSE_VERSION_MINOR)
+    return 1;
+  else if (minor > GEDCOM_PARSE_VERSION_MINOR)
+    return 0;
+  else if (patch <= GEDCOM_PARSE_VERSION_PATCH)
+    return 1;
+  else
+    return 0;
+}