svn: r8622
This commit is contained in:
Alex Roitman
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# Gramps - a GTK+/GNOME based genealogy program
|
||||
#
|
||||
# Copyright (C) 2004-2006 Donald N. Allingham
|
||||
# Copyright (C) 2004-2007 Donald N. Allingham
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -38,6 +38,7 @@ import re
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
from RelLib import Name
|
||||
from Errors import NameDisplayError
|
||||
|
||||
try:
|
||||
import Config
|
||||
@@ -243,19 +244,19 @@ class NameDisplay:
|
||||
|
||||
|
||||
def _gen_raw_func(self, format_str):
|
||||
"""The job of building the name from a format string is rather
|
||||
expensive and it is called lots and lots of times. So it is worth
|
||||
going to some length to optimise it as much as possible.
|
||||
"""The job of building the name from a format string is rather
|
||||
expensive and it is called lots and lots of times. So it is worth
|
||||
going to some length to optimise it as much as possible.
|
||||
|
||||
This method constructs a new function that is specifically written
|
||||
to format a name given a particualar format string. This is worthwhile
|
||||
because the format string itself rarely changes, so by caching the new
|
||||
function and calling it directly when asked to format a name to the
|
||||
same format string again we can be as quick as possible.
|
||||
This method constructs a new function that is specifically written
|
||||
to format a name given a particualar format string. This is worthwhile
|
||||
because the format string itself rarely changes, so by caching the new
|
||||
function and calling it directly when asked to format a name to the
|
||||
same format string again we can be as quick as possible.
|
||||
|
||||
The new function is of the form:
|
||||
The new function is of the form:
|
||||
|
||||
def fn(raw_data):
|
||||
def fn(raw_data):
|
||||
return "%s %s %s %s %s" % (raw_data[_TITLE],
|
||||
raw_data[_FIRSTNAME],
|
||||
raw_data[_PREFIX],
|
||||
@@ -264,15 +265,15 @@ class NameDisplay:
|
||||
|
||||
"""
|
||||
|
||||
# we need the names of each of the variables or methods that are
|
||||
# called to fill in each format flag.
|
||||
# we need the names of each of the variables or methods that are
|
||||
# called to fill in each format flag.
|
||||
d = {"%t":"raw_data[_TITLE]",
|
||||
"%f":"raw_data[_FIRSTNAME]",
|
||||
"%p":"raw_data[_PREFIX]",
|
||||
"%l":"raw_data[_SURNAME]",
|
||||
"%s":"raw_data[_SUFFIX]",
|
||||
"%y":"raw_data[_PATRONYM]",
|
||||
"%c":"raw_data[_CALL]",
|
||||
"%c":"raw_data[_CALL]",
|
||||
"%T":"raw_data[_TITLE].upper()",
|
||||
"%F":"raw_data[_FIRSTNAME].upper()",
|
||||
"%P":"raw_data[_PREFIX].upper()",
|
||||
@@ -284,8 +285,8 @@ class NameDisplay:
|
||||
|
||||
new_fmt = format_str
|
||||
|
||||
# replace the specific format string flags with a
|
||||
# flag that works in standard python format strings.
|
||||
# replace the specific format string flags with a
|
||||
# flag that works in standard python format strings.
|
||||
new_fmt = new_fmt.replace("%t","%s")
|
||||
new_fmt = new_fmt.replace("%f","%s")
|
||||
new_fmt = new_fmt.replace("%p","%s")
|
||||
@@ -303,10 +304,10 @@ class NameDisplay:
|
||||
new_fmt = new_fmt.replace("%C","%s")
|
||||
new_fmt = new_fmt.replace("%%",'%')
|
||||
|
||||
# find each format flag in the original format string
|
||||
# for each one we find the variable name that is needed to
|
||||
# replace it and add this to a list. This list will be used
|
||||
# generate the replacement tuple.
|
||||
# find each format flag in the original format string
|
||||
# for each one we find the variable name that is needed to
|
||||
# replace it and add this to a list. This list will be used
|
||||
# generate the replacement tuple.
|
||||
pat = re.compile("%.")
|
||||
|
||||
param = ()
|
||||
@@ -317,37 +318,37 @@ class NameDisplay:
|
||||
|
||||
s = 'def fn(raw_data):\n'\
|
||||
' return "%s" %% (%s)' % (new_fmt,",".join(param))
|
||||
exec(s)
|
||||
exec(s)
|
||||
|
||||
return fn
|
||||
|
||||
def _gen_cooked_func(self, format_str):
|
||||
"""The job of building the name from a format string is rather
|
||||
expensive and it is called lots and lots of times. So it is worth
|
||||
going to some length to optimise it as much as possible.
|
||||
"""The job of building the name from a format string is rather
|
||||
expensive and it is called lots and lots of times. So it is worth
|
||||
going to some length to optimise it as much as possible.
|
||||
|
||||
This method constructs a new function that is specifically written
|
||||
to format a name given a particualar format string. This is worthwhile
|
||||
because the format string itself rarely changes, so by caching the new
|
||||
function and calling it directly when asked to format a name to the
|
||||
same format string again we can be as quick as possible.
|
||||
This method constructs a new function that is specifically written
|
||||
to format a name given a particualar format string. This is worthwhile
|
||||
because the format string itself rarely changes, so by caching the new
|
||||
function and calling it directly when asked to format a name to the
|
||||
same format string again we can be as quick as possible.
|
||||
|
||||
The new function is of the form:
|
||||
The new function is of the form:
|
||||
|
||||
def fn(first,surname,prefix,suffix,patronymic,title,call,):
|
||||
def fn(first,surname,prefix,suffix,patronymic,title,call,):
|
||||
return "%s %s %s %s %s" % (first,surname,prefix,suffix,patronymic)
|
||||
|
||||
"""
|
||||
|
||||
# we need the names of each of the variables or methods that are
|
||||
# called to fill in each format flag.
|
||||
# we need the names of each of the variables or methods that are
|
||||
# called to fill in each format flag.
|
||||
d = {"%t":"title",
|
||||
"%f":"first",
|
||||
"%p":"prefix",
|
||||
"%l":"surname",
|
||||
"%s":"suffix",
|
||||
"%y":"patronymic",
|
||||
"%c":"call",
|
||||
"%c":"call",
|
||||
"%T":"title.upper()",
|
||||
"%F":"first.upper()",
|
||||
"%P":"prefix.upper()",
|
||||
@@ -360,8 +361,8 @@ class NameDisplay:
|
||||
|
||||
new_fmt = format_str
|
||||
|
||||
# replace the specific format string flags with a
|
||||
# flag that works in standard python format strings.
|
||||
# replace the specific format string flags with a
|
||||
# flag that works in standard python format strings.
|
||||
new_fmt = new_fmt.replace("%t","%s")
|
||||
new_fmt = new_fmt.replace("%f","%s")
|
||||
new_fmt = new_fmt.replace("%p","%s")
|
||||
@@ -379,11 +380,11 @@ class NameDisplay:
|
||||
new_fmt = new_fmt.replace("%C","%s")
|
||||
new_fmt = new_fmt.replace("%%",'%')
|
||||
|
||||
# find each format flag in the original format string
|
||||
# for each one we find the variable name that is needed to
|
||||
# replace it and add this to a list. This list will be used
|
||||
# generate the replacement tuple.
|
||||
pat = re.compile("%.")
|
||||
# find each format flag in the original format string
|
||||
# for each one we find the variable name that is needed to
|
||||
# replace it and add this to a list. This list will be used
|
||||
# generate the replacement tuple.
|
||||
pat = re.compile('|'.join(d.keys()))
|
||||
|
||||
param = ()
|
||||
mat = pat.search(format_str)
|
||||
@@ -393,7 +394,7 @@ class NameDisplay:
|
||||
|
||||
s = 'def fn(first,surname,prefix,suffix,patronymic,title,call,):\n'\
|
||||
' return "%s" %% (%s)' % (new_fmt,",".join(param))
|
||||
exec(s)
|
||||
exec(s)
|
||||
|
||||
return fn
|
||||
|
||||
@@ -403,19 +404,19 @@ class NameDisplay:
|
||||
name.call,format_str)
|
||||
|
||||
def format_str_raw(self,raw_data,format_str):
|
||||
"""
|
||||
Format a name from the raw name list. To make this as fast as possible
|
||||
this uses _gen_raw_func to generate a new method for each new format_string.
|
||||
|
||||
Is does not call _format_str_base because it would introduce an extra
|
||||
method call and we need all the speed we can squeeze out of this.
|
||||
"""
|
||||
"""
|
||||
Format a name from the raw name list. To make this as fast as possible
|
||||
this uses _gen_raw_func to generate a new method for each new format_string.
|
||||
|
||||
Is does not call _format_str_base because it would introduce an extra
|
||||
method call and we need all the speed we can squeeze out of this.
|
||||
"""
|
||||
func = self.__class__.raw_format_funcs.get(format_str)
|
||||
if func == None:
|
||||
func = self._gen_raw_func(format_str)
|
||||
self.__class__.raw_format_funcs[format_str] = func
|
||||
|
||||
s = func(raw_data)
|
||||
s = func(raw_data)
|
||||
return ' '.join(s.split())
|
||||
|
||||
|
||||
@@ -443,10 +444,14 @@ class NameDisplay:
|
||||
func = self._gen_cooked_func(format_str)
|
||||
self.__class__.format_funcs[format_str] = func
|
||||
|
||||
s = func(first,surname,prefix,suffix,patronymic,title,call)
|
||||
try:
|
||||
s = func(first,surname,prefix,suffix,patronymic,title,call)
|
||||
except (ValueError,TypeError,):
|
||||
raise NameDisplayError, "Incomplete format string"
|
||||
|
||||
return ' '.join(s.split())
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
def sort_string(self,name):
|
||||
return u"%-25s%-30s%s" % (name.surname,name.first_name,name.suffix)
|
||||
|
||||
Reference in New Issue
Block a user