new logging scheme

svn: r6080

src/plugins/BookReport.py

@@ -31,6 +31,14 @@
 import os
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".BookReport")
+
 #-------------------------------------------------------------------------
 #
 # SAX interface
@@ -1088,27 +1096,23 @@ def cl_report(database,name,category,options_str_dict):
                     this_style_name,style_sheet.get_style(this_style_name))
 
     # write report
-    try:
-        doc = clr.format(selected_style,clr.paper,clr.template_name,clr.orien)
-        rptlist = []
-        newpage = 0
-        for item in book.get_item_list():
-            item.option_class.set_document(doc)
-            item.option_class.set_newpage(newpage)
-            report_class = item.get_write_item()
-            obj = Report.write_book_item(database,clr.person,
-                        report_class,item.option_class)
-            rptlist.append(obj)
-            newpage = 1
-        doc.open(clr.option_class.get_output())
-        doc.init()
-        for item in rptlist:
-            item.begin_report()
-            item.write_report()
-        doc.close()
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    doc = clr.format(selected_style,clr.paper,clr.template_name,clr.orien)
+    rptlist = []
+    newpage = 0
+    for item in book.get_item_list():
+        item.option_class.set_document(doc)
+        item.option_class.set_newpage(newpage)
+        report_class = item.get_write_item()
+        obj = Report.write_book_item(database,clr.person,
+                                     report_class,item.option_class)
+        rptlist.append(obj)
+        newpage = 1
+    doc.open(clr.option_class.get_output())
+    doc.init()
+    for item in rptlist:
+        item.begin_report()
+        item.write_report()
+    doc.close()
 
 #------------------------------------------------------------------------
 #

src/plugins/Check.py

@@ -32,6 +32,14 @@ import cStringIO
 import sets
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".CheckRepair")
+
 #-------------------------------------------------------------------------
 #
 # gtk modules
@@ -136,50 +144,46 @@ class Check(Tool.Tool):
         # def runTool(database,active_person,callback,parent=None):
         cli = int(parent == None)
 
-        try:
-            if db.readonly:
-                # TODO: split plugin in a check and repair part to support
-                # checking of a read only database
-                return
+        if db.readonly:
+            # TODO: split plugin in a check and repair part to support
+            # checking of a read only database
+            return
 
-            # The low-level repair is bypassing the transaction mechanism.
-            # As such, we run it before starting the transaction.
-            # We only do this for the BSDDB backend.
-            if db.__class__.__name__ == 'GrampsBSDDB':
-                low_level(db)
+        # The low-level repair is bypassing the transaction mechanism.
+        # As such, we run it before starting the transaction.
+        # We only do this for the BSDDB backend.
+        if db.__class__.__name__ == 'GrampsBSDDB':
+            low_level(db)
         
-            trans = db.transaction_begin("",batch=True)
-            db.disable_signals()
-            checker = CheckIntegrity(db,parent,trans)
-            checker.fix_encoding()
-            checker.cleanup_missing_photos(cli)
+        trans = db.transaction_begin("",batch=True)
+        db.disable_signals()
+        checker = CheckIntegrity(db,parent,trans)
+        checker.fix_encoding()
+        checker.cleanup_missing_photos(cli)
             
-            prev_total = -1
-            total = 0
+        prev_total = -1
+        total = 0
         
-            while prev_total != total:
-                prev_total = total
+        while prev_total != total:
+            prev_total = total
             
-                checker.check_for_broken_family_links()
-                checker.check_parent_relationships()
-                checker.cleanup_empty_families(cli)
-                checker.cleanup_duplicate_spouses()
+            checker.check_for_broken_family_links()
+            checker.check_parent_relationships()
+            checker.cleanup_empty_families(cli)
+            checker.cleanup_duplicate_spouses()
 
-                total = checker.family_errors()
+            total = checker.family_errors()
 
-            checker.check_events()
-            checker.check_place_references()
-            checker.check_source_references()
-            db.transaction_commit(trans, _("Check Integrity"))
-            db.enable_signals()
-            db.request_rebuild()
+        checker.check_events()
+        checker.check_place_references()
+        checker.check_source_references()
+        db.transaction_commit(trans, _("Check Integrity"))
+        db.enable_signals()
+        db.request_rebuild()
 
