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

Display Handles properly

Browse Source 
svn: r23308
This commit is contained in:
Doug Blank 2013-10-11 17:23:42 +00:00
parent 716c14856a
commit aae377636d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gramps/gen/simple/_simpleaccess.py
View File

@ -29,6 +29,7 @@ from __future__ import with_statement, unicode_literals
from ..lib import (Person, Family, Event, Source, Place, Citation, from ..lib import (Person, Family, Event, Source, Place, Citation,
MediaObject, Repository, Note, Date, Tag) MediaObject, Repository, Note, Date, Tag)
from ..lib.handle import Handle
from ..datehandler import displayer from ..datehandler import displayer
from ..utils.string import gender as gender_map from ..utils.string import gender as gender_map
from ..utils.db import get_birth_or_fallback, get_death_or_fallback from ..utils.db import get_birth_or_fallback, get_death_or_fallback
@ -942,18 +943,21 @@ class SimpleAccess(object):
return "%s: [%s]" % (_(object_class), return "%s: [%s]" % (_(object_class),
obj.name) obj.name)
else: else:
return "Error: incorrect object class: '%s'" % type(obj) return "Error: incorrect object class in display: '%s'" % type(obj)
else: else:
return "Error: missing object" return "Error: missing object"
elif object_class == "Handle":
return "%s.handle [%s]" % (prop, value)
else: else:
return "Error: invalid object class: '%s'" % object_class return "Error: invalid object class in display: '%s'" % object_class
def describe(self, obj, prop=None, value=None): def describe(self, obj, prop=None, value=None):
""" """
Given a object, return a string describing the object. Given a object, return a string describing the object.
""" """
if prop and value: if prop and value:
obj = self.dbase.get_table_metadata(obj)[prop + "_func"](value) if self.dbase.get_table_metadata(obj):
obj = self.dbase.get_table_metadata(obj)[prop + "_func"](value)
if isinstance(obj, Person): if isinstance(obj, Person):
return "%s [%s]" % (self.name(obj), return "%s [%s]" % (self.name(obj),
self.gid(obj)) self.gid(obj))
@ -984,8 +988,10 @@ class SimpleAccess(object):
self.gid(obj)) self.gid(obj))
elif isinstance(obj, Tag): elif isinstance(obj, Tag):
return "[%s]" % (obj.name) return "[%s]" % (obj.name)
elif isinstance(obj, Handle):
return "%s.handle [%s]" % (prop, obj.handle)
else: else:
return "Error: incorrect object class: '%s'" % type(obj) return "Error: incorrect object class in describe: '%s'" % type(obj)
def get_link(self, object_class, prop, value): def get_link(self, object_class, prop, value):
""" """