[BACK]Return to versionedFile.py CVS log [TXT] [DIR] Up to [Repository] / versionedFile

Diff for /versionedFile/versionedFile.py between versions 1.61 and 1.69

version 1.61, 2006/06/15 22:01:59 version 1.69, 2006/10/11 10:00:27
Line 9  from Products.PageTemplates.ZopePageTemp Line 9  from Products.PageTemplates.ZopePageTemp
 from AccessControl import ClassSecurityInfo  from AccessControl import ClassSecurityInfo
 from difflib import Differ  from difflib import Differ
 from pprint import pprint  from pprint import pprint
   
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware  from Products.ZCatalog.CatalogPathAwareness import CatalogAware
   
 try:  try:
Line 36  except: Line 35  except:
           
 def sortv(x,y):  def sortv(x,y):
     return cmp(x[0],y[0])      return cmp(x[0],y[0])
   
 tdir = "/tmp/downloadVersionedFiles"  tdir = "/tmp/downloadVersionedFiles"
   
 class generateDownloadZip:  class generateDownloadZip:
Line 63  class generateDownloadZip: Line 63  class generateDownloadZip:
         if not os.path.exists(tmpPath):          if not os.path.exists(tmpPath):
             os.mkdir(tmpPath)               os.mkdir(tmpPath) 
                   
           tempfile.tempdir=storeTempDir
     self.response="<h3>1. step: getting the files</h3>"      self.response="<h3>1. step: getting the files</h3>"
   
         for files in self.folder.ZopeFind(self.folder,obj_metatypes=['versionedFile']):          for files in self.folder.ZopeFind(self.folder,obj_metatypes=['versionedFile']):
Line 131  class versionedFileFolder(Folder,ECHO_ba Line 132  class versionedFileFolder(Folder,ECHO_ba
         {'label':'Generate Index.html','action':'generateIndexHTML'},          {'label':'Generate Index.html','action':'generateIndexHTML'},
                 {'label':'Generate Image Index.html','action':'generateIndexHTML_image'},                  {'label':'Generate Image Index.html','action':'generateIndexHTML_image'},
                 {'label':'Generate history_template.html','action':'generateHistoryHTML'},                  {'label':'Generate history_template.html','action':'generateHistoryHTML'},
                 {'label':'Import Folder','action':'importFolderForm'},                  {'label':'Import Folder','action':'impor<olderForm'},
                 {'label':'Export Folder','action':'exportFolder'},                  {'label':'Export Folder','action':'exportFolder'},
                 {'label':'Position of version number','action':'changeHistoryFileNamesForm'},                  {'label':'Position of version number','action':'changeHistoryFileNamesForm'},
                 )                  )
   
               
     def changeHistoryFileNamesForm(self):      def changeHistoryFileNamesForm(self):
         """change position of version num"""          """change position of version num"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self)          pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self)
Line 539  class versionedFileObject(File): Line 541  class versionedFileObject(File):
     manage_editForm._setName('manage_editForm')      manage_editForm._setName('manage_editForm')
   
   
       
    
     security.declarePublic('getTitle')      security.declarePublic('getTitle')
   
     def getTitle(self):      def getTitle(self):
Line 665  class versionedFileObject(File): Line 669  class versionedFileObject(File):
             except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this              except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this
                 ret=str(self.author).replace("-","\n")                  ret=str(self.author).replace("-","\n")
             ret=ret.replace("\r","\n")              ret=ret.replace("\r","\n")
             return ret              return ret.lstrip().rstrip()
   
         else:          else:
             jar=self._p_jar              jar=self._p_jar
Line 831  class versionedFile(CatalogAware,Folder) Line 835  class versionedFile(CatalogAware,Folder)
         le=lv.lastEditor()          le=lv.lastEditor()
         return le          return le
           
           def getLockedBy(self):
           """get locked by"""
           return str(self.lockedBy)
                   
     security.declarePublic('getLastVersion')      security.declarePublic('getLastVersion')
     def getLastVersion(self):      def getLastVersion(self):
Line 856  class versionedFile(CatalogAware,Folder) Line 862  class versionedFile(CatalogAware,Folder)
     def diff(self,data):      def diff(self,data):
         """differenz between lastversion and data"""          """differenz between lastversion and data"""
         d=Differ()          d=Differ()
         tmp=self.getLastVersion().data          data=data.rstrip()
           try:
               tmp=self.getLastVersion().data.rstrip()
           except:
               tmp=str(self.getLastVersion().data).rstrip()
         #print "XX",data,tmp          #print "XX",data,tmp
   
           try:
         l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))          l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
           except:
                   try:
                           l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
                   except:
                           return 9999,[]
                   
         plus=0          plus=0
         minus=0          minus=0
   
         for a in l:          for a in l:
             if a[0]=='+':              if a[0]=='+':
                 plus+=1                  plus+=1
Line 913  class versionedFile(CatalogAware,Folder) Line 931  class versionedFile(CatalogAware,Folder)
         return ret          return ret
   
     security.declareProtected('AUTHENTICATED_USER','forceunlock')         security.declareProtected('AUTHENTICATED_USER','forceunlock')   
     def forceunlock(self,RESPONSE):      def forceunlock(self,RESPONSE=None):
         """unlock"""          """unlock"""
           #safe who had the lock
           if self.lockedBy:
               self.brokenLock=str(self.lockedBy)
           else:
               self.brokenLock=""
         self.lockedBy=''          self.lockedBy=''
           return self.brokenLock
   
     security.declareProtected('AUTHENTICATED_USER','unlock')         security.declareProtected('AUTHENTICATED_USER','unlock')   
     def unlock(self,RESPONSE):      def unlock(self,RESPONSE):
Removed from v.1.61  
changed lines
  Added in v.1.69

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>