-            errs = checker.build_report(cli)
-            if errs:
-                Report(checker.text.getvalue(),parent)
-        except:
-            import DisplayTrace
-            DisplayTrace.DisplayTrace()
+        errs = checker.build_report(cli)
+        if errs:
+            Report(checker.text.getvalue(),parent)
 
 #-------------------------------------------------------------------------
 #

src/plugins/ExportVCalendar.py

@@ -38,6 +38,14 @@ from time import localtime
 import gtk
 import gtk.glade
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".ExportVCal")
+
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
@@ -301,12 +309,8 @@ class CalendarWriter:
 #-------------------------------------------------------------------------
 def exportData(database,filename,person,option_box):
     ret = 0
-    try:
-        cw = CalendarWriter(database,person,0,filename,option_box)
-        ret = cw.export_data(filename)
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    cw = CalendarWriter(database,person,0,filename,option_box)
+    ret = cw.export_data(filename)
     return ret
 
 #-------------------------------------------------------------------------

src/plugins/ExportVCard.py

@@ -29,6 +29,14 @@
 #-------------------------------------------------------------------------
 import os
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".ExportVCard")
+
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK modules
@@ -220,12 +228,8 @@ class CardWriter:
 #-------------------------------------------------------------------------
 def exportData(database,filename,person,option_box):
     ret = 0
-    try:
-        cw = CardWriter(database,person,0,filename,option_box)
-        ret = cw.export_data(filename)
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    cw = CardWriter(database,person,0,filename,option_box)
+    ret = cw.export_data(filename)
     return ret
 
 #-------------------------------------------------------------------------

src/plugins/FilterEditor.py

@@ -32,6 +32,14 @@ __author__ = "Don Allingham"
 import os
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".FilterEdit")
+
 #-------------------------------------------------------------------------
 #
 # GTK/GNOME 
@@ -854,10 +862,6 @@ class EditRule:
             self.window.destroy()
         except KeyError:
             pass
-        except:
-            import DisplayTrace
-            self.window.destroy()
-            DisplayTrace.DisplayTrace()
                                
 #-------------------------------------------------------------------------
 #

src/plugins/GraphViz.py

@@ -32,6 +32,14 @@ import os
 from gettext import gettext as _
 from time import asctime
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".GraphViz")
+
 #------------------------------------------------------------------------
 #
 # GNOME/gtk
@@ -894,17 +902,14 @@ class EmptyDoc:
 #------------------------------------------------------------------------
 def cl_report(database,name,category,options_str_dict):
 
-    clr = Report.CommandLineReport(database,name,category,GraphVizOptions,options_str_dict)
+    clr = Report.CommandLineReport(database,name,category,GraphVizOptions,
+                                   options_str_dict)
 
     # Exit here if show option was given
     if clr.show:
         return
 
-    try:
-        GraphViz(database,clr.person,clr.option_class)
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    GraphViz(database,clr.person,clr.option_class)
 
 #------------------------------------------------------------------------
 #

src/plugins/ImportGeneWeb.py

@@ -31,6 +31,14 @@ import re
 import time
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".ImportGeneWeb")
+
 #-------------------------------------------------------------------------
 #
 # GTK/GNOME Modules
@@ -80,11 +88,6 @@ def importData(database, filename, cb=None):
     except IOError,msg:
         ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
         return
-    except:
-        ErrorDialog(_("%s could not be opened\n") % filename)
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
-        return
 
     try:
         status = g.parse_geneweb_file()
@@ -92,11 +95,6 @@ def importData(database, filename, cb=None):
         errmsg = _("%s could not be opened\n") % filename
         ErrorDialog(errmsg,str(msg))
         return
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
-        return
-    
 
 #-------------------------------------------------------------------------
 # For a description of the file format see

src/plugins/ImportvCard.py

@@ -31,6 +31,14 @@ import re
 import time
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".ImportVCard")
+
 #-------------------------------------------------------------------------
 #
 # GTK/GNOME Modules
