--- versionedFile/versionedFile.py	2005/03/21 14:54:50	1.33
+++ versionedFile/versionedFile.py	2005/03/31 16:44:23	1.34
@@ -101,15 +101,34 @@ class versionedFileFolder(Folder,ECHO_ba
 
         
         def sortComment(x,y):
+
+        
+            
 	 try:
-	    x=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
+	    xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower()
 	 except:
-	    x='zzzzzzzzzzzzzzzz'
+	    xc='ZZZZZZZZZZZZZ'.lower()
 	 try:
-	    y=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
+	    yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()
          except:
-            y='zzzzzzzzzzzzzzzz'
-         return cmp(x,y)
+            yc='ZZZZZZZZZZZZZ'.lower()
+
+
+         if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()):
+             
+             try:
+                 xc=x[1].getLastVersion().getVComment().lower()
+             except:
+                 xc='ZZZZZZZZZZZZZ'.lower()
+                 
+         if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()):
+             try:
+                 yc=y[1].getLastVersion().getVComment().lower()
+             except:
+                 yc='ZZZZZZZZZZZZZ'.lower()
+
+         
+         return cmp(xc,yc)
 
         def sortAuthor(x,y):
             
@@ -255,6 +274,11 @@ class versionedFileObject(File):
             
     def manageVCommentForm(self):
         """add a comment"""
+
+        self.REQUEST.SESSION['refer']=self.REQUEST['HTTP_REFERER']
+
+
+        
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVComment')).__of__(self)
         return pt()
 
@@ -269,6 +293,9 @@ class versionedFileObject(File):
 
                 self.vComment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
 
+        if self.REQUEST.SESSION.has_key('refer'):
+
+            return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer'])
         return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history")