Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/GrampsDbBase.py: Properly validate ID prefix strings

Browse Source 
svn: r5221
This commit is contained in:
Martin Hawlisch
2005-09-23 22:06:01 +00:00
parent 374e117c17
commit 0fc8d53798
2 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@@ -1,3 +1,6 @@
2005-09-24 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/GrampsDbBase.py: Properly validate ID prefix strings
2005-09-23 Alex Roitman <shura@gramps-project.org> 2005-09-23 Alex Roitman <shura@gramps-project.org>
Merge changes done in the TOOL_OPT branch as follows: Merge changes done in the TOOL_OPT branch as follows:
* src/Tool.py: Add to CVS: Generic tool interface. * src/Tool.py: Add to CVS: Generic tool interface.

65
gramps2/src/GrampsDbBase.py
View File

@@ -56,7 +56,6 @@ import GrampsDBCallback
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
_UNDO_SIZE = 1000 _UNDO_SIZE = 1000
_id_reg = re.compile("%\d+d")
PERSON_KEY = 0 PERSON_KEY = 0
FAMILY_KEY = 1 FAMILY_KEY = 1
@@ -917,19 +916,29 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
return self.family_map.keys() return self.family_map.keys()
return [] return []
def _validated_id_prefix(self, val, default):
if val:
try:
junk = val % 1
prefix_var = val # use the prefix as is because it works fine
except:
try:
val = val + "%d"
junk = val % 1
prefix_var = val # format string was missing
except:
prefix_var = default+"%04d" # use default
else:
prefix_var = default+"%04d"
return prefix_var
def set_person_id_prefix(self,val): def set_person_id_prefix(self,val):
""" """
Sets the naming template for GRAMPS Person ID values. The string is expected Sets the naming template for GRAMPS Person ID values. The string is expected
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as I%d or I%04d. a C/Python style format string using %d, such as I%d or I%04d.
""" """
if val: self.iprefix = self._validated_id_prefix(val,"I")
if _id_reg.search(val):
self.iprefix = val
else:
self.iprefix = val + "%d"
else:
self.iprefix = "I%04d"
def set_source_id_prefix(self,val): def set_source_id_prefix(self,val):
""" """
@@ -937,13 +946,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as S%d or S%04d. a C/Python style format string using %d, such as S%d or S%04d.
""" """
if val: self.sprefix = self._validated_id_prefix(val,"S")
if _id_reg.search(val):
self.sprefix = val
else:
self.sprefix = val + "%d"
else:
self.sprefix = "S%04d"
def set_object_id_prefix(self,val): def set_object_id_prefix(self,val):
""" """
@@ -951,13 +954,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as O%d or O%04d. a C/Python style format string using %d, such as O%d or O%04d.
""" """
if val: self.oprefix = self._validated_id_prefix(val,"O")
if _id_reg.search(val):
self.oprefix = val
else:
self.oprefix = val + "%d"
else:
self.oprefix = "O%04d"
def set_place_id_prefix(self,val): def set_place_id_prefix(self,val):
""" """
@@ -965,13 +962,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as P%d or P%04d. a C/Python style format string using %d, such as P%d or P%04d.
""" """
if val: self.pprefix = self._validated_id_prefix(val,"P")
if _id_reg.search(val):
self.pprefix = val
else:
self.pprefix = val + "%d"
else:
self.pprefix = "P%04d"
def set_family_id_prefix(self,val): def set_family_id_prefix(self,val):
""" """
@@ -979,13 +970,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as F%d or F%04d. a C/Python style format string using %d, such as F%d or F%04d.
""" """
if val: self.fprefix = self._validated_id_prefix(val,"F")
if _id_reg.search(val):
self.fprefix = val
else:
self.fprefix = val + "%d"
else:
self.fprefix = "F%04d"
def set_event_id_prefix(self,val): def set_event_id_prefix(self,val):
""" """
@@ -993,13 +978,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
to be in the form of a simple text string, or in a format that contains to be in the form of a simple text string, or in a format that contains
a C/Python style format string using %d, such as E%d or E%04d. a C/Python style format string using %d, such as E%d or E%04d.
""" """
if val: self.eprefix = self._validated_id_prefix(val,"E")
if _id_reg.search(val):
self.eprefix = val
else:
self.eprefix = val + "%d"
else:
self.eprefix = "E%04d"
def transaction_begin(self,msg=""): def transaction_begin(self,msg=""):
""" """