@@ -61,11 +69,6 @@ def importData(database, filename, cb=None):
     except IOError,msg:
         ErrorDialog(_("%s could not be opened\n") % filename,str(msg))
         return
-    except:
-        ErrorDialog(_("%s could not be opened\n") % filename)
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
-        return
 
     try:
         status = g.parse_vCard_file()
@@ -73,11 +76,6 @@ def importData(database, filename, cb=None):
         errmsg = _("%s could not be opened\n") % filename
         ErrorDialog(errmsg,str(msg))
         return
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
-        return
-    
 
 #-------------------------------------------------------------------------
 #

src/plugins/Makefile.am

@@ -46,7 +46,6 @@ pkgdata_PYTHON = \
 	Summary.py\
 	TimeLine.py\
 	Verify.py\
-	WebPage.py\
 	WriteFtree.py\
 	WritePkg.py\
 	WriteCD.py\

src/plugins/NavWebPage.py

@@ -35,11 +35,23 @@ import time
 import locale
 import shutil
 import codecs
-import sets
 import tarfile
 from gettext import gettext as _
 from cStringIO import StringIO
 
+try:
+    set()
+except:
+    from sets import Set as set
+
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".WebPage")
+
 #------------------------------------------------------------------------
 #
 # GNOME/gtk
@@ -2148,7 +2160,7 @@ class WebReport(Report.Report):
         ind_list = self.database.get_person_handles(sort_handles=False)
         self.progress.set_pass(_('Filtering'),1)
         ind_list = self.filter.apply(self.database,ind_list)
-        restrict_list = sets.Set()
+        restrict_list = set()
 
         # if private records need to be filtered out, strip out any person
         # that has the private flag set.
@@ -2722,7 +2734,7 @@ class WebReportDialog(Report.ReportDialog):
             ErrorDialog(m1,m2)
 
 def sort_people(db,handle_list):
-    flist = sets.Set(handle_list)
+    flist = set(handle_list)
 
     sname_sub = {}
     sortnames = {}
@@ -2764,18 +2776,15 @@ def sort_people(db,handle_list):
 #------------------------------------------------------------------------
 def cl_report(database,name,category,options_str_dict):
 
-    clr = Report.CommandLineReport(database,name,category,WebReportOptions,options_str_dict)
+    clr = Report.CommandLineReport(database,name,category,WebReportOptions,
+                                   options_str_dict)
 
     # Exit here if show option was given
     if clr.show:
         return
 
-    try:
-        MyReport = WebReport(database,clr.person,clr.option_class)
-        MyReport.write_report()
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    MyReport = WebReport(database,clr.person,clr.option_class)
+    MyReport.write_report()
 
 #------------------------------------------------------------------------
 #

src/plugins/ReadPkg.py

@@ -32,6 +32,14 @@ import os
 import tarfile
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".ReadPkg")
+
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK+ modules
@@ -86,12 +94,8 @@ def impData(database, name,cb=None,cl=0):
 
     imp_db_name = os.path.join(tmpdir_path,const.xmlFile)  
 
-    try:
-        importer = gramps_db_reader_factory(const.app_gramps_xml)
-        importer(database,imp_db_name,cb)
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    importer = gramps_db_reader_factory(const.app_gramps_xml)
+    importer(database,imp_db_name,cb)
 
     # Clean up tempdir after ourselves
     #     THIS HAS BEEN CHANGED, because now we want to keep images

src/plugins/Rebuild.py

@@ -31,6 +31,14 @@ import os
 import cStringIO
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".Rebuild")
+
 #-------------------------------------------------------------------------
 #
 # gtk modules
@@ -59,32 +67,28 @@ class Rebuild(Tool.Tool):
     def __init__(self,db,person,options_class,name,callback=None,parent=None):
         Tool.Tool.__init__(self,db,person,options_class,name)
 
-        try:
-            if db.readonly:
-                # TODO: split plugin in a check and repair part to support
-                # checking of a read only database
-                return
+        if db.readonly:
+            # TODO: split plugin in a check and repair part to support
+            # checking of a read only database
+            return
 
