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

* src/plugins/NavWebPage.py: Avoid some segfaults

Browse Source 
svn: r4936
This commit is contained in:
Martin Hawlisch 2005-07-15 05:32:31 +00:00
parent 0116f4040d
commit c31363c02b
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2005-07-15 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/plugins/NavWebPage.py: Avoid some segfaults
2005-07-14 Don Allingham <don@gramps-project.org> 2005-07-14 Don Allingham <don@gramps-project.org>
* src/plugins/NavWebPage.py: gallery/media object enhancements, div/span fixes * src/plugins/NavWebPage.py: gallery/media object enhancements, div/span fixes
in HTML, source and place references, individual source pges. in HTML, source and place references, individual source pges.

84
gramps2/src/plugins/NavWebPage.py
View File

@ -205,15 +205,16 @@ class BasePage:
photo_handle = photolist[0].get_reference_handle() photo_handle = photolist[0].get_reference_handle()
photo = db.get_object_from_handle(photo_handle) photo = db.get_object_from_handle(photo_handle)
try: if photo.get_mime_type():
newpath = self.copy_media(photo) try:
of.write('<div class="snapshot">\n') newpath = self.copy_media(photo)
of.write('<a href="%s.%s">' % (photo_handle,self.ext)) of.write('<div class="snapshot">\n')
of.write('<img class="thumbnail" border="0" src="%s" ' % newpath) of.write('<a href="%s.%s">' % (photo_handle,self.ext))
of.write('height="100"></a>') of.write('<img class="thumbnail" border="0" src="%s" ' % newpath)
of.write('</div>\n') of.write('height="100"></a>')
except (IOError,OSError),msg: of.write('</div>\n')
ErrorDialog(str(msg)) except (IOError,OSError),msg:
ErrorDialog(str(msg))
def display_note_object(self,of,noteobj=None): def display_note_object(self,of,noteobj=None):
if not noteobj: if not noteobj:
@ -806,22 +807,23 @@ class ContactPage(BasePage):
of.write('<h3>%s</h3>\n' % _('Contact')) of.write('<h3>%s</h3>\n' % _('Contact'))
note_id = options.handler.options_dict['NWEBcontact'] note_id = options.handler.options_dict['NWEBcontact']
if note_id:
obj = db.get_object_from_handle(note_id) obj = db.get_object_from_handle(note_id)
mime_type = obj.get_mime_type() if obj:
mime_type = obj.get_mime_type()
if mime_type and mime_type.startswith("image"):
try: if mime_type and mime_type.startswith("image"):
newpath = self.copy_media(obj) try:
of.write('<div class="rightwrap">\n') newpath = self.copy_media(obj)
of.write('<table cellspacing="0" cellpadding="0" border="0"><tr>') of.write('<div class="rightwrap">\n')
of.write('<td height="205">') of.write('<table cellspacing="0" cellpadding="0" border="0"><tr>')
of.write('<img border="0" height="200" ') of.write('<td height="205">')
of.write('src="%s.%s" />' % (note_id,self.ext)) of.write('<img border="0" height="200" ')
of.write('</td></tr></table>\n') of.write('src="%s.%s" />' % (note_id,self.ext))
of.write('</div>\n') of.write('</td></tr></table>\n')
except (IOError,OSError),msg: of.write('</div>\n')
ErrorDialog(str(msg)) except (IOError,OSError),msg:
ErrorDialog(str(msg))
r = db.get_researcher() r = db.get_researcher()
@ -833,16 +835,19 @@ class ContactPage(BasePage):
of.write('%s<br>\n' % r.email) of.write('%s<br>\n' % r.email)
of.write('</blockquote>\n') of.write('</blockquote>\n')
nobj = obj.get_note_object() if obj:
if nobj: nobj = obj.get_note_object()
format = nobj.get_format() if nobj:
text = nobj.get() format = nobj.get_format()
text = nobj.get()
if format:
text = u"<pre>" + u"<br>".join(text.split("\n")) if format:
text = u"<pre>" + u"<br>".join(text.split("\n"))
else:
text = u"</p><p>".join(text.split("\n"))
of.write('<p>%s</p>\n' % text)
else: else:
text = u"</p><p>".join(text.split("\n")) of.write('<br><br><br><br>\n')
of.write('<p>%s</p>\n' % text)
else: else:
of.write('<br><br><br><br>\n') of.write('<br><br><br><br>\n')
@ -897,7 +902,13 @@ class IndividualPage(BasePage):
index = 1 index = 1
for sref in sreflist: for sref in sreflist:
self.src_list.add(sref.get_base_handle())
if self.src_list.has_key(sref.get_base_handle()):
if self.person.handle not in self.src_list[sref.get_base_handle()]:
self.src_list[sref.get_base_handle()].append(self.person.handle)
else:
self.src_list[sref.get_base_handle()] = [self.person.handle]
source = self.db.get_source_from_handle(sref.get_base_handle()) source = self.db.get_source_from_handle(sref.get_base_handle())
author = source.get_author() author = source.get_author()
@ -905,6 +916,7 @@ class IndividualPage(BasePage):
publisher = source.get_publication_info() publisher = source.get_publication_info()
date = _dd.display(sref.get_date_object()) date = _dd.display(sref.get_date_object())
of.write('<tr><td class="field">%d. ' % index) of.write('<tr><td class="field">%d. ' % index)
of.write('<a href="%s.%s">' % (source.handle,self.ext))
values = [] values = []
if author: if author:
values.append(author) values.append(author)
@ -915,7 +927,7 @@ class IndividualPage(BasePage):
if date: if date:
values.append(date) values.append(date)
of.write(', '.join(values)) of.write(', '.join(values))
of.write('</td></tr>\n') of.write('</a></td></tr>\n')
of.write('</table>\n') of.write('</table>\n')
def display_ind_pedigree(self,of): def display_ind_pedigree(self,of):