problems with branch-1.7

Hi, I tested a fresh checkout of branch-1-7 today.

It compiled fine, but then it was still missing the column
repligard.author. It seems to me that this may be because the file
repligard.sql contains two statements, one adding the author field and
the other adding a locked field. The problem is that this happens when
the file is added to the mysql db:
midcom:/opt/lampp/share/midgard# /opt/lampp/bin/mysql midgard <
repligard.sql
ERROR 1060 (42S21) at line 1: Duplicate column name 'locked'

Testing this after removing the line proved that this .sql file is not
in use by datagard (or so it seemed).

I then tried to patch empty.sql to see if that would remove the problem
of "ais_topic" not found (that was my original problem). It did.

So, I end up thinking that the problem is that current empty.sql in
branch-1-7 is missing this patch:
@@ -328,6 +328,7 @@
   guid varchar(80) NOT NULL default '',
   action enum('create','update','delete') NOT NULL default 'create',
   sitegroup int(11) NOT NULL default '0',
+  author int(11) NOT NULL default '0',
   creator varchar(80) NOT NULL default '',
   created datetime NOT NULL default '0000-00-00 00:00:00',
   revisor varchar(80) NOT NULL default '',

Is this correct?

Tarjei
-- 
Tarjei Huse <tarjei-y/[email protected]>