Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,240 Commits 28 Branches 95 Tags 527 MiB
2fc5096d23
Commit Graph

8813 Commits

Author SHA1 Message Date
Rob G. Healey
aad0f9d0f5 Added elements for family map option to mapstraction style sheet. 
svn: r15590
 2010-06-23 08:39:23 +00:00
Rob G. Healey
7fb39141c8 Uploading missing mapstraction javascript files. Updated to 2.0.2 
svn: r15589
 2010-06-23 08:37:47 +00:00
Rob G. Healey
b73286a598 Cleared up some valuable vertical spacing. 
svn: r15588
 2010-06-22 04:32:44 +00:00
Rob G. Healey
59e9259d7a Added border lines to PlaceDetail table section. 
svn: r15587
 2010-06-21 02:44:13 +00:00
Rob G. Healey
84fb222ca0 Added dashed line back into Attributes section. 
svn: r15586
 2010-06-20 19:47:55 +00:00
Rob G. Healey
79e2d97698 Moved _create_place_map() back into class PlacePage. Getting ready for include family place map. Added border around PlacePage map in style sheet. 
svn: r15585
 2010-06-20 07:48:25 +00:00
Rob G. Healey
cba915b882 Add place_title to bottom of map and at marker description. Added style elements to style sheet. 
svn: r15584
 2010-06-20 05:42:42 +00:00
Nick Hall
939ac5505e Change sort order from D.D8 to ISO-DMS 
svn: r15583
 2010-06-19 23:44:13 +00:00
Nick Hall
49a0830d29 4076: Fix sort order when different latitude/longitude formats are used 
svn: r15581
 2010-06-19 17:41:28 +00:00
Rob G. Healey
1915b899b3 Pep8 cleanup, media_link() and doc_link(): can see object description now and making them look and work like each other. indivgallery changes in style sheet. 
svn: r15579
 2010-06-19 02:47:48 +00:00
Rob G. Healey
71ecdfdee8 Re-added the dashed border on the List pages. 
svn: r15578
 2010-06-18 22:05:57 +00:00
Rob G. Healey
1f9033cb44 Fixed name sorting in AddressBookListPage. Fixed has_residence in AddressBookPage. Fixed some elements in style sheet. 
svn: r15577
 2010-06-18 07:34:59 +00:00
Rob G. Healey
24978e4ba6 Added marker.setInfoBubble() back into Place Map, and adjusted font of the div#geo-info to a more readable size. 
svn: r15576
 2010-06-17 05:21:00 +00:00
Rob G. Healey
c5f30ccc3a Added ftps:// to list of url.startswith() in display_url_list(). 
svn: r15575
 2010-06-17 04:47:32 +00:00
Rob G. Healey
f5ef3abf53 Fixed missing marker on PlacePage Map. 
svn: r15574
 2010-06-16 06:03:51 +00:00
Rob G. Healey
82cb3ff0cc Simplified the python and style sheet code for Place Maps. 
svn: r15570
 2010-06-15 08:26:38 +00:00
Peter Landgren
d6fa234f9b Fix of 4071 so that substitutioins variables /%N, /%s, /%S follow the spec in the manual. 
svn: r15569
 2010-06-15 06:34:54 +00:00
Rob G. Healey
205a1b703d Re-located the _create_place_map() code and updated Mapstraction.css style sheet. 
svn: r15567
 2010-06-15 00:30:31 +00:00
Rob G. Healey
368ebca243 NarrativeWeb: Adding new style sheet for Mapstraction CSS elements. 
svn: r15566
 2010-06-14 05:16:14 +00:00
Serge Noiraud
42043e29ac GeoView : Moving to mapstraction v2, openlayers and google v3 as 
google v2 is deprecated. With mapstraction v2, we need
          to use the openlayers api to show openstreetmap.


svn: r15562
 2010-06-12 21:46:32 +00:00
Rob G. Healey
3d2daa22f4 Add border to place map and added info-bubble to left-click on marker. 
svn: r15561
 2010-06-12 19:23:06 +00:00
Rob G. Healey
570cf9a5df Removed table from the place map division because of problem associated with drifting when changing providers. Thank you Serge Noiraud. 
svn: r15560
 2010-06-12 17:21:23 +00:00
