ajack 2004/01/09 11:37:54
Modified: python/gump/syndication rss.pyc syndicator.pyc __init__.pyc
python/gump/output statsdb.py
python/gump/model workspace.py
python/gump/document forrest.py
Log:
1) More tweaks for xdocs (separating into pages).
2) Start of Workspace-based stats (trying to debug why LSD still has bad counters.)
Revision Changes Path
1.6 +16 -14 jakarta-gump/python/gump/syndication/rss.pyc
<<Binary file>>
1.5 +17 -17 jakarta-gump/python/gump/syndication/syndicator.pyc
<<Binary file>>
1.2 +4 -3 jakarta-gump/python/gump/syndication/__init__.pyc
<<Binary file>>
1.7 +12 -2 jakarta-gump/python/gump/output/statsdb.py
Index: statsdb.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/output/statsdb.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- statsdb.py 16 Dec 2003 17:13:48 -0000 1.6
+++ statsdb.py 9 Jan 2004 19:37:54 -0000 1.7
@@ -73,6 +73,7 @@
from gump.model.project import Project, ProjectStatistics
from gump.model.module import Module, ModuleStatistics
from gump.model.repository import Repository, RepositoryStatistics
+from gump.model.workspace import Workspace, WorkspaceStatistics
from gump.model.state import *
class StatisticsDB:
@@ -82,6 +83,10 @@
if not name: name='stats.db'
if not dbdir: dbdir=dir.work
self.dbpath = os.path.abspath('%s/%s' % (dbdir,name))
+
+ if not os.path.exists(self.dbpath):
+ log.info('*New* Statistic Database:' + self.dbpath)
+
log.debug('Open Statistic Database:' + self.dbpath)
if not os.name == 'dos' and not os.name == 'nt':
self.db = anydbm.open(self.dbpath,'c')
@@ -95,8 +100,13 @@
print "Project " + pname + " Key " + key
s=self.getProjectStats(pname)
dump(s)
-
-
+
+ # Workspace
+ def getWorkspaceStats(self):
+ stats=WorkspaceStatistics()
+ self.getBaseStats(stats)
+ return stats
+
# Project
def getProjectStats(self,projectName):
1.21 +28 -2 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- workspace.py 17 Dec 2003 00:52:11 -0000 1.20
+++ workspace.py 9 Jan 2004 19:37:54 -0000 1.21
@@ -76,6 +76,7 @@
from gump.model.profile import Profile
from gump.model.object import ModelObject
from gump.model.property import PropertyContainer
+from gump.model.stats import Statable, Statistics
from gump.utils.note import transferAnnotations, Annotatable
#
@@ -88,7 +89,7 @@
BAD_ENVIRONMENT=3
-class Workspace(ModelObject,PropertyContainer):
+class Workspace(ModelObject,PropertyContainer, Statable):
"""Gump Workspace"""
def __init__(self,xmlworkspace):
ModelObject.__init__(self,xmlworkspace)
@@ -630,4 +631,29 @@
return ok
def getJavaCommand(self):
- return self.javaCommand
\ No newline at end of file
+ return self.javaCommand
+
+
+class WorkspaceStatistics(Statistics):
+ """Statistics Holder"""
+ def __init__(self):
+ Statistics.__init__(self,'workspace')
+ self.lastUpdated=-1
+
+ def getLastUpdated(self):
+ return (self.lastUpdated)
+
+ def getKeyBase(self):
+ return self.name
+
+ def lastUpdatedKey(self):
+ return self.getKeyBase() + '-last-updated'
+
+ def update(self,module):
+ Statistics.update(self,module)
+
+ #
+ # Track code updates/changes
+ #
+ if module.isUpdated():
+ self.lastUpdated=default.time
\ No newline at end of file
1.45 +14 -3 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- forrest.py 8 Jan 2004 23:48:16 -0000 1.44
+++ forrest.py 9 Jan 2004 19:37:54 -0000 1.45
@@ -802,7 +802,19 @@
projectRow.createData(secsToElapsedString(project.getElapsedSecs()))
if not pcount: pallTable.createLine('None')
+
+ addnSection=document.createSection('Additional Details')
+ addnPara=addnSection.createParagraph()
+ addnPara.createLink(gumpSafeName(module.getName()) + '_details.html',
\
+ 'More module details ...')
+
+ document.serialize()
+ document=XDocDocument('Module Details : ' + module.getName(), \
+ self.resolver.getFile(module, \
+ module.getName() + '_details', \
+ '.xml'))
+
detailSection=document.createSection('Module Details')
detailList=detailSection.createList()
detailList.createEntry("State: " + module.getStateDescription())
@@ -946,10 +958,9 @@
addnSection=document.createSection('Additional Details')
addnPara=addnSection.createParagraph()
- addnPara.createLink(gumpSafeName(project.getName()) + '_details.xml',
\
+ addnPara.createLink(gumpSafeName(project.getName()) + '_details.html',
\
'More project details ...')
-
-
+
document.serialize()
document=XDocDocument('Project Details : ' + project.getName(), \
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
