--- ImageArchive/ImageArchive.py	2006/07/24 17:31:06	1.98
+++ ImageArchive/ImageArchive.py	2006/12/08 16:24:08	1.101
@@ -499,7 +499,7 @@ class ImageDigilib(Folder,Persistent,Imp
 
             self.scaleWorkingVersions()
 
-            self.scaleToJpg()
+            #self.scaleToJpg()
             if RESPONSE:
                     RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
         
@@ -1731,20 +1731,12 @@ class ImageCollection(OrderedFolder, Per
         else:
             return ids[(row-1)*numberOfColumns:]
         
-    def thumblistSelected_old(self):
-        """main template collection"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self)
-        return pt()
 
     def thumblistSelected(self):
         """main template collection"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self)
         return pt()
     
-    def thumblist_old(self):
-        """main template collection"""
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self)
-        return pt()
 
     def thumblist(self):
         """main template collection"""
@@ -1932,6 +1924,7 @@ class ImageCollectionMD(ImageCollection,
                     ret=ret+"<br>"+file+" already exists!"
 
                 else:
+                    zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding ZOPE: %s"%file)
                     ret=ret+"<br>"+file+" created!"
                     newObj=ImageDigilib(file,file)
                     #print newObj,file
@@ -1941,13 +1934,15 @@ class ImageCollectionMD(ImageCollection,
                     except:
                         """nothing yet"""
                         
-                    
-                    args={}
-                    args['_table']=self.imageCollectionConfig.getTable()
-                    args[self.imageCollectionConfig.getKey()]=file
-                    
-                    if not self.ZSQLInlineSearch(args=args):
-                        self.ZSQLAdd(args=args)    
+                # check entry in database
+                args={}
+                args['_table']=self.imageCollectionConfig.getTable()
+                args[self.imageCollectionConfig.getKey()]=file
+
+                if not self.ZSQLInline(args=args):
+                    zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding DB: %s"%file)
+                    self.ZSQLAdd(args=args)
+ 
         #print ret
         #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
         #print self.ImageStoragePath
@@ -1961,7 +1956,7 @@ class ImageCollectionMD(ImageCollection,
 
         self.scaleWorkingVersions()
         
-        self.scaleToJpgs()
+        #self.scaleToJpgs()
         
         if RESPONSE:
                 RESPONSE.redirect('manage_main')
@@ -2045,6 +2040,7 @@ class ImageCollectionMD(ImageCollection,
         
         rc=[]
         fnIds={}
+
         for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
             key=getattr(found,self.imageCollectionConfig.getKey())
             key=self.getImageByName(key,onlyName="yes")        
@@ -2247,6 +2243,9 @@ class ImageCollectionMD(ImageCollection,
         #return url
         
         url=urllib.unquote(url)
+     
+        url=url.replace(" ","+") # ersetze Leerzeichen in der URL durch "+"
+        print url
         xmldoc=urllib.urlopen(url).read()
         #return xmldoc
         try:
@@ -2308,9 +2307,7 @@ class ImageCollectionMD(ImageCollection,
                 pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
                 return pt()        
         
-        pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
-        return pt()        
-
+        
     def selection(self):
         """show only selected"""
         if self.REQUEST.has_key('filename'):
@@ -2479,4 +2476,4 @@ def manage_AddImageZogiLib(self,id=None,
                  
 def manage_AddImageZogiLibForm(self):
     """to be done"""
-    
\ No newline at end of file
+