Serge Noiraud
27c21d0a09 NarrativeWeb : add icons and correct a drift problem with openlayers. 
svn: r15559
 2010-06-12 09:18:27 +00:00
Gerald Britton
da1abaa31d Optimize by replacing multiple calls to .write methods with one call where possible 
svn: r15558
 2010-06-11 14:29:44 +00:00
Rob G. Healey
36aadb5c60 Removed options from Place Map tab and added to advanced instead. Removed individualpage map. Please test it out and let me know how well it works. 
svn: r15557
 2010-06-11 06:34:09 +00:00
Doug Blank
7cddb5c236 Removed some subtle checks in probably_alive to make more protective when restricting on alive status 
svn: r15554
 2010-06-11 00:35:54 +00:00
Rob G. Healey
f509249c59 Fixed problems in Basic-Blue style sheet. Cleaned up page layout for PlacePage. 
svn: r15553
 2010-06-11 00:10:53 +00:00
Rob G. Healey
5cdccef384 PlacePage map using mapstraction is now complete and ready for testing. IndividualPage maps are not ready yet. 
svn: r15552
 2010-06-10 08:03:31 +00:00
Peter Landgren
ee99d280d8 Fix of issue 4059, event type begins with non latin char. 
svn: r15550
 2010-06-09 21:04:03 +00:00
Gerald Britton
b6aa4a4d83 Replace "== None" with "is None" 
svn: r15547
 2010-06-09 20:08:11 +00:00
Gerald Britton
98473ea46b Optimize by combining many write calls into one plus other minor tweaks 
svn: r15546
 2010-06-09 20:06:55 +00:00
Rob G. Healey
b2a8800379 Fixed problems with attributes not being properly displayed. 
svn: r15544
 2010-06-08 23:16:09 +00:00
Rob G. Healey
d78c1d0f9c Add svn Id string to file. 
svn: r15542
 2010-06-08 06:47:30 +00:00
Rob G. Healey
11c37cea2d Add extra files needed for google and openlayers maps for v3. 
svn: r15541
 2010-06-08 06:44:12 +00:00
Rob G. Healey
3cd93ce9ba Fixed errors introduced in r15528. 
svn: r15540
 2010-06-08 06:34:22 +00:00
Rob G. Healey
76e30c0071 Removed options from plugin that didn't exist in plugin options -- fixed crash. 
svn: r15539
 2010-06-08 06:25:56 +00:00
Rob G. Healey
f3b2aaebc0 Cleanup and simplify display_first_image_as_thumbnail(). 
svn: r15538
 2010-06-08 06:06:11 +00:00
Igal Shapira
9e99065877 Merge hebrew translations to trunk (67%) 
svn: r15536
 2010-06-06 18:17:48 +00:00
Peter Landgren
308d9e2142 Fixed coding error when looking at issue 4034. 
svn: r15535
 2010-06-06 17:18:48 +00:00
Rob G. Healey
69df521213 Cleanup of class PlaceListPage and PlacePage, dump_places(). Add the elements for the PlaceListPage. 
svn: r15533
 2010-06-05 13:53:34 +00:00
Doug Blank
937c8368ac Crash on family with no parents 
svn: r15532
 2010-06-05 11:36:28 +00:00
Serge Noiraud
b70e874315 Mapstraction : google v2 is deprecated. So we move to v2 with googlev3 and openlayers. 
will be used by narativeweb individual maps. 
               The gramps maps use v1 for the moment : no more crosshair in v2, ...


svn: r15530
 2010-06-05 09:16:20 +00:00
Rob G. Healey
2d2a9481bf Feature Request#4029: Added PlaceMap elements to all style sheets. Thanks Serge Noiraud. 
svn: r15528
 2010-06-05 05:09:25 +00:00
Gerald Britton
7244e05a25 Optimize docgen backends by consolidating calls to write methods 
svn: r15527
 2010-06-04 17:19:26 +00:00
Jérôme Rapinat
0901feda9e #4044 #2855 #2762 fix on half relations (contribution by reinhard) 
svn: r15526
 2010-06-04 13:33:22 +00:00
Rob G. Healey
02316615d4 Mirrored changed made in display_url_list() to all style sheets. 
svn: r15525
 2010-06-04 04:04:24 +00:00
Rob G. Healey
504b31e255 Cleanup on display_url_list() and WebLinks elements. 
svn: r15524
 2010-06-04 03:33:14 +00:00
