--- trunk/ChangeLog	2010/08/04 13:32:37	380
+++ trunk/ChangeLog	2010/10/04 16:19:17	403
@@ -1,3 +1,83 @@
+2010-10-04  Torsten Irländer <torsten.irlaender@intevation.de>
+
+	* formed/formed/model/data.py (RuleLeaf.__init__): Added new attribute
+	"tag" for rule-leafs
+
+2010-09-30  Torsten Irländer <torsten.irlaender@intevation.de>
+
+	* formed/formed/plugins/export/rules_sh.py
+	(ExportRulesAsSH.doExport): Filter out duplicted rules.
+
+2010-09-20  Frank Koormann   <frank.koormann@intevation.de>
+
+	* formed/formed/plugins/export/latex.py (RecursiveExporter): 
+	Add "required"-field information to output and include 
+	choice list contents. 
+
+2010-09-16  Bernhard Herzog  <bh@intevation.de>
+
+	Avoid database deadlocks that can happen when database clients try
+	to work with the same case using two separate database
+	connections.  See mpuls/issue1145 for details.
+
+	* formed/formed/plugins/export/rg_sql.py (SQL_TEMPLATE): Split the
+	computation of the new json structure description into the new
+	database function compute_case_structure
+	(TRIGGER_TMPL): Change the trigger functions to immediately update
+	the cached json structure description instead of just setting the
+	modified flag.  This avoids the lazy recomputation that makes what
+	seems like a read-only access (calling get_case_structure) into a
+	writing access (updates of the cache).  The writes lock the row in
+	the case_structure table which prevent other connections from
+	accessing the same case.  As part of this, the delete triggers are
+	now AFTER triggers because the repeat groups instance must have
+	been removed when the structure is recomputed.
+	(SUBSELECT_TMPL): Since the delete trigger is now an after
+	trigger, we need to change the way the master id is computed.  We
+	cannot join with the repeatgroup table in question because the row
+	has already been deleted.  However, we can use the master_id
+	column of the OLD row to select the row of the parent table.
+	(create_triggers): Avoid the inner joins with the current repeat
+	group for the above mentioned reasons.  In the very common case of
+	repeat groups which are direct children of the master_tbl, we can
+	compare the master_tbl.id directly with the row's master_id.
+
+2010-09-14 Roland Geider <roland.geider@intevation.de>
+
+	* formed/formed/plugins/export/xsd.py: issue1131: update XSD for new
+	  formedtree structure
+
+2010-09-01 Roland Geider <roland.geider@intevation.de>
+
+	* formed/formed/plugins/modify/rules.py: issue1050: mandatory fields
+	  appearing double.
+	  The problem was that the way the formEditor handled fields with
+	  manually created rules changed. Instead of ignoring fields (very
+	  early behaviour) or always generating them (early behaviour), now the
+	  formED will only ignore fields with rules which name starts with
+	  'required-rule-manual'. This is helpful when the rules for mandatory
+	  fields are more complex (e.g. mother's name is only required if
+	  mother is known).
+
+2010-08-10  Torsten Irländer <torsten.irlaender@intevation.de>
+
+	* contrib/diff_formed.py: New helperscript to diff to given
+	  formedtrees
+
+2010-08-09	Roland Geider <roland.geider@intevation.de>
+
+	* formed/model/exprtree.py: fixed typo
+
+2010-08-04  Bernhard Herzog  <bh@intevation.de>
+
+	* formed/po/de_DE.po: Update translations
+
+2010-08-04  Bernhard Herzog  <bh@intevation.de>
+
+	* formed/po/formed.pot: Regenerated.
+
+	* formed/po/de_DE.po: Update.
+
 2010-08-04  Bernhard Herzog  <bh@intevation.de>
 
 	* formed/po/Makefile: Use correct filename of the pot-file in the