--- ImageArchive/ImageArchive.py 2005/10/26 14:57:59 1.71 +++ ImageArchive/ImageArchive.py 2006/02/07 20:29:31 1.75 @@ -22,6 +22,7 @@ import time from threading import Thread import Queue import cgi +import zLOG from AccessControl import ClassSecurityInfo, getSecurityManager @@ -284,7 +285,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 +365,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: @@ -479,7 +482,8 @@ class ImageDigilib(Folder,Persistent,Imp def updateImage(self,file,rename=None,RESPONSE=None): """lade neues Version des Bildes""" #teste ob Dokumenten ordner schon vorhanden - imagePath=os.path.join(self.ImageStoragePath,self.getId()) + #imagePath=os.path.join(self.ImageStoragePath,self.getId()) + imagePath=os.path.join(self.ImageStoragePath,self.filename) path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir") if not os.path.exists(path): @@ -490,16 +494,20 @@ class ImageDigilib(Folder,Persistent,Imp #teste ob version schon existiert - while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))): + while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.filename))): versionNumber+=1 #kopieren der bestehenden Version in den Versions ordner. - imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.getId())) - os.rename(imagePath,imageNewPath) + imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename)) + try: + #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath)) + os.rename(imagePath,imageNewPath) + except: + zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath)) #lesen des upload files und schreiben filedata=file.read() - f=open(imagePath,"w") + f=open(imagePath,"w") # if we wanted to have filename=id we should do it here! f.write(filedata) f.close() try: @@ -523,7 +531,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 +606,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 +795,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 +929,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 +958,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 +999,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) @@ -1562,7 +1585,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] @@ -1581,7 +1604,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: @@ -1597,9 +1620,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'] @@ -1616,7 +1644,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)