Rob G. Healey
fcf02507b5 Cleanup and add conformity to dump_residence(). 
svn: r15523
 2010-06-04 02:56:14 +00:00
Rob G. Healey
4b57c7c3be Adjusted some PlaceDetail elements. 
svn: r15522
 2010-06-04 02:29:49 +00:00
Rob G. Healey
629df385e0 Beginning of feature request #4029: placemaps on placepages with help from Serge Noiraud. Cleanup and conformity of dump_place() with remainder of NarrativeWeb. 
svn: r15521
 2010-06-04 02:28:00 +00:00
Doug Blank
3989ef284f Follow StyledText links to include other objects, too 
svn: r15520
 2010-06-01 17:10:00 +00:00
Doug Blank
8d2e6a82c4 Protection from null family 
svn: r15519
 2010-05-31 15:47:22 +00:00
Doug Blank
c5d11d3218 Added filter editor for person and note filters, and removed unneeded reference filters 
svn: r15518
 2010-05-31 14:50:34 +00:00
Doug Blank
943cfd07e2 4037: get_full_path method of gen.lib.url uses undefined variable 
svn: r15517
 2010-05-31 12:56:19 +00:00
Doug Blank
01ef2759d4 Inverse filters will show differences between previous proxy 
svn: r15514
 2010-05-30 14:03:29 +00:00
Doug Blank
61905f3681 Change message to right-click from double-click 
svn: r15513
 2010-05-30 13:50:29 +00:00
