[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/reports doc/report-notes.txt src/base/GRDa...
|
From: |
Jason Cater |
|
Subject: |
gnue/reports doc/report-notes.txt src/base/GRDa... |
|
Date: |
Sun, 12 Jan 2003 13:55:47 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/01/12 13:55:46
Modified files:
reports/doc : report-notes.txt
reports/src/base: GRDataMapper.py
reports/src/base/layout: ContainerElement.py GRDefault.py
GRField.py GRFirstRow.py GRFormula.py
GRLastRow.py GRLayoutElement.py
GRNotFirstRow.py GRNotLastRow.py
GRParam.py GRPassThru.py GRSection.py
GRSumm.py
Added files:
reports/src/adapters/filters/Standard/_base/psutils:
FontMetrics.py
PrinterDefinition.py
__init__.py
Log message:
* Cleaned up the process() calls
* Started on some ps output utilities
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/doc/report-notes.txt.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/_base/psutils/FontMetrics.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/_base/psutils/PrinterDefinition.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/_base/psutils/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/GRDataMapper.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/ContainerElement.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRDefault.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRField.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRFirstRow.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRFormula.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRLastRow.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRLayoutElement.py.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRNotFirstRow.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRNotLastRow.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRParam.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRPassThru.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRSection.py.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRSumm.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
Patches:
Index: gnue/reports/doc/report-notes.txt
diff -c gnue/reports/doc/report-notes.txt:1.13
gnue/reports/doc/report-notes.txt:1.14
*** gnue/reports/doc/report-notes.txt:1.13 Thu Jan 9 01:58:43 2003
--- gnue/reports/doc/report-notes.txt Sun Jan 12 13:55:44 2003
***************
*** 4,9 ****
--- 4,10 ----
* Relational positioning/sizing
* Charting
* Cross-tabulation
+ * Conditional Text
---------------------------------------------------------------------
Index: gnue/reports/src/base/GRDataMapper.py
diff -c gnue/reports/src/base/GRDataMapper.py:1.20
gnue/reports/src/base/GRDataMapper.py:1.21
*** gnue/reports/src/base/GRDataMapper.py:1.20 Wed Jan 1 19:45:49 2003
--- gnue/reports/src/base/GRDataMapper.py Sun Jan 12 13:55:45 2003
***************
*** 285,291 ****
GDebug.printMesg (10, "sourceMap=%s" % self.sourceMap)
! def addFieldToSection(self, section, field):
self.sectionMap[section].addField(field)
self.sources.getDataSource(self.sectionMap[section].source) \
.referenceField(field)
--- 285,291 ----
GDebug.printMesg (10, "sourceMap=%s" % self.sourceMap)
! def addFieldToSection(self, section, field, bound=1):
self.sectionMap[section].addField(field)
self.sources.getDataSource(self.sectionMap[section].source) \
.referenceField(field)
Index: gnue/reports/src/base/layout/ContainerElement.py
diff -c gnue/reports/src/base/layout/ContainerElement.py:1.53
gnue/reports/src/base/layout/ContainerElement.py:1.54
*** gnue/reports/src/base/layout/ContainerElement.py:1.53 Wed Jan 1
21:36:52 2003
--- gnue/reports/src/base/layout/ContainerElement.py Sun Jan 12 13:55:45 2003
***************
*** 60,68 ****
self.processTrigger('On-Process')
for child in self._children:
if child._type == "_content_":
dest.write(child.getContent())
! else:
# Handle GRSections specially as
# they require extra logic
if child._type == 'GRSection':
--- 60,69 ----
self.processTrigger('On-Process')
for child in self._children:
+
if child._type == "_content_":
dest.write(child.getContent())
! elif isinstance(child, GRLayoutElement) and child._enabled:
# Handle GRSections specially as
# they require extra logic
if child._type == 'GRSection':
***************
*** 80,87 ****
(nextSection._name not in
(child._childSections)),
firstSection=firstSection,
nextSection=nextSection)
# Don't allow the processing to enter trigger objects
- elif isinstance(child, GTrigger):
- pass
else:
# Handle the layout element.
nextSection = child.process(dest, mapper, first, islast,
--- 81,86 ----
Index: gnue/reports/src/base/layout/GRDefault.py
diff -c gnue/reports/src/base/layout/GRDefault.py:1.53
gnue/reports/src/base/layout/GRDefault.py:1.54
*** gnue/reports/src/base/layout/GRDefault.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRDefault.py Sun Jan 12 13:55:45 2003
***************
*** 61,66 ****
def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
return nextSection
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
return nextSection
--- 61,66 ----
def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
return nextSection
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
return nextSection
Index: gnue/reports/src/base/layout/GRField.py
diff -c gnue/reports/src/base/layout/GRField.py:1.53
gnue/reports/src/base/layout/GRField.py:1.54
*** gnue/reports/src/base/layout/GRField.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRField.py Sun Jan 12 13:55:45 2003
***************
*** 28,34 ****
#
- from gnue.common.GObjects import *
from gnue.common import GDebug, GConditions
from gnue.common.GTrigger import GTrigger,GTriggerExtension
--- 28,33 ----
***************
*** 47,53 ****
self._section = None
self.format = None
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
## structuralComment(dest,"<!-- [field:%s] -->" % self.name)
dest.write (string.replace(saxutils.escape("%s" %
self._mymapper.getField(self.name,
self.format)), '\r',''))
--- 46,52 ----
self._section = None
self.format = None
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
## structuralComment(dest,"<!-- [field:%s] -->" % self.name)
dest.write (string.replace(saxutils.escape("%s" %
self._mymapper.getField(self.name,
self.format)), '\r',''))
Index: gnue/reports/src/base/layout/GRFirstRow.py
diff -c gnue/reports/src/base/layout/GRFirstRow.py:1.53
gnue/reports/src/base/layout/GRFirstRow.py:1.54
*** gnue/reports/src/base/layout/GRFirstRow.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRFirstRow.py Sun Jan 12 13:55:45 2003
***************
*** 41,47 ****
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRFirstRow')
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
if isfirst:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
--- 41,47 ----
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRFirstRow')
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
if isfirst:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
Index: gnue/reports/src/base/layout/GRFormula.py
diff -c gnue/reports/src/base/layout/GRFormula.py:1.53
gnue/reports/src/base/layout/GRFormula.py:1.54
*** gnue/reports/src/base/layout/GRFormula.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRFormula.py Sun Jan 12 13:55:45 2003
***************
*** 28,34 ****
#
! from gnue.common.GObjects import *
from gnue.common import GDebug, GConditions
from gnue.common.GTrigger import GTrigger,GTriggerExtension
--- 28,34 ----
#
! from gnue.common.GObjects import GObj
from gnue.common import GDebug, GConditions
from gnue.common.GTrigger import GTrigger,GTriggerExtension
***************
*** 47,52 ****
--- 47,53 ----
self.section = None
self.format = None
self._inits = [self.init]
+ self._value = ""
def _buildObject(self):
if self.section:
***************
*** 57,71 ****
return GRLayoutElement._buildObject(self)
def init(self):
code = ""
for f in self.getChildrenAsContent().code.split('\n'):
if f.strip()[:1] != '#':
code += f + ' '
self._code = code
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
## structuralComment(dest,"<!-- [formula:%s] -->" % (self.section))
# dest.write (self._mymapper.getSummary(self._field, self.function,
self.format))
## structuralComment(dest,"<!-- [/formula] -->")
return nextSection
--- 58,81 ----
return GRLayoutElement._buildObject(self)
def init(self):
+
+ # self._validTriggers = {'__FORMULA__': '__FORMULA__'}
+ # self._mymapper.addField(self.name)
+
code = ""
for f in self.getChildrenAsContent().code.split('\n'):
if f.strip()[:1] != '#':
code += f + ' '
self._code = code
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
## structuralComment(dest,"<!-- [formula:%s] -->" % (self.section))
+ ##self._mymapper.setField(self._field, self.function
# dest.write (self._mymapper.getSummary(self._field, self.function,
self.format))
## structuralComment(dest,"<!-- [/formula] -->")
return nextSection
+
+
+
+
\ No newline at end of file
Index: gnue/reports/src/base/layout/GRLastRow.py
diff -c gnue/reports/src/base/layout/GRLastRow.py:1.53
gnue/reports/src/base/layout/GRLastRow.py:1.54
*** gnue/reports/src/base/layout/GRLastRow.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRLastRow.py Sun Jan 12 13:55:45 2003
***************
*** 42,48 ****
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRLastRow')
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
if islast:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
--- 42,48 ----
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRLastRow')
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
if islast:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
Index: gnue/reports/src/base/layout/GRLayoutElement.py
diff -c gnue/reports/src/base/layout/GRLayoutElement.py:1.54
gnue/reports/src/base/layout/GRLayoutElement.py:1.55
*** gnue/reports/src/base/layout/GRLayoutElement.py:1.54 Thu Jan 2
10:43:13 2003
--- gnue/reports/src/base/layout/GRLayoutElement.py Sun Jan 12 13:55:45 2003
***************
*** 48,56 ****
self.name = None
self._source = None
self._mymapper = None
!
! # Called if section contains data
! def process(self, dest, *args, **parms):
tag = self.getXmlTag()
attrs = ""
for attr in self.__dict__.keys():
--- 48,63 ----
self.name = None
self._source = None
self._mymapper = None
! self._enabled = 1
! self._process = self.process
! self._triggerFunctions = {'enable':{'function':self.enable } }
!
! # Called if section contains data...
! # (The namespace-qualified version)
! def __processWithNamespace(self, dest, *args, **parms):
!
! if not self._enabled: return
!
tag = self.getXmlTag()
attrs = ""
for attr in self.__dict__.keys():
***************
*** 61,75 ****
attrs += ' %s="%s"' % (att, saxutils.escape(self.__dict__[attr]))
dest.write('<%s%s>' % (tag, attrs))
! rv = self._process(dest, *args, **parms)
dest.write('</%s>' % tag)
return rv
!
! # Called if section contains data (the non-namespace version)
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
return nextSection
def prepare(self):
if hasattr(self,'source') and self.source is not None:
self._source = self.source
--- 68,83 ----
attrs += ' %s="%s"' % (att, saxutils.escape(self.__dict__[attr]))
dest.write('<%s%s>' % (tag, attrs))
! rv = self.process(dest, *args, **parms)
dest.write('</%s>' % tag)
return rv
!
!
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
return nextSection
+
def prepare(self):
if hasattr(self,'source') and self.source is not None:
self._source = self.source
***************
*** 79,87 ****
except AttributeError:
self._source = None
! if not self._xmlnamespaces:
! # Avoid any overhead if this element doesn't
! # contain namespace-qualified attributes
! self.process = self._process
return GObj._buildObject(self)
--- 87,102 ----
except AttributeError:
self._source = None
! # Avoid any overhead if this element doesn't
! # contain namespace-qualified attributes
! if self._xmlnamespaces:
! self._process = self.__processWithNamespace
! else:
! self._process = self.process
!
return GObj._buildObject(self)
+
+ def enable(self, value=1):
+ self._enabled = value
+
Index: gnue/reports/src/base/layout/GRNotFirstRow.py
diff -c gnue/reports/src/base/layout/GRNotFirstRow.py:1.53
gnue/reports/src/base/layout/GRNotFirstRow.py:1.54
*** gnue/reports/src/base/layout/GRNotFirstRow.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRNotFirstRow.py Sun Jan 12 13:55:45 2003
***************
*** 41,47 ****
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRNotFirstRow')
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
if not isfirst:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
--- 41,47 ----
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRNotFirstRow')
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
if not isfirst:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
Index: gnue/reports/src/base/layout/GRNotLastRow.py
diff -c gnue/reports/src/base/layout/GRNotLastRow.py:1.53
gnue/reports/src/base/layout/GRNotLastRow.py:1.54
*** gnue/reports/src/base/layout/GRNotLastRow.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRNotLastRow.py Sun Jan 12 13:55:45 2003
***************
*** 41,47 ****
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRNotLastRow')
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
if not islast:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
--- 41,47 ----
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRNotLastRow')
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
if not islast:
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
return nextSection
Index: gnue/reports/src/base/layout/GRParam.py
diff -c gnue/reports/src/base/layout/GRParam.py:1.53
gnue/reports/src/base/layout/GRParam.py:1.54
*** gnue/reports/src/base/layout/GRParam.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRParam.py Sun Jan 12 13:55:45 2003
***************
*** 50,56 ****
GRLayoutElement.__init__(self, parent=None)
GRStubParam.__init__(self, parent)
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
## structuralComment(dest,"<!-- [param:%s] -->" % self.name)
dest.write (self.getFormattedValue())
## structuralComment(dest,"<!-- [/param:%s] -->" % self.name)
--- 50,56 ----
GRLayoutElement.__init__(self, parent=None)
GRStubParam.__init__(self, parent)
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
## structuralComment(dest,"<!-- [param:%s] -->" % self.name)
dest.write (self.getFormattedValue())
## structuralComment(dest,"<!-- [/param:%s] -->" % self.name)
Index: gnue/reports/src/base/layout/GRPassThru.py
diff -c gnue/reports/src/base/layout/GRPassThru.py:1.53
gnue/reports/src/base/layout/GRPassThru.py:1.54
*** gnue/reports/src/base/layout/GRPassThru.py:1.53 Wed Jan 1 21:36:52 2003
--- gnue/reports/src/base/layout/GRPassThru.py Sun Jan 12 13:55:45 2003
***************
*** 42,48 ****
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRPassThru')
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
dest.write('<%s' % self._xmltag)
for attr in self._loadedxmlattrs.keys():
dest.write(' %s="%s"' % (attr,
saxutils.escape(str(self._loadedxmlattrs[attr]))))
--- 42,48 ----
def __init__(self, parent):
ContainerElement.__init__(self, parent, 'GRPassThru')
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
dest.write('<%s' % self._xmltag)
for attr in self._loadedxmlattrs.keys():
dest.write(' %s="%s"' % (attr,
saxutils.escape(str(self._loadedxmlattrs[attr]))))
Index: gnue/reports/src/base/layout/GRSection.py
diff -c gnue/reports/src/base/layout/GRSection.py:1.54
gnue/reports/src/base/layout/GRSection.py:1.55
*** gnue/reports/src/base/layout/GRSection.py:1.54 Sat Jan 4 11:09:33 2003
--- gnue/reports/src/base/layout/GRSection.py Sun Jan 12 13:55:45 2003
***************
*** 77,83 ****
# This is a dataless section...
# simply process it's children
! self.process(dest, mapper, 1, 1, None, None)
else:
firstSection, nextSection = self.getGotos(mapper, 1)
--- 77,83 ----
# This is a dataless section...
# simply process it's children
! self._process(dest, mapper, 1, 1, None, None)
else:
firstSection, nextSection = self.getGotos(mapper, 1)
***************
*** 85,91 ****
if firstSection:
# This is a data-bound section and there
# was data returned, so process section
! self.process(dest, mapper, 1, nextSection == None, self, nextSection)
else:
# This is a data-bound section and there
--- 85,91 ----
if firstSection:
# This is a data-bound section and there
# was data returned, so process section
! self._process(dest, mapper, 1, nextSection == None, self, nextSection)
else:
# This is a data-bound section and there
***************
*** 137,144 ****
# Generic process() method. Process the
# current record and handle any children.
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
self.processTrigger('Pre-Section')
GDebug.printMesg(10,"Repeating Section %s" % self._name)
## structuralComment(dest,"<!-- [section:%s] -->" % self._name)
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
--- 137,145 ----
# Generic process() method. Process the
# current record and handle any children.
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
self.processTrigger('Pre-Section')
+
GDebug.printMesg(10,"Repeating Section %s" % self._name)
## structuralComment(dest,"<!-- [section:%s] -->" % self._name)
nextSection = self.processChildren(dest, mapper, isfirst, islast,
firstSection, nextSection)
***************
*** 154,157 ****
GDebug.printMesg(10,"Leaving section %s" % self._name)
self.processTrigger('Post-Section')
return nextSection
-
--- 155,157 ----
Index: gnue/reports/src/base/layout/GRSumm.py
diff -c gnue/reports/src/base/layout/GRSumm.py:1.53
gnue/reports/src/base/layout/GRSumm.py:1.54
*** gnue/reports/src/base/layout/GRSumm.py:1.53 Wed Jan 1 21:36:53 2003
--- gnue/reports/src/base/layout/GRSumm.py Sun Jan 12 13:55:45 2003
***************
*** 54,60 ****
self._field = string.lower(self.field)
return GRLayoutElement._buildObject(self)
! def _process(self, dest, mapper, isfirst, islast, firstSection,
nextSection):
## structuralComment(dest,"<!-- [summ:%s:%s:%s] -->" % (self.section,
self._field, self.function))
dest.write (self._mymapper.getSummary(self._field, self.function,
self.format))
## structuralComment(dest,"<!-- [/summ] -->")
--- 54,60 ----
self._field = string.lower(self.field)
return GRLayoutElement._buildObject(self)
! def process(self, dest, mapper, isfirst, islast, firstSection, nextSection):
## structuralComment(dest,"<!-- [summ:%s:%s:%s] -->" % (self.section,
self._field, self.function))
dest.write (self._mymapper.getSummary(self._field, self.function,
self.format))
## structuralComment(dest,"<!-- [/summ] -->")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/reports doc/report-notes.txt src/base/GRDa...,
Jason Cater <=