Commit Graph

93 Commits

Author SHA1 Message Date
Michiel Nauta
729823612e 5809: Multisurname editor impossibly narrow
svn: r19747
2012-06-03 20:11:39 +00:00
Tim G L Lyons
c29763c6f2 0005667: Merging notes with citation references fails (also merge media)
svn: r19251
2012-04-06 17:15:34 +00:00
Tim G L Lyons
d1105720f4 0005656: Error during citation merging. get_confidence_level should be set_confidence_level - the classic single character fix!!
svn: r19231
2012-04-04 18:14:55 +00:00
Josip Pisoj
53c9c30890 bug #5554: Automake problem
svn: r18851
2012-02-10 20:25:15 +00:00
Michiel Nauta
d2ec6e9899 5467: Selected object after merger is not always merged object
svn: r18669
2011-12-31 18:47:05 +00:00
Michiel Nauta
3584fd804f 5410: Merge dialog (context) ignores role on Events section for Person objects
svn: r18643
2011-12-20 18:52:14 +00:00
Paul Franklin
c83653f017 for Python files and Makefile.am files in the "src" (only) sub-tree:
1) add SVN svn:keywords "Id" property if it didn't have it
2) add SVN svn:mime-type "text/plain" property if it didn't have it
3) add SVN "Id" line to the file if it had none


svn: r18554
2011-12-06 16:56:50 +00:00
Tim G L Lyons
c833073ba6 GEPS023: merge branch (changes 17960-18546) into trunk
svn: r18548
2011-12-04 17:09:17 +00:00
Tim G L Lyons
f8f510d5f1 Delete remove_source_references and replace_source_references as they are no longer needed.
Rename remove_citation to remove_citation_refs and make it apply to a citation_handle_list.
Updated tool/Check.py to change check_source_references into check_citation_references


svn: r18433
2011-11-11 17:12:43 +00:00
Tim G L Lyons
b4f434357f Remove has_source_reference because it is only used in mergesource, and it is better to make the test directly, because only citations have source references and they only have one reference.
svn: r18417
2011-11-08 17:39:17 +00:00
Tim G L Lyons
3adb1b7ffa Merged trunk r17888 through r18397 into geps023.
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
2011-11-05 19:07:58 +00:00
Tim G L Lyons
2c89d2e0b2 Fix merge citations for repositories
svn: r18343
2011-10-18 16:38:18 +00:00
Paul Franklin
331c135235 5128: Python files with no SVN "Id" property (& added MIME text/plain if none)
svn: r18338
2011-10-16 20:21:22 +00:00
Tim G L Lyons
29cc4ee6e9 * various updates to CitationView, CitationEmbedView and CitationEditor to take account of Rev 17973 for two different object types in selectors
* updates to citationviews to support all the functionality (add source etc.) provided by sourceview (including different tooltips for tree view and list view)
* moved registration of citationtreeview into view.grp.py
* removed citationtreeview.grp.py module
* fixed update to citation when note is deleted
* fixed update to citation when media object is deleted
* re-enabled edit button in sourcebackreflist
* improved date display in mergecitation
* changed default note type for citation notes
* changed backref in citation editor to CitationBackRefList
* fixed removal of citation handles from the list in primary objects when a citation is deleted
* fixes for pylint

svn: r18095
2011-09-01 18:13:42 +00:00
Tim G L Lyons
5a3cef062c * Implemented merge Citation
* Updated merge Sources
* Implemented undo-redo for citations (revision 18069 had only added citations to the undo-redo list, not acted on that types of element)
* Fixed embedded lists for some of the object type editors that were done in Rev 18069
* Modified EditCitation so the source parameter is optional
* Added svn properties for all /src/Merge/merge*.py modules
* Added support for EditCitation from backreflist.py

svn: r18085
2011-08-30 10:40:30 +00:00
Michiel Nauta
b46a74df36 5109: Error when merging duplicate records
svn: r18012
2011-08-08 21:04:03 +00:00
Michiel Nauta
e1109cd0b0 4209: XML DTD rewrite, cleanup
svn: r17647
2011-06-01 21:32:52 +00:00
Michiel Nauta
a2028ba0f6 Speedup merging
svn: r17146
2011-04-18 21:09:49 +00:00
Gerald Britton
c3bc7cd925 Tweaks and simplifications
svn: r17064
2011-04-06 18:26:42 +00:00
Michiel Nauta
1df2e8f060 Removed translation of string that doesn't need it
svn: r17038
2011-04-04 20:23:02 +00:00
Michiel Nauta
d1a8593f7f Add merge unittests
svn: r16952
2011-03-27 21:15:07 +00:00
Michiel Nauta
5dadd0c866 Commit phoenix asap to fix a bug and simplify code in merge code
svn: r16937
2011-03-26 18:51:29 +00:00
Michiel Nauta
6e1ed4c481 Use new transactions with eventmerger
svn: r16772
2011-03-07 08:09:18 +00:00
Benny Malengier
752d594571 4198: Person view does not remove a row correctly when two people are merged.
This patch improves on the context changes:
 * avoid use of transaction_xx methods
 * force an abort in case of unclean transaction

