--- cdli/cdli_files.py	2010/03/23 16:20:40	1.116
+++ cdli/cdli_files.py	2011/07/20 09:33:35	1.119
@@ -306,10 +306,15 @@ def manage_addCDLIFile(self,id,title,loc
 
 def checkUTF8(data):
     """check utf 8"""
+    if not isinstance(data, str):
+        logging.error("checkUTF8 data is not string! (%s)"%repr(data))
+
     try:
-        data.encode('utf-8')
+        data.decode('utf-8')
+        logging.debug("checkUTF8: ok!")
         return True
     except:
+        logging.debug("checkUTF8: false!")
         return False
     
 
@@ -335,7 +340,7 @@ def splitatf(fh,dir=None,ext=None):
     i=0
 
     #ROC: why split \n first and then \r???
-    if (type(fh) is StringType) or (type(fh) is UnicodeType):
+    if isinstance(fh, basestring):
         iter=fh.split("\n")
     else:
         iter=fh.readlines()
@@ -369,7 +374,7 @@ def splitatf(fh,dir=None,ext=None):
                     if dir:
                         filename=os.path.join(dir,filename)
                     nf=file(filename,"w")
-                    logging.info("open %s"%filename)
+                    logging.debug("open %s"%filename)
                 if nf:    
                     nf.write(line.replace("\n","")+"\n")
 
@@ -378,8 +383,9 @@ def splitatf(fh,dir=None,ext=None):
     except:
         pass
     
-    if not((type(fh) is StringType) or (type(fh) is UnicodeType)):
+    if not isinstance(fh, basestring):
         fh.close()
+        
     return ret,len(os.listdir(dir))
 
 
@@ -802,7 +808,8 @@ class CDLIRoot(Folder):
 		          return fileId
         x=self.v_files.get(fileId)
         logging.debug("obj: "+repr(x))
-        if x==None:
+        if x is None:
+            logging.debug("fileId"+repr(fileId))
             folder=fileId[0:3]
             f2=fileId[0:5]
             fObj = getattr(self.cdliRoot.cdli_main,folder);
@@ -1237,7 +1244,39 @@ class CDLIRoot(Folder):
         
         
         return generateXMLReturn(stObj.returnValue)
+    
+    def uploadATFAsync(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
+        """upload an atf file / basket file"""
+        #self._v_uploadATF.returnValue=None
+        
+       
+        idTmp=str(randint(0,1000000000))
+        
+        if upload is None:
+            return "ERROR NO FILE!"
+        
+        tmpFile = File("/tmp/idTmp","w")
+        # sicher basket in file
+        for x in upload.read():
+            tmpFile.write(x)
+        
+        tmpFile.close();
+        uploadATFAsync(baskerId,idTmp,basketId,self.REQUEST['AUTHENTICATED_USER'],idTmp,serverport=self.REQUEST['SERVER_PORT'])
         
+        return idTMP   
+        
+    def viewTicketAsync(self,ticketNr=1):
+        """viewticket"""
+        
+        tmp = pickle.load(file("/tmp/"+str(ticketNr)+".result"))
+        
+        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','uploadCheckAsync.zpt')).__of__(self)
+        
+        return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
+                  basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
+               
+        
+     
     def uploadATF(self,repeat=None,upload=None,basketId=0,RESPONSE=None):
         """upload an atf file / basket file"""
         #self._v_uploadATF.returnValue=None
@@ -1309,6 +1348,7 @@ class CDLIRoot(Folder):
                 return pt(changed=tmp['changed'],lockerrors=tmp['lockerrors'],errors=tmp['errors'],dir=tmp['dir'],newPs=tmp['newPs'],basketLen=tmp['basketLen'],numberOfFiles=tmp['numberOfFiles'],
                   basketNameFromId=tmp['basketNameFromId'],basketNameFromFile=tmp['basketNameFromFile'],basketId=tmp['basketId'])
                      
+          
     def redoUpload(self,threadName):
        """redo the upload"""
        tmp=self.cdli_main.tmpStore2[threadName]
@@ -1401,7 +1441,11 @@ class CDLIRoot(Folder):
             obj=self.ZopeFind(root,obj_ids=[folder])
             logging.debug("importFiles: folder=%s f2=%s obj=%s"%(folder,f2,obj)) 
             if ext:
-                ext.result="<p>adding: %s </p>"%f+ext.result
+                
+                if type(ext.result) is types.FileType:
+                    ext.result.write("<p>adding: %s </p>\n"%f)
+                else:
+                    ext.result="<p>adding: %s </p>"%f+ext.result
 
             
             if not obj: # if not create it