X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;ds=sidebyside;f=gom%2Fchange_date.c;h=605039d8d2b28ea7f0f460c0beef51c660ce123a;hb=8073f669d16f11bfd50d42bb2cf6fdb79d358565;hp=2b703f819185d2e10cf0cd4201f5a459af0b6785;hpb=1568cb8ab16ecc1984d0d00b8ae8189c32508b08;p=gedcom-parse.git

diff --git a/gom/change_date.c b/gom/change_date.c
index 2b703f8..605039d 100644
--- a/gom/change_date.c
+++ b/gom/change_date.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include "change_date.h"
 #include "family.h"
 #include "individual.h"
@@ -45,30 +46,26 @@ Gedcom_ctxt sub_chan_start(_ELT_PARAMS_)
   if (! ctxt)
     NO_CONTEXT;
   else {
-    struct change_date *chan
-      = (struct change_date *)malloc(sizeof(struct change_date));
-    if (! chan)
-      MEMORY_ERROR;
-    else {
-      memset (chan, 0, sizeof(struct change_date));
-      
-      switch (ctxt->ctxt_type) {
+    struct change_date *chan = SUB_MAKEFUNC(change_date)();
+    if (chan) {
+      int type = ctxt_type(ctxt);
+      switch (type) {
 	case REC_FAM:
-	  family_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(family,change_date)(ctxt, chan); break;
 	case REC_INDI:
-	  individual_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(individual,change_date)(ctxt, chan); break;
 	case REC_OBJE:
-	  multimedia_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(multimedia,change_date)(ctxt, chan); break;
 	case REC_NOTE:
-	  note_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(note,change_date)(ctxt, chan); break;
 	case REC_REPO:
-	  repository_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(repository,change_date)(ctxt, chan); break;
 	case REC_SOUR:
-	  source_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(source,change_date)(ctxt, chan); break;
 	case REC_SUBM:
-	  submitter_set_change_date(ctxt, chan); break;
+	  ADDFUNC2_NOLIST(submitter,change_date)(ctxt, chan); break;
 	default:
-	  UNEXPECTED_CONTEXT(ctxt->ctxt_type);
+	  UNEXPECTED_CONTEXT(type);
       }
       result = MAKE_GOM_CTXT(elt, change_date, chan);
     }
@@ -77,8 +74,15 @@ Gedcom_ctxt sub_chan_start(_ELT_PARAMS_)
   return (Gedcom_ctxt)result;
 }
 
-DATE_CB(change_date, sub_chan_date_start, date)
-STRING_CB(change_date, sub_chan_time_start, time)
+DEFINE_SUB_MAKEFUNC(change_date)
+DEFINE_SUB_SETFUNC(change_date)
+DEFINE_SUB_DELETEFUNC(change_date)
+
+DEFINE_DATE_CB(change_date, sub_chan_date_start, date)
+DEFINE_STRING_CB(change_date, sub_chan_time_start, time)
+
+DEFINE_ADDFUNC2(change_date, note_sub, note)
+DEFINE_ADDFUNC2(change_date, user_data, extra)
 
 void change_date_subscribe()
 {
@@ -89,31 +93,70 @@ void change_date_subscribe()
 			      def_elt_end);
 }
 
-void change_date_add_note(Gom_ctxt ctxt, struct note_sub* note)
-{
-  struct change_date *chan = SAFE_CTXT_CAST(change_date, ctxt);
-  if (chan)
-    LINK_CHAIN_ELT(note_sub, chan->note, note);
-}
-
-void change_date_add_user_data(Gom_ctxt ctxt, struct user_data* data)
+void UNREFALLFUNC(change_date)(struct change_date* obj)
 {
-  struct change_date *obj = SAFE_CTXT_CAST(change_date, ctxt);
-  if (obj)
-    LINK_CHAIN_ELT(user_data, obj->extra, data);
+  if (obj) {
+    UNREFALLFUNC(note_sub)(obj->note);
+    UNREFALLFUNC(user_data)(obj->extra);
+  }
 }
 
-void change_date_cleanup(struct change_date *chan)
+void CLEANFUNC(change_date)(struct change_date *chan)
 {
   if (chan) {
     SAFE_FREE(chan->date);
     SAFE_FREE(chan->time);
-    DESTROY_CHAIN_ELTS(note_sub, chan->note, note_sub_cleanup);
-    DESTROY_CHAIN_ELTS(user_data, chan->extra, user_data_cleanup);
+    DESTROY_CHAIN_ELTS(note_sub, chan->note);
+    DESTROY_CHAIN_ELTS(user_data, chan->extra);
   }
   SAFE_FREE(chan);
 }
 
+int update_date(struct date_value** dv, struct tm* tm_ptr)
+{
+  int result;
+  struct date_value* dval = gedcom_new_date_value(NULL);
+  dval->type        = DV_NO_MODIFIER;
+  dval->date1.cal   = CAL_GREGORIAN;
+  dval->date1.day   = tm_ptr->tm_mday;
+  dval->date1.month = tm_ptr->tm_mon + 1;
+  dval->date1.year  = tm_ptr->tm_year + 1900;
+  result = gedcom_normalize_date(DI_FROM_NUMBERS, dval);
+
+  if (result == 0) {
+    if (*dv) free(*dv);
+    *dv = dval;
+  }
+  return result;
+}
+
+int update_time(char** tv, struct tm* tm_ptr)
+{
+  char tval[16];
+  sprintf(tval, "%02d:%02d:%02d",
+	  tm_ptr->tm_hour, tm_ptr->tm_min, tm_ptr->tm_sec);
+
+  if (gom_set_string(tv, tval))
+    return 0;
+  else
+    return 1;
+}
+
+int gom_update_timestamp(struct change_date** chan, time_t t)
+{
+  int result = 1;
+  if (chan) {
+    if (! *chan) gom_set_new_change_date(chan);
+    if (*chan) {
+      struct tm *tm_ptr = localtime(&t);
+      result = 0;
+      result |= update_date(&((*chan)->date), tm_ptr);
+      result |= update_time(&((*chan)->time), tm_ptr);
+    }
+  }
+  return result;
+}
+
 int write_change_date(Gedcom_write_hndl hndl, int parent,
 		      struct change_date *chan)
 {