Backward compatibility is broken to achieve this.


svn: r16680
2011-02-20 10:52:06 +00:00
Michiel Nauta
1231b1cac8 4590: Error on access of LDS editor when sealed to family has been removed.
svn: r16592
2011-02-09 16:03:52 +00:00
Michiel Nauta
ed85671df5 Fix typos in mergecode, notebly one missing space.
svn: r16556
2011-02-03 18:35:27 +00:00
Jérôme Rapinat
c67d02847b 4326: typos (by PaulFranklin); part I
svn: r16543
2011-02-02 18:33:16 +00:00
Michiel Nauta
3fff5e38b8 make context info work for person merge
svn: r16525
2011-02-01 12:06:25 +00:00
Benny Malengier
6d596ad987 4198: Person view does not remove a row correctly when two people are merged.
This is a major patch by Michael Nauta. It means all writes happen immediately to bsddb, and the bsddb 
rollback is used on a crash. Transaction is no longer used to store changes and do them on commit.
Undo database is set on end. 
At the same time with statement is used throughout for transactions
At the same time, the original bug in merge code should be fixed
Still some issues, that will be ironed out


svn: r16523
2011-01-31 21:54:58 +00:00
Jérôme Rapinat
325bb5086e 4436: FindDuplicated tool uses merging (fix by MD Nauta)
svn: r16254
2010-12-06 09:02:01 +00:00
Nick Hall
fd00d8c6e1 Remove rebuilds from merges that do not use batch transactions
svn: r16097
2010-11-01 12:00:26 +00:00
Doug Blank
6a473c8a54 4198: Person view does not remove a row correctly when two people are merged (fixed issue from previous commit)
svn: r16070
2010-10-28 13:38:43 +00:00
Doug Blank
afefbad431 4198: Person view does not remove a row correctly when two people are merged.
svn: r16069
2010-10-28 13:33:29 +00:00
Doug Blank
e3fdeb363d Add property keywords; removed unneeded files after merge fixes (#2059)
svn: r16059
2010-10-26 10:49:11 +00:00
Nick Hall
c3e527b4fb GEPS 011: Tagging - Extended to Family, Note and Media objects
svn: r16025
2010-10-22 23:22:33 +00:00
Nick Hall
2bece278c0 Fix error handling when merging people
svn: r15675
2010-08-01 18:18:29 +00:00
Doug Blank
3e28ee67ec 2059: need a way to compare and merge all objects, by MD Nauta
svn: r15645
2010-07-22 02:16:32 +00:00
Gerald Britton
c6df5a7a0f Tweak
svn: r15429
2010-05-20 18:39:58 +00:00
Brian Matherly
df32be43de 0003796: Make export available when no GUI available. Patch from jmodule (Jakim Friant).
svn: r15294
2010-05-01 04:12:42 +00:00
Doug Blank
9e505f3419 3831: Childref notes are lost on merging of children
svn: r15096
2010-04-13 02:23:56 +00:00
Doug Blank
76fbbcaab9 3831: Childref notes are lost on merging of children, by MD Nauta
svn: r15083
2010-04-11 13:44:01 +00:00
Doug Blank
ac4e25bffc 3830: 'Merged GRAMPS ID' attribute overwritten on PeopleMerge by MD Nauta
svn: r15080
2010-04-11 13:09:23 +00:00
Gerald Britton
8f0582df8a Use built-in functions to replace for loops:
Old code:

for x in y:
  f(x)

New Code:

map(f, y)

Also use defaultdict instead of simple dict when advantageous and use list comprehensions
instead of for loops where map() could be used but requires lambdas.


svn: r14135
2010-01-25 17:45:21 +00:00
Brian Matherly
f04880ec09 Move gettext, ngettext and sgettext calls into the new ggettext module. All of them return unicode all of the time.
svn: r14091
2010-01-18 04:42:17 +00:00
Brian Matherly
c5f54d0cfc Continued work on GEP008: Move src/BasicUtils/_NameDisplay.py to src/gen/display.
svn: r14072
2010-01-14 04:08:04 +00:00
Doug Blank
872e971fd3 gen.lib and gen.utils are independent; removed gen.utils.dbutils --- moved db methods to gen.db.base
svn: r13872
2009-12-21 04:18:31 +00:00
Gerald Britton
966d2bcd42 Use new iter_objects methods
svn: r13203
2009-09-14 20:50:25 +00:00
Gerald Britton
181c0c9b41 Replace get_place_handles with iter_place_handles
svn: r12778
2009-07-08 18:11:02 +00:00
Gerald Britton
b601f4bdf2 Replace get_family_handles with iter_family_handles
svn: r12776
2009-07-08 16:11:20 +00:00
Gerald Britton
2769b58a44 Implement iter_people_handles methods and begin to use them - second batch of updates
svn: r12774
2009-07-07 18:58:47 +00:00