From ea81accae13a4617cc46f5256dad50e2732cc206 Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Sat, 1 Feb 2003 17:00:01 +0000 Subject: [PATCH] Added compatibility for PAF 4. --- gedcom/compat.h | 14 + gedcom/gedcom.y | 42 ++- gedcom/gedcom_lex_common.c | 19 +- t/compat-paf4.test | 3 + t/input/compat-paf4.ged | 171 +++++++++++ t/output/compat-paf4.ref | 441 +++++++++++++++++++++++++++++ t/output/write_gom_compat-paf4.ged | 150 ++++++++++ t/output/write_gom_compat-paf4.ref | 7 + t/write_gom_compat-paf4.test | 3 + 9 files changed, 834 insertions(+), 16 deletions(-) create mode 100755 t/compat-paf4.test create mode 100644 t/input/compat-paf4.ged create mode 100644 t/output/compat-paf4.ref create mode 100644 t/output/write_gom_compat-paf4.ged create mode 100644 t/output/write_gom_compat-paf4.ref create mode 100755 t/write_gom_compat-paf4.test diff --git a/gedcom/compat.h b/gedcom/compat.h index a8c2a07..813f794 100644 --- a/gedcom/compat.h +++ b/gedcom/compat.h @@ -45,6 +45,8 @@ typedef enum _COMPAT_RULES { C_NO_GEDC_FORM, C_NOTE_NOTE, C_TAB_CHARACTER, + C_SUBM_CTRY, + C_NOTE_TOO_LONG, C_NR_OF_RULES } Compat_rule; @@ -70,6 +72,13 @@ Gedcom_ctxt compat_generate_head_time_start(int level, struct tag_struct ts, char* value); void compat_generate_head_time_end(Gedcom_ctxt self); +/* C_SUBM_CTRY */ +void compat_save_ctry_parent_context(Gedcom_ctxt parent); +Gedcom_ctxt compat_generate_addr_ctry_start(int level, struct tag_struct ts, + char* value); +void compat_generate_addr_ctry_end(Gedcom_ctxt self); +void compat_free_ctry_parent_context(); + /* C_INDI_ATTR */ Gedcom_ctxt compat_generate_resi_start(Gedcom_ctxt parent); void compat_generate_resi_end(Gedcom_ctxt parent, Gedcom_ctxt self); @@ -89,4 +98,9 @@ int compat_check_subm_comm_cont(const char* tag); Gedcom_ctxt compat_subm_comm_cont_start(Gedcom_ctxt parent, char* str); void compat_subm_comm_cont_end(Gedcom_ctxt parent, Gedcom_ctxt self); +/* C_NOTE_TOO_LONG */ +int compat_long_line(int level, int tag); +char* compat_long_line_get_prefix(char* str); +void compat_long_line_finish(Gedcom_ctxt parent, int level); + #endif /* __COMPAT_H */ diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y index 9eadd44..75fd0b1 100644 --- a/gedcom/gedcom.y +++ b/gedcom/gedcom.y @@ -261,7 +261,7 @@ void clean_up(); } %token_table -%expect 309 +%expect 310 %token BADTOKEN %token OPEN @@ -1919,11 +1919,14 @@ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM $$ = start_record(REC_SUBM, $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5, NULL, GEDCOM_MAKE_NULL(val2)); - START(SUBM, $1, $$) } + START(SUBM, $1, $$) } subm_subs { CHECK1(NAME) } CLOSE - { end_record(REC_SUBM, $6, GEDCOM_MAKE_NULL(val1)); } + { end_record(REC_SUBM, $6, GEDCOM_MAKE_NULL(val1)); + if (compat_mode(C_SUBM_CTRY)) + compat_free_ctry_parent_context(); + } ; subm_subs : /* empty */ @@ -1937,6 +1940,9 @@ subm_sub : subm_name_sect { OCCUR2(NAME, 1, 1) } | subm_rfn_sect { OCCUR2(RFN, 0, 1) } | subm_rin_sect { OCCUR2(RIN, 0, 1) } | change_date_sub /* 0:1 */ + | subm_ctry_sect { if (!compat_mode(C_SUBM_CTRY)) + INVALID_TAG("CTRY"); + OCCUR2(CTRY, 0, 1) } | no_std_sub ; @@ -2000,6 +2006,19 @@ subm_rin_sect : OPEN DELIM TAG_RIN mand_line_item } ; +/* SUBM.CTRY (Only for compatibility) */ +subm_ctry_sect : OPEN DELIM TAG_CTRY opt_line_item + { if (compat_mode(C_SUBM_CTRY)) { + $$ = compat_generate_addr_ctry_start($1, $3, $4); + } + } + CLOSE + { if (compat_mode (C_SUBM_CTRY)) { + compat_generate_addr_ctry_end($5); + } + } + ; + /*********************************************************************/ /**** Substructures ****/ /*********************************************************************/ @@ -2015,7 +2034,9 @@ addr_sect : OPEN DELIM TAG_ADDR mand_line_item GEDCOM_MAKE_STRING(val1, $4)); reset_buffer(&concat_buffer); safe_buf_append(&concat_buffer, $4); - START(ADDR, $1, $$) + START(ADDR, $1, $$); + if (compat_mode(C_SUBM_CTRY)) + compat_save_ctry_parent_context($$); } addr_subs { CHECK0 } @@ -3189,14 +3210,19 @@ note_struc_link_sub : source_cit_sub ; note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item - { $$ + { char* str = $4; + if (compat_mode(C_NOTE_TOO_LONG)) + str = compat_long_line_get_prefix($4); + $$ = start_element(ELT_SUB_NOTE, - PARENT, $1, $3, $4, - GEDCOM_MAKE_NULL_OR_STRING(val1, $4)); + PARENT, $1, $3, str, + GEDCOM_MAKE_NULL_OR_STRING(val1, str)); reset_buffer(&concat_buffer); if ($4) safe_buf_append(&concat_buffer, $4); - START(NOTE, $1, $$) + START(NOTE, $1, $$); + if (compat_mode(C_NOTE_TOO_LONG)) + compat_long_line_finish($$, $1); } note_struc_emb_subs { CHECK0 } diff --git a/gedcom/gedcom_lex_common.c b/gedcom/gedcom_lex_common.c index 149a8a8..06c1f77 100644 --- a/gedcom/gedcom_lex_common.c +++ b/gedcom/gedcom_lex_common.c @@ -33,9 +33,10 @@ static size_t encoding_width; static int current_level = -1; -static int level_diff=MAXGEDCLEVEL; +static int level_diff = MAXGEDCLEVEL; static size_t line_len = 0; static int tab_space = 0; +static int current_tag = -1; static struct conv_buffer* ptr_buffer = NULL; static struct conv_buffer* tag_buffer = NULL; @@ -93,10 +94,10 @@ int test_loop(ENCODING enc, const char* code) /* These are defined as functions here, because xgettext has trouble extracting the strings out of long pre-processor defined */ -static void error_line_too_long(const char *line) +static void error_line_too_long() { - gedcom_error(_("Line too long, max %d characters allowed: %s"), - MAXGEDCLINELEN, line); + gedcom_error(_("Line too long, max %d characters allowed"), + MAXGEDCLINELEN); } static void error_level_leading_zero() @@ -162,8 +163,9 @@ static int dummy_conv = 0; #define CHECK_LINE_LEN \ { if (line_len != (size_t)-1) { \ line_len += strlen(yytext); \ - if (line_len > MAXGEDCLINELEN * encoding_width) { \ - error_line_too_long(yytext); \ + if (line_len > MAXGEDCLINELEN * encoding_width \ + && ! compat_long_line(current_level, current_tag)) { \ + error_line_too_long(); \ line_len = (size_t)-1; \ return BADTOKEN; \ } \ @@ -179,10 +181,11 @@ static int dummy_conv = 0; #define MKTAGACTION(THETAG) \ { CHECK_LINE_LEN; \ gedcom_lval.tag.string = TO_INTERNAL(yytext, tag_buffer); \ - gedcom_lval.tag.value = TAG_##THETAG; \ + current_tag = TAG_##THETAG; \ + gedcom_lval.tag.value = current_tag; \ BEGIN(NORMAL); \ line_no++; \ - return TAG_##THETAG; \ + return current_tag; \ } /* The GEDCOM level number is converted into a sequence of opening diff --git a/t/compat-paf4.test b/t/compat-paf4.test new file mode 100755 index 0000000..3952606 --- /dev/null +++ b/t/compat-paf4.test @@ -0,0 +1,3 @@ +#!/bin/sh + +$srcdir/src/test_script -2 $0 0 compat-paf4.ged diff --git a/t/input/compat-paf4.ged b/t/input/compat-paf4.ged new file mode 100644 index 0000000..03dd017 --- /dev/null +++ b/t/input/compat-paf4.ged @@ -0,0 +1,171 @@ +0 HEAD +1 SOUR PAF +2 NAME Personal Ancestral File +2 VERS 4.0.4.18 +2 CORP The Church of Jesus Christ of Latter-day Saints +3 ADDR 50 East North Temple Street +4 CONT Salt Lake City, UT 84150 +1 DEST PAF +1 DATE 7 JAN 2002 +2 TIME 14:07:16 +1 FILE bock.ged +1 GEDC +2 VERS 5.5 +2 FORM LINEAGE-LINKED +1 CHAR ANSEL +1 LANG English +1 SUBM @SUB1@ +1 NOTE (Peter Verthez) This is a reduced version of the original file found at: +2 CONT http://www.rm.quik.com.au/macca27/gen/gedcom.html +0 @SUB1@ SUBM +1 NAME Andrew McPhee +1 ADDR c/o 820 Frauenfelder Street +2 CONT Albury. NSW. Australia. 2641. +1 CTRY Australia +1 PHON (0260) 409039 +1 _EMAIL macca27@rm.quik.com.au +0 @I41@ INDI +1 NAME George Albert /Bock/ +2 GIVN George Albert +2 SURN Bock +1 SEX M +1 BIRT +2 DATE 2 APR 1865 +2 PLAC New Dundee,Ontario,Canada +1 DEAT +2 DATE 1 JUL 1943 +2 PLAC Big River,Sask,Canada +1 NOTE George was 2 years old when his family moved west from New Dundee to Bruce County in 1867, Em +2 CONC anuel was 16 and still recovering from his hip illness, Rachel was 10 and Allan 5 years. Th +2 CONC e family moved again when George was 9 years to the farm in Bruce County and the 3 boys Allan +2 CONC , George and John went to School Section No. 1 at Saugeen, then in November 1880 when he wa +2 CONC s 15 he had to leave school to go to work for another North Bruce farmer after their barn an +2 CONC d stock were destroyed by fire. +2 CONT +2 CONT George was hired out to the farmer for 2 years until he went back to Waterloo County where h +2 CONC e had a lot of cousins who helped him to get work - the Rosenbergers and Levi & Aaron Bock i +2 CONC n Wilmot Township. In 1885 when he was 20 years old he returned in the spring and brought wit +2 CONC h him his girl-friend Alberta Godbold whose parents lived in Berlin (Kitchener), Alberta want +2 CONC ed to hire out as a house-keeper and secured such a job for a local banker's wife who was ill +2 CONC , she stayed at this for a year and got on very well with the lady and her 4 year old boy. +2 CONT +2 CONT George had spent this year working at Cargill's Mill then in May 1886 they were married and l +2 CONC ived in Port Elgin, their first child Era Alberta was born there on 25 April 1887, George wor +2 CONC ked at the Port Elgin Button Factory until the spring of 1888 the family moved to Cargill whe +2 CONC re George got a job at the mill. In August 1888 another little girl, Ena Margaret was born an +2 CONC d the following spring in 1889 George's father-in-law Ben Godbold offered George a job on hi +2 CONC s home-farm near Berlin (Kitchener), George's cousin John Spreeman also worked on this farm w +2 CONC ith him. +2 CONT +2 CONT John's wife Geraldine was also Alberta's sister and they had both been born on that farm an +2 CONC d now they each had 2 little girls to play together. In less than 2 years they all moved fro +2 CONC m the farm (father-in-law hired someone else) and George moved his family to Preston in 1890 +2 CONC . It was in 1889 that George's sister Rachel died in Sears, Michigan, Grandma Bock was lookin +2 CONC g after her 2 girls Rosanna and Maud when Lemuel returned and took the girls to Preston, hi +2 CONC s relatives were the Rosenbergers who lived there also. +2 CONT +2 CONT George and Alberta offered to take care of the girls for Lemuel but he declined them althoug +2 CONC h it was thought that Maud's health would have been better if she'd stayed there. George, Alb +2 CONC erta and the 2 girls moved once again in 1896 west to Russell, Manitoba where George secure +2 CONC d employment with the Beaver Lumber Company, during this time another daughter Edna Aileen wa +2 CONC s born in 1898 at St. Jean Baptiste, Manitoba and then in 1900 a boy George Allan was born bu +2 CONC t he died in infancy. +2 CONT +2 CONT In 1902 another boy Albert Allan was born at Rosenfeld, Manitoba, soon after this George wa +2 CONC s transferred to Lemberg, Saskatchewan. In 1925 George got a job as a store-keeper at the wor +2 CONC kshops of the Canadian National Railroad (C.N.R.) at Watrous, Saskatchewan, it was about thi +2 CONC s time that their grand-daughter Beryl came to live with them. +2 CONT +2 CONT Then in 1930 George retired from the railway aged 65 and took up a homestead at Ladder Valley +2 CONC , Sask, their son Albert and his family (wife Anne and daughter Myrl) and also their eldest d +2 CONC aughter's family (Era and husband Wilber Eddy and children Wilber L., George and Marjorie) al +2 CONC l had adjoining quarter sections. +2 CONT +2 CONT In Oct 1941 George's son Albert joined up in the R.C.A.F. and his family left the homestead t +2 CONC o live in Prince Albert for a time, George and Alberta stayed on at the homestead till Georg +2 CONC e passed away there on 1 Jul 1943 then Alberta moved to Regina where she passed away on 3 De +2 CONC c 1944. +1 CHAN +2 DATE 23 DEC 2001 +3 TIME 05:52:22 +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_100.jpg +2 TITL George A. Bock c1870 5yo +2 NOTE Original ferrotype photograph 45x74mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_j\bock_js_102.jpg +2 TITL George A. Bock (second from R) c1873 8yo +2 NOTE Original albumen carte de visite card 62x101mm.~~Taken same day as bock_j_103.~~Photographer: W. St. John, Walkerton, Ontario.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_am_108.jpg +2 TITL George (R) with brother Allan M. Bock c1890 +2 NOTE Original ferrotype photograph 65x94mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_112.jpg +2 TITL George A. Bock c1895 30yo +2 NOTE Original ferrotype photograph 53x73mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_116.jpg +2 TITL George A. Bock in his bearskin coat c1900 35yo +2 NOTE Original gelatin-chloride cabinet card 100x138mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM Y +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\ph_misc\lembergbt_097.jpg +2 TITL 1911 Lemberg Baseball Team +2 NOTE Back: Gardiner, s.s. Roche, p. Pohlman, 3rd b. Steinback, r.f.~~Middle: Bock, 2nd b. McArthur, 1st b. Jolly, mgr. Rist, captain. Saunders, c.f.~~Front: O'Connell, spare. Pohlman, mascot. Bradley, l.f.~~Original gelatin-silver mounted photo 235x190mm. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_140.jpg +2 TITL George A. Bock, July 1923, Melville. Sask. +2 NOTE George is holding Beryl Bock (L) and Norma Thomas (R).~~Original gelatin-silver photograph 63x70mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_160.jpg +2 TITL George A. Bock with his car - 18 Jul 1930 +2 NOTE Original gelatin-silver photograph 70x47mm.~~Date is written on reverse.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_180.jpg +2 TITL George A. Bock c1938 +2 NOTE Original gelatin-silver photograph 39x49mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_168.jpg +2 TITL George A. Bock astride his power saw c1940 +2 NOTE Contact print from original gelatin-silver negative 69x205mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +0 TRLR diff --git a/t/output/compat-paf4.ref b/t/output/compat-paf4.ref new file mode 100644 index 0000000..649de9d --- /dev/null +++ b/t/output/compat-paf4.ref @@ -0,0 +1,441 @@ + +=== Parsing file compat-paf4.ged +Header start +Source is PAF (ctxt is 1001, parent is 1) +== 2 NAME (342) Personal Ancestral File (ctxt is 1001, conversion failures: 0) +== 2 VERS (391) 4.0.4.18 (ctxt is 1001, conversion failures: 0) +== 2 CORP (302) The Church of Jesus Christ of Latter-day Saints (ctxt is 1001, conversion failures: 0) +== 3 ADDR (266) 50 East North Temple Street (ctxt is 1001, conversion failures: 0) +== 4 CONT (300) Salt Lake City, UT 84150 (ctxt is 1001, conversion failures: 0) +WARNING: Warning on line 7: Enabling compatibility with 'Personal Ancestral File', version 4 +Source context 1001 in parent 1 +== 1 DEST (310) PAF (ctxt is 1, conversion failures: 0) +== 1 DATE (306) 7 JAN 2002 (ctxt is 1, conversion failures: 0) +== 2 TIME (387) 14:07:16 (ctxt is 1, conversion failures: 0) +== 1 FILE (324) bock.ged (ctxt is 1, conversion failures: 0) +== 1 GEDC (326) (null) (ctxt is 1, conversion failures: 0) +== 2 VERS (391) 5.5 (ctxt is 1, conversion failures: 0) +== 2 FORM (325) LINEAGE-LINKED (ctxt is 1, conversion failures: 0) +== 1 CHAR (292) ANSEL (ctxt is 1, conversion failures: 0) +== 1 LANG (334) English (ctxt is 1, conversion failures: 0) +== 1 SUBM (382) @SUB1@ (ctxt is 1, conversion failures: 0) +Note: (Peter Verthez) This is a reduced version of the original file found at: (ctxt is 1, parent is 1) +== 2 CONT (300) http://www.rm.quik.com.au/macca27/gen/gedcom.html (ctxt is 1, conversion failures: 0) +Complete note: +(Peter Verthez) This is a reduced version of the original file found at: +http://www.rm.quik.com.au/macca27/gen/gedcom.html +Header end, context is 1 +Submitter, xref is @SUB1@ +== 1 NAME (342) Andrew McPhee (ctxt is 10000, conversion failures: 0) +== 1 ADDR (266) c/o 820 Frauenfelder Street (ctxt is 10000, conversion failures: 0) +== 2 CONT (300) Albury. NSW. Australia. 2641. (ctxt is 10000, conversion failures: 0) +== 1 CTRY (304) Australia (ctxt is 10000, conversion failures: 0) +== 1 PHON (357) (0260) 409039 (ctxt is 10000, conversion failures: 0) +== 1 _EMAIL (264) macca27@rm.quik.com.au (ctxt is 10000, conversion failures: 0) +Rec INDI start, xref is @I41@ +== 1 NAME (342) George Albert /Bock/ (ctxt is 333, conversion failures: 0) +== 2 GIVN (327) George Albert (ctxt is 333, conversion failures: 0) +== 2 SURN (384) Bock (ctxt is 333, conversion failures: 0) +== 1 SEX (374) M (ctxt is 333, conversion failures: 0) +== 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0) +Contents of the date_value: + raw value: 2 APR 1865 + type: 0 + date1: + calendar type: 0 + day: 2 + month: APR + year: 1865 + date type: 1 + sdn1: 2402329 + sdn2: -1 + date2: + calendar type: 4 + day: + month: + year: + date type: 0 + sdn1: -1 + sdn2: -1 + phrase: +== 2 PLAC (358) New Dundee,Ontario,Canada (ctxt is 333, conversion failures: 0) +== 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0) +Contents of the date_value: + raw value: 1 JUL 1943 + type: 0 + date1: + calendar type: 0 + day: 1 + month: JUL + year: 1943 + date type: 1 + sdn1: 2430907 + sdn2: -1 + date2: + calendar type: 4 + day: + month: + year: + date type: 0 + sdn1: -1 + sdn2: -1 + phrase: +== 2 PLAC (358) Big River,Sask,Canada (ctxt is 333, conversion failures: 0) +== 1 NOTE (348) George was 2 years old when his family moved west from New Dundee to Bruce County in 1867, Em (ctxt is 333, conversion failures: 0) +== 2 CONC (297) anuel was 16 and still recovering from his hip illness, Rachel was 10 and Allan 5 years. Th (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e family moved again when George was 9 years to the farm in Bruce County and the 3 boys Allan (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , George and John went to School Section No. 1 at Saugeen, then in November 1880 when he wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s 15 he had to leave school to go to work for another North Bruce farmer after their barn an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d stock were destroyed by fire. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George was hired out to the farmer for 2 years until he went back to Waterloo County where h (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e had a lot of cousins who helped him to get work - the Rosenbergers and Levi & Aaron Bock i (ctxt is 333, conversion failures: 0) +== 2 CONC (297) n Wilmot Township. In 1885 when he was 20 years old he returned in the spring and brought wit (ctxt is 333, conversion failures: 0) +== 2 CONC (297) h him his girl-friend Alberta Godbold whose parents lived in Berlin (Kitchener), Alberta want (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ed to hire out as a house-keeper and secured such a job for a local banker's wife who was ill (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , she stayed at this for a year and got on very well with the lady and her 4 year old boy. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George had spent this year working at Cargill's Mill then in May 1886 they were married and l (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ived in Port Elgin, their first child Era Alberta was born there on 25 April 1887, George wor (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ked at the Port Elgin Button Factory until the spring of 1888 the family moved to Cargill whe (ctxt is 333, conversion failures: 0) +== 2 CONC (297) re George got a job at the mill. In August 1888 another little girl, Ena Margaret was born an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d the following spring in 1889 George's father-in-law Ben Godbold offered George a job on hi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s home-farm near Berlin (Kitchener), George's cousin John Spreeman also worked on this farm w (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ith him. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) John's wife Geraldine was also Alberta's sister and they had both been born on that farm an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d now they each had 2 little girls to play together. In less than 2 years they all moved fro (ctxt is 333, conversion failures: 0) +== 2 CONC (297) m the farm (father-in-law hired someone else) and George moved his family to Preston in 1890 (ctxt is 333, conversion failures: 0) +== 2 CONC (297) . It was in 1889 that George's sister Rachel died in Sears, Michigan, Grandma Bock was lookin (ctxt is 333, conversion failures: 0) +== 2 CONC (297) g after her 2 girls Rosanna and Maud when Lemuel returned and took the girls to Preston, hi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s relatives were the Rosenbergers who lived there also. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George and Alberta offered to take care of the girls for Lemuel but he declined them althoug (ctxt is 333, conversion failures: 0) +== 2 CONC (297) h it was thought that Maud's health would have been better if she'd stayed there. George, Alb (ctxt is 333, conversion failures: 0) +== 2 CONC (297) erta and the 2 girls moved once again in 1896 west to Russell, Manitoba where George secure (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d employment with the Beaver Lumber Company, during this time another daughter Edna Aileen wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s born in 1898 at St. Jean Baptiste, Manitoba and then in 1900 a boy George Allan was born bu (ctxt is 333, conversion failures: 0) +== 2 CONC (297) t he died in infancy. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) In 1902 another boy Albert Allan was born at Rosenfeld, Manitoba, soon after this George wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s transferred to Lemberg, Saskatchewan. In 1925 George got a job as a store-keeper at the wor (ctxt is 333, conversion failures: 0) +== 2 CONC (297) kshops of the Canadian National Railroad (C.N.R.) at Watrous, Saskatchewan, it was about thi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s time that their grand-daughter Beryl came to live with them. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) Then in 1930 George retired from the railway aged 65 and took up a homestead at Ladder Valley (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , Sask, their son Albert and his family (wife Anne and daughter Myrl) and also their eldest d (ctxt is 333, conversion failures: 0) +== 2 CONC (297) aughter's family (Era and husband Wilber Eddy and children Wilber L., George and Marjorie) al (ctxt is 333, conversion failures: 0) +== 2 CONC (297) l had adjoining quarter sections. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) In Oct 1941 George's son Albert joined up in the R.C.A.F. and his family left the homestead t (ctxt is 333, conversion failures: 0) +== 2 CONC (297) o live in Prince Albert for a time, George and Alberta stayed on at the homestead till Georg (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e passed away there on 1 Jul 1943 then Alberta moved to Regina where she passed away on 3 De (ctxt is 333, conversion failures: 0) +== 2 CONC (297) c 1944. (ctxt is 333, conversion failures: 0) +== 1 CHAN (291) (null) (ctxt is 333, conversion failures: 0) +== 2 DATE (306) 23 DEC 2001 (ctxt is 333, conversion failures: 0) +== 3 TIME (387) 05:52:22 (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_100.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1870 5yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 45x74mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_j\bock_js_102.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock (second from R) c1873 8yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original albumen carte de visite card 62x101mm.~~Taken same day as bock_j_103.~~Photographer: W. St. John, Walkerton, Ontario.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_am_108.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George (R) with brother Allan M. Bock c1890 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 65x94mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_112.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1895 30yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 53x73mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_116.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock in his bearskin coat c1900 35yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-chloride cabinet card 100x138mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) Y (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\ph_misc\lembergbt_097.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) 1911 Lemberg Baseball Team (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Back: Gardiner, s.s. Roche, p. Pohlman, 3rd b. Steinback, r.f.~~Middle: Bock, 2nd b. McArthur, 1st b. Jolly, mgr. Rist, captain. Saunders, c.f.~~Front: O'Connell, spare. Pohlman, mascot. Bradley, l.f.~~Original gelatin-silver mounted photo 235x190m (ctxt is 333, conversion failures: 0) +== 3 CONC (297) m. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_140.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock, July 1923, Melville. Sask. (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) George is holding Beryl Bock (L) and Norma Thomas (R).~~Original gelatin-silver photograph 63x70mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_160.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock with his car - 18 Jul 1930 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-silver photograph 70x47mm.~~Date is written on reverse.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_180.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1938 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-silver photograph 39x49mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_168.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock astride his power saw c1940 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Contact print from original gelatin-silver negative 69x205mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +WARNING: Warning: Cross-reference @I41@ defined on line 27 is never used + +=== Total conversion failures: 0 + +=== Parsing file compat-paf4.ged +Header start +Source is PAF (ctxt is 1001, parent is 1) +== 2 NAME (342) Personal Ancestral File (ctxt is 1001, conversion failures: 0) +== 2 VERS (391) 4.0.4.18 (ctxt is 1001, conversion failures: 0) +== 2 CORP (302) The Church of Jesus Christ of Latter-day Saints (ctxt is 1001, conversion failures: 0) +== 3 ADDR (266) 50 East North Temple Street (ctxt is 1001, conversion failures: 0) +== 4 CONT (300) Salt Lake City, UT 84150 (ctxt is 1001, conversion failures: 0) +WARNING: Warning on line 7: Enabling compatibility with 'Personal Ancestral File', version 4 +Source context 1001 in parent 1 +== 1 DEST (310) PAF (ctxt is 1, conversion failures: 0) +== 1 DATE (306) 7 JAN 2002 (ctxt is 1, conversion failures: 0) +== 2 TIME (387) 14:07:16 (ctxt is 1, conversion failures: 0) +== 1 FILE (324) bock.ged (ctxt is 1, conversion failures: 0) +== 1 GEDC (326) (null) (ctxt is 1, conversion failures: 0) +== 2 VERS (391) 5.5 (ctxt is 1, conversion failures: 0) +== 2 FORM (325) LINEAGE-LINKED (ctxt is 1, conversion failures: 0) +== 1 CHAR (292) ANSEL (ctxt is 1, conversion failures: 0) +== 1 LANG (334) English (ctxt is 1, conversion failures: 0) +== 1 SUBM (382) @SUB1@ (ctxt is 1, conversion failures: 0) +Note: (Peter Verthez) This is a reduced version of the original file found at: (ctxt is 1, parent is 1) +== 2 CONT (300) http://www.rm.quik.com.au/macca27/gen/gedcom.html (ctxt is 1, conversion failures: 0) +Complete note: +(Peter Verthez) This is a reduced version of the original file found at: +http://www.rm.quik.com.au/macca27/gen/gedcom.html +Header end, context is 1 +Submitter, xref is @SUB1@ +== 1 NAME (342) Andrew McPhee (ctxt is 10000, conversion failures: 0) +== 1 ADDR (266) c/o 820 Frauenfelder Street (ctxt is 10000, conversion failures: 0) +== 2 CONT (300) Albury. NSW. Australia. 2641. (ctxt is 10000, conversion failures: 0) +== 1 CTRY (304) Australia (ctxt is 10000, conversion failures: 0) +== 1 PHON (357) (0260) 409039 (ctxt is 10000, conversion failures: 0) +== 1 _EMAIL (264) macca27@rm.quik.com.au (ctxt is 10000, conversion failures: 0) +Rec INDI start, xref is @I41@ +== 1 NAME (342) George Albert /Bock/ (ctxt is 333, conversion failures: 0) +== 2 GIVN (327) George Albert (ctxt is 333, conversion failures: 0) +== 2 SURN (384) Bock (ctxt is 333, conversion failures: 0) +== 1 SEX (374) M (ctxt is 333, conversion failures: 0) +== 1 BIRT (283) (null) (ctxt is 333, conversion failures: 0) +Contents of the date_value: + raw value: 2 APR 1865 + type: 0 + date1: + calendar type: 0 + day: 2 + month: APR + year: 1865 + date type: 1 + sdn1: 2402329 + sdn2: -1 + date2: + calendar type: 4 + day: + month: + year: + date type: 0 + sdn1: -1 + sdn2: -1 + phrase: +== 2 PLAC (358) New Dundee,Ontario,Canada (ctxt is 333, conversion failures: 0) +== 1 DEAT (307) (null) (ctxt is 333, conversion failures: 0) +Contents of the date_value: + raw value: 1 JUL 1943 + type: 0 + date1: + calendar type: 0 + day: 1 + month: JUL + year: 1943 + date type: 1 + sdn1: 2430907 + sdn2: -1 + date2: + calendar type: 4 + day: + month: + year: + date type: 0 + sdn1: -1 + sdn2: -1 + phrase: +== 2 PLAC (358) Big River,Sask,Canada (ctxt is 333, conversion failures: 0) +== 1 NOTE (348) George was 2 years old when his family moved west from New Dundee to Bruce County in 1867, Em (ctxt is 333, conversion failures: 0) +== 2 CONC (297) anuel was 16 and still recovering from his hip illness, Rachel was 10 and Allan 5 years. Th (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e family moved again when George was 9 years to the farm in Bruce County and the 3 boys Allan (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , George and John went to School Section No. 1 at Saugeen, then in November 1880 when he wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s 15 he had to leave school to go to work for another North Bruce farmer after their barn an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d stock were destroyed by fire. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George was hired out to the farmer for 2 years until he went back to Waterloo County where h (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e had a lot of cousins who helped him to get work - the Rosenbergers and Levi & Aaron Bock i (ctxt is 333, conversion failures: 0) +== 2 CONC (297) n Wilmot Township. In 1885 when he was 20 years old he returned in the spring and brought wit (ctxt is 333, conversion failures: 0) +== 2 CONC (297) h him his girl-friend Alberta Godbold whose parents lived in Berlin (Kitchener), Alberta want (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ed to hire out as a house-keeper and secured such a job for a local banker's wife who was ill (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , she stayed at this for a year and got on very well with the lady and her 4 year old boy. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George had spent this year working at Cargill's Mill then in May 1886 they were married and l (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ived in Port Elgin, their first child Era Alberta was born there on 25 April 1887, George wor (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ked at the Port Elgin Button Factory until the spring of 1888 the family moved to Cargill whe (ctxt is 333, conversion failures: 0) +== 2 CONC (297) re George got a job at the mill. In August 1888 another little girl, Ena Margaret was born an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d the following spring in 1889 George's father-in-law Ben Godbold offered George a job on hi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s home-farm near Berlin (Kitchener), George's cousin John Spreeman also worked on this farm w (ctxt is 333, conversion failures: 0) +== 2 CONC (297) ith him. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) John's wife Geraldine was also Alberta's sister and they had both been born on that farm an (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d now they each had 2 little girls to play together. In less than 2 years they all moved fro (ctxt is 333, conversion failures: 0) +== 2 CONC (297) m the farm (father-in-law hired someone else) and George moved his family to Preston in 1890 (ctxt is 333, conversion failures: 0) +== 2 CONC (297) . It was in 1889 that George's sister Rachel died in Sears, Michigan, Grandma Bock was lookin (ctxt is 333, conversion failures: 0) +== 2 CONC (297) g after her 2 girls Rosanna and Maud when Lemuel returned and took the girls to Preston, hi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s relatives were the Rosenbergers who lived there also. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) George and Alberta offered to take care of the girls for Lemuel but he declined them althoug (ctxt is 333, conversion failures: 0) +== 2 CONC (297) h it was thought that Maud's health would have been better if she'd stayed there. George, Alb (ctxt is 333, conversion failures: 0) +== 2 CONC (297) erta and the 2 girls moved once again in 1896 west to Russell, Manitoba where George secure (ctxt is 333, conversion failures: 0) +== 2 CONC (297) d employment with the Beaver Lumber Company, during this time another daughter Edna Aileen wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s born in 1898 at St. Jean Baptiste, Manitoba and then in 1900 a boy George Allan was born bu (ctxt is 333, conversion failures: 0) +== 2 CONC (297) t he died in infancy. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) In 1902 another boy Albert Allan was born at Rosenfeld, Manitoba, soon after this George wa (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s transferred to Lemberg, Saskatchewan. In 1925 George got a job as a store-keeper at the wor (ctxt is 333, conversion failures: 0) +== 2 CONC (297) kshops of the Canadian National Railroad (C.N.R.) at Watrous, Saskatchewan, it was about thi (ctxt is 333, conversion failures: 0) +== 2 CONC (297) s time that their grand-daughter Beryl came to live with them. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) Then in 1930 George retired from the railway aged 65 and took up a homestead at Ladder Valley (ctxt is 333, conversion failures: 0) +== 2 CONC (297) , Sask, their son Albert and his family (wife Anne and daughter Myrl) and also their eldest d (ctxt is 333, conversion failures: 0) +== 2 CONC (297) aughter's family (Era and husband Wilber Eddy and children Wilber L., George and Marjorie) al (ctxt is 333, conversion failures: 0) +== 2 CONC (297) l had adjoining quarter sections. (ctxt is 333, conversion failures: 0) +== 2 CONT (300) (null) (ctxt is 333, conversion failures: 0) +== 2 CONT (300) In Oct 1941 George's son Albert joined up in the R.C.A.F. and his family left the homestead t (ctxt is 333, conversion failures: 0) +== 2 CONC (297) o live in Prince Albert for a time, George and Alberta stayed on at the homestead till Georg (ctxt is 333, conversion failures: 0) +== 2 CONC (297) e passed away there on 1 Jul 1943 then Alberta moved to Regina where she passed away on 3 De (ctxt is 333, conversion failures: 0) +== 2 CONC (297) c 1944. (ctxt is 333, conversion failures: 0) +== 1 CHAN (291) (null) (ctxt is 333, conversion failures: 0) +== 2 DATE (306) 23 DEC 2001 (ctxt is 333, conversion failures: 0) +== 3 TIME (387) 05:52:22 (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_100.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1870 5yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 45x74mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_j\bock_js_102.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock (second from R) c1873 8yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original albumen carte de visite card 62x101mm.~~Taken same day as bock_j_103.~~Photographer: W. St. John, Walkerton, Ontario.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_am_108.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George (R) with brother Allan M. Bock c1890 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 65x94mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_112.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1895 30yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original ferrotype photograph 53x73mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_116.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock in his bearskin coat c1900 35yo (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-chloride cabinet card 100x138mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) Y (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\ph_misc\lembergbt_097.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) 1911 Lemberg Baseball Team (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Back: Gardiner, s.s. Roche, p. Pohlman, 3rd b. Steinback, r.f.~~Middle: Bock, 2nd b. McArthur, 1st b. Jolly, mgr. Rist, captain. Saunders, c.f.~~Front: O'Connell, spare. Pohlman, mascot. Bradley, l.f.~~Original gelatin-silver mounted photo 235x190m (ctxt is 333, conversion failures: 0) +== 3 CONC (297) m. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_140.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock, July 1923, Melville. Sask. (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) George is holding Beryl Bock (L) and Norma Thomas (R).~~Original gelatin-silver photograph 63x70mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_160.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock with his car - 18 Jul 1930 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-silver photograph 70x47mm.~~Date is written on reverse.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_180.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock c1938 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Original gelatin-silver photograph 39x49mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +== 1 OBJE (351) (null) (ctxt is 333, conversion failures: 0) +== 2 FORM (325) jpg (ctxt is 333, conversion failures: 0) +== 2 FILE (324) G:\_Rootsweb\bock\bock_g\bock_ga_168.jpg (ctxt is 333, conversion failures: 0) +== 2 TITL (388) George A. Bock astride his power saw c1940 (ctxt is 333, conversion failures: 0) +== 2 NOTE (348) Contact print from original gelatin-silver negative 69x205mm.~~This image is cropped and retouched. (ctxt is 333, conversion failures: 0) +== 2 _SCBK (264) Y (ctxt is 333, conversion failures: 0) +== 2 _PRIM (264) N (ctxt is 333, conversion failures: 0) +== 2 _TYPE (264) PHOTO (ctxt is 333, conversion failures: 0) +WARNING: Warning: Cross-reference @I41@ defined on line 27 is never used + +=== Total conversion failures: 0 +Parse succeeded diff --git a/t/output/write_gom_compat-paf4.ged b/t/output/write_gom_compat-paf4.ged new file mode 100644 index 0000000..df21a71 --- /dev/null +++ b/t/output/write_gom_compat-paf4.ged @@ -0,0 +1,150 @@ +0 HEAD +1 CHAR ANSEL +1 SOUR PAF +2 NAME Personal Ancestral File +2 VERS 4.0.4.18 +2 CORP The Church of Jesus Christ of Latter-day Saints +3 ADDR 50 East North Temple Street +4 CONT Salt Lake City, UT 84150 +1 DEST PAF +1 DATE 9 SEP 2001 +2 TIME 02:46:40 +1 SUBM @SUB1@ +1 FILE bock.ged +1 GEDC +2 VERS 5.5 +2 FORM LINEAGE-LINKED +1 LANG English +1 NOTE (Peter Verthez) This is a reduced version of the original file found at: +2 CONT http://www.rm.quik.com.au/macca27/gen/gedcom.html +0 @SUB1@ SUBM +1 NAME Andrew McPhee +1 ADDR c/o 820 Frauenfelder Street +2 CONT Albury. NSW. Australia. 2641. +1 PHON (0260) 409039 +1 CHAN +2 DATE 9 SEP 2001 +3 TIME 02:46:40 +1 _EMAIL macca27@@rm.quik.com.au +0 @I41@ INDI +1 NAME George Albert /Bock/ +2 GIVN George Albert +2 SURN Bock +1 SEX M +1 BIRT +2 DATE 2 APR 1865 +2 PLAC New Dundee,Ontario,Canada +1 DEAT +2 DATE 1 JUL 1943 +2 PLAC Big River,Sask,Canada +1 OBJE +2 FORM jpg +2 TITL George A. Bock c1870 5yo +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_100.jpg +2 NOTE Original ferrotype photograph 45x74mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock (second from R) c1873 8yo +2 FILE G:\_Rootsweb\bock\bock_j\bock_js_102.jpg +2 NOTE Original albumen carte de visite card 62x101mm.~~Taken same day as bock_j_103.~~Photographer: W. St. John, Walkerton, Ontario.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George (R) with brother Allan M. Bock c1890 +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_am_108.jpg +2 NOTE Original ferrotype photograph 65x94mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock c1895 30yo +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_112.jpg +2 NOTE Original ferrotype photograph 53x73mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock in his bearskin coat c1900 35yo +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_116.jpg +2 NOTE Original gelatin-chloride cabinet card 100x138mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM Y +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL 1911 Lemberg Baseball Team +2 FILE G:\_Rootsweb\ph_misc\lembergbt_097.jpg +2 NOTE Back: Gardiner, s.s. Roche, p. Pohlman, 3rd b. Steinback, r.f.~~Middle: Bock, 2nd b. McArthur, 1st b. Jolly, mgr. Rist, captain. Saunders, c.f.~~Front: O'Connell, spare. Pohlman, mascot. Bradley, l.f.~~Original gelatin-silver mounted photo 235x190 +3 CONC mm. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock, July 1923, Melville. Sask. +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_140.jpg +2 NOTE George is holding Beryl Bock (L) and Norma Thomas (R).~~Original gelatin-silver photograph 63x70mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock with his car - 18 Jul 1930 +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_160.jpg +2 NOTE Original gelatin-silver photograph 70x47mm.~~Date is written on reverse.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock c1938 +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_180.jpg +2 NOTE Original gelatin-silver photograph 39x49mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 OBJE +2 FORM jpg +2 TITL George A. Bock astride his power saw c1940 +2 FILE G:\_Rootsweb\bock\bock_g\bock_ga_168.jpg +2 NOTE Contact print from original gelatin-silver negative 69x205mm.~~This image is cropped and retouched. +2 _SCBK Y +2 _PRIM N +2 _TYPE PHOTO +1 NOTE George was 2 years old when his family moved west from New Dundee to Bruce County in 1867, Emanuel was 16 and still recovering from his hip illness, Rachel was 10 and Allan 5 years. The family moved again when George was 9 years to the farm in Bru +2 CONC ce County and the 3 boys Allan, George and John went to School Section No. 1 at Saugeen, then in November 1880 when he was 15 he had to leave school to go to work for another North Bruce farmer after their barn and stock were destroyed by fire. +2 CONT +2 CONT George was hired out to the farmer for 2 years until he went back to Waterloo County where he had a lot of cousins who helped him to get work - the Rosenbergers and Levi & Aaron Bock in Wilmot Township. In 1885 when he was 20 years old he returne +2 CONC d in the spring and brought with him his girl-friend Alberta Godbold whose parents lived in Berlin (Kitchener), Alberta wanted to hire out as a house-keeper and secured such a job for a local banker's wife who was ill, she stayed at this for a yea +2 CONC r and got on very well with the lady and her 4 year old boy. +2 CONT +2 CONT George had spent this year working at Cargill's Mill then in May 1886 they were married and lived in Port Elgin, their first child Era Alberta was born there on 25 April 1887, George worked at the Port Elgin Button Factory until the spring of 188 +2 CONC 8 the family moved to Cargill where George got a job at the mill. In August 1888 another little girl, Ena Margaret was born and the following spring in 1889 George's father-in-law Ben Godbold offered George a job on his home-farm near Berlin (Kitc +2 CONC hener), George's cousin John Spreeman also worked on this farm with him. +2 CONT +2 CONT John's wife Geraldine was also Alberta's sister and they had both been born on that farm and now they each had 2 little girls to play together. In less than 2 years they all moved from the farm (father-in-law hired someone else) and George moved h +2 CONC is family to Preston in 1890. It was in 1889 that George's sister Rachel died in Sears, Michigan, Grandma Bock was looking after her 2 girls Rosanna and Maud when Lemuel returned and took the girls to Preston, his relatives were the Rosenbergers w +2 CONC ho lived there also. +2 CONT +2 CONT George and Alberta offered to take care of the girls for Lemuel but he declined them although it was thought that Maud's health would have been better if she'd stayed there. George, Alberta and the 2 girls moved once again in 1896 west to Russell +2 CONC , Manitoba where George secured employment with the Beaver Lumber Company, during this time another daughter Edna Aileen was born in 1898 at St. Jean Baptiste, Manitoba and then in 1900 a boy George Allan was born but he died in infancy. +2 CONT +2 CONT In 1902 another boy Albert Allan was born at Rosenfeld, Manitoba, soon after this George was transferred to Lemberg, Saskatchewan. In 1925 George got a job as a store-keeper at the workshops of the Canadian National Railroad (C.N.R.) at Watrous, S +2 CONC askatchewan, it was about this time that their grand-daughter Beryl came to live with them. +2 CONT +2 CONT Then in 1930 George retired from the railway aged 65 and took up a homestead at Ladder Valley, Sask, their son Albert and his family (wife Anne and daughter Myrl) and also their eldest daughter's family (Era and husband Wilber Eddy and children Wi +2 CONC lber L., George and Marjorie) all had adjoining quarter sections. +2 CONT +2 CONT In Oct 1941 George's son Albert joined up in the R.C.A.F. and his family left the homestead to live in Prince Albert for a time, George and Alberta stayed on at the homestead till George passed away there on 1 Jul 1943 then Alberta moved to Regin +2 CONC a where she passed away on 3 Dec 1944. +1 CHAN +2 DATE 23 DEC 2001 +3 TIME 05:52:22 +0 TRLR diff --git a/t/output/write_gom_compat-paf4.ref b/t/output/write_gom_compat-paf4.ref new file mode 100644 index 0000000..b9ae42f --- /dev/null +++ b/t/output/write_gom_compat-paf4.ref @@ -0,0 +1,7 @@ +WARNING: Warning on line 7: Enabling compatibility with 'Personal Ancestral File', version 4 +WARNING: Warning on line 24: Country 'Australia' lost in the compatibility (out of context) +WARNING: Warning: Cross-reference @I41@ defined on line 27 is never used +Writing file... +Re-parsing file... +WARNING: Warning: Cross-reference @I41@ defined on line 29 is never used +Test succeeded diff --git a/t/write_gom_compat-paf4.test b/t/write_gom_compat-paf4.test new file mode 100755 index 0000000..a7d162f --- /dev/null +++ b/t/write_gom_compat-paf4.test @@ -0,0 +1,3 @@ +#!/bin/sh + +$srcdir/src/test_writegom $0 0 LF ANSEL 0 compat-paf4.ged -- 2.30.2