marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make report into a separate function in scour. Remove getReport call from scra.py

Browse source
This commit is contained in:
JSCHILL1 2009-07-11 07:57:14 -05:00
parent 9dd7f08231
commit 759924fe72
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scour.py
View file

@ -1692,6 +1692,17 @@ def parse_args(args=None):
return options, [infile, outfile] return options, [infile, outfile]
def getReport():
return ' Number of elements removed: ' + str(numElemsRemoved) + \
'\n Number of attributes removed: ' + str(numAttrsRemoved) + \
'\n Number of unreferenced id attributes removed: ' + str(numIDsRemoved) + \
'\n Number of style properties fixed: ' + str(numStylePropsFixed) + \
'\n Number of raster images embedded inline: ' + str(numRastersEmbedded) + \
'\n Number of path segments reduced/removed: ' + str(numPathSegmentsReduced) + \
'\n Number of bytes saved in path data: ' + str(numBytesSavedInPathData) + \
'\n Number of bytes saved in colors: ' + str(numBytesSavedInColors) + \
'\n Number of points removed from polygons: ' + str(numPointsRemovedFromPolygon)
if __name__ == '__main__': if __name__ == '__main__':
if sys.platform == "win32": if sys.platform == "win32":
from time import clock as get_tick from time import clock as get_tick
@ -1720,16 +1731,9 @@ if __name__ == '__main__':
# GZ: unless silenced by -q or something? # GZ: unless silenced by -q or something?
# GZ: not using globals would be good too # GZ: not using globals would be good too
print >>sys.stderr, ' File:', input.name, \ print >>sys.stderr, ' File:', input.name, \
'\n Time taken:', str(end-start) + 's', \ '\n Time taken:', str(end-start) + 's\n', \
'\n Number of elements removed:', numElemsRemoved, \ getReport()
'\n Number of attributes removed:', numAttrsRemoved, \
'\n Number of unreferenced id attributes removed:', numIDsRemoved, \
'\n Number of style properties fixed:', numStylePropsFixed, \
'\n Number of raster images embedded inline:', numRastersEmbedded, \
'\n Number of path segments reduced/removed:', numPathSegmentsReduced, \
'\n Number of bytes saved in path data:', numBytesSavedInPathData, \
'\n Number of bytes saved in colors:', numBytesSavedInColors, \
'\n Number of points removed from polygons:',numPointsRemovedFromPolygon
oldsize = len(in_string) oldsize = len(in_string)
newsize = len(out_string) newsize = len(out_string)
sizediff = (newsize / oldsize) * 100 sizediff = (newsize / oldsize) * 100

3
scra.py
View file

@ -106,6 +106,3 @@ def fetch(req, indoc,**params):
req.write(scourString(fileitem.file.read())) req.write(scourString(fileitem.file.read()))
else: else:
req.write(scourString(indoc,options)) req.write(scourString(indoc,options))
req.write( '<!-- ' + getReport() + ' -->')