--- ImageArchive/ImageArchive.py	2006/05/25 15:49:42	1.94
+++ ImageArchive/ImageArchive.py	2006/12/08 13:54:21	1.100
@@ -53,7 +53,7 @@ tdir="tmp"
 #tdir = "/mpiwg/temp/tmp/archivesImageServer/"
 #tdir="/tmp/archivesImageServer/"
 
-imageExtensions=['jpg','jpeg','tif','tiff','png']
+imageExtensions=['.jpg','.jpeg','.tif','.tiff','.png','.gif']
 
 def splitPath(str):
         str2=str.replace("\\","/")
@@ -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)
         
@@ -779,6 +779,7 @@ class ImageCollection(OrderedFolder, Per
      
        
         #ret=scaleStr
+  	#zLOG.LOG("ImageCollection:scale",zLOG.INFO,scaleStr)
         ret=os.popen2(scaleStr,1)[1].read()
  
         if RESPONSE:
@@ -792,12 +793,12 @@ class ImageCollection(OrderedFolder, Per
         
         name=os.path.splitext(name)[0]
         for extension in imageExtensions:
-            nameExt=name+"."+extension
+            nameExt=name+extension
 
             if hasattr(self,nameExt):
                 return getattr(self,nameExt)
             
-            nameExt=name+"_."+extension
+            nameExt=name+"_"+extension
             if hasattr(self,nameExt):
                 return getattr(self,nameExt)
         
@@ -930,9 +931,9 @@ class ImageCollection(OrderedFolder, Per
         dest=os.path.join(self.scaledBasis,'thumb')
         self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE)
         #ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
-        if RESPONSE:
-                RESPONSE.write(ret.read())
-                RESPONSE.write("\n")
+        #if RESPONSE:
+        #        RESPONSE.write(ret.read())
+        #        RESPONSE.write("\n")
                 
         return "RESCALING STARTED"
 
@@ -1604,16 +1605,17 @@ class ImageCollection(OrderedFolder, Per
         return ret
 
     
-    def show_thumbs_selected_rows(self,numberOfColumns):
+    def show_thumbs_selected_rows(self,numberOfColumns,start=0,max=10000):
         """Ausgabe anzahl"""
         ids=self.show_selected_thumbs()
 
         if not ids:
                 return None
         self.REQUEST.SESSION['ids']=ids
-        number=int(len(ids)/numberOfColumns)+1
-        self.REQUEST.SESSION['number']=range(number)
-        return range(number+1)
+        number=min(start+int(len(ids)/numberOfColumns)+1,max)
+        
+        self.REQUEST.SESSION['number']=range(start,number)
+        return range(start,number+1)
 
     def setColTimesRowForm(self):
         """form for matrix setting"""
@@ -1729,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"""
@@ -1786,13 +1780,22 @@ class ImageCollection(OrderedFolder, Per
         #FIXME: umlaute in filename
         fn=getattr(self,repr(filename),None)
         if not fn:
-            filenameM=filename.split(".")[0]
-                            
-            founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
 
+	    if os.path.splitext(filename)[1].lower() in imageExtensions:
+	            filenameM=os.path.splitext(filename)[0]
+            else:                    
+		   filenameM=filename
 
+
+
+            founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
+
+	    
             for found in founds:
-                foundM=found[0].split(".")[0]
+		if os.path.splitext(found[0])[1].lower() in imageExtensions:
+	                foundM=os.path.splitext(found[0])[0]
+		else:	
+			foundM=found[0]
 
                 if filenameM.lower()==foundM.lower():
                     if onlyName:
@@ -1921,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
@@ -1930,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
@@ -1950,7 +1956,7 @@ class ImageCollectionMD(ImageCollection,
 
         self.scaleWorkingVersions()
         
-        self.scaleToJpgs()
+        #self.scaleToJpgs()
         
         if RESPONSE:
                 RESPONSE.redirect('manage_main')
@@ -2236,6 +2242,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:
@@ -2297,9 +2306,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'):