--- versionedFile/versionedFile.py	2005/11/02 12:38:52	1.50
+++ versionedFile/versionedFile.py	2005/11/21 19:54:11	1.51
@@ -8,15 +8,15 @@ from AccessControl import getSecurityMan
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from AccessControl import ClassSecurityInfo
-<<<<<<< versionedFile.py
-from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib
+
+
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
-=======
+
 try:
  from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib
 except:
  print "no images"
->>>>>>> 1.49
+
 
 from threading import Thread
 import shutil
@@ -133,8 +133,55 @@ class versionedFileFolder(Folder,ECHO_ba
                 {'label':'Generate history_template.html','action':'generateHistoryHTML'},
                 {'label':'Import Folder','action':'importFolderForm'},
                 {'label':'Export Folder','action':'exportFolder'},
+                {'label':'Position of version number','action':'changeHistoryFileNamesForm'},
                 )
 
+    def changeHistoryFileNamesForm(self):
+        """change position of version num"""
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self)
+        return pt()
+    
+    
+    def changeHistoryFileNames(self,positionVersionNum="front",RESPONSE=None):
+        """change position of version num"""
+        
+        
+        
+        versions=self.ZopeFind(self,obj_metatypes=['versionedFileObject'],search_sub=1)
+        
+        if not (getattr(self,'positionVersionNum','front')==positionVersionNum):
+
+            for version in versions:
+                                
+                if positionVersionNum=="front":
+        
+                    titleTmp=os.path.splitext(version[1].title)
+                    titleTmp2="_".join(titleTmp[0].split("_")[0:-1])
+                    if len(titleTmp)>1:
+                        id=titleTmp[0].split("_")[-1]+"_"+titleTmp2+"."+titleTmp[1]
+                    else:
+                        id=titleTmp[0].split("_")[-1]+"_"+titleTmp2
+
+                else:
+                    titleTmp="_".join(version[1].getId().split("_")[1:])
+                    tmp=os.path.splitext(titleTmp)
+                    if len(tmp)>1:
+                        id=tmp[0]+"_"+version[1].getId().split("_")[0]+tmp[1]
+                    else:
+                        id=tmp[0]+"_"+version[1].getId().split("_")[0]
+                
+                print version[0],id
+                
+                version[1].aq_parent.manage_renameObjects(ids=[version[1].getId()],new_ids=[id])
+                version[1].title=id
+                
+                
+        self.positionVersionNum=positionVersionNum        
+        if RESPONSE:
+            RESPONSE.redirect("manage_main")
+        
+        
+        
     def importFolderForm(self):
         """form fuer folder import"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importFolderForm.zpt')).__of__(self)
@@ -469,13 +516,10 @@ class versionedFileObject(File):
     manage_editForm  =DTMLFile('dtml/fileEdit',globals(),
                                Kind='File',kind='file')
     manage_editForm._setName('manage_editForm')
-<<<<<<< versionedFile.py
+
 
     security.declarePublic('getVComment')
-=======
-    security= ClassSecurityInfo()
 
->>>>>>> 1.49
     def getVComment(self):
         """get the comment of this file"""
         if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""):
@@ -510,16 +554,14 @@ class versionedFileObject(File):
             return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer'])
         return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history")
     
-<<<<<<< versionedFile.py
+
     security.declarePublic('getVersionComment')
     def getVersionComment(self):
         """getversioncomment"""
         return self.versionComment
     
     security.declarePublic('getTime')
-=======
-    security.declarePublic('getTime')                                              
->>>>>>> 1.49
+
     def getTime(self):
         """getTime"""
         #return self.bobobase_modification_time().ISO()
@@ -572,12 +614,9 @@ class versionedFileObject(File):
         """set version"""
         self.versionNumber=versionNumber
 
-<<<<<<< versionedFile.py
 
-    security.declarePublic('getVersionNumber')
-=======
     security.declarePublic('getVersionNumber')                                              
->>>>>>> 1.49
+
     def getVersionNumber(self):
         """get version"""
         return self.versionNumber
@@ -588,11 +627,9 @@ class versionedFileObject(File):
         return self.versionComment
 
    
-<<<<<<< versionedFile.py
-    security.declarePublic('lastEditor')         
-=======
+
     security.declarePublic('lastEditor')                                              	
->>>>>>> 1.49
+
     def lastEditor(self):
         """last Editor"""
         if hasattr(self,'author'):
@@ -848,11 +885,24 @@ class versionedFile(CatalogAware,Folder)
 
         if not newName=='':
             self.title=newName[0:]
-        print self.title
         
-        id="V%i"%self.getVersion()+"_"+self.title
         
-        manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type)
+
+        
+        
+        positionVersionNum=getattr(self,'positionVersionNum','front')
+        
+        if positionVersionNum=='front':
+            id="V%i"%self.getVersion()+"_"+self.title
+        else:
+            tmp=os.path.splitext(self.title)
+            if len(tmp)>1:
+                id=tmp[0]+"_V%i"%self.getVersion()+tmp[1]
+            else:
+                id=tmp[0]+"_V%i"%self.getVersion()
+            
+        
+        manage_addVersionedFileObject(self,id,vC,author,file,id,precondition, content_type)
         objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion()))
         self.REQUEST.SESSION['objID_parent']=self.getId()