diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 5e1436dd4..957f414d2 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-07-26 Martin Hawlisch + * src/NavWebPage.py: Catch missing header/footer notes; Add Surname + page that is sorted by the number of persons. + 2005-07-25 Alexander Roitman * src/gramps.glade (editPerson,marriageEditor): Use Title for the source titles. diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index de516155a..592769b8e 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -213,9 +213,10 @@ class BasePage: of.write('


\n') if self.footer != u"": obj = db.get_object_from_handle(self.footer) - of.write('
\n') - of.write(obj.get_note()) - of.write('
\n') + if obj: + of.write('
\n') + of.write(obj.get_note()) + of.write('
\n') of.write('\n') of.write('\n') @@ -247,9 +248,10 @@ class BasePage: of.write('\n') if self.header != u"": obj = db.get_object_from_handle(self.header) - of.write('
\n') - of.write(obj.get_note()) - of.write('
\n') + if obj: + of.write('
\n') + of.write(obj.get_note()) + of.write('
\n') of.write('
\n') format = locale.nl_langinfo(locale.D_FMT) @@ -768,15 +770,22 @@ class MediaPage(BasePage): # #------------------------------------------------------------------------ class SurnameListPage(BasePage): - + ORDER_BY_NAME = 0 + ORDER_BY_COUNT = 1 def __init__(self, db, title, person_handle_list, options, archive, - media_list, levels): + media_list, levels, order_by=ORDER_BY_NAME): BasePage.__init__(self, title, options, archive, media_list, levels) - of = self.create_file("surnames") - self.display_header(of,db,_('Surnames'), + if order_by == self.ORDER_BY_NAME: + of = self.create_file("surnames") + self.display_header(of,db,_('Surnames'), get_researcher().get_name()) + of.write('

%s

\n' % _('Surnames')) + else: + of = self.create_file("surnames_count") + self.display_header(of,db,_('Surnames by person count'), + get_researcher().get_name()) + of.write('

%s

\n' % _('Surnames by person count')) - of.write('

%s

\n' % _('Surnames')) of.write('

%s

\n' % _( 'This page contains an index of all the ' 'surnames in the database. Selecting a link ' @@ -789,12 +798,22 @@ class SurnameListPage(BasePage): of.write('') of.write('%s\n' % _('Letter')) of.write('') - of.write('%s\n' % _('Surname')) + of.write('%s\n' % ("surnames", self.ext, _('Surname'))) of.write('') - of.write('%s\n' % _('Number of people')) + of.write('%s\n' % ("surnames_count", self.ext, _('Number of people'))) of.write('\n') person_handle_list = sort_people(db,person_handle_list) + if order_by == self.ORDER_BY_COUNT: + temp_list = {} + for (surname,data_list) in person_handle_list: + temp_list["%90d_%s" % (999999999-len(data_list),surname)] = (surname,data_list) + temp_keys = temp_list.keys() + temp_keys.sort() + person_handle_list = [] + for key in temp_keys: + person_handle_list.append(temp_list[key]) + last_letter = '' last_surname = '' @@ -1768,7 +1787,10 @@ class WebReport(Report.Report): levels) SurnameListPage(self.database, self.title, ind_list, self.options_class, archive, photo_list, - levels) + levels, SurnameListPage.ORDER_BY_NAME) + SurnameListPage(self.database, self.title, ind_list, + self.options_class, archive, photo_list, + levels, SurnameListPage.ORDER_BY_COUNT) self.progress_bar_step() while gtk.events_pending(): gtk.main_iteration()