X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=standalone.c;h=70a3ac17f80a8bb1a0f60ef811a560a6cfa735e1;hb=37246a4b0ab22fb948d6fb5b9b91917441db26cf;hp=9f435f511acbc6506ba60747146544a2ecc50889;hpb=0a3842e05ee5ad37ffacefb70f685bbae3ad7fe6;p=gedcom-parse.git

diff --git a/standalone.c b/standalone.c
index 9f435f5..70a3ac1 100644
--- a/standalone.c
+++ b/standalone.c
@@ -64,7 +64,7 @@ Gedcom_ctxt header_start(int level, Gedcom_val xref, char *tag,
 			 Gedcom_val parsed_value)
 {
   output(1, "Header start\n");
-  return (Gedcom_ctxt)0;
+  return (Gedcom_ctxt)1;
 }
 
 void header_end(Gedcom_ctxt self)
@@ -73,14 +73,16 @@ void header_end(Gedcom_ctxt self)
 }
 
 char family_xreftags[100][255];
-int  family_nr = 0;
+int  family_nr = 1;
 
 Gedcom_ctxt family_start(int level, Gedcom_val xref, char *tag,
 			 char *raw_value, int tag_value,
 			 Gedcom_val parsed_value)
 {
-  output(1, "Family start, xref is %s\n", GEDCOM_STRING(xref));
-  strcpy(family_xreftags[family_nr], GEDCOM_STRING(xref));
+  struct xref_value *xr = GEDCOM_XREF_PTR(xref);
+  output(1, "Family start, xref is %s\n", xr->string);
+  strcpy(family_xreftags[family_nr], xr->string);
+  xr->object = (Gedcom_ctxt)family_nr;
   return (Gedcom_ctxt)(family_nr++);
 }
 
@@ -88,9 +90,9 @@ Gedcom_ctxt rec_start(int level, Gedcom_val xref, char *tag,
 		      char *raw_value, int tag_value,
 		      Gedcom_val parsed_value)
 {
-  char *xref_str = NULL;
+  char* xref_str = NULL;
   if (! GEDCOM_IS_NULL(xref))
-    xref_str = GEDCOM_STRING(xref);
+    xref_str = GEDCOM_XREF_PTR(xref)->string;
   output(1, "Rec %s start, xref is %s\n", tag, xref_str);
   return (Gedcom_ctxt)tag_value;
 }
@@ -99,9 +101,9 @@ Gedcom_ctxt note_start(int level, Gedcom_val xref, char *tag,
 		       char *raw_value, int tag_value,
 		       Gedcom_val parsed_value)
 {
-  output(0, "== %d %s (%d) %s (xref is %s)\n",
+  output(1, "== %d %s (%d) %s (xref is %s)\n",
 	 level, tag, tag_value, GEDCOM_STRING(parsed_value),
-	 GEDCOM_STRING(xref));
+	 GEDCOM_XREF_PTR(xref)->string);
   return (Gedcom_ctxt)tag_value;
 }
 
@@ -114,7 +116,7 @@ Gedcom_ctxt submit_start(int level, Gedcom_val xref, char *tag,
 			 char *raw_value, int tag_value,
 			 Gedcom_val parsed_value)
 {
-  output(1, "Submitter, xref is %s\n", GEDCOM_STRING(xref));
+  output(1, "Submitter, xref is %s\n", GEDCOM_XREF_PTR(xref)->string);
   return (Gedcom_ctxt)10000;
 }