--- ImageArchive/ImageArchive.py 2004/11/24 17:03:23 1.40 +++ ImageArchive/ImageArchive.py 2004/12/21 17:22:22 1.41 @@ -12,6 +12,7 @@ import xml.dom.minidom import operator import tempfile import shutil +from types import * try: @@ -23,6 +24,7 @@ except: manage_options=() + def splitPath(str): str2=str.replace("\\","/") return os.path.split(str2)[1] @@ -92,7 +94,7 @@ class ImageDigilib(Folder,Persistent,Imp f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" #scale thumb @@ -210,6 +212,7 @@ def manage_AddImageDigilibForm(self): def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None): """Add ImageCollection""" + #fileupload=self.REQUEST['fileupload'] fn=splitPath(fileupload.filename) newObj=ImageDigilib(id,fn,meta) @@ -221,7 +224,9 @@ def manage_AddImageDigilib(self,id,fileu RESPONSE.redirect('manage_main') + class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): + """Sammelordner für Bilder""" meta_type="ImageCollection" @@ -304,8 +309,16 @@ class ImageCollection(Folder, Persistent #folgeseiten if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1: ids=self.show_thumbs() - nr=ids.index(id[0]) - + try: + nr=ids.index(id[0]) + except: + if RESPONSE: + RESPONSE.write(str("
Error in File: %s (possible missing)
\n"%id[0]))
+ else:
+ """nothing"""
+
+ nr=0
+
numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1]
for k in range(int(numberOfPages)-1):
i=k+1
@@ -413,10 +426,7 @@ class ImageCollection(Folder, Persistent
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
- if ECHO_basis:
- optTMP= Folder.manage_options+ECHO_basis.manage_options
- else:
- optTMP= Folder.manage_options
+ optTMP= Folder.manage_options
manage_options = optTMP+(
{'label':'Main Config','action':'ImageCollection_config'},
@@ -595,11 +605,13 @@ class ImageCollection(Folder, Persistent
def addImage(self):
"""Add an Image"""
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self)
return pt()
def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None):
"""Add"""
+
#print "FU",fileupload
if use_default:
@@ -610,7 +622,7 @@ class ImageCollection(Folder, Persistent
else:
meta=None
fn=splitPath(fileupload.filename)
-
+
manage_AddImageDigilib(self,fn,fileupload,meta=meta)
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
#return self.REQUEST['URL1']+'/'+fileupload.filename