From 2baffc68d22da6fbf5f1e4bd45225005869eb097 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 15 Feb 2004 03:48:45 +0000 Subject: [PATCH] * src/sort: Typos. svn: r2832 --- gramps2/ChangeLog | 1 + gramps2/src/plugins/WebPage.py | 8 ++++---- gramps2/src/sort.py | 14 +++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 685168d42..ae31f2ce1 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -16,6 +16,7 @@ * src/PlaceView.py (key_press): Add function. * src/SourceView.py (key_press): Add function. * src/plugins/WebPage.py: Add tab with index page options. + * src/sort: Typos. 2004-02-13 Egyeki Gergely * src/po/hu.po: Update diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index c87779845..ad25e33cc 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -228,7 +228,7 @@ class IndividualPage: person = self.db.find_person_from_id(person_id) if self.list.has_key(person.get_id()): self.doc.start_link("%s.%s" % (person.get_id(),self.ext)) - self.doc.write_text(person.getPrimaryName().getRegularName()) + self.doc.write_text(person.get_primary_name().get_regular_name()) self.doc.end_link() else: self.doc.write_text(person.get_primary_name().get_regular_name()) @@ -829,7 +829,7 @@ class WebReport(Report.Report): col_len = n_rows for person in p_list: - name = person.get_primary_name().get_surname() + name = person.get_primary_name().get_name() doc.start_link("%s.%s" % (person.get_id(),self.ext)) doc.write_text(name) @@ -859,11 +859,11 @@ class WebReport(Report.Report): if self.include_alpha_links: doc.write_linktarget("%03d" % a[n]) doc.write_text(n) - doc.end_paragraph() + doc.end_paragraph() col_len = col_len - 1 for person in p_list: - name = person.get_primary_name().get_surname() + name = person.get_primary_name().get_name() doc.start_link("%s.%s" % (person.get_id(),self.ext)) doc.write_text(name) diff --git a/gramps2/src/sort.py b/gramps2/src/sort.py index e85fcddb8..103744331 100644 --- a/gramps2/src/sort.py +++ b/gramps2/src/sort.py @@ -71,17 +71,17 @@ def build_sort_date(n): def by_last_name(first, second): """Sort routine for comparing two last names. If last names are equal, uses the given name and suffix""" - name1 = first.PrimaryName - name2 = second.PrimaryName + name1 = first.get_primary_name() + name2 = second.get_primary_name() - fsn = name1.Surname.upper() - ssn = name2.Surname.upper() + fsn = name1.get_surname().upper() + ssn = name2.get_surname().upper() if fsn == ssn : - ffn = name1.FirstName.upper() - sfn = name2.FirstName.upper() + ffn = name1.get_first_name().upper() + sfn = name2.get_first_name().upper() if ffn == sfn : - return cmp(name1.Suffix.upper(), name2.Suffix.upper()) + return cmp(name1.get_suffix().upper(), name2.get_suffix().upper()) else : return cmp(ffn, sfn) else :