commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue/reports setup.py src/GRFilters.py src/adap...


From: Jason Cater
Subject: gnue/reports setup.py src/GRFilters.py src/adap...
Date: Fri, 13 Dec 2002 04:24:05 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/13 04:24:05

Modified files:
        reports        : setup.py 
        reports/src    : GRFilters.py 
        reports/src/adapters/filters/MailMerge/merge_latex: Adapter.py 
        reports/src/adapters/filters/MailMerge/merge_ps: Adapter.py 
        reports/src/adapters/filters/MailMerge/merge_psfax: Adapter.py 
        reports/src/adapters/filters/MailMerge/merge_rtf: Adapter.py 
Added files:
        reports/src/adapters/filters/SimpleTabulation/tabulator: 
                                                                 Adapter.py 
                                                                 __init__.py 
        reports/src/adapters/filters/SimpleTabulation/tabulator/formatters: 
                                                                            
__init__.py 
                                                                            
csv.py 
                                                                            
html.py 
                                                                            
pdf.py 
                                                                            
text.py 

Log message:
        * Added btami's xslt-less filter for SimpleTabulation reports
        * Rearranged the adapters/filters directory to group adapters by their 
supported report type.  For adapters that are generic in nature (not tied to a 
specific type of report) go into general/

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/setup.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/Adapter.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/csv.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/html.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/pdf.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/SimpleTabulation/tabulator/formatters/text.py?rev=1.1

Patches:
Index: gnue/reports/setup.py
diff -c gnue/reports/setup.py:1.17 gnue/reports/setup.py:1.18
*** gnue/reports/setup.py:1.17  Wed Nov 13 12:00:23 2002
--- gnue/reports/setup.py       Fri Dec 13 04:24:04 2002
***************
*** 242,256 ****
         packages = ["gnue.reports",
                     "gnue.reports.adapters",
                     "gnue.reports.adapters.filters",
!                    "gnue.reports.adapters.filters.sablotron",
!                    "gnue.reports.adapters.filters.4xslt",
!                    "gnue.reports.adapters.filters.raw",
!                    "gnue.reports.adapters.filters.labels",
!                    "gnue.reports.adapters.filters.labels.formatters",
!                    "gnue.reports.adapters.filters._merge",
!                    "gnue.reports.adapters.filters.merge_latex",
!                    "gnue.reports.adapters.filters.merge_rtf",
!                    "gnue.reports.adapters.filters.merge_ps",
                     "gnue.reports.adapters.destinations",
                     "gnue.reports.adapters.destinations.email",
                     "gnue.reports.adapters.destinations.fax",
--- 242,262 ----
         packages = ["gnue.reports",
                     "gnue.reports.adapters",
                     "gnue.reports.adapters.filters",
!                    "gnue.reports.adapters.filters.general",
!                    "gnue.reports.adapters.filters.general.sablotron",
!                    "gnue.reports.adapters.filters.general.4xslt",
!                    "gnue.reports.adapters.filters.general.raw",
!                    "gnue.reports.adapters.filters.Labels",
!                    "gnue.reports.adapters.filters.Labels.labels",
!                    "gnue.reports.adapters.filters.Labels.labels.formatters",
!                    "gnue.reports.adapters.filters.SimpleTabulation",
!                    "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
!                    "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
!                    "gnue.reports.adapters.filters.MailMerge",
!                    "gnue.reports.adapters.filters.MailMerge._merge",
!                    "gnue.reports.adapters.filters.MailMerge.merge_latex",
!                    "gnue.reports.adapters.filters.MailMerge.merge_rtf",
!                    "gnue.reports.adapters.filters.MailMerge.merge_ps",
                     "gnue.reports.adapters.destinations",
                     "gnue.reports.adapters.destinations.email",
                     "gnue.reports.adapters.destinations.fax",
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.17 gnue/reports/src/GRFilters.py:1.18
*** gnue/reports/src/GRFilters.py:1.17  Wed Nov 13 18:56:25 2002
--- gnue/reports/src/GRFilters.py       Fri Dec 13 04:24:04 2002
***************
*** 47,52 ****
--- 47,54 ----
  
    def loadFilter(self, namespace, filter, destination, filter_options):
  
+     lastNamespace = namespace.split(':')[-1]
+ 
      try:
        parameters = self._config.filters[namespace + ":" + filter]
      except KeyError:
***************
*** 57,63 ****
            "Unable to find a filter definition for %s" % (namespace+":"+filter)
  
      try:
!       module = dyn_import ('gnue.reports.adapters.filters.%s' % 
parameters['engine'])
      except ImportError:
        raise
        raise FilterError, "Invalid filter specified: %s" % filter
--- 59,67 ----
            "Unable to find a filter definition for %s" % (namespace+":"+filter)
  
      try:
!       module = dyn_import ('gnue.reports.adapters.filters.%s.%s' % 
(lastNamespace,parameters['engine']))
!     except ImportError:
!       module = dyn_import ('gnue.reports.adapters.filters.general.%s' % 
parameters['engine'])
      except ImportError:
        raise
        raise FilterError, "Invalid filter specified: %s" % filter
Index: gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py
diff -c gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py:1.1 
gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py:1.2
*** gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py:1.1      
Tue May 14 20:27:39 2002
--- gnue/reports/src/adapters/filters/MailMerge/merge_latex/Adapter.py  Fri Dec 
13 04:24:04 2002
***************
*** 26,32 ****
  # NOTES:
  #
  
! from gnue.reports.adapters.filters._merge import MergeBase as mailmerge
  import string, sys
  
  
--- 26,32 ----
  # NOTES:
  #
  
! from gnue.reports.adapters.filters.MailMerge._merge import MergeBase
  import string, sys
  
  
Index: gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py
diff -c gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py:1.1 
gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py:1.2
*** gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py:1.1 Tue Oct 
 8 13:30:44 2002
--- gnue/reports/src/adapters/filters/MailMerge/merge_ps/Adapter.py     Fri Dec 
13 04:24:04 2002
***************
*** 26,32 ****
  # NOTES:
  #
  
! from gnue.reports.adapters.filters._merge import MergeBase
  import string, sys
  
  
--- 26,32 ----
  # NOTES:
  #
  
! from gnue.reports.adapters.filters.MailMerge._merge import MergeBase
  import string, sys
  
  
Index: gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py
diff -c gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py:1.4 
gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py:1.5
*** gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py:1.4      
Thu Oct 10 11:07:07 2002
--- gnue/reports/src/adapters/filters/MailMerge/merge_psfax/Adapter.py  Fri Dec 
13 04:24:04 2002
***************
*** 26,32 ****
  # NOTES:
  #
  
! from gnue.reports.adapters.filters._merge import MergeBase
  import string, sys, os
  
  
--- 26,32 ----
  # NOTES:
  #
  
! from gnue.reports.adapters.filters.MailMerge._merge import MergeBase
  import string, sys, os
  
  
Index: gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py
diff -c gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py:1.2 
gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py:1.3
*** gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py:1.2        
Wed May 15 00:30:32 2002
--- gnue/reports/src/adapters/filters/MailMerge/merge_rtf/Adapter.py    Fri Dec 
13 04:24:04 2002
***************
*** 26,32 ****
  # NOTES:
  #
  
! from gnue.reports.adapters.filters._merge import MergeBase
  import string, sys
  
  
--- 26,32 ----
  # NOTES:
  #
  
! from gnue.reports.adapters.filters.MailMerge._merge import MergeBase
  import string, sys
  
  



reply via email to

[Prev in Thread] Current Thread [Next in Thread]