From d45b36537e139a6c3d52a386e58830eb30318265 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 30 Jul 2005 03:29:34 +0000
Subject: [PATCH] * src/Utils.py: use intermediate variable

svn: r4980
---
 gramps2/ChangeLog                 |  1 +
 gramps2/src/Utils.py              |  2 +-
 gramps2/src/plugins/NavWebPage.py | 18 +++++++-----------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 74a1796eb..4f1fd37be 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2005-07-29  Don Allingham  <don@gramps-project.org>
+	* src/Utils.py: use intermediate variable
 	* src/MergePeople.py: Fix wording of the message.
 	* src/Report.py: Don't force expansion of widgets
 	* src/ReportUtils.py: allow restriction of information
diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py
index d5075aaf9..07c0db6d3 100644
--- a/gramps2/src/Utils.py
+++ b/gramps2/src/Utils.py
@@ -469,7 +469,7 @@ def probably_alive(person,db,current_year=None):
         death = db.get_event_from_handle(person.death_handle)
         if death.get_date_object().get_start_date() != Date.EMPTY:
             death_year = death.get_date_object().get_year()
-            if death.get_date_object().get_year() < current_year:
+            if death_year < current_year:
                 return False
     
     # Look for Cause Of Death, Burial or Cremation events.
diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py
index 5ab9b8ec3..dd8601762 100644
--- a/gramps2/src/plugins/NavWebPage.py
+++ b/gramps2/src/plugins/NavWebPage.py
@@ -185,6 +185,7 @@ class BasePage:
     def lnkfmt(self,text):
         return md5.new(text).hexdigest()
 
+
     def display_footer(self,of,db):
 
         of.write('</div>\n')
@@ -1704,11 +1705,13 @@ class WebReport(Report.Report):
                     new_list.append(key)
             ind_list = new_list
 
+        years = time.localtime(time.time())[0] - self.restrict_years
+
         if self.restrict:
             new_list = []
             for key in ind_list:
-                if not Utils.probably_alive(self.database.get_person_from_handle(key),
-                                            self.database):
+                p = self.database.get_person_from_handle(key)
+                if not Utils.probably_alive(p,self.database,years):
                     new_list.append(key)
             ind_list = new_list
 
@@ -1758,14 +1761,6 @@ class WebReport(Report.Report):
             if not self.exclude_private:
                 person = ReportUtils.sanitize_person(self.database,person)
 
-            if self.restrict:
-                years = time.localtime(time.time())[0] - self.restrict_years
-            else:
-                years = None
-
-            if self.restrict and Utils.probably_alive(person,self.database,years):
-                person = ReportUtils.restrict_no_names(self.database,person)
-
             idoc = IndividualPage(self.database, person, self.title,
                                   ind_list, place_list, source_list,
                                   self.options, archive, photo_list, levels)
@@ -2080,6 +2075,7 @@ class WebReportOptions(ReportOptions.ReportOptions):
         user selected choices for later use."""
         
         self.options_dict['NWEBrestrictinfo'] = int(self.restrict_living.get_active())
+        self.options_dict['NWEBrestrictyears'] = int(self.restrict_years.get_text())
         self.options_dict['NWEBincpriv'] = int(not self.no_private.get_active())
         self.options_dict['NWEBnoid'] = int(self.noid.get_active())
         self.options_dict['NWEBcontact'] = unicode(self.contact.get_handle())
@@ -2219,7 +2215,7 @@ class WebReportDialog(Report.ReportDialog):
     def parse_format_frame(self):
         """The format frame is not used in this dialog."""
         pass
-    
+
     def make_report(self):
         """Create the object that will produce the web pages."""