--- versionedFile/extVersionedFile.py	2010/03/31 17:07:43	1.35
+++ versionedFile/extVersionedFile.py	2010/05/11 09:03:08	1.36
@@ -427,8 +427,9 @@ class extVersionedFileFolder(Folder,ECHO
             return cmp(x[1].title.lower(),y[1].title.lower())
 
         def sortDate(x,y):
-            return cmp(y[1].getContentObject().getTime(),x[1].getContentObject().getTime())
-
+    
+                return cmp(y[1].getContentObject().getTime(),x[1].getContentObject().getTime())
+           
         def sortComment(x,y):
             try:
                 xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
@@ -445,19 +446,26 @@ class extVersionedFileFolder(Folder,ECHO
                     xc=x[1].getContentObject().getVComment().lower()
                 except:
                     xc='ZZZZZZZZZZZZZ'.lower()
+                   
                             
             if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()):
                 try:
                     yc=y[1].getContentObject().getVComment().lower()
                 except:
                     yc='ZZZZZZZZZZZZZ'.lower()
+                  
                                     
             return cmp(xc,yc)
 
         def sortAuthor(x,y):
+           
+                return cmp(x[1].getContentObject().lastEditor().lower(),y[1].getContentObject().lastEditor().lower())
+           
             
-            return cmp(x[1].getContentObject().lastEditor().lower(),y[1].getContentObject().lastEditor().lower())
-        
+        def sortVersionComment(x,y):
+         
+                return cmp(x[1].getContentObject().getVersionComment().lower(),y[1].getContentObject().getVersionComment().lower())
+          
         versionedFiles=self.objectItems(self.file_meta_type)
         logging.debug("versionedfiles: %s of type %s"%(repr(versionedFiles),repr(self.file_meta_type)))
         
@@ -467,9 +475,12 @@ class extVersionedFileFolder(Folder,ECHO
             versionedFiles.sort(sortDate)
         elif sortField=='author':
             versionedFiles.sort(sortAuthor)
+        elif sortField=='versioncomment':
+            versionedFiles.sort(sortVersionComment)
         elif sortField=='comment':
             versionedFiles.sort(sortComment)
 
+
         return versionedFiles
 
 
@@ -966,28 +977,28 @@ class extVersionedFile(CatalogAware,Fold
     security.declarePublic('getLastVersion')
     def getLastVersion(self):
         """Last Version (old)"""
-        tmp=0
-        lv=None
-        
-        for v in self.objectValues(self.content_meta_type):
-            #logging.debug("getlastversion: check %s"%v.getId())
-            if v.getVersionNumber() > tmp:
-                    tmp=v.getVersionNumber()
-                    lv=v
-        
-        #ogging.debug("getlastversion: got %s"%lv.getId())
-        return lv
-
+#        tmp=0
+#        lv=None
+#        
+#        for v in self.objectValues(self.content_meta_type):
+#            #logging.debug("getlastversion: check %s"%v.getId())
+#            if v.getVersionNumber() > tmp:
+#                    tmp=v.getVersionNumber()
+#                    lv=v
+#        
+#        #ogging.debug("getlastversion: got %s"%lv.getId())
+#        return lv
+        return self.getContentObject();
+     
     def getContentObject(self):
         """returns the last version object"""
-        if not getattr(self, 'lastVersionId', None):
+        if (not getattr(self, 'lastVersionId', None)) or (not getattr(self, self.lastVersionId, None)):
             # find last version and save it
             lv = self.findLastVersion()
             if lv is None:
                 return None
             self.lastVersionNumber = lv.getVersionNumber()
             self.lastVersionId = lv.getId()
-            
         return getattr(self, self.lastVersionId, None)
 
     security.declarePublic('getData')