--- cdli/cdli_files.py	2007/01/09 16:06:09	1.57
+++ cdli/cdli_files.py	2007/01/24 18:05:24	1.58
@@ -23,6 +23,7 @@ from ZPublisher.BaseRequest import Reque
 import threading
 from BTrees.OOBTree import OOBTree
 import logging
+import transaction
 
 def unique(s):
     """Return a list of the elements in s, but without duplicates.
@@ -167,7 +168,7 @@ class uploadATFfinallyThread(Thread):
         #add the files
         self.uploadATFfinallyThread(ctx,self.procedure,comment=self.comment,basketname=self.basketname,unlock=self.unlock,SESSION=self.SESSION,username=self.username)
         #commit the transactions
-        get_transaction().commit()
+        transaction.get().commit()
         conn.close()
         #set flag for end of this method
         self.end=True
@@ -311,9 +312,9 @@ class uploadATFThread(Thread):
         self.uploadATFThread(ctx,self.upload,self.basketId)
      
         #ctx.cdliRoot.cdli_main.tmpStore2[self.getName()[0:]]=self.returnValue
-
-        get_transaction().commit()
-    
+        
+        
+        transaction.get().commit()
         while self.continueVar:
             pass
        
@@ -630,8 +631,8 @@ class BasketObject_old(Folder):
         
         self.temp_folder.downloadCounter+=1 
         self._p_changed=1
-        get_transaction().commit()      
-
+         
+        transaction.get().commit()
         
         for object in self.contents:
             
@@ -649,7 +650,8 @@ class BasketObject_old(Folder):
         self.REQUEST.RESPONSE.write(ret)    
         self.temp_folder.downloadCounter-=1 
         self._p_changed=1
-        get_transaction().commit()      
+        transaction.get().commit()
+             
         
         
 def manage_addBasket_oldObjectForm(self):
@@ -1199,10 +1201,10 @@ class CDLIBasketVersion(Implicit,Persist
             if str(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
                 self.temp_folder.downloadCounterBaskets-=1 
                 self._p_changed=1
-                get_transaction().commit()      
+                transaction.get().commit()      
                 self.temp_folder.downloadCounterBaskets-=1 
                 self._p_changed=1
-                get_transaction().commit()      
+                transaction.get().commit()      
                 return "please login first"
 
             #check if a locked object exist in the basket.
@@ -1222,7 +1224,7 @@ class CDLIBasketVersion(Implicit,Persist
                 
                 self.temp_folder.downloadCounterBaskets-=1 
                 self._p_changed=1
-                get_transaction().commit()      
+                transaction.get().commit()      
 
                 return pt()
          
@@ -1252,7 +1254,7 @@ class CDLIBasketVersion(Implicit,Persist
 
         self.temp_folder.downloadCounterBaskets-=1 
         self._p_changed=1
-        get_transaction().commit()      
+        transaction.get().commit()      
         
         self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s.atf" """%basket_name)
         self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream")
@@ -1831,7 +1833,7 @@ class CDLIFileFolder(extVersionedFileFol
 
         self.temp_folder.downloadCounter+=1
         self._p_changed=1
-        get_transaction().commit()
+        transaction.get().commit()
        
         list=[(x.getId,x) for x in catalog()]
         list.sort(sortF)
@@ -1851,7 +1853,7 @@ class CDLIFileFolder(extVersionedFileFol
                     RESPONSE.write(obj.getLastVersion().getData()[0:])
                 self.temp_folder.downloadCounter-=1 
                 self._p_changed=1
-        get_transaction().commit()
+        transaction.get().commit()
         #os.close(tf)
         #RESPONSE.redirect(self.absolute_url()+"/downloadFile?fn="%tfilename)
         return True
@@ -2024,7 +2026,7 @@ class CDLIRoot(Folder):
         
         self.lineIndex=li
      
-        get_transaction().commit()
+        transaction.get().commit()
         
 
     def showFile(self,fileId):
@@ -2106,6 +2108,14 @@ class CDLIRoot(Folder):
         """unquote url"""
         return urllib.unquote(str)
     
+    def URLquote_plus(self,str):
+        """quote url"""
+        return urllib.quote_plus(str)
+    
+    def URLunquote_plus(self,str):
+        """unquote url"""
+        return urllib.unquote_plus(str)
+    
     
     def forceunlock(self):
         "break all locks"
@@ -2338,7 +2348,7 @@ class CDLIRoot(Folder):
             if not obj:
                 manage_addCDLIFileFolder(root,folder,folder)
                 fobj=getattr(root,folder)
-                #get_transaction().commit()                           
+                #transaction.get().commit()                           
             else:
                 fobj=obj[0][1]
             
@@ -2366,9 +2376,9 @@ class CDLIRoot(Folder):
 
 	    if count > 1000:
 		print "committing"
-		get_transaction().commit()
+		transaction.get().commit()
 		count=0
-	get_transaction().commit()
+	    transaction.get().commit()
         return "ok"