2007-04-17 Don Allingham <don@gramps-project.org>

* src/DataViews/_FamilyList.py: add marriage date column
	* src/GrampsDb/_DbUtils.py: add function for finding a marriage event
	* src/DisplayModels/_FamilyModel.py: add marriage date column
	* src/GrampsDbUtils/_GedcomParse.py: handle place form handing
	* src/GrampsDbUtils/_GedcomLex.py: handle place form handing
	* src/GrampsDbUtils/_WriteGedcom.py: handle note list
	* src/docgen/ODFDoc.py: escape special characters



svn: r8398

src/DisplayModels/_FamilyModel.py

@@ -43,8 +43,10 @@ import gtk
 import const
 import ToolTips
 import GrampsLocale
+import DateHandler
 from BasicUtils import NameDisplay
 import RelLib
+import GrampsDb
 
 from _BaseModel import BaseModel
 
@@ -66,6 +68,7 @@ class FamilyModel(BaseModel):
             self.column_father,
             self.column_mother,
             self.column_type,
+            self.column_marriage,
             self.column_change,
             self.column_handle,
             self.column_tooltip,
@@ -77,13 +80,14 @@ class FamilyModel(BaseModel):
             self.sort_father,
             self.sort_mother,
             self.column_type,
+            self.sort_marriage,
             self.sort_change,
             self.column_handle,
             self.column_tooltip,
             self.column_marker_text,
             self.column_marker_color,
             ]
-        self.marker_color_column = 8
+        self.marker_color_column = 9
         BaseModel.__init__(self, db, scol, order, tooltip_column=6,
                            search=search, skip=skip, sort_map=sort_map)
 
@@ -124,6 +128,22 @@ class FamilyModel(BaseModel):
     def column_type(self, data):
         return str(RelLib.FamilyRelType(data[5]))
 
+    def column_marriage(self, data):
+        erlist = [ RelLib.EventRef().unserialize(d) for d in data[6] ]
+        event = GrampsDb.marriage_from_eventref_list(self.db, erlist)
+        if event:
+            return DateHandler.displayer.display(event.date)
+        else:
+            return u''
+
+    def sort_marriage(self, data):
+        erlist = [ RelLib.EventRef().unserialize(d) for d in data[6] ]
+        event = GrampsDb.marriage_from_eventref_list(self.db, erlist)
+        if event:
+            return "%09d" % event.date.get_sort_value()
+        else:
+            return u''
+
     def column_id(self, data):
         return unicode(data[1])
 

src/DisplayModels/_PeopleModel.py

@@ -704,7 +704,6 @@ class PeopleModel(gtk.GenericTreeModel):
         else:
             return u''
         
-
     def column_int_id(self, data, node):
         return node