Book Merge committed to HEAD

Sat Oct 16 13:26:36 EDT 2004

On Saturday 16 October 2004 4:56 pm, Derek Atkins wrote:
> Hi,
>
> I just committed Neil's book-merge code to HEAD.  A couple of notes:
>
> 1) you will need to "rm src/engine/.scm-links" in your build tree to
>    get this to build properly.

Was there a way to avoid this? I did tweak the makefile config to build the ./ 
=> qof/ symlink with a new build. 

> 2) There are still a bunch of bugs in the code.  I started with an
>    empty data file and ran the File -> Add Hierarchy menu item.
>    It showed me the "choose a currency" page but the page was empty.
>    Then when it jumped to the merge druid I got the following error
>    on my terminal:

Hmm. I've tested with my local code using gnucash --nofile and the File -> Add 
New Hierarchy druid loads as expected: merge druid first, then the hierarchy 
druid, complete with US Dollar selected in currency widget. I always tested 
with an empty file or with small files. With --nofile, it should just be 
merging the new hierarchy into an empty QofBook - it's done that before 
without problems.
:-(

druid-hierarchy.c / h, druid-merge.c / h merge.glade and qof_book_merge.c /h 
are identical in both my local tree and the latest cvs HEAD tree.

However, CVS HEAD won't build with my libofx setup anymore.
(last successful build was 4-Oct-04).

gnc-ofx-import.c:82: error: conflicting types for `ofx_proc_security_cb'
/usr/include/libofx/libofx.h:251: error: previous declaration of 
`ofx_proc_security_cb'
gnc-ofx-import.c:83: error: conflicting types for `ofx_proc_transaction_cb'
/usr/include/libofx/libofx.h:424: error: previous declaration of 
`ofx_proc_transaction_cb'
gnc-ofx-import.c:84: error: conflicting types for `ofx_proc_account_cb'
/usr/include/libofx/libofx.h:196: error: previous declaration of 
`ofx_proc_account_cb'

Package: libofx-dev
Source: libofx
Version: 0.6.6-2.1

Package: libofx0c102
Source: libofx
Version: 0.6.6-2.1

libofx-dev is already the newest version.
libofx0c102 is already the newest version.

I've been distracted with other projects recently, have I missed an update to 
OFX - is my Debian version behind the gnucash requirement?

Returning to my code: 
Basically, I've wrapped the merge druid around the new file druid. When New 
File is selected, the hierarchy druid loads on it's own. When New Hierarchy 
is selected, the merge druid starts first to explain what is happening, then 
merge druid is hidden and the hierarchy druid is started and when done, merge 
druid is restored to complete the task.

There are still problems getting the new accounts to show up, related to 
AccountGroup.

>    Gtk-CRITICAL **: file gtkwidget.c: line 1428 (gtk_widget_show):
> assertion `GTK_IS_WIDGET (widget)' failed.

I can't reproduce this, but until I get ofx sorted, I can't tell if it's a 
problem in the book merge code or elsewhere. I can't find any differences 
between the files in the book merge patch when comparing HEAD with my local 
copy.

# p 'src/business/business-core/gncInvoice.c' 41116 1095804144 0100644
# p 'src/business/business-core/gncInvoice.h' 7924 1095804161 0100644
# p 'src/business/business-gnome/dialog-date-close.c' 12895 1066883551 0100644
# p 'src/business/business-gnome/dialog-date-close.h' 2961 1066883551 0100644
# p 'src/business/business-gnome/dialog-invoice.c' 72280 1088261532 0100644
# p 'src/business/business-gnome/glade/date-close.glade' 11390 1049253581 
0100644
# p 'src/business/business-utils/business-prefs.scm' 4174 1066883233 0100644
# p 'src/engine/Makefile.am' 5061 1095807300 0100644
# p 'src/import-export/qif-import/qif-objects.scm' 19209 1062202900 0100644

I don't see how those files could cause the problem.

Confused.
:-(

> 3) This code (the druid in particular) will need to get ported to the
>    g2 branch.

Trying to build that now.

-- 

Neil Williams
=============
http://www.codehelp.co.uk/
http://www.dclug.org.uk/
http://www.isbn.org.uk/
http://sourceforge.net/projects/isbnsearch/

http://www.biglumber.com/x/web?qs=0x8801094A28BCB3E3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20041016/13c5b072/attachment.bin