[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-reports/src/adapters/filters/Universal Bas...
|
From: |
Jan Ischebeck |
|
Subject: |
gnue-reports/src/adapters/filters/Universal Bas... |
|
Date: |
Tue, 18 Nov 2003 16:11:59 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue-reports
Branch:
Changes by: Jan Ischebeck <address@hidden> 03/11/18 16:11:58
Modified files:
src/adapters/filters/Universal/Base/Writers: RelativeWriter.py
Writer.py
src/adapters/filters/Universal/postscript/psutils:
PrinterDefinition.py
src/adapters/filters/Universal/html: __init__.py
src/adapters/filters/Universal/Base: Parser.py
src/adapters/filters/Universal/Base/Objects: Section.py
Added files:
src/adapters/filters/Universal/Base: Adapter.py
Log message:
small fixes, addons to make universal markup accessible even if doesn't
do anything yet.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.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/Universal/Base/Writers/Writer.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/Universal/postscript/psutils/PrinterDefinition.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/html/__init__.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/Universal/Base/Adapter.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/Parser.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py:1.5
gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py:1.6
*** gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py:1.5
Tue May 13 14:58:25 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Objects/Section.py Tue Nov
18 16:11:58 2003
***************
*** 28,46 ****
# NOTES:
#
! __all__ = ['Section','SectionPlexor']
from ContainerObj import ContainerObj
! from gnue.common.definitions.GParserHelpers import ParserMultiplexor
class Section(ContainerObj):
pass
# Used by GParser to get the correct Section type
! class SectionPlexor(ParserMultiplexor):
! def getClass(self):
! return SectionPlexMap.get(self.mode,Section)
--- 28,46 ----
# NOTES:
#
! #__all__ = ['Section','SectionPlexor']
from ContainerObj import ContainerObj
! #from gnue.common.definitions.GParserHelpers import ParserMultiplexor
class Section(ContainerObj):
pass
# Used by GParser to get the correct Section type
! #class SectionPlexor(ParserMultiplexor):
! # def getClass(self):
! # return SectionPlexMap.get(self.mode,Section)
Index: gnue-reports/src/adapters/filters/Universal/Base/Parser.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.10
gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.11
*** gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.10 Mon Oct
6 15:23:17 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Parser.py Tue Nov 18
16:11:57 2003
***************
*** 34,40 ****
from gnue.common.formatting import GTypecast
from gnue.common.definitions import GParser
from gnue.common.logic import GTrigger
! from Helpers import measurement
import copy, types
--- 34,40 ----
from gnue.common.formatting import GTypecast
from gnue.common.definitions import GParser
from gnue.common.logic import GTrigger
! from ParserTypes import measurement, color
import copy, types
***************
*** 72,78 ****
global xmlElements
# Here due to some nasty recursive imports
! from Objects import *
if xmlElements == None:
--- 72,78 ----
global xmlElements
# Here due to some nasty recursive imports
! from Objects import Report,Section
if xmlElements == None:
***************
*** 95,101 ****
'ParentTags': None },
'section': {
! 'BaseClass': GRParameters.GRSection,
'Attributes': {
'positioning': {
'ValueSet': {
--- 95,101 ----
'ParentTags': None },
'section': {
! 'BaseClass': Section, # TODO: should be replaced by Multiplexed
Section
'Attributes': {
'positioning': {
'ValueSet': {
***************
*** 157,291 ****
'spacinghoriz': {
'Typecast': measurement,
'Default': '0' } } ,
- 'ParentTags': ('parameters',) },
-
- 'sortoptions': {
- 'BaseClass': GRSortOptions.GRSortOptions,
- 'SingleInstance': 1,
'ParentTags': ('report',) },
- 'sortoption': {
- 'BaseClass': GRSortOptions.GRSortOption,
- 'Attributes': {
- 'id': {
- 'Required': 1,
- 'Unique': 1,
- 'Typecast': GTypecast.name },
- 'description': {
- 'Required': 1,
- 'Typecast': GTypecast.name },
- 'default': {
- 'Typecast': GTypecast.boolean,
- 'Default': 0 } },
- 'ParentTags': ('sortoptions',) },
-
- 'sortcolumn': {
- 'BaseClass': GRSortOptions.GRSortColumn,
- 'Attributes': {
- 'name': {
- 'Required': 1,
- 'Typecast': GTypecast.name } },
- 'ParentTags': ('sortoption',) },
-
- 'layout': {
- 'BaseClass': GRLayout.GRLayout,
- 'Required': 1,
- 'SingleInstance': 1,
- 'MixedContent': 1,
- 'Attributes': {
- 'format': {
- 'Typecast': GTypecast.text },
- 'suppressGNUeTags': {
- 'Typecast': GTypecast.boolean } },
- 'ParentTags': ('report',) },
-
- 'section': {
- 'BaseClass': GRLayout.GRSection,
- 'Required': 1,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'Attributes': {
- 'name': {
- 'Typecast': GTypecast.name },
- 'source': {
- 'Typecast': GTypecast.name } },
- 'ParentTags': ('layout',) },
-
- 'default': {
- 'BaseClass': GRLayout.GRDefault,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'ParentTags': ('section',) },
-
- 'firstrow': {
- 'BaseClass': GRLayout.GRFirstRow,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'ParentTags': ('section',) },
-
- 'notfirstrow': {
- 'BaseClass': GRLayout.GRNotFirstRow,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'ParentTags': ('section',) },
-
- 'lastrow': {
- 'BaseClass': GRLayout.GRLastRow,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'ParentTags': ('section',) },
-
- 'notlastrow': {
- 'BaseClass': GRLayout.GRNotLastRow,
- 'MixedContent': 1,
- 'KeepWhitespace': 1,
- 'ParentTags': ('section',) },
-
- 'field': {
- 'BaseClass': GRLayout.GRField,
- 'Attributes': {
- 'name': {
- 'Required': 1,
- 'Typecast': GTypecast.name },
- 'source': {
- 'Typecast': GTypecast.name },
- 'section': {
- 'Typecast': GTypecast.name },
- 'format': {
- 'Typecast': GTypecast.name } },
- 'ParentTags': ('section',) },
-
- 'summ': {
- 'BaseClass': GRLayout.GRSumm,
- 'Attributes': {
- 'name': {
- 'Typecast': GTypecast.name },
- 'function': {
- 'Typecast': GTypecast.name,
- 'Default': "count"},
- 'field': {
- 'Typecast': GTypecast.name,
- 'Default': None},
- 'section': {
- 'Typecast': GTypecast.name },
- 'format': {
- 'Typecast': GTypecast.name } },
- 'ParentTags': ('layout',) },
-
- 'param': {
- 'BaseClass': GRLayout.GRParam,
- 'Attributes': {
- 'name': {
- 'Required': 1,
- 'Typecast': GTypecast.name },
- 'format': {
- 'Typecast': GTypecast.name } },
- 'ParentTags': ('layout',) },
-
- 'sources': {
- 'BaseClass': GRSources.GRSources,
- 'SingleInstance': 1,
- 'ParentTags': ('report',) },
}
borderTypes = {
--- 157,164 ----
***************
*** 340,348 ****
#
for tag in ('section',):
xmlElements[tag]['Attributes'].update( borderStyles )
-
-
-
return GParser.buildImportableTags('report',xmlElements)
--- 213,218 ----
Index:
gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.py
diff -c
gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.py:1.1
gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.py:1.2
***
gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.py:1.1
Sat Apr 26 00:57:49 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Writers/RelativeWriter.py
Tue Nov 18 16:11:55 2003
***************
*** 57,63 ****
def __init__(self):
! self.initialize()
!
--- 57,62 ----
def __init__(self):
! pass
Index: gnue-reports/src/adapters/filters/Universal/Base/Writers/Writer.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/Writers/Writer.py:1.2
gnue-reports/src/adapters/filters/Universal/Base/Writers/Writer.py:1.3
*** gnue-reports/src/adapters/filters/Universal/Base/Writers/Writer.py:1.2
Sat Apr 26 00:57:49 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Writers/Writer.py Tue Nov
18 16:11:56 2003
***************
*** 52,58 ****
def __init__(self):
! self.initialize()
!
--- 52,57 ----
def __init__(self):
! pass
Index: gnue-reports/src/adapters/filters/Universal/html/__init__.py
diff -c gnue-reports/src/adapters/filters/Universal/html/__init__.py:1.1
gnue-reports/src/adapters/filters/Universal/html/__init__.py:1.2
*** gnue-reports/src/adapters/filters/Universal/html/__init__.py:1.1 Fri Apr
25 18:31:33 2003
--- gnue-reports/src/adapters/filters/Universal/html/__init__.py Tue Nov
18 16:11:57 2003
***************
*** 0 ****
--- 1,6 ----
+ from gnue.reports.adapters.filters.Universal.Base.Adapter import
TransformAdapter as Base
+ import Writer
+
+ class TransformAdapter(Base):
+ writer = Writer.Writer()
+
Index:
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py
diff -c
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.15
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.16
***
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.15
Mon Oct 6 15:23:18 2003
---
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py
Tue Nov 18 16:11:57 2003
***************
*** 32,38 ****
import string, re
from gnue.common.utils.FileUtils import openResource
!
# Just what its name implies...
class InvalidPPDFormat(UniversalError):
--- 32,38 ----
import string, re
from gnue.common.utils.FileUtils import openResource
! from gnue.reports.adapters.filters.Universal.Base.Adapter import
UniversalError
# Just what its name implies...
class InvalidPPDFormat(UniversalError):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-reports/src/adapters/filters/Universal Bas...,
Jan Ischebeck <=