--- cdli/cdli_files.py	2006/05/04 14:40:09	1.15
+++ cdli/cdli_files.py	2006/05/05 08:13:36	1.16
@@ -131,8 +131,8 @@ class BasketObject_old(Folder):
     
     meta_type="basketObject"
     def __init__(self):
-        	"""init basket object"""
-        	self.contents=[]
+                """init basket object"""
+                self.contents=[]
 
     def numberOfItems(self):
         """return anzahl der elemente im basket"""
@@ -152,9 +152,9 @@ class BasketObject_old(Folder):
         return True
 
     def index_html(self):
-        	"""view the basket"""
-        	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','basketObject_index_html.zpt')).__of__(self)
-        	return pt()
+                """view the basket"""
+                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','basketObject_index_html.zpt')).__of__(self)
+                return pt()
 
     def deleteObjects(self,ids,RESPONSE=None):
         """delete objects"""
@@ -166,7 +166,7 @@ class BasketObject_old(Folder):
         
 
         if RESPONSE:
-        	    RESPONSE.redirect(self.absolute_url())
+                    RESPONSE.redirect(self.absolute_url())
 
 
     def unlockTest(self):
@@ -208,7 +208,7 @@ class BasketObject_old(Folder):
             elif not procedure: #keine fails gesperrt dann alle donwloaden
                 procedure="downloadAll" 
         
-        print procedure    
+
         for object in self.contents:
             
                 if (procedure=="downloadAll") or (object.lockedBy=='') or (object.lockedBy==self.REQUEST['AUTHENTICATED_USER']):
@@ -757,14 +757,12 @@ class CDLIFileObject(versionedFileObject
     security.declarePublic('getDesignation')
     def getDesignation(self):
         """get the designation out of the file"""
-	try:
-        	txt=re.search("&[Pp](.*)= (.*)",self.data[0:])
+        try:
+                txt=re.search("&[Pp](.*)= (.+[^\n\r])",self.data[0:])
         except:
-		print self.getId()
-		txt=self.data[0:]
-		print str(txt)
-		
-		return "ERROR"
+                txt=self.data[0:]
+                
+                return "ERROR"
         try:
             return txt.group(2)
         except:
@@ -1044,13 +1042,20 @@ class CDLIFileFolder(versionedFileFolder
         """upload the files"""
         
         if procedure=="uploadchanged":
-            uploadFns=self.REQUEST.SESSION['changed']+self.REQUEST.SESSION['newPs']
+      
+            uploadFns=self.REQUEST.SESSION.get('changed',[])+self.REQUEST.SESSION.get('newPs',[])
         
         elif procedure=="uploadAll":
             uploadFns=[]
             for x in os.listdir(self.REQUEST.SESSION['tmpdir']):
                 if not x in self.REQUEST.SESSION['errors']:
                     uploadFns.append(x)
+        elif procedure=="noupload":
+                if RESPONSE is not None:
+                        RESPONSE.redirect(self.aq_parent.absolute_url())
+			return ""
+                else:
+                        return ""
         else:
             uploadFns=[]
             
@@ -1058,7 +1063,7 @@ class CDLIFileFolder(versionedFileFolder
             founds=self.CDLICatalog.search({'title':fn})
             if len(founds)>0:
                 self.REQUEST.SESSION['author']=str(self.REQUEST['AUTHENTICATED_USER'])
-
+        
                 founds[0].getObject().manage_addCDLIFileObject('',comment,self.REQUEST.SESSION['author'],file=file(os.path.join(self.REQUEST.SESSION['tmpdir'],fn)))