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

Allow for ID values to be strings

Browse Source 
svn: r243
This commit is contained in:
Don Allingham
2001-07-13 04:32:59 +00:00
parent f57adb09df
commit 6267eb4fc9
11 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/GraphViz.py
View File

@@ -213,12 +213,10 @@ def dump_person(person_list,file):
continue
father = family.getFather()
if father and father in person_list:
file.write('p' + str(person.getId()) + ' -> p')
file.write(str(father.getId()) + ';\n')
file.write('p%s -> p%s;\n' % (person.getId(), father.getId()))
mother = family.getMother()
if mother and mother in person_list:
file.write('p' + str(person.getId()) + ' -> p')
file.write(str(mother.getId()) + ';\n')
file.write('p%s -> p%s;\n' % (person.getId(), mother.getId()))
#########################################################################
#
@@ -231,9 +229,8 @@ def dump_index(person_list,file):
for person in person_list:
name = person.getPrimaryName().getName()
id = person.getId()
# file.write('p' + str(id) + ' [shape=box, fontsize=11, ')
file.write('p' + str(id) + ' [shape=box, ')
file.write('fontname="Arial", label="' + name + '"];\n')
file.write('p%s [shape=box, ' % id)
file.write('fontname="Arial", label="%s"];\n' % name)
#------------------------------------------------------------------------
#

6
src/plugins/HtmlReport.py
View File

@@ -369,7 +369,7 @@ def name_or_link(individual, prefix):
name = individual.getPrimaryName().getRegularName()
if individual in ind_list:
id = individual.getId()
return "<A HREF=\"" + prefix + str(id) + ".html\">" + name + "</A>"
return "<A HREF=\"" + prefix + id + ".html\">" + name + "</A>"
else:
return name
@@ -392,7 +392,7 @@ def write_reference(html, parent, prefix):
def dump_person(person,prefix,templateTop,templateBottom,targetDir):
filebase = "%s%d.html" % (prefix,person.getId())
filebase = "%s%s.html" % (prefix,person.getId())
html = open(targetDir + os.sep + filebase,"w")
name = person.getPrimaryName().getRegularName()
@@ -539,7 +539,7 @@ def dump_index(person_list,filename,prefix,templateTop,templateBottom,targetDir)
for person in person_list:
name = person.getPrimaryName().getName()
id = person.getId()
html.write("<A HREF=\"%s%d.html\">%s</A><BR>\n" % (prefix,id,name))
html.write("<A HREF=\"%s%s.html\">%s</A><BR>\n" % (prefix,id,name))
for line in templateBottom:
html.write(line)

8
src/plugins/Merge.py
View File

@@ -538,8 +538,8 @@ class Merge:
else:
mother2 = ""
label1 = "%s (%s)" % (_("First Person"),str(person1.getId()))
label2 = "%s (%s)" % (_("Second Person"),str(person2.getId()))
label1 = "%s (%s)" % (_("First Person"),person1.getId())
label2 = "%s (%s)" % (_("Second Person"),person2.getId())
self.topDialog.get_widget("PersonFrame1").set_label(label1)
self.topDialog.get_widget("PersonFrame2").set_label(label2)
@@ -613,7 +613,7 @@ class Merge:
name = "unknown"
else:
name = spouse.getPrimaryName().getName() + \
" (" + str(spouse.getId()) + ")"
" (" + spouse.getId() + ")"
self.topDialog.get_widget("spouse1").append([name])
length = min(len(p2list),3)
@@ -631,7 +631,7 @@ class Merge:
name = "unknown"
else:
name = spouse.getPrimaryName().getName() + \
" (" + str(spouse.getId()) + ")"
" (" + spouse.getId() + ")"
self.topDialog.get_widget("spouse2").append([name])
self.mergee = person1

11
src/plugins/WebPage.py
View File

@@ -177,7 +177,7 @@ class IndividualPage:
self.doc.start_paragraph("Data")
if person:
if person in self.list:
self.doc.start_link("i%s.html" % str(person.getId()))
self.doc.start_link("i%s.html" % person.getId())
self.doc.write_text(person.getPrimaryName().getRegularName())
if person in self.list:
self.doc.end_link()
@@ -215,7 +215,7 @@ class IndividualPage:
#
#--------------------------------------------------------------------
def create_page(self):
filebase = "i%d.html" % (self.person.getId())
filebase = "i%s.html" % self.person.getId()
self.doc.open("%s%s%s" % (self.dir,os.sep,filebase))
photo_list = self.person.getPhotoList()
@@ -378,7 +378,7 @@ class IndividualPage:
self.doc.start_cell("NormalCell",2)
self.doc.start_paragraph("Spouse")
if spouse:
self.doc.start_link("i%s.html" % str(spouse.getId()))
self.doc.start_link("i%s.html" % spouse.getId())
self.doc.write_text(spouse.getPrimaryName().getRegularName())
self.doc.end_link()
else:
@@ -410,7 +410,7 @@ class IndividualPage:
first = 0
else:
self.doc.write_text('\n')
self.doc.start_link("i%s.html" % str(child.getId()))
self.doc.start_link("i%s.html" % child.getId())
self.doc.write_text(child.getPrimaryName().getRegularName())
self.doc.end_link()
self.doc.end_paragraph()
@@ -760,8 +760,7 @@ def dump_index(person_list,styles,template,html_dir):
person_list.sort(sort.by_last_name)
for person in person_list:
name = person.getPrimaryName().getName()
id = person.getId()
doc.start_link("i%s.html" % str(person.getId()))
doc.start_link("i%s.html" % person.getId())
doc.write_text(name)
doc.end_link()
doc.newline()

8
src/plugins/WriteGedcom.py
View File

@@ -333,7 +333,7 @@ def write_person_name(g,name,nick):
def write_source_ref(g,level,ref):
if ref.getBase() == None:
return
g.write("%d SOUR @S%s@\n" % (level,str(ref.getBase().getId())))
g.write("%d SOUR @S%s@\n" % (level,ref.getBase().getId()))
if ref.getPage() != "":
g.write("%d PAGE %s\n" % (level+1,ref.getPage()))
if ref.getText() != "" or ref.getDate().getDate() != "":
@@ -425,11 +425,11 @@ def write_person(g,person):
family = person.getMainFamily()
if family != None and family in family_list:
g.write("1 FAMC @F%s@\n" % str(family.getId()))
g.write("1 FAMC @F%s@\n" % family.getId())
g.write("2 PEDI birth\n")
for family in person.getAltFamilyList():
g.write("1 FAMC @F%s@\n" % str(family[0].getId()))
g.write("1 FAMC @F%s@\n" % family[0].getId())
if string.lower(family[1]) == "adopted":
g.write("2 PEDI adopted\n")
@@ -537,7 +537,7 @@ def exportData(database, filename):
g.write("1 CHIL @I%s@\n" % person.getId())
for source in source_list:
g.write("0 @S%s@ SOUR\n" % str(source.getId()))
g.write("0 @S%s@ SOUR\n" % source.getId())
if source.getTitle() != "":
g.write("1 TITL %s\n" % cnvtxt(source.getTitle()))
if source.getAuthor() != "":