2007-09-03 Don Allingham <don@gramps-project.org>

* plugins/WritePkg.py: fix package export
	* GrampsDbUtils/_WriteXML.py: fix package export



svn: r8925

ChangeLog

@@ -1,3 +1,7 @@
+2007-09-03  Don Allingham  <don@gramps-project.org>
+	* plugins/WritePkg.py: fix package export
+	* GrampsDbUtils/_WriteXML.py: fix package export
+
 2007-09-03  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
 	* src/docgen/gtkprintpreview.glade: Hide Print button for now.
 	* src/docgen/GtkPrint.py: Print dialog comes back after Preview is

src/GrampsDbUtils/_WriteXML.py

@@ -83,7 +83,8 @@ class XmlWriter(GrampsDbXmlWriter):
     def __init__(self, db, callback, strip_photos, compress=1):
         """
         """
-        GrampsDbXmlWriter.__init__(self, db, strip_photos, compress, const.version)
+        GrampsDbXmlWriter.__init__(self, db, strip_photos, compress, 
+                                   const.version, callback)
         
     def write(self,filename):
         """

src/plugins/WritePkg.py

@@ -33,6 +33,8 @@ import sys
 import tarfile
 from cStringIO import StringIO
 from gettext import gettext as _
+import ExportOptions
+from BasicUtils import UpdateCallback
 
 #------------------------------------------------------------------------
 #
@@ -65,9 +67,28 @@ from PluginUtils import register_export
 # writeData
 #
 #-------------------------------------------------------------------------
-def writeData(database,filename,person,callback=None):
+def writeData(database, filename, person, option_box, callback=None):
     ret = 0
-    writer = PackageWriter(database,filename,callback)
+
+    option_box.parse_options()
+
+    restrict = option_box.restrict
+    private = option_box.private
+
+    if private:
+        from GrampsDbUtils._PrivateProxyDb import PrivateProxyDb
+        database = PrivateProxyDb(database)
+
+    if restrict:
+        from GrampsDbUtils._LivingProxyDb import LivingProxyDb
+        database = LivingProxyDb(database, LivingProxyDb.MODE_RESTRICT)
+
+    if not option_box.cfilter.is_empty():
+        from GrampsDbUtils._FilterProxyDb import FilterProxyDb
+        database = FilterProxyDb(database, option_box.cfilter)
+
+
+    writer = PackageWriter(database, filename, callback)
     ret = writer.export()
     return ret
     
@@ -185,7 +206,7 @@ class PackageWriter:
         
         # Write XML now
         g = StringIO()
-        gfile = XmlWriter(self.db,self.callback,2)
+        gfile = XmlWriter(self.db, self.callback, 2)
         gfile.write_handle(g)
         tarinfo = tarfile.TarInfo('data.gramps')
         tarinfo.size = len(g.getvalue())
@@ -206,8 +227,9 @@ class PackageWriter:
 #
 #-------------------------------------------------------------------------
 _title = _('GRAM_PS package (portable XML)')
-_description = _('GRAMPS package is an archived XML database together with the media object files.')
+_description = _('GRAMPS package is an archived XML database together '
-_config = None
+                 'with the media object files.')
+_config = (_('GRAMPS package export options'), ExportOptions.WriterOptionBox)
 _filename = 'gpkg'
 
-register_export(writeData,_title,_description,_config,_filename)
+register_export(writeData, _title, _description, _config, _filename)