-            db.disable_signals()
-            if parent:
-                progress = Utils.ProgressMeter(
+        db.disable_signals()
+        if parent:
+            progress = Utils.ProgressMeter(
                     _('Rebuilding Secondary Indices'))
-                # Six indices to rebuild, and the first step is removing
-                # old ones
-                total = 7
-                progress.set_pass('',total)
-                db.rebuild_secondary(progress.step)
-                progress.close()
-                OkDialog(_("Secondary indices rebuilt"),
-                         _('All secondary indices have been rebuilt.'))
-            else:
-                print "Rebuilding Secondary Indices..."
-                db.rebuild_secondary(self.empty)
-                print "All secondary indices have been rebuilt."
-            db.enable_signals()
-        except:
-            import DisplayTrace
-            DisplayTrace.DisplayTrace()
+            # Six indices to rebuild, and the first step is removing
+            # old ones
+            total = 7
+            progress.set_pass('',total)
+            db.rebuild_secondary(progress.step)
+            progress.close()
+            OkDialog(_("Secondary indices rebuilt"),
+                     _('All secondary indices have been rebuilt.'))
+        else:
+            print "Rebuilding Secondary Indices..."
+            db.rebuild_secondary(self.empty)
+            print "All secondary indices have been rebuilt."
+        db.enable_signals()
 
     def empty(self):
         pass

src/plugins/WriteCD.py

@@ -31,6 +31,14 @@ import os
 from cStringIO import StringIO
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".WriteCD")
+
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK modules
@@ -66,12 +74,8 @@ _title_string = _("Export to CD")
 #-------------------------------------------------------------------------
 def writeData(database,filename,person,option_box=None):
     ret = 0
-    try:
-        writer = PackageWriter(database,filename)
-        ret = writer.export()
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    writer = PackageWriter(database,filename)
+    ret = writer.export()
     return ret
     
 #-------------------------------------------------------------------------

src/plugins/WriteFtree.py

@@ -31,6 +31,14 @@ import os
 from cStringIO import StringIO
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".WriteFtree")
+
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK modules
@@ -56,12 +64,8 @@ from QuestionDialog import ErrorDialog
 #-------------------------------------------------------------------------
 def writeData(database,filename,person,option_box):
     ret = 0
-    try:
-        writer = FtreeWriter(database,person,0,filename,option_box)
-        ret = writer.export_data()
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    writer = FtreeWriter(database,person,0,filename,option_box)
+    ret = writer.export_data()
     return ret
     
 class FtreeWriterOptionBox:

src/plugins/WriteGeneWeb.py

@@ -38,6 +38,14 @@ from gettext import gettext as _
 import gtk
 import gtk.glade
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".WriteGeneWeb")
+
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules
@@ -580,12 +588,8 @@ class GeneWebWriter:
 #-------------------------------------------------------------------------
 def exportData(database,filename,person,option_box):
     ret = 0
-    try:
-        gw = GeneWebWriter(database,person,0,filename,option_box)
-        ret = gw.export_data()
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    gw = GeneWebWriter(database,person,0,filename,option_box)
+    ret = gw.export_data()
     return ret
 
 #-------------------------------------------------------------------------

src/plugins/WritePkg.py

@@ -33,6 +33,14 @@ import tarfile
 from cStringIO import StringIO
 from gettext import gettext as _
 
+#------------------------------------------------------------------------
+#
+# Set up logging
+#
+#------------------------------------------------------------------------
+import logging
+log = logging.getLogger(".WritePkg")
+
 #-------------------------------------------------------------------------
 #
 # GNOME/GTK modules
@@ -57,13 +65,8 @@ from QuestionDialog import MissingMediaDialog
 #-------------------------------------------------------------------------
 def writeData(database,filename,person,callback=None):
     ret = 0
-    try:
-        writer = PackageWriter(database,filename,callback)
-        ret = writer.export()
-
-    except:
-        import DisplayTrace
-        DisplayTrace.DisplayTrace()
+    writer = PackageWriter(database,filename,callback)
+    ret = writer.export()
     return ret
     
 #-------------------------------------------------------------------------