--- ImageArchive/ImageArchive.py	2005/11/23 17:41:04	1.72
+++ ImageArchive/ImageArchive.py	2006/02/07 18:36:07	1.74
@@ -364,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:
@@ -599,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)
@@ -991,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)
         
@@ -1599,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:
@@ -1618,7 +1617,7 @@ class ImageCollection(Folder, Persistent
           
             overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
             
-            if overview:
+            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)
@@ -1639,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)