[Openhpi-svn] SF.net SVN: openhpi: [6157] www/trunk/htdocs/tracker

[<re...@us...>]

Revision: 6157
          http://svn.sourceforge.net/openhpi/?rev=6157&view=rev
Author:   renierm
Date:     2006-10-07 17:25:19 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
More tweaks to the tracker scripts

Modified Paths:
--------------
    www/trunk/htdocs/tracker/wiki2web.py
    www/trunk/htdocs/tracker/xml2changelog.py
    www/trunk/htdocs/tracker/xml2wiki.py

Modified: www/trunk/htdocs/tracker/wiki2web.py
===================================================================
--- www/trunk/htdocs/tracker/wiki2web.py	2006-10-07 23:07:49 UTC (rev 6156)
+++ www/trunk/htdocs/tracker/wiki2web.py	2006-10-08 00:25:19 UTC (rev 6157)
@@ -17,17 +17,16 @@
 	Renier Morales <re...@op...>
 """
 import sys, time
-from subprocess import Popen, PIPE
 from mechanize import Browser
 from optparse import OptionParser
 from getpass import getpass
 
-optsparser = OptionParser(usage='%prog [options] <release>')
+optsparser = OptionParser(usage='%prog [options]')
 optsparser.add_option('-f',
-                      '--xmlfile',
-                      default='xml_export.xml',
-                      dest='xmlfile',
-                      help='Read tracker data from this file '
+                      '--wikifile',
+                      default='tracker.wiki',
+                      dest='wikifile',
+                      help='Read tracker data from this wiki file '
                            '[default: %default]')
 optsparser.add_option('-u',
                       '--username',
@@ -40,19 +39,12 @@
                       dest='password',
                       help='Password')
 options, args = optsparser.parse_args()
-if len(args) != 1:
-	print 'Did not get a release level (e.g. %s 2.6.0).' % sys.argv[0]
-	optsparser.print_help()
-	sys.exit()
 
 z = 1
 # Capture wiki tracker data
 print 'Capturing wiki data...'
-popen = Popen('./xml2wiki.py -f %s %s' % (options.xmlfile, args[0]),
-	      shell=True,
-	      stdout=PIPE)
-popen.wait()
-wikidata = popen.stdout.read()
+wikifile = open(options.wikifile, 'r')
+wikidata = wikifile.read()
 
 # Post it
 br = Browser()

Modified: www/trunk/htdocs/tracker/xml2changelog.py
===================================================================
--- www/trunk/htdocs/tracker/xml2changelog.py	2006-10-07 23:07:49 UTC (rev 6156)
+++ www/trunk/htdocs/tracker/xml2changelog.py	2006-10-08 00:25:19 UTC (rev 6157)
@@ -115,7 +115,7 @@
                 print ''
 
 # Main
-db = sfparser.get_data(options.xmlfile, [args[0]])
+db = sf2xml_parser.get_data(options.xmlfile, [args[0]])
 print_changelog = print_text
 #if options.web: print_changelog = print_html
 if options.web: print_changelog = print_wiki

Modified: www/trunk/htdocs/tracker/xml2wiki.py
===================================================================
--- www/trunk/htdocs/tracker/xml2wiki.py	2006-10-07 23:07:49 UTC (rev 6156)
+++ www/trunk/htdocs/tracker/xml2wiki.py	2006-10-08 00:25:19 UTC (rev 6157)
@@ -16,14 +16,13 @@
 Author(s):
         Renier Morales <re...@us...>
 """
+import sys
 from optparse import OptionParser
 from xml.sax import make_parser, handler, SAXException
 import sf2xml_parser
 
-# List of releases to go in the html report
-releases = ['2.7.0']
 # Parse options
-optsparser = OptionParser(usage='%prog [options] [release [release ...]]')
+optsparser = OptionParser(usage='%prog [options] <release [release [release ...]]>')
 optsparser.add_option('-f', '--xmlfile',
 		      dest='xmlfile',
 		      metavar='XMLEXPORTFILE',
@@ -32,8 +31,11 @@
 options, args = optsparser.parse_args()
 
 # Get list of releases if specified
-if len(args) > 0:
-	releases = args
+releases = args
+if len(releases) == 0:
+	print 'Did not get a release level (e.g. %s 2.6.0).' % sys.argv[0]
+        optsparser.print_help()
+        sys.exit()
 	
 # This is for determining what css class name to use for printing the artifact
 def get_colors(artifact):
@@ -55,7 +57,7 @@
 			return style % colors['Closed']
 
 # Go get the parsed data
-db = sfparser.get_data(options.xmlfile, releases, ['Features', 'Bugs'])
+db = sf2xml_parser.get_data(options.xmlfile, releases, ['Features', 'Bugs'])
 
 # Generate the wiki page
 url = 'http://sourceforge.net/tracker/?func=detail&aid=%s&group_id=71730&atid='


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.