Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn: r6703

Browse Source
This commit is contained in:
Don Allingham
2006-05-18 03:14:55 +00:00
parent 4623e525dd
commit 8e2c9ee3b8
17 changed files with 36 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gramps2/src/GrampsDb/_DbUtils.py
View File

@@ -20,6 +20,7 @@
# $Id: __init__.py 6086 2006-03-06 03:54:58Z dallingham $
from gettext import gettext as _
import RelLib
from BasicUtils import UpdateCallback

2
gramps2/src/GrampsDb/_GrampsDbBase.py
View File

@@ -1721,7 +1721,7 @@ class GrampsDbBase(GrampsDBCallback):
"""
returns True if the handle exists in the current Repository database.
"""
return self.repository_map.has_key(str(handle)) != False
return self.repository_map.has_key(str(handle))
def _sortbyname(self, first, second):
name1 = self.person_map.get(str(first))[3].sname

33
gramps2/src/GrampsDb/_ReadGedcom.py
View File

@@ -669,7 +669,7 @@ class GedcomParser(UpdateCallback):
return (0,tries)
def get_next(self):
if self.backoff == False:
if not self.backoff:
self.groups = self.lexer.read()
self.update()
@@ -707,7 +707,6 @@ class GedcomParser(UpdateCallback):
self.trans = self.db.transaction_begin("",not use_trans,no_magic)
self.db.disable_signals()
t = time.time()
self.fam_count = 0
self.indi_count = 0
self.repo_count = 0
@@ -731,9 +730,6 @@ class GedcomParser(UpdateCallback):
src.set_note(note)
self.db.add_source(src,self.trans)
t = time.time() - t
msg = _('Import Complete: %d seconds') % t
self.db.transaction_commit(self.trans,_("GEDCOM import"))
self.db.enable_signals()
self.db.request_rebuild()
@@ -1513,12 +1509,12 @@ class GedcomParser(UpdateCallback):
else:
note = "\n%s" % info
elif matches[1] in (TOKEN__GODP, TOKEN__WITN, TOKEN__WTN):
if matches[2][0] == "@":
witness_handle = self.find_person_handle(self.map_gid(matches[2][1:-1]))
witness = RelLib.Witness(RelLib.Event.ID,witness_handle)
else:
witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
event.add_witness(witness)
# if matches[2][0] == "@":
# witness_handle = self.find_person_handle(self.map_gid(matches[2][1:-1]))
# witness = RelLib.Witness(RelLib.Event.ID,witness_handle)
# else:
# witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
# event.add_witness(witness)
self.ignore_sub_junk(level+1)
elif matches[1] in (TOKEN_RELI, TOKEN_TIME, TOKEN_ADDR,TOKEN_IGNORE,
TOKEN_STAT,TOKEN_TEMP,TOKEN_OBJE):
@@ -1674,12 +1670,13 @@ class GedcomParser(UpdateCallback):
elif matches[1] == TOKEN_NOTE:
note = self.parse_note(matches,event,level+1,note)
elif matches[1] in (TOKEN__WITN, TOKEN__WTN):
if matches[2][0] == "@":
witness_handle = self.find_person_handle(self.map_gid(matches[2][1:-1]))
witness = RelLib.Witness(RelLib.Event.ID,witness_handle)
else:
witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
event.add_witness(witness)
pass
# if matches[2][0] == "@":
# witness_handle = self.find_person_handle(self.map_gid(matches[2][1:-1]))
# witness = RelLib.Witness(RelLib.Event.ID,witness_handle)
# else:
# witness = RelLib.Witness(RelLib.Event.NAME,matches[2])
# event.add_witness(witness)
self.ignore_sub_junk(level+1)
else:
self.barf(level+1)
@@ -2237,7 +2234,7 @@ class GedcomParser(UpdateCallback):
if int(the_type) == RelLib.EventType.CUSTOM \
and str(the_type) in self.attrs:
attr = RelLib.Attribute()
attr.set_type((RelLib.EventType.CUSTOM,self.gedattr[n]))
attr.set_type((RelLib.EventType.CUSTOM,self.gedattr[matches[2]]))
attr.set_value(event.get_description())
state.person.add_attribute(attr)
else:

9
gramps2/src/GrampsDb/_WriteGedcom.py
View File

@@ -736,7 +736,6 @@ class GedcomWriter(UpdateCallback):
event = self.db.get_event_from_handle(event_handle)
if not event or self.private and event.get_privacy():
continue
index = int(event.get_type())
val = event.get_type().xml_str()
if val == "":
val = self.target_ged.gramps2tag(name)
@@ -807,7 +806,7 @@ class GedcomWriter(UpdateCallback):
if self.adopt == GedcomInfo.ADOPT_LEGACY:
if family.get_handle() in \
person.get_parent_family_handle_list():
self.writeln('2 _STAT %s' % f[2])
self.writeln('2 _STAT %s' % child_ref.mrel.xml_str())
for srcref in family.get_source_references():
self.write_source_ref(1,srcref)
@@ -932,10 +931,9 @@ class GedcomWriter(UpdateCallback):
event = self.db.get_event_from_handle(event_ref.ref)
if self.private and event.get_privacy():
continue
index = int(event.get_type())
val = event.get_type().xml_str()
if val == "":
val = self.target_ged.gramps2tag(index)
val = self.target_ged.gramps2tag(int(event.get_type()))
if self.adopt == GedcomInfo.ADOPT_EVENT and val == "ADOP":
ad = 1
@@ -983,7 +981,7 @@ class GedcomWriter(UpdateCallback):
# needed on how to handle this
if event.get_description() != "":
self.writeln("1 EVEN %s" %
self.snvtxt(event.get_description()))
self.cnvtxt(event.get_description()))
else:
self.writeln("1 EVEN")
self.writeln("2 TYPE %s" % self.cnvtxt(val))
@@ -1384,7 +1382,6 @@ class GedcomWriter(UpdateCallback):
if form:
self.writeln('%d FORM %s' % (level+1, form) )
self.writeln('%d TITL %s' % (level+1, photo_obj.get_description()))
dirname = os.path.join (self.dirname, self.images_path)
basename = os.path.basename (path)
self.writeln('%d FILE %s' % (level+1,os.path.join(self.images_path,
basename)))