gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump/python/gump/document forrest.py
Date Tue, 24 Feb 2004 20:18:30 GMT
ajack       2004/02/24 12:18:30

  Modified:    python/gump/utils __init__.py file.py
               python/gump/document forrest.py
  Log:
  Tweaks to (1) add files to docs (2) fix bugs w/ that.
  
  Revision  Changes    Path
  1.24      +7 -7      jakarta-gump/python/gump/utils/__init__.py
  
  Index: __init__.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/utils/__init__.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- __init__.py	23 Feb 2004 23:29:39 -0000	1.23
  +++ __init__.py	24 Feb 2004 20:18:29 -0000	1.24
  @@ -391,10 +391,10 @@
               kid_ru_msgrcv, kid_ru_nsignals, kid_ru_nvcsw, 	\
               kid_ru_nivcsw)=kidresources
               
  -        log.info('My Memory ' + message + ' ' + `my_ru_maxrss`)
  -        log.info('My Resources ' + message + ' ' + `myresources`)
  -        log.info('Child Memory ' + message + ' ' + `kid_ru_maxrss`)
  -        log.info('Child Resources ' + message + ' ' + `kidresources`)        
  +        log.debug('My Memory ' + message + ' ' + `my_ru_maxrss`)
  +        log.debug('My Resources ' + message + ' ' + `myresources`)
  +        log.debug('Child Memory ' + message + ' ' + `kid_ru_maxrss`)
  +        log.debug('Child Resources ' + message + ' ' + `kidresources`)        
       
           #resources=resource.getrusage(resource.RUSAGE_BOTH)
           #log.debug('All Resources ' + message  + ' ' + `resources`)
  
  
  
  1.2       +7 -4      jakarta-gump/python/gump/utils/file.py
  
  Index: file.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/utils/file.py,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- file.py	24 Feb 2004 19:32:28 -0000	1.1
  +++ file.py	24 Feb 2004 20:18:30 -0000	1.2
  @@ -78,7 +78,7 @@
                   FILE_TYPE_CONFIG : "Config",
                   FILE_TYPE_OUTPUT : "Output", }    
       
  -def fileTypeName(type):
  +def fileTypeDescription(type):
       return fileTypeDescriptions.get(type,'Unknown File Type:' + str(type))
                      
   class FileReference(Ownable,Annotatable):
  @@ -100,7 +100,7 @@
               self.addInfo(message)
               
       def overview(self, lines=50):
  -        overview='File Name: ' + self.name +' (Type: ' + fileTypeName(self.type)+')\n'
  +        overview='File Name: ' + self.name +' (Type: ' + fileTypeDescription(self.type)+')\n'
           
           #
           # :TODO: Annotations....
  @@ -126,8 +126,11 @@
       def getType(self):
           return self.type
   
  -    def getTypeName(self):
  -        return fileTypeName(self.type)
  +    def getTypeDescription(self):
  +        return fileTypeDescription(self.type)
  +        
  +    def getPath(self):
  +        return self.path
           
       def getName(self):
           return self.name
  
  
  
  1.81      +15 -9     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.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- forrest.py	24 Feb 2004 19:32:28 -0000	1.80
  +++ forrest.py	24 Feb 2004 20:18:30 -0000	1.81
  @@ -344,6 +344,7 @@
           # x.write('<p><strong>Workspace Config:</strong> <link href=\'xml.txt\'>XML</link></p>')
           # x.write('<p><strong>RSS :</strong> <link href=\'index.rss\'>News
Feed</link></p>')
           
  +        self.documentFileList(document,workspace,'Workspace-level Files')
           self.documentWorkList(document,workspace,'Workspace-level Work')
        
           document.serialize()
  @@ -795,6 +796,7 @@
       
           self.documentXML(document,repo)
           
  +        self.documentFileList(document,repo,'Repository-level Files')
           self.documentWorkList(document,repo,'Repository-level Work')
   
           document.serialize()
  @@ -844,6 +846,7 @@
               
           self.documentXML(document,server)
           
  +        self.documentFileList(document,server,'Server-level Files')
           self.documentWorkList(document,server,'Server-level Work')
   
           document.serialize()
  @@ -894,6 +897,7 @@
               
           self.documentXML(document,tracker)
           
  +        self.documentFileList(document,tracker,'Tracker-level Files')
           self.documentWorkList(document,tracker,'Tracker-level Work')
   
           document.serialize()
  @@ -986,6 +990,7 @@
               
           if not pcount: pallTable.createLine('None')
                              
  +        self.documentFileList(document,module,'Module-level Files')
           self.documentWorkList(document,module,'Module-level Work')
           
           addnSection=document.createSection('Additional Details')
  @@ -1166,6 +1171,7 @@
           if stats.last:
               statsTable.createEntry("Last Success: ", secsToDate(stats.last))
                   
  +        self.documentFileList(document,project,'Project-level Files')  
           self.documentWorkList(document,project,'Project-level Work')  
                   
           addnSection=document.createSection('Additional Details')
  @@ -1616,13 +1622,13 @@
           if not filelist: return
           
           fileSection=xdocNode.createSection(description)        
  -        fileTable=fileSection.createTable(['Name','Type','PAth'])
  +        fileTable=fileSection.createTable(['Name','Type','Path'])
           
           for file in filelist:
               fileRow=fileTable.createRow()
               fileRow.createComment(file.getName())            
               self.insertLink(file,holder,fileRow.createData())  
  -            fileRow.createData(fileTypeDescription(file.getType()))
  +            fileRow.createData(file.getTypeDescription())
               fileRow.createData(file.getPath())
                           
           #
  @@ -1634,13 +1640,13 @@
       def documentFile(self,workspace,fileReference):
           
           fdocument=XDocDocument(	\
  -                fileTypeName(fileReference.getType()) + ' : ' + fileReference.getName(),
\
  +                fileReference.getTypeDescription() + ' : ' + fileReference.getName(),	\
                   self.resolver.getFile(fileReference))
                       
           fileSection=fdocument.createSection('Details')
               
           fileList=fileSection.createList() 
  -        fileList.createEntry("State: ", fileTypeName(fileReference.getType()))
  +        fileList.createEntry("State: ", fileReference.getTypeDescription())
               
           self.insertTypedLink(fileReference.getOwner(),	\
                       fileReference,	\
  @@ -1663,7 +1669,7 @@
                   #
                   # Show the content...
                   #
  -                outputSection=fdocument.createSection('Output')
  +                outputSection=fdocument.createSection('File Contents')
                   outputSource=outputSection.createSource()
                   output=fileReference.getPath()
                   if output:
  @@ -1695,7 +1701,7 @@
                   else:
                       outputSource.createText('No contents in this file.')
           else:
  -            fdocument.createText('No such file or directory.')
  +            fdocument.createParagraph('No such file or directory.')
              
           fdocument.serialize()
           fdocument=None
  
  
  

Mime
View raw message