--- ImageArchive/ImageArchive.py	2005/10/25 20:03:31	1.70
+++ ImageArchive/ImageArchive.py	2006/02/07 18:36:07	1.74
@@ -284,7 +284,8 @@ class ImageDigilib(Folder,Persistent,Imp
         """get the accessright, return is string "extern" or "intern" """
         return self.getRights(self.filename.split('.')[0])
          
- 
+    security.declarePublic('isAccessible')
+    
     def isAccessible(self):
         """gives true if obejct is accessible taking the rights of the user into account"""
         
@@ -363,12 +364,13 @@ class ImageDigilib(Folder,Persistent,Imp
     def uploadImage(self,fileupload,path_name):
         """upload an Image from an Requast"""
         #path_name=self.ImageStoragePath
-        fn=splitPath(fileupload.filename)
+        fn = self.filename or splitPath(fileupload.filename)
         filename=path_name+"/"+fn
         filedata=fileupload.read()
         f=open(filename,"w")
         f.write(filedata)
         f.close()
+        self.filename = fn
         try:
             os.chmod(filename,0664)
         except:
@@ -523,7 +525,8 @@ class ImageDigilib(Folder,Persistent,Imp
         
 
             return "done"
-            
+  
+    security.declarePublic('thumb')
     def thumb(self,url=None):
         """show thumb"""
         thumbname=os.path.splitext(self.filename)[0]+".jpg"
@@ -597,7 +600,8 @@ def manage_AddImageDigilib(self,id,fileu
     """Add ImageCollection"""
     
     #fileupload=self.REQUEST['fileupload']
-    fn=splitPath(fileupload.filename)
+    #fn=splitPath(fileupload.filename)
+    fn = id # filename is the same as id
     newObj=ImageDigilib(id,fn,meta)
     
     self._setObject(id,newObj)
@@ -785,7 +789,7 @@ class ImageCollection(Folder, Persistent
         """import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty"""
         
         for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]):
-            print image[1].getId()
+           
             image[1].manageMetaData(strict)
         return "ok"
         
@@ -919,12 +923,20 @@ class ImageCollection(Folder, Persistent
                 
                 idnr=image.getElementsByTagName('idnr')[0]
                 id=getText(idnr.childNodes)
-                numberOfPages=image.getElementsByTagName('numberOfPages')[0]
-                nopT=getText(numberOfPages.childNodes)
                 try:
-                        nop=int(nopT)
+                    numberOfPages=image.getElementsByTagName('numberOfPages')[0]
                 except:
-                        nop=0
+                    numberOfPages=None
+                    
+                if numberOfPages:
+                    nopT=getText(numberOfPages.childNodes)
+                    try:
+                            nop=int(nopT)
+                    except:
+                            nop=0
+                else:
+                    nop=0
+                            
                 texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
                 for text in texts:
                     if not text=="":
@@ -940,6 +952,14 @@ class ImageCollection(Folder, Persistent
         self.REQUEST.SESSION['filenames']=rc
         self.REQUEST.SESSION['filenamesIds']=fnIds
         
+        overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+            
+        if overview:
+                return overview[0][1]()
+        else:
+                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
+                return pt()        
+        
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
         return pt()        
 
@@ -973,10 +993,7 @@ class ImageCollection(Folder, Persistent
         else:
             meta=None
         
-        if fileName:
-            fn=fileName
-        else:
-            fn=splitPath(fileupload.filename)
+        fn=fileName or splitPath(fileupload.filename)
         
         manage_AddImageDigilib(self,fn,fileupload,meta=meta)
         
@@ -1425,7 +1442,7 @@ class ImageCollection(Folder, Persistent
         """sets default columns and rows"""
         self.defaultcols = cols
         self.defaultrows = rows
-        
+
     def getColTimesRow(self,showall='No'):
         """coltimesrow"""
         
@@ -1435,15 +1452,16 @@ class ImageCollection(Folder, Persistent
             try:
                 rows=int(REQUEST.cookies["ImageViewerRows"])
             except:
-                rows=self.defaultrows
+                rows=getattr(self,'defaultrows',6)
         else:
-            rows=self.defaultrows
+            rows=getattr(self,'defaultrows',6)
             
         if REQUEST.cookies.has_key("ImageViewerCols"):
             #print "COLS",REQUEST.cookies["ImageViewerCols"]
             cols=int(REQUEST.cookies["ImageViewerCols"])
         else:
-            cols=self.defaultcols
+            cols=getattr(self,'defaultcols',3)
+
 
         idsnumber=len(self.show_thumbs())
         if rows:
@@ -1561,7 +1579,7 @@ class ImageCollection(Folder, Persistent
 
     def getImageByName(self,filename,onlyName=None):
         """get filename"""
-        
+       
         fn=getattr(self,filename,None)
         if not fn:
             filenameM=filename.split(".")[0]
@@ -1580,7 +1598,7 @@ class ImageCollection(Folder, Persistent
         
         
     security.declareProtected('View','index_html')
-    def index_html(self,fn=None):
+    def index_html(self,fn=None,generic=None):
         """main template collection"""
     
         if fn:
@@ -1596,9 +1614,14 @@ class ImageCollection(Folder, Persistent
 
             self.REQUEST.SESSION['filenames']=ret
                 #self.REQUEST.SESSION['filenamesIds']=fnIds
-
-            pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
-            return pt()        
+          
+            overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+            
+            if overview and (generic is None):
+                return overview[0][1]()
+            else:
+                pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
+                return pt()        
 
         if self.REQUEST.has_key('filename'):
             filen=self.REQUEST['filename']
@@ -1615,7 +1638,7 @@ class ImageCollection(Folder, Persistent
             
 
         overview=self.ZopeFind(self,obj_ids=['overview.html'])
-        if overview:
+        if overview and (generic is None):
             return overview[0][1]()
         elif hasattr(self,'templates'):
             pt=self.templates.imgcoll_main.__of__(self)