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

Merged trunk r17888 through r18397 into geps023.

Browse Source 
Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405
This commit is contained in:
Tim G L Lyons
2011-11-05 19:07:58 +00:00
parent 4169661302 886e89cd30
commit 3adb1b7ffa
431 changed files with 150048 additions and 89561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/tool/Check.py
View File

@@ -150,6 +150,27 @@ def _table_low_level(db,table):
table.sync()
return True
def cross_table_duplicates(db):
"""
Function to find the presence of identical handles that occur in different
database tables.
Assumes there are no intable duplicates, see low_level function.
:param db: the database to check
:type db: :class:`gen.db.read.DbBsddbRead`
:returns: the presence of cross table duplicate handles
:rtype: bool
"""
total_nr_handles = 0
all_handles = set([])
for the_map in [db.person_map, db.family_map, db.event_map, db.place_map,
db.source_map, db.media_map, db.repository_map, db.note_map]:
handle_list = the_map.keys()
total_nr_handles += len(handle_list)
all_handles.update(handle_list)
return total_nr_handles > len(all_handles)
#-------------------------------------------------------------------------
#
# runTool
@@ -174,7 +195,15 @@ class Check(tool.BatchTool):
# We only do this for the dbdir backend.
if self.db.__class__.__name__ == 'DbBsddb':
low_level(self.db)
if cross_table_duplicates(self.db):
Report(uistate, _(
"Your family tree contains cross table duplicate handles.\n "
"This is bad and can be fixed by making a backup of your\n"
"family tree and importing that backup in an empty family\n"
"tree. The rest of the checking is skipped, the Check and\n"
"Repair tool should be run anew on this new family tree."), cli)
return
with DbTxn(_("Check Integrity"), self.db, batch=True) as trans:
self.db.disable_signals()
checker = CheckIntegrity(dbstate, uistate, trans)

2
src/plugins/tool/ReorderIds.py
View File

@@ -20,7 +20,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id:ReorderIds.py 9912 2008-01-22 09:17:46Z acraphae $
# $Id$
"""
Change id IDs of all the elements in the database to conform to the

58
src/plugins/tool/ownereditor.glade
View File

@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="ownereditor">
<property name="window_position">center</property>
@@ -37,7 +37,9 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name:</property>
<property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">name</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -48,7 +50,9 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Street:</property>
<property name="label" translatable="yes">_Street:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">address</property>
</object>
<packing>
<property name="top_attach">1</property>
@@ -61,7 +65,9 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">City:</property>
<property name="label" translatable="yes">_City:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">city</property>
</object>
<packing>
<property name="top_attach">3</property>
@@ -74,7 +80,9 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">State/County:</property>
<property name="label" translatable="yes">_State/County:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">state</property>
</object>
<packing>
<property name="top_attach">4</property>
@@ -87,7 +95,9 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Country:</property>
<property name="label" translatable="yes">_Country:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">country</property>
</object>
<packing>
<property name="top_attach">5</property>
@@ -100,7 +110,9 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">ZIP/Postal Code:</property>
<property name="label" translatable="yes">_ZIP/Postal Code:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">zip</property>
</object>
<packing>
<property name="top_attach">6</property>
@@ -113,7 +125,9 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Phone:</property>
<property name="label" translatable="yes">_Phone:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">phone</property>
</object>
<packing>
<property name="top_attach">7</property>
@@ -126,7 +140,9 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Email:</property>
<property name="label" translatable="yes">_Email:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">email</property>
</object>
<packing>
<property name="top_attach">8</property>
@@ -139,7 +155,7 @@
<object class="GtkEntry" id="name">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -151,7 +167,7 @@
<object class="GtkEntry" id="address">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -165,7 +181,7 @@
<object class="GtkEntry" id="city">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -179,7 +195,7 @@
<object class="GtkEntry" id="state">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -193,7 +209,7 @@
<object class="GtkEntry" id="country">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -207,7 +223,7 @@
<object class="GtkEntry" id="zip">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -221,7 +237,7 @@
<object class="GtkEntry" id="phone">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -235,7 +251,7 @@
<object class="GtkEntry" id="email">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x2022;</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -249,7 +265,9 @@
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Locality:</property>
<property name="label" translatable="yes">_Locality:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">locality</property>
</object>
<packing>
<property name="top_attach">2</property>
@@ -262,7 +280,7 @@
<object class="GtkEntry" id="locality">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>

2
src/plugins/tool/toolsdebug.gpr.py
View File

@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id: tools.gpr.py 14300 2010-02-10 12:13:47Z dsblank $
# $Id$
"""
GRAMPS registration file