Doug Blank
ddfcf61f12 Add a second version of reference by select proxy (doesn't remove people) 
svn: r15512
 2010-05-30 13:38:58 +00:00
Doug Blank
546272f1bb Use correct method of translating number-based items (ngettext) 
svn: r15511
 2010-05-30 13:15:14 +00:00
Doug Blank
8110ef8eda Use correct method of translating number-based items (ngettext) 
svn: r15510
 2010-05-30 13:08:44 +00:00
Doug Blank
cbef7fe84c Minor change of packing 
svn: r15509
 2010-05-30 12:59:49 +00:00
Doug Blank
ea7bf26054 Use new option_box in ExportCsv 
svn: r15508
 2010-05-30 12:57:20 +00:00
Doug Blank
a6c702638f Protection from null objects 
svn: r15507
 2010-05-30 12:14:26 +00:00
Doug Blank
204c4e1d24 Protection from null objects 
svn: r15506
 2010-05-30 12:09:17 +00:00
Doug Blank
016d45b4a6 Protect from null tree iter 
svn: r15505
 2010-05-30 11:49:50 +00:00
Doug Blank
41a4ff748d Protection from null objects 
svn: r15504
 2010-05-30 11:35:45 +00:00
Doug Blank
a9ac340110 3878: Private option and filter on Exporter; adds proxy order, browse of proxy data, referenced proxy, update of all exports (except csv) 
svn: r15502
 2010-05-30 04:07:50 +00:00
Doug Blank
ba2d5d503d Protection from null family 
svn: r15501
 2010-05-30 04:03:05 +00:00
Doug Blank
1b3e2aa09f Protections for readonly databases 
svn: r15500
 2010-05-29 20:19:22 +00:00
Doug Blank
34c7efe804 New proxy that traces forward references 
svn: r15499
 2010-05-29 20:17:06 +00:00
Doug Blank
2a44a7dd77 Added SimpleAccess.describe method that gives a simple description of an object instance; protection for null objects; new quick views for proxies 
svn: r15498
 2010-05-29 20:13:09 +00:00
Rob G. Healey
44aafc8569 Make Menu easier to read and see when hovering over it...for Web_Basic_Blue.css 
svn: r15497
 2010-05-28 21:28:07 +00:00
Rob G. Healey
a93f4e0a85 Mant Pep8 fixes in this commit from 7.19 to 8.82 
svn: r15496
 2010-05-28 21:11:28 +00:00
Doug Blank
00cf69b744 Convert SimpleTable left- and double-click actions to a right-click popup menu to workaround gtk problems 
svn: r15495
 2010-05-28 13:35:43 +00:00
Doug Blank
41524b59a4 Added a new quickview: people not in proxy, but in basedb 
svn: r15494
 2010-05-28 13:34:27 +00:00
Peter Landgren
bbf095ddb5 Final fix of issue 3935, coding problem in Windows. 
svn: r15493
 2010-05-28 13:21:14 +00:00
Rob G. Healey
23b1178629 Changed main and sub navigation menus. 
svn: r15491
 2010-05-28 07:11:45 +00:00
Serge Noiraud
59ab92808d Open Document : Issue 4018 and 4017 : random page break + top and bottom margin for paragraphs. 
svn: r15490
 2010-05-27 19:12:11 +00:00
Peter Landgren
4e929d3595 Added info about DB version. 
svn: r15487
 2010-05-27 11:04:45 +00:00
Doug Blank
6cedab8349 3778: Family notes and attributes are not displayed in reports, by lcc 
svn: r15485
 2010-05-26 02:15:38 +00:00
Doug Blank
8a25a77c9f Removed .get_base_db() method as there was already basedb for the same purpose 
svn: r15484
 2010-05-25 23:29:37 +00:00
Doug Blank
8f9970839b 4015: Addition of option of 'Page Break before Endnotes' on DDR and DAR reports 
svn: r15482
 2010-05-25 21:21:52 +00:00
Doug Blank
72eadb0d71 4016: Plugin with a BooleanListOption crashes when report_options.xml has fewer entries than expected. 
svn: r15481
 2010-05-25 21:10:25 +00:00
Gerald Britton
2604ee39fa Use itertools ifilter and imap to simplify some operations 
svn: r15480
 2010-05-25 18:31:31 +00:00
Doug Blank
5e632304dc 4012: Improvement for "What's next" report 
svn: r15479
 2010-05-25 13:21:06 +00:00
Doug Blank
6c91585f43 Fixed spelling error 
svn: r15477
 2010-05-25 11:30:43 +00:00
Doug Blank
f72178b4df 4012: Improvement for "What's next" report 
svn: r15475
 2010-05-25 10:06:53 +00:00
Rob G. Healey
6c01a611d7 Removed Totals Column and Row from class EventListPage. 
svn: r15472
 2010-05-25 04:59:00 +00:00
Rob G. Healey
577071b666 Increased the size of #navigation and #subnavigation menus. 
svn: r15471
 2010-05-25 04:43:59 +00:00
Rob G. Healey
e9db3fd8c1 Bug#4007: class EventListPage and EventPage: family events are being doubled up. 
svn: r15470
 2010-05-25 04:42:16 +00:00
Rob G. Healey
4c273594ba Some cleanup of the menus. 
svn: r15469
 2010-05-24 04:57:56 +00:00
Doug Blank
a00b4bcb45 4004, 3983, 3861, 3758: initialize_options missing argument 
svn: r15467
 2010-05-24 01:41:03 +00:00
Doug Blank
0a73ecc10e use new get_base_db method of db 
svn: r15466
 2010-05-23 15:45:41 +00:00
Doug Blank
a69337b6c6 method for getting base database, if a proxy 
svn: r15465
 2010-05-23 15:44:51 +00:00
Doug Blank
a3a12e87fe Show All filter shows counts out of total, unfiltered 
svn: r15464
 2010-05-23 15:43:49 +00:00
Doug Blank
96c081bb6e Some ordering problems when readonly db 
svn: r15463
 2010-05-23 15:42:18 +00:00
Doug Blank
67a82ed20c No need to get surname list for a readonly db 
svn: r15462
 2010-05-23 15:40:59 +00:00
Doug Blank
ed3c144a79 Apparently we don't need these two methods (see Gerald in mailing list, 05/23/2010) 
svn: r15461
 2010-05-23 15:36:15 +00:00
Doug Blank
ed73f393ed Readonly databases do not necessarily have commit methods 
svn: r15460
 2010-05-23 15:00:48 +00:00
Doug Blank
7c4d945da6 Backrefmodel will skip missing or inaccessible objects 
svn: r15459
 2010-05-23 14:59:04 +00:00
Doug Blank
0c10a6c7a5 Added 7 new quick view filters: all (summary counts), all events, all media, all notes, all repos, all sources, and all places. 
svn: r15458
 2010-05-23 14:57:43 +00:00
Doug Blank
cdeb47ad3b Proxies should report that they are read-only 
svn: r15457
 2010-05-23 14:55:20 +00:00
Doug Blank
4ac224430f Added missing editors for media and note; add ability for table link to be a filter 
svn: r15456
 2010-05-23 14:53:04 +00:00
Doug Blank
80f5069a49 Protection from missing (or inaccessible) person 
svn: r15455
 2010-05-23 14:51:51 +00:00
Doug Blank
4ce41d4656 3986: Interface for running code not associated with a plugin type: this passes dbstate and uistate to a load_on_reg function/class if a library has it, and it is marked as load_on_reg 
svn: r15454
 2010-05-23 11:44:13 +00:00
Doug Blank
8ca80428a5 added methods that protect living data from leaking out: get_person_handles, iter_person_handles, and iter_people 
svn: r15453
 2010-05-23 05:10:11 +00:00
Rob G. Healey
657e4dc784 Bug#4006: Fixed WebCal text being doubled up. Thank you Doug S. Blank for the patch. 
svn: r15452
 2010-05-23 04:51:59 +00:00
Doug Blank
1e3b765bd4 iter_people method was incorrectly returning handles and people objects; should be just people to match gen.db interface 
svn: r15451
 2010-05-23 04:40:58 +00:00
Serge Noiraud
80c94857ed GeoView : bug #4002 console message: undefined @1: ReferenceError: Can't find variable: addcrosshair 
svn: r15448
 2010-05-22 07:41:04 +00:00
Rob G. Healey
bedbf0084f Changed Download page a little and made the changes uniform in all the style sheets. Still have a problem in Web_Mainz.css though. 
svn: r15446
 2010-05-22 07:20:27 +00:00
Peter Landgren
c92dde9549 Added version info about the database. 
svn: r15441
 2010-05-21 14:18:32 +00:00
Doug Blank
9421b66984 3993: Add Jewish holidays and translate holidays and countries names (part 2) 
svn: r15439
 2010-05-21 12:58:08 +00:00
Doug Blank
3af2af9dd2 3993: Add Jewish holidays and translate holidays and countries names (part 1), by igal_shapira 
svn: r15438
 2010-05-21 12:18:21 +00:00
Doug Blank
2a0ae02088 3982: One more date-time format - Database Timestamp (ISO) format, by Yenidai 
svn: r15436
 2010-05-21 11:15:08 +00:00
Peter Landgren
59acfc216d Fixed problem with non unicode path name. 
svn: r15434
 2010-05-21 06:22:24 +00:00
Serge Noiraud
9a6a01fabb GeoView : bug #3973 ignore buttons_have_icons which avoid set_image() to change the image of a button. 
gnome => 2.26 now set this to false


svn: r15433
 2010-05-20 21:00:47 +00:00
Gerald Britton
df79811a4e Add extra information for undo history 
svn: r15430
 2010-05-20 18:40:31 +00:00
Gerald Britton
c6df5a7a0f Tweak 
svn: r15429
 2010-05-20 18:39:58 +00:00
Gerald Britton
6369bb0286 Minor edit 
svn: r15428
 2010-05-20 18:32:36 +00:00
Gerald Britton
cd8ded4b37 Updates to undo/redo logic: 
1. Replace single transaction list with separate undo/redo deques
2. Update UndoHistory GUI to work with new queue setup
3. Add test to txn.py for empty transaction list


svn: r15427
 2010-05-20 18:32:08 +00:00
Nick Hall
6da2ade5e3 Format date in Last Changed column in views according to preference setting 
svn: r15426
 2010-05-20 17:47:31 +00:00
Doug Blank
8981551fcd 3878: Private option and filter on Exporter --- protection from null person 
svn: r15425
 2010-05-19 00:30:00 +00:00
Doug Blank
88a571d9e3 3878: Private option and filter on Exporter (undo of commit 15402) 
svn: r15424
 2010-05-19 00:13:25 +00:00
Jérôme Rapinat
bc7912d5ab update month names (by Łukasz Rymarczyk) 
svn: r15418
 2010-05-16 15:49:03 +00:00
Doug Blank
b400c4ed79 Remove debug setting as default 
svn: r15411
 2010-05-14 08:59:36 +00:00
Nick Hall
3c6546c6dd 3710: Add a configuration dialog to the pedigree view 
svn: r15409
 2010-05-13 21:50:22 +00:00
Jérôme Rapinat
75d8575909 use of functions 
svn: r15406
 2010-05-13 17:52:00 +00:00
Nick Hall
a1c96c8a93 Append space to paragraph leader in ascii reports. (revert 15388) 
svn: r15404
 2010-05-13 17:12:18 +00:00
Doug Blank
d2d983f10a Try to reload first; if fails, then not in path (addon), and try new import 
svn: r15403
 2010-05-13 13:02:52 +00:00
Doug Blank
d134be8d2e 3878: Private option and filter on Exporter 
svn: r15402
 2010-05-13 12:11:22 +00:00
Doug Blank
7da7919b78 3957: probably_alive does not use full database to determine living status 
svn: r15401
 2010-05-13 12:09:15 +00:00
Doug Blank
2df0322aef 3958: Extremely slow gedcom import 
svn: r15400
 2010-05-13 11:08:20 +00:00
Rob G. Healey
44a360c1bf Fixed EventDetail pages in ColumnPerson... First individual was being shown twice in the line 
svn: r15398
 2010-05-13 06:17:43 +00:00
Rob G. Healey
b3e5f17baf Removed forcing the table headers to be full capsitalization, except for the calendar day letters 
svn: r15397
 2010-05-13 03:20:52 +00:00
Doug Blank
958a0fe898 Protection against null objects; added ability to get fallback object rather than just date 
svn: r15396
 2010-05-12 19:25:51 +00:00
Rob G. Healey
b3b100747e Removed border lines from Parents section on the IndividualPages 
svn: r15392
 2010-05-12 07:28:27 +00:00
Rob G. Healey
33bcc40293 Switched 'Graph generations' option in Report Options from EnumeratedListOption to NumberOption as it didn't maked sense to me 
svn: r15391
 2010-05-12 07:17:23 +00:00
Rob G. Healey
9b73c0e80a Re-added event description back into event sections 
svn: r15390
 2010-05-12 07:08:28 +00:00
Rob G. Healey
3a0acefae7 Removed black cell in EventsPage details on Person 
svn: r15389
 2010-05-12 06:11:54 +00:00
Craig J. Anderson
81e1b117b2 added a space after the descendant number. 
svn: r15388
 2010-05-12 02:35:09 +00:00
Doug Blank
cda97348e8 3878: Private option and filter on Exporter 
svn: r15383
 2010-05-10 00:00:15 +00:00
Espen Berg
548a8ba315 issues 3915, 3950 and 3951 (and perhaps some more?) due to a change in pygtk appears to be fixed with this patch. 
svn: r15378
 2010-05-09 18:43:06 +00:00
Doug Blank
e7a50282b4 3943: Crashed whilst exporting to data.gramps using a person filter 'Public'; fixed many filter rules for people 
svn: r15374
 2010-05-09 15:18:54 +00:00
Doug Blank
7044978e72 3943: Crashed whilst exporting to data.gramps using a person filter 'Public'; fixed many filter rules for people 
svn: r15372
 2010-05-09 15:08:53 +00:00
Doug Blank
187e1d582f 3640: Truncated FILE media path on Gedcom export; extended line for file to 255 characters 
svn: r15370
 2010-05-09 13:54:50 +00:00
Doug Blank
9fd5722f96 3943: Crashed whilst exporting to data.gramps using a person filter 'Public'; fixed many filter rules for people 
svn: r15369
 2010-05-09 13:43:50 +00:00
Doug Blank
14f3d33da4 3640: Truncated FILE media path on Gedcom export; extended line for file to 255 characters 
svn: r15366
 2010-05-09 12:57:05 +00:00
Rob G. Healey
887f8ba9bd Added Gramps Styled Notes hyperlink element to Blue stylesheet. 
svn: r15365
 2010-05-08 19:24:19 +00:00
Rob G. Healey
eb2f4ee79d Moved navigation menu outside borders to Horizontal stylesheet. 
svn: r15364
 2010-05-08 19:22:36 +00:00
Rob G. Healey
b8d650d3c7 Fixed Horiontal navigation menus outside borders. 
svn: r15363
 2010-05-08 19:17:41 +00:00
Doug Blank
a2c515f5da Added a flag to get_note_format to set the up variable so that the backend will build_link correctly. This should be refactored, but it at least does the right thing for now. 
svn: r15362
 2010-05-08 15:21:11 +00:00