Improved context handling, to allow elements out of context.

[gedcom-parse.git] / gom / place.c

diff --git a/gom/place.c b/gom/place.c
index cb852536aec106632f8da69e0c1a27f354b5c53a..779ea87881591a1c558d9fd06df7efe53aeb7840 100644 (file)
--- a/gom/place.c
+++ b/gom/place.c
@@ -50,7 +50,8 @@ Gedcom_ctxt sub_place_start(_ELT_PARAMS_)
        free(place);
       }
       else {
-       switch (ctxt->ctxt_type) {
+       int type = ctxt_type(ctxt);
+       switch (type) {
          case ELT_SUB_FAM_EVT:
          case ELT_SUB_FAM_EVT_EVEN:
          case ELT_SUB_INDIV_ATTR:
@@ -61,7 +62,7 @@ Gedcom_ctxt sub_place_start(_ELT_PARAMS_)
          case ELT_SUB_INDIV_EVEN:
            ADDFUNC2_NOLIST(event,place)(ctxt, place); break;
          default:
-           UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+           UNEXPECTED_CONTEXT(type);
        }
        result = MAKE_GOM_CTXT(elt, place, place);
       }
@@ -72,7 +73,7 @@ Gedcom_ctxt sub_place_start(_ELT_PARAMS_)
 }
 
 DEFINE_SUB_MAKEFUNC(place)
-DEFINE_SUB_ADDFUNC(place)
+DEFINE_SUB_SETFUNC(place)
 DEFINE_SUB_DELETEFUNC(place)
      
 DEFINE_STRING_CB(place, sub_place_form_start, place_hierarchy)
@@ -88,6 +89,15 @@ void place_subscribe()
                              sub_place_form_start, def_elt_end);
 }
 
+void UNREFALLFUNC(place)(struct place* obj)
+{
+  if (obj) {
+    UNREFALLFUNC(source_citation)(obj->citation);
+    UNREFALLFUNC(note_sub)(obj->note);
+    UNREFALLFUNC(user_data)(obj->extra);
+  }
+}
+
 void CLEANFUNC(place)(struct place* place)
 {
   if (place) {