X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2Fstandalone.c;h=fdf26611000dffbda46cc905e22d8b54922d2956;hb=4a4dbe97741a213e9078d9991d67454df3629da3;hp=008b5148144c197a45a545553fe18b91a5366db6;hpb=5b6276627db2ebc8a7790213df6a523dc8e04238;p=gedcom-parse.git

diff --git a/t/standalone.c b/t/standalone.c
index 008b514..fdf2661 100644
--- a/t/standalone.c
+++ b/t/standalone.c
@@ -67,7 +67,7 @@ void show_help ()
   printf("  -q    No output to standard output\n");
 }
 
-Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag,
+Gedcom_ctxt header_start(Gedcom_rec rec, int level, Gedcom_val xref, char *tag,
 			 char *raw_value, int tag_value,
 			 Gedcom_val parsed_value)
 {
@@ -75,7 +75,7 @@ Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag,
   return (Gedcom_ctxt)1;
 }
 
-void header_end(Gedcom_ctxt self)
+void header_end(Gedcom_rec rec, Gedcom_ctxt self)
 {
   output(1, "Header end, context is %d\n", (int)self);
 }
@@ -83,7 +83,7 @@ void header_end(Gedcom_ctxt self)
 char family_xreftags[100][255];
 int  family_nr = 1;
 
-Gedcom_ctxt family_start(int level, Gedcom_val xref, char *tag,
+Gedcom_ctxt family_start(Gedcom_rec rec, int level, Gedcom_val xref, char *tag,
 			 char *raw_value, int tag_value,
 			 Gedcom_val parsed_value)
 {
@@ -94,7 +94,7 @@ Gedcom_ctxt family_start(int level, Gedcom_val xref, char *tag,
   return (Gedcom_ctxt)(family_nr++);
 }
 
-Gedcom_ctxt rec_start(int level, Gedcom_val xref, char *tag,
+Gedcom_ctxt rec_start(Gedcom_rec rec, int level, Gedcom_val xref, char *tag,
 		      char *raw_value, int tag_value,
 		      Gedcom_val parsed_value)
 {
@@ -105,7 +105,7 @@ Gedcom_ctxt rec_start(int level, Gedcom_val xref, char *tag,
   return (Gedcom_ctxt)tag_value;
 }
 
-Gedcom_ctxt note_start(int level, Gedcom_val xref, char *tag,
+Gedcom_ctxt note_start(Gedcom_rec rec, int level, Gedcom_val xref, char *tag,
 		       char *raw_value, int tag_value,
 		       Gedcom_val parsed_value)
 {
@@ -115,12 +115,12 @@ Gedcom_ctxt note_start(int level, Gedcom_val xref, char *tag,
   return (Gedcom_ctxt)tag_value;
 }
 
-void family_end(Gedcom_ctxt self)
+void family_end(Gedcom_rec rec, Gedcom_ctxt self)
 {
   output(1, "Family end, xref is %s\n", family_xreftags[(int)self]);
 }
 
-Gedcom_ctxt submit_start(int level, Gedcom_val xref, char *tag,
+Gedcom_ctxt submit_start(Gedcom_rec rec, int level, Gedcom_val xref, char *tag,
 			 char *raw_value, int tag_value,
 			 Gedcom_val parsed_value)
 {
@@ -128,8 +128,8 @@ Gedcom_ctxt submit_start(int level, Gedcom_val xref, char *tag,
   return (Gedcom_ctxt)10000;
 }
 
-Gedcom_ctxt source_start(Gedcom_ctxt parent, int level, char *tag,
-			 char* raw_value,
+Gedcom_ctxt source_start(Gedcom_elt elt, Gedcom_ctxt parent, int level,
+			 char *tag, char* raw_value,
 			 int tag_value, Gedcom_val parsed_value)
 {
   Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
@@ -138,13 +138,14 @@ Gedcom_ctxt source_start(Gedcom_ctxt parent, int level, char *tag,
   return self;
 }
 
-void source_end(Gedcom_ctxt parent, Gedcom_ctxt self, Gedcom_val parsed_value)
+void source_end(Gedcom_elt elt, Gedcom_ctxt parent, Gedcom_ctxt self,
+		Gedcom_val parsed_value)
 {
   output(1, "Source context %d in parent %d\n", (int)self, (int)parent);
 }
 
-Gedcom_ctxt date_start(Gedcom_ctxt parent, int level, char *tag,
-		       char* raw_value,
+Gedcom_ctxt date_start(Gedcom_elt elt, Gedcom_ctxt parent, int level,
+		       char *tag, char* raw_value,
 		       int tag_value, Gedcom_val parsed_value)
 {
   struct date_value dv;
@@ -173,8 +174,26 @@ Gedcom_ctxt date_start(Gedcom_ctxt parent, int level, char *tag,
   return self;
 }
 
-void default_cb(Gedcom_ctxt ctxt, int level, char *tag, char *raw_value,
-		int tag_value)
+Gedcom_ctxt age_start(Gedcom_elt elt, Gedcom_ctxt parent, int level,
+		      char *tag, char *raw_value,
+		      int tag_value, Gedcom_val parsed_value)
+{
+  struct age_value age;
+  Gedcom_ctxt self = (Gedcom_ctxt)((int) parent + 1000);
+  age = GEDCOM_AGE(parsed_value);
+  output(1, "Contents of the age_value:\n");
+  output(1, "  raw value: %s\n", raw_value);
+  output(1, "  type: %d\n", age.type);
+  output(1, "  modifier: %d\n", age.mod);
+  output(1, "  years: %d\n", age.years);
+  output(1, "  months: %d\n", age.months);
+  output(1, "  days: %d\n", age.days);
+  output(1, "  phrase: %s\n", age.phrase);
+  return self;
+}
+
+void default_cb(Gedcom_elt elt, Gedcom_ctxt ctxt, int level, char *tag,
+		char *raw_value, int tag_value)
 {
   char   *converted = NULL;
   int    conv_fails = 0;
@@ -200,6 +219,7 @@ void subscribe_callbacks()
   gedcom_subscribe_to_element(ELT_SOUR_DATA_EVEN_DATE,
 			      date_start, NULL);
   gedcom_subscribe_to_element(ELT_SUB_EVT_DATE, date_start, NULL);
+  gedcom_subscribe_to_element(ELT_SUB_FAM_EVT_AGE, age_start, NULL);
 }
 
 void gedcom_message_handler(Gedcom_msg_type type, char *msg)
@@ -293,13 +313,12 @@ int main(int argc, char* argv[])
     output(0, "\n=== Parsing file %s\n", file_name);
     result |= gedcom_parse_file(file_name);
   }
-  fclose(outfile);
   if (result == 0) {
     output(1, "Parse succeeded\n");
-    return 0;
   }
   else {
     output(1, "Parse failed\n");
-    return 1;
-  }  
+  }
+  fclose(outfile);
+  return result;
 }