--- ImageArchive/ImageArchive.py	2006/05/15 15:57:35	1.80
+++ ImageArchive/ImageArchive.py	2006/05/16 10:28:08	1.81
@@ -491,58 +491,68 @@ class ImageDigilib(Folder,Persistent,Imp
                     RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
         
 
-    def updateImage(self,file,rename=None,RESPONSE=None):
-            """lade neues Version des Bildes"""
-            #teste ob Dokumenten ordner schon vorhanden
-            #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+    def updateImage(self,_fileupload,_rename=None,RESPONSE=None):
+        """lade neues Version des Bildes"""
+        #teste ob Dokumenten ordner schon vorhanden
+        #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+        
+        identifyField="filename"
+        
+        if _fileupload and _fileupload.filename!="":
             imagePath=os.path.join(self.ImageStoragePath,self.filename)
             path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")
-            
+                
             if not os.path.exists(path):
-                    os.mkdir(path,0775)
-                    os.chmod(path,0775)
-                    
+                os.mkdir(path,0775)
+                os.chmod(path,0775)
+                        
             versionNumber=getattr(self,'versionNumber',0)+1
-
+    
             #teste ob version schon existiert
-
+    
             while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.filename))):
-                    versionNumber+=1
-
+                versionNumber+=1
+    
             #kopieren der bestehenden Version in den Versions ordner.
             imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
-	    try:
-		#zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
-		os.rename(imagePath,imageNewPath)
-	    except:
-		zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))	
-
+            try:    
+    		    #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+    		    os.rename(imagePath,imageNewPath)
+            except:
+                zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))	
+    
             #lesen des upload files und schreiben
             filedata=file.read()
             f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!
             f.write(filedata)
             f.close()
             try:
-                    os.chmod(imagePath,0664)
+                os.chmod(imagePath,0664)
             except:
-                    """hack"""
+                pass
             #scale thumb
-        
-            self.scaleThumbs()
             
+            self.scaleThumbs()
+                
             #scale standard
-
+    
             self.scaleWorkingVersions()
-
-            if rename:
+    
+            if _rename:
                 self.renameImage(file.filename)
         
-        
-            if RESPONSE:
-                    RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+     
+        args=self.REQUEST.form
+       
+        args['-identify']=identifyField+"="+args['_identifyField']
+         
+        self.ZSQLChange(args=args)
+         
+        if RESPONSE:
+            RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
         
 
-            return "done"
+        return "done"
   
     security.declarePublic('thumb')
     def thumb(self,url=None):
@@ -1751,7 +1761,7 @@ class ImageCollectionMD(ImageCollection,
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImageMD.zpt')).__of__(self)
         return pt()
     
-    def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None,**argv):
+    def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None):
         """Add"""
 
         filenameKey="filename"
@@ -1769,9 +1779,10 @@ class ImageCollectionMD(ImageCollection,
         
         manage_AddImageDigilib(self,fn,_fileupload,meta=meta)
         
-        args[key]=_filename
+        args=self.REQUEST.form
+        args[filenameKey]=fn
         
-        self.ZSQLAdd(args=argv)
+        self.ZSQLAdd(args=args)
         
         if RESPONSE:
             return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
@@ -1819,7 +1830,7 @@ class ImageCollectionMD(ImageCollection,
         #context.ZSQLFind(_table='vision_main')
         urlTmp=REQUEST['URL1']
         
-        url=urlTmp+'/searchResultXML?-table=vision_main&'+REQUEST['QUERY_STRING']
+        url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
         
         if xml is None:
             RESPONSE.redirect('xmlinput?url='+urllib.quote(url))