ajack 2003/12/08 16:48:36
Modified: python/gump/model workspace.py
python/gump/syndication rss.py syndicator.py
python/gump/document forrest.py
Log:
Less is more, remove the extra image fluff from RSS...
Revision Changes Path
1.16 +1 -1 jakarta-gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/workspace.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- workspace.py 6 Dec 2003 18:01:48 -0000 1.15
+++ workspace.py 9 Dec 2003 00:48:36 -0000 1.16
@@ -502,7 +502,7 @@
self.addWarning('"forrest" command not found, no xdoc output')
if not self.noRuper and \
- not self.checkExecutable('java
org.krysalis.ruper2.tool.ResourceTool','-version',exitOnError,0,'check_ruper'):
+ not
self.checkExecutable('ruper','-version',exitOnError,0,'check_ruper'):
self.noRuper=1
self.addWarning('"ruper" command not found, no package downloads')
1.9 +10 -7 jakarta-gump/python/gump/syndication/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/rss.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss.py 8 Dec 2003 17:16:31 -0000 1.8
+++ rss.py 9 Dec 2003 00:48:36 -0000 1.9
@@ -129,17 +129,20 @@
self.rssStream.write(' <item>\n')
# Tag on description
- tagOn=("""
- <a href="http://feedvalidator.org/check?url=%s";>
- <img align="right" src="http://feedvalidator.org/images/valid-rss.png";
- alt="[Valid RSS]" title="Validate my RSS feed" width="88"
height="31" />
- </a><br clear='ALL'><hr>""") % (self.rssUrl)
+# tagOn=("""
+# <a href="http://feedvalidator.org/check?url=%s";>
+# <img align="right" src="http://feedvalidator.org/images/valid-rss.png";
+# alt="[Valid RSS]" title="Validate my RSS feed" width="88"
height="31" />
+# </a><br clear='ALL'><hr>""") % (self.rssUrl)
# Mandatory Fields
self.rssStream.write((' <title>%s</title>\n') %(escape(self.title)))
self.rssStream.write((' <link>%s</link>\n') %(escape(self.link)))
- self.rssStream.write((' <description>%s%s</description>\n') \
- %(escape(self.description),escape(tagOn)))
+ self.rssStream.write((' <description>%s</description>\n') \
+ %(escape(self.description)))
+# Not yet
+# self.rssStream.write((' <description>%s%s</description>\n') \
+# %(escape(self.description),escape(tagOn)))
self.rssStream.write(' <author>[EMAIL PROTECTED]</author>\n')
self.rssStream.write((' <dc:subject>%s</dc:subject>\n')
%(escape(self.subject)))
1.7 +4 -3 jakarta-gump/python/gump/syndication/syndicator.py
Index: syndicator.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/syndicator.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- syndicator.py 7 Dec 2003 18:15:45 -0000 1.6
+++ syndicator.py 9 Dec 2003 00:48:36 -0000 1.7
@@ -178,9 +178,10 @@
'</a></td><td>' + state + \
'</td></tr>\n')
content += '<table></p>'
-
- content += ('<br><hr>\n<img align=\'left\' alt=\'Brought to you by Jakarta
Gump\' src=\'%s\'/>') \
- % resolver.getImageUrl('apache.png')
+
+# Overkill
+# content += ('<br><hr>\n<img align=\'left\' alt=\'Brought to you by Jakarta
Gump\' src=\'%s\'/>') \
+# % resolver.getImageUrl('apache.png')
return content
1.33 +4 -4 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- forrest.py 8 Dec 2003 16:34:14 -0000 1.32
+++ forrest.py 9 Dec 2003 00:48:36 -0000 1.33
@@ -247,7 +247,9 @@
document=XDocDocument('Workspace', \
self.resolver.getFile(workspace))
-
+
+ document.createNote('This install runs Python Gump, not Traditional Gump.')
+
definitionSection=document.createSection('Workspace Definition')
definitionTable=definitionSection.createTable()
@@ -298,9 +300,7 @@
#self.documentXML(document,workspace)
detailsSection=document.createSection('Details')
-
- detailsSection.createNote('This install runs Python Gump, not Traditional
Gump.')
-
+
detailsTable=detailsSection.createTable()
detailsTable.createEntry("State : ", workspace.getStateDescription())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
![http://feedvalidator.org/images/valid-rss.png"](http://feedvalidator.org/images/valid-rss.png"){kind=link}