Move from object references to IDs
svn: r2822
This commit is contained in:
@@ -38,10 +38,10 @@ class EventAfter(Filter.Filter):
|
||||
Filter.Filter.__init__(self,text)
|
||||
|
||||
def match(self,p):
|
||||
for event in p.getEventList() + [p.getBirth(), p.getDeath()]:
|
||||
if self.date.getDate() == "" or event.getDate() == "":
|
||||
for event in p.get_event_list() + [p.get_birth(), p.get_death()]:
|
||||
if self.date.get_date() == "" or event.get_date() == "":
|
||||
continue
|
||||
if event.getDateObj().greater_than(self.date):
|
||||
if event.get_date_object().greater_than(self.date):
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ class HaveAltFamilies(Filter.Filter):
|
||||
"People who were adopted"
|
||||
|
||||
def match(self,person):
|
||||
for vals in person.getParentList():
|
||||
for vals in person.get_parent_family_id_list():
|
||||
if vals[1] == "Adopted" or vals[2] == "Adopted":
|
||||
return 1
|
||||
return 0
|
||||
|
||||
@@ -38,10 +38,10 @@ class EventBefore(Filter.Filter):
|
||||
Filter.Filter.__init__(self,text)
|
||||
|
||||
def match(self,p):
|
||||
for event in p.getEventList() + [p.getBirth(), p.getDeath()]:
|
||||
if self.date.getDate() == "" or event.getDate() == "":
|
||||
for event in p.get_event_list() + [p.get_birth(), p.get_death()]:
|
||||
if self.date.get_date() == "" or event.get_date() == "":
|
||||
continue
|
||||
if event.getDateObj().less_than(self.date):
|
||||
if event.get_date_object().less_than(self.date):
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ class IsComplete(Filter.Filter):
|
||||
"People with complete information"
|
||||
|
||||
def match(self,person):
|
||||
return person.getComplete() == 1
|
||||
return person.get_complete() == 1
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,7 +27,7 @@ class Disconnected(Filter.Filter):
|
||||
"Disconnected individuals"
|
||||
|
||||
def match(self,person):
|
||||
return person.getMainParents() == None and len(person.getFamilyList()) == 0
|
||||
return person.get_main_parents_family_id() == None and len(person.get_family_id_list()) == 0
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -36,13 +36,13 @@ class EventPlace(Filter.Filter):
|
||||
Filter.Filter.__init__(self,text)
|
||||
|
||||
def match(self,person):
|
||||
list = person.getEventList()[:]
|
||||
list.append(person.getBirth())
|
||||
list.append(person.getDeath())
|
||||
list = person.get_event_list()[:]
|
||||
list.append(person.get_birth())
|
||||
list.append(person.get_death())
|
||||
for event in list:
|
||||
if self.regexp.search(event.getPlaceName()):
|
||||
if self.regexp.search(event.get_place_name()):
|
||||
return 1
|
||||
place = event.getPlace()
|
||||
place = event.get_place_id()
|
||||
if not place:
|
||||
continue
|
||||
locs = [place.get_main_location()] + place.get_alternate_locations()
|
||||
|
||||
@@ -26,8 +26,8 @@ from gettext import gettext as _
|
||||
class EventType(Filter.Filter):
|
||||
|
||||
def match(self,person):
|
||||
for event in person.getEventList():
|
||||
if event.getName() == self.text:
|
||||
for event in person.get_event_list():
|
||||
if event.get_name() == self.text:
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ class Females(Filter.Filter):
|
||||
"Females"
|
||||
|
||||
def match(self,person):
|
||||
return person.getGender() == RelLib.Person.female
|
||||
return person.get_gender() == RelLib.Person.female
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,7 +27,7 @@ class HavePhotos(Filter.Filter):
|
||||
"People who have images"
|
||||
|
||||
def match(self,person):
|
||||
return len(person.getPhotoList()) > 0
|
||||
return len(person.get_photo_list()) > 0
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,8 +27,8 @@ class IncompleteNames(Filter.Filter):
|
||||
"People with incomplete names"
|
||||
|
||||
def match(self,person):
|
||||
name = person.getPrimaryName()
|
||||
return name.getFirstName() == "" or name.getSurname() == ""
|
||||
name = person.get_primary_name()
|
||||
return name.get_first_name() == "" or name.get_surname() == ""
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -28,7 +28,7 @@ class Males(Filter.Filter):
|
||||
"Males"
|
||||
|
||||
def match(self,person):
|
||||
return person.getGender() == RelLib.Person.male
|
||||
return person.get_gender() == RelLib.Person.male
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -32,7 +32,7 @@ class MatchSndEx(Filter.Filter):
|
||||
Filter.Filter.__init__(self,text)
|
||||
|
||||
def match(self,person):
|
||||
return self.sndex == soundex.soundex(person.getPrimaryName().getSurname())
|
||||
return self.sndex == soundex.soundex(person.get_primary_name().get_surname())
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -30,7 +30,7 @@ class MatchSndEx2(Filter.Filter):
|
||||
"Names with SoundEx code of ..."
|
||||
|
||||
def match(self,person):
|
||||
return self.text == soundex.soundex(person.getPrimaryName().getSurname())
|
||||
return self.text == soundex.soundex(person.get_primary_name().get_surname())
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,7 +27,7 @@ class MultipleMarriages(Filter.Filter):
|
||||
"People with multiple marriage records"
|
||||
|
||||
def match(self,person):
|
||||
return len(person.getFamilyList()) > 1
|
||||
return len(person.get_family_id_list()) > 1
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,7 +27,7 @@ class NeverMarried(Filter.Filter):
|
||||
"People with no marriage records"
|
||||
|
||||
def match(self,person):
|
||||
return len(person.getFamilyList()) == 0
|
||||
return len(person.get_family_id_list()) == 0
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -27,7 +27,7 @@ class NoBirthdate(Filter.Filter):
|
||||
"People without a birth date"
|
||||
|
||||
def match(self,person):
|
||||
return person.getBirth().getDate() == ""
|
||||
return person.get_birth().get_date() == ""
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
|
||||
@@ -28,8 +28,8 @@ class HaveChildren(Filter.Filter):
|
||||
|
||||
def match(self,person):
|
||||
val = 0
|
||||
for family in person.getFamilyList():
|
||||
if len(family.getChildList()) > 0:
|
||||
for family in person.get_family_id_list():
|
||||
if len(family.get_child_id_list()) > 0:
|
||||
val = 1
|
||||
break
|
||||
return val
|
||||
|
||||
Reference in New Issue
Block a user