X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fmultilex.c;h=5b0aa4eec262861c492e5745115b7bbcd957ddb2;hb=3a3f7c5589b2e265306385da92727592e168e442;hp=437f0bdaccc0542879da1d9ee60cb79aee6b21a0;hpb=fffe9618ff8a5cfcac207f231b531615dfb0e38f;p=gedcom-parse.git

diff --git a/gedcom/multilex.c b/gedcom/multilex.c
index 437f0bd..5b0aa4e 100644
--- a/gedcom/multilex.c
+++ b/gedcom/multilex.c
@@ -26,28 +26,30 @@
 #include "encoding.h"
 #include "xref.h"
 
-int line_no;
+int line_no = 0;
 
 typedef int (*lex_func)(void);
 lex_func lf;
 
+#define NEW_MODEL_FILE "new.ged"
+
 int lexer_init(ENCODING enc, FILE* f)
 {
   if (enc == ONE_BYTE) {
-    gedcom_1byte_in = f;
-    lf = &gedcom_1byte_lex;
+    lf  = &gedcom_1byte_lex;
+    gedcom_1byte_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("ASCII");
   }
   else if (enc == TWO_BYTE_HILO) {
-    gedcom_hilo_in = f;
-    lf = &gedcom_hilo_lex;
+    lf  = &gedcom_hilo_lex;
+    gedcom_hilo_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("UNICODE");
   }
   else if (enc == TWO_BYTE_LOHI) {
-    gedcom_lohi_in = f;
-    lf = &gedcom_lohi_lex;
+    lf  = &gedcom_lohi_lex;
+    gedcom_lohi_myinit(f);
     set_encoding_width(enc);
     return open_conv_to_internal("UNICODE");
   }
@@ -114,7 +116,7 @@ int determine_encoding(FILE* f)
   }
 }
 
-static int init_called = 0;
+int init_called = 0;
 
 void gedcom_init()
 {
@@ -159,7 +161,6 @@ int gedcom_parse_file(const char* file_name)
     gedcom_error(_("Internal error: GEDCOM parser not initialized"));
   }
   else {
-    line_no = 1;
     file = fopen(file_name, "r");
     if (!file) {
       gedcom_error(_("Could not open file '%s': %s"),
@@ -170,9 +171,10 @@ 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;
 	if (result == 0)
 	  result = check_xref_table();
       }
@@ -190,3 +192,26 @@ int gedcom_parse_file(const char* file_name)
   return result;
 }
 
+int gedcom_new_model()
+{
+  int result = 1;
+  FILE* file;
+
+  file = fopen(NEW_MODEL_FILE, "r");
+  if (file) {
+    fclose(file);
+    result = gedcom_parse_file(NEW_MODEL_FILE);
+  }
+  else {
+    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;
+}