From b239854bb47e5a369c1aaecc8b6fdbf719f7bb2c Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Fri, 3 Jun 2005 22:38:14 +0000
Subject: [PATCH] event/name type fixes

svn: r4780
---
 ChangeLog                  |   7 +++++++
 example/gramps/data.gramps | Bin 5410 -> 24343 bytes
 src/DisplayModels.py       |   1 -
 src/ListBox.py             |  12 +++++++++++-
 src/PedView.py             |   5 ++++-
 src/ReadXML.py             |  17 +++++++++++++++--
 src/RelLib.py              |   7 +++++--
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 405332463..c5f66f236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-03  Don Allingham  <don@gramps-project.org>
+	* src/DisplayModels.py: remove unused print
+	* src/ListBox.py: get EventBox working for event types
+	* src/PedView.py: handle event types
+	* src/ReadXML.py: handle name types properly
+	* src/RelLib.py: add type checking for set_type
+
 2005-06-03  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/DisplayModels.py (RepositoryModel): Display repository type as text
 	* src/RelLib.py (Repository): Serialize type as tuple not unicode
diff --git a/example/gramps/data.gramps b/example/gramps/data.gramps
index a3280d1fc25325bbadd9f19c09dff70a98ff2a16..65d86ea43ee668d9aaf4f0c843626ae0f43b6669 100644
GIT binary patch
literal 24343
zcmcg!-E!Nw6~50?pt|U^GnTC%+Y+a;x3=TN$tJPK%64a`(+gOFEG87GAt`(PP<@KN
zSU-RycmSF(r7)i4!Xm)~;5+{ZKa*enTm|ew#EBn;C!PL&uk*|4o5^3^USE9u<K~jh
zdCKp2BG~kg>DSB8taBgp)jHXqr}GZ`_kYl|XmR?6vB^^KxrpVT_%VwGPsLo)5GS1h
zJG;4MgI;ggDf{c~d;9(FIu`v7TZ?ENpyA=5!xnty2fj!!qN5H=qD?%LKMv6<;Ofu8
zQRg7<Cl-m|@oZUijIQx0<STLdF~Z1Ke!83-6pz%{vL<{!k58{LdG-|_3)MzFBW-4W
z`gA&tR^m}NQIANIB*g?zzlcZnM-+coRI*2;%`Do4Y5a8h+w@E|D1MVB>j+;3r~Se3
z@JO}EAJ8VtC={o|;jnvjbky}mgF)6%JtpnMiu=LoU38box&JdMhQA+*RDF>(P+w%f
zOZ+AWB@-tZPuN^6_$EkCIv<9kPLBE-G82W&pX2FZoIeGw_ac-c@NROD|5c1jGK8g1
zYq0p-kJBalf(QCLe7W%BBt1O~Lq0jk{?0$eyMW`>G>wJ7Scn*tP!9^y2a4InFYzG4
zl=ehBk;3@EA@V$caE*_9-JaJS3=3gWf~#bV#bR;Nx#=I4uO<hIbOrzhMLT*6Szp$7
z<PApM-T?ngY9K&6B15qIS@Re(^22OM@B00M$mAg7!gDO~^k52>eBPBM7cuwm*^Nj=
zT*sMA$J$|vcYNH**~b^?vzTp#Hv~)@GRm3@5hj~N!vWkM{WKIw!lc-obUsGQkiCr{
zi(i+1!tkH7#9zS}u~a1K{^THUuNiO2!EEUV^JtN?XIzZe!JT1?-1*F7$i~lOOw7Z3
z!C;$W7=ZrBgAq>BXs!M}F6LV0&8U3kVopVGs7{oU4yHLl*D4{k%2bzLF%Sno`o~&4
z3T@fhfPEBU=)*|WaO6yyM_A6bOqkajb^HBpPy53PD;$=Es!4?trm6JCN9d$G@CrC9
z{W#RoVo7OKT|8+~M=oQ3#y$nn)4YZ&d63YS0ULIE<1V~n9-?dmm2FJeDi&~6XY*){
zU<#p;@l$tTOMSnQ*jN4b&Q3yE(W`GfSn)d1Zx`et+-bi%)brdOWMaiCFlwQ8NNS5H
zz9N8Q4+?$Q?GZ!WJS5r1aE#E;ad$vaw)!b$wQA;RN9TN<`pHV0YP2?Ol$z3U7b%9;
z3#%)tleR~pU42-s{Q7>p{y^H?(u`GPuTO?x_hV`}ZD^TEg4iUCkYk*GxPE_oc60T|
zn>V?jumq7la;!xht=L7h7U7a3?%rc>MF>Uw&Jd!fOTn(E7iYKZ!-qZAKV)B`2eG<C
z+SA8G7>{HB!4K~l0?Z<bVS|y`YM)&R_Q(^KD3pW<*%Okkghj!8pIv92BujtI);viB
zB8Hd+ev&d7QKd1mLiM$LgwcWyXXnV|zN-XfpGoR7l^;axR)o<WM)JVtobhlDIuG~;
zG1yX3OC*h$A?)!5TSPHPr9M)NJAoevR79Ev`E;fL^m~$x9jTeb3GJuR29U%dyWul`
z0mpC)4C9FB<C^gpP$X+HOVPOOU{3-WvPYF%MC=g+Gjb^g$>TY@_JcPU(Q3`ZC)K40
z^XURu$pap*o)}MAHYzp(k7k+=BQ@1T#B#0*pNlA7M=?^B{PWLZ?$7X3K4-`#{XoGn
z_mkO@#|Y8D%d^e>2B3qlp6p5XdV|E*pZk#{Gvy(Bhj?y=Z-DUy4}8oo^!YwJk0iVp
zBmf7r-y(@F0x5R4!C!Md2#(MNkbM>_w7_WIW9Epj@y#ZQ0<l@imKh5{O%7n#1LcpK
z5Cil^M|;^k^LK+IyhG%izaIAxY%57uxtzn~qAZ}J@jTDm*>k<$B(D(_j6I})9_&V~
zaiXTcigu}OdMQvl9(Mb^?x4OO?bE8}wy|x}Uc<$t!wQpjj;ggxeiA6uJYODYH3=Oa
zs<4`*|CTFpc`Xx0ZO0v04g2k5RfE&@a>ZLrKM?CWU2dOb47MxWMy$su)gX)@!n*}S
z>O8B1BPa^lCT3^pJxkKqpR+044zLe-Zm4SuU2RJ8c<iY_x!xYMXm<ub+wSNz*TFfM
z*w#3ACD~P@NUi2G;{lTRzAL{brpVSK)86Qm$c0g_g3-<n6c{D1SRRx~3yib&K$YOT
zC3zmfUppB>Op%)*bU>CRqQ=pBRi+m%KDKD3E+0hjR98v->?6z+0YasAiX;e!bd~oG
z5qTLE*;rbzXui8p8MG+f%4Q=(4gA_b@rw^+L~Bk}ne1^FF+p7(OC{<DLd8REPOG7y
z1-owPfPGl4gzW4xe?^rPb?rLaD{am^O4X7?O9F|45|VmXfl~)^RkXH=WP0O5^0S<^
zmdi9(ctI<)Epo62C79Oy;;(YC&d;*&S8<Qy<F2f_Xfga*R{t2mEGp_P)NZMcTFRtd
zxr<xX>}h8YjTATKi{^ZSd?%a5!vFJh8Y3mo|1K6-e_**aQ?Yt*`&y2FOvQ#s7DjSi
zH(yA6NzqCbwDpWC_6t=()coZNNxju}RRw837t2@{xk8k&w8jDttJrxAFi`{7{;;AE
zTFR<eMt9$^zMZXDUXuY&j2Dy{W{64OShB6f-X+^DMxPfv4%j93i!>K+6q!(L)V7d9
zueK&QK=)9=L6W0G><Z|5`c=?rKQ9$=j#Sb{%hjM~tc{W(*fMMKN{`6JkYZm4dil|M
z+6PpBRfXZ_S7}D0UZLUK3?gl`sEk_ylO?~pr30>E)i&=O=$r-q3}squu&Il6ZbbYY
z73sDjZx8#2WS~QI*hZ_~9NJ)MA`Z0LT*!SbJ<m4=)f-nDiMaKz2}Hvd>)D^=y3FhC
z*6~ocfKeo|u_aB^A-a)5Nwv{(w?o#3EylQ)L2df+QOJF0EpFo&_tZ|bGUu;27Kb-?
zIu^reXyXPRS!R$DX%>LwL$2q%W5|{r(ay}lT2y?r%g%k&&PMl>A7FneyON8aa!=&5
zuIeLpTefF)u_lA)aJL<Rls7L$4qjF#CtR^PZDFrVP!8;|&7w8zKXR-f3WklIHMpP6
z`KmqKj{!P1;}AS7`$SEb4HX6cdN$jvd5VqF8VgXGi)0r2*q9K7r?(=-QZka_5R35G
z1w-HI<Vlg#VA2lWiu+g?TVl<K-y55W6D5DXNqn`ZG3$JVRq96lTe47QC=Ow$me+Sq
zOn((}S^pJxW+A&DyVhW}v#uIQBQ??n3+>EsTl2_)V2j%1*f0GPYGlVKyu-c_lq_YU
zxHuflOGfMvN{fBj+B8+Xp~I0`BHbkYsTR?9mgvv?UU`jYJxaSPMn{ljY3$2r-C~9-
zMl}tOd-J+t`Ho4isT@RbDqHO|OC5?+t?Ta`0-UKWP-+`djUQ^2Tb_sN5VVINU~x+u
z4m@|LPNUc?@6F-$h-%rrnJjDM5?V}OKFcjeEMIPV9nQchI5#M^%bBdeObn$Z2M*2{
zE{K%EEf>^?Wz`bK&NlBAD?Z}^;B&6hIFb%iur&u9_NK*@10cQ5&ggMj_I972X%(qz
z-o3LpUCtkC548M_#0^^x+p2|)$K_cgvw&zDMJuY%*g1q}*kV}mdLi-<p%)5-I&7+h
zUc`ghAejnA4VeX>wx|yHaKuxmNk5wJ!_B94<yCn&q~*2b(Fn&@v$Kw`TbHids~^+C
z?fo#ES$1AmuP;q?U?&5cT~}VbV|mD_JJ5<(l}jR+&y0cyv@NzY7Jfd<FHQ`qL!lpl
za^+AUdMp}c#|pnh`3cwOn$pyL8ZFXCxz+kIyhjedL*d|ZzL`}E6FBK=p560Co<6(h
zjU7OeS1zbtu2&F3z=uxye1E!siGPiX6h_!X`Dof38e3Pg3;mhH;tX3%FW%xv^;1pw
zdWB8**u~t=z7-som22IOoSd#!+WfTaa=EG50TT-Pwqf4c%Dn1<Cu~*5i7{f1Ae6K`
zu4M$z9U0gQ#f!0r4T>mUkodfLKc+<M0lBzQ722J-A>Cwc=+$aEJjM<Ud4!6@2o^}h
zc5KZI)9#HuV)q;eWnJ5?sEc^{99lLx$F%~E$(a(MlN5;#oCLWCfVeyRcv!|q>&Vre
zz<v^(mb%&`Sf1Zwe~TXF4ih|CMjKr5fm27(8kbJsv`-r0=>i9q{$3pX$(qDs7R7V4
zTd?;5pC|lJ81P01b`D!Cd17|i`6RV;USnfhl~zwK2V<{Iy-L&7bX!~v_eD8xvbuC%
z4sAcI+TNWjU~(ZQVV40%)KP=tdn`y`nWiOAh15dsSfYY!nORH3pG^}aI`XO*>4PT4
zO);56%6>knTS?yOts#&Xd4{cYS__mrafC1n=5QB--eo&k;TT-`hE!IK%RUrAEb(ZH
z7>K!4GsdD)qXdA8gN22Xj(m`YX`(O428FB$lz%|!()OjCg5&a*ou_Az!)-iS^5RBr
zKsz^(qrPuT<VK$6+wQ3oopH%u$Bc33P@@@B(KTj_t<R+tQD@OWR*vdq#Wp0yv`ByS
zIhAJmyiA-NFzEe~FEE};mjMHHS6iZh`z7SABqCE*K%j#mJa?!Ht$7<NLEW+Wf<%PI
z3(8Z9rLnF;Ul@@#eL>^uTD8N?DouotS|tN~W9HkT@5!w<&lW5Us2!rC3m$IKDV-d+
zXpWxpciYjceZ`KuASi7rJB|ryrF2h-%7`%^nrCcj1LbW|SaYKkEL|w&$*l}@AG;yi
z<whe11p0)I8v;We3=C)$acc~IR3h~$3-{<zr7bPDF?z&W<(n-f5^J+^qXDsp76+*(
zp%RH^hT*8Q=X7lJgL2K>!C2%&O)L!^zNxJA^qn!@5=}?<Fapi`uU9VWfwpB0(sPtd
z2nCBZ1X{eYtC@tQhHbPMhlHmT9?BqGp_jjKA=J<lm&DM$A-vQWZmW9oW*C%O^*}47
zR)e@Dy_6fMXd+COn~~~6We?>Nxxv7ZTNQv|j#g(zYDFj*GFkUrtDuV!+6uX?2rXn-
zjL_X+_!JyP(3wSeIP@eBBM}OqK`U0JwpXz+gid4Nnrp+jzt&*V;|g0&bv%YvVw+yQ
zR?=Rn6u2hTFrsqUIUQ`#Zt}lzL8;0?^ZQBjL@N8GQqU<`0K{pz6gjIpUm~yPK?+)2
zwt|aPaDB^dR$IYotE^>y1xiNl8QP@mM`>?OhZGbHIv2QSQ(ljQWrW6KB1N8@R{f`V
zlilm8FjPXV;4CB@s;xl0k<LP5cha%$uQ7h&UYvbgX>(TCicC#35ou2|BDYZ(ialI-
z6Nk$vSm~>hYCe?upMCf#!p(h~^&a+j1}jv|*e6*<n?4F$fK&6aRH%IDsBC;s_So+{
zS>jS!HP|ozs`*TcZT4ASW!q!F$`fHe4!x$hr|9L5W$cqtxZ+P(T$=B(vjAtFaHWzP
zCm9)JAL1&b)h5LCx9SR^yC<wBp?`L<#AUoopvJ=oti=P#TFjA;6vU=0+@y(%i?*H!
zDhUOR^Z)&~1}{`cibigBl(WPASh)CCF<)K)oPly(Lm!^7p#K%9@Ezs>6H}1LZbxb)
z2r!4mSHE4bbDRSbfq1GJrHZO@v59e+@Gfv8U@tm+<~FgKj<Ft8d<2zDIlGM#4$X+d
zX!Vl3A$QQ<`YQ<elCPjuTZ+4?wq;X)7vpNGFl{RDsE6tPA>AKQ{>I4FEH1Fo<i+8a
z47!S*_yLX#@Pn(!m(zC{1_V&F+gpw?Lz6IY*&~$v1vQ1=FTVdhisk{X?b^fj(?Rso
zcco!acCfJ-L}jDsaLQ-61ROCPt`IB#HakX*R$bJsY&(oFE>kOvd-hA2_G>UdiDxIB
z>!bZ|>w6sj!9{K-9e)LXc<^m4@Pw=xpLEp5Aof?>K>iPwpCV9Yel3@jHaL^fK5RrA
z(HL1&$ZidPmM%0TqdROwHyd-lozX!Sa+r}FG$V`BZH`2CxZ6P*>Y0)5HzIvjTnLD3
z<a81v4+evY8QUNW8Nps7f@G6F9p&VJ2*%_tioV0LelNtN_+1ph%aPb`bYQ4y6g6<2
X$k}i5sBUsl&_b`+iI87*fBNSCZhP-S

literal 5410
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
M0RuZnr)qxy06z+Et^fc4

diff --git a/src/DisplayModels.py b/src/DisplayModels.py
index d00d8f912..dcdd6196a 100644
--- a/src/DisplayModels.py
+++ b/src/DisplayModels.py
@@ -220,7 +220,6 @@ class ChildModel(gtk.ListStore):
     def column_birth_day(self,data):
         event_ref = data.get_birth_ref()
         if event_ref and event_ref.ref:
-            print event_ref.ref
             return self.db.get_event_from_handle(event_ref.ref).get_date()
         else:
             return u""
diff --git a/src/ListBox.py b/src/ListBox.py
index b9e9caa04..04ada147f 100644
--- a/src/ListBox.py
+++ b/src/ListBox.py
@@ -270,8 +270,18 @@ class EventListBox(ReorderListBox):
         ReorderListBox.__init__(self, parent, person, obj, label,
                                 button_list, evalues, DdTargets.EVENT)
 
+        self.name_map = {}
+        self.val_map = Utils.personal_events
+        self.custom = RelLib.Event.CUSTOM
+        for key in self.val_map.keys():
+            self.name_map[self.val_map[key]] = key
+
     def set_name(self,index,value):
-        self.data[index][1].set_name(value)
+        val = self.name_map.get(value,self.custom)
+        if val == self.custom:
+            self.data[index][1].set_type((val,value))
+        else:
+            self.data[index][1].set_type((val,self.val_map[val]))
         self.change_list.add(self.data[index])
 
     def set_description(self,index,value):
diff --git a/src/PedView.py b/src/PedView.py
index ca3da2cc1..87d8bd21c 100644
--- a/src/PedView.py
+++ b/src/PedView.py
@@ -46,6 +46,7 @@ import GrampsCfg
 import Relationship
 import NameDisplay
 import RelLib
+import Utils
 
 #-------------------------------------------------------------------------
 #
@@ -690,7 +691,9 @@ class PedigreeView:
             if event:
                 if line_count < 3:
                     return event.get_date()
-                text += _(event.get_name())
+                i,s = event.get_type()
+                name = Utils.family_relations[i]
+                text += name
                 text += "\n"
                 text += event.get_date()
                 text += "\n"
diff --git a/src/ReadXML.py b/src/ReadXML.py
index 44ea6645f..092273272 100644
--- a/src/ReadXML.py
+++ b/src/ReadXML.py
@@ -64,6 +64,14 @@ _FAMILY_TRANS = {
     'Other'       : RelLib.Family.CUSTOM,
     }
 
+_NAME_TRANS = {
+    "Unknown"       : RelLib.Name.UNKNOWN,
+    "Custom"        : RelLib.Name.CUSTOM,
+    "Also Known As" : RelLib.Name.AKA,
+    "Birth Name"    : RelLib.Name.BIRTH,
+    "Married Name"  : RelLib.Name.MARRIED,
+    }
+
 #-------------------------------------------------------------------------
 #
 # Importing data into the currently open database. 
@@ -893,7 +901,11 @@ class GrampsParser:
         if not self.in_witness:
             self.name = RelLib.Name()
             if attrs.has_key("type"):
-                self.name.set_type(attrs["type"])
+                tval = _NAME_TRANS[attrs['type']]
+                if tval == RelLib.Name.CUSTOM:
+                    self.name.set_type((tval,attrs["type"]))
+                else:
+                    self.name.set_type((tval,Utils.name_types[tval]))
             if attrs.has_key("sort"):
                 self.name.set_sort_as(int(attrs["sort"]))
             if attrs.has_key("display"):
@@ -1242,7 +1254,6 @@ class GrampsParser:
                 self.person.set_death_ref(ref)
             else:
                 self.person.add_event_ref(ref)
-            print self.event.get_date()
         self.db.commit_event(self.event,self.trans,self.change)
         self.event = None
 
@@ -1254,6 +1265,7 @@ class GrampsParser:
             self.name.set_type("Birth Name")
         self.person.set_primary_name (self.name)
         self.person.get_primary_name().build_sort_name()
+        print "*",self.person.primary_name.get_name()
         self.name = None
 
     def stop_ref(self,tag):
@@ -1293,6 +1305,7 @@ class GrampsParser:
 
     def stop_person(self,*tag):
         self.db.commit_person(self.person,self.trans,self.change)
+        print self.person.handle,self.person.primary_name.get_name()
         self.person = None
         while gtk.events_pending():
             gtk.main_iteration()
diff --git a/src/RelLib.py b/src/RelLib.py
index 3e26c426c..e130419d8 100644
--- a/src/RelLib.py
+++ b/src/RelLib.py
@@ -2369,6 +2369,7 @@ class Event(PrimaryObject,PrivateSourceNote,MediaBase,DateBase,PlaceBase):
         @param the_type: Type to assign to the Event
         @type the_type: tuple
         """
+        assert type(the_type) == tuple
         self.type = the_type
 
     def get_type(self):
@@ -3535,6 +3536,7 @@ class Attribute(PrivateSourceNote):
 
     def set_type(self,val):
         """sets the type (or key) of the Attribute instance"""
+        assert type(the_type) == tuple
         self.type = val
 
     def get_type(self):
@@ -3801,9 +3803,10 @@ class Name(PrivateSourceNote,DateBase):
         """
         self.prefix = val
 
-    def set_type(self,type):
+    def set_type(self,the_type):
         """sets the type of the Name instance"""
-        self.type = type
+        assert type(the_type) == tuple
+        self.type = the_type
 
     def get_type(self):
         """returns the type of the Name instance"""