--- ImageArchive/ImageArchive.py 2005/10/25 18:57:59 1.68 +++ ImageArchive/ImageArchive.py 2006/03/29 18:48:00 1.76 @@ -1,6 +1,5 @@ +genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config -genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images" -#genericServerPath="http://127.0.0.1:8080/zogilib_images" from OFS.Folder import Folder @@ -23,6 +22,7 @@ import time from threading import Thread import Queue import cgi +import zLOG from AccessControl import ClassSecurityInfo, getSecurityManager @@ -31,6 +31,9 @@ try: except: print "ZSQL Extend Folder nicht importiert" print "Metadatendfolder funktioniert nicht!!!" + class ZSQLExtendFolder: + """leer""" + manage_options=() @@ -282,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""" @@ -294,6 +298,11 @@ class ImageDigilib(Folder,Persistent,Imp user=getSecurityManager().getUser() roles=user.getRoles() + + if self.getRightsQuery()=="": + #query empty then always true + return True + if 'Authenticated' in roles: return True @@ -331,6 +340,9 @@ class ImageDigilib(Folder,Persistent,Imp self.filename=filename self.meta=meta + def getBasename(self): + """returns base filename (sans extension)""" + return os.path.splitext(self.filename)[0] def getMeta(self): """ausgabe der metadaten""" @@ -358,12 +370,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: @@ -474,7 +487,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): @@ -485,16 +499,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: @@ -518,7 +536,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" @@ -592,7 +611,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) @@ -623,6 +643,13 @@ class ImageCollection(Folder, Persistent defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP + imgcoll_main = PageTemplateFile('zpt/overview', globals()) + imgcoll_thumb = PageTemplateFile('zpt/thumb', globals()) + + def getServerPath(self): + """get Server path""" + return getattr(self,'serverPath',genericServerPath) + def getScalerPath(self): """get ScalerPath""" path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn=" @@ -752,6 +779,8 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString self.serverPath=serverPath + self.defaultrows = 6 + self.defaultcols = 2 optTMP= Folder.manage_options @@ -771,7 +800,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" @@ -884,7 +913,7 @@ class ImageCollection(Folder, Persistent def xmlinput(self,url): - """Anzeige first sets" + return ""+text+"" else: - return "first sets" + return ""+text+"" - def lastSets(self,selected=None): + def lastSets(self,selected=None,text='last set'): ids=self.show_thumbs() if ids: colRows=self.getColTimesRow() @@ -1147,39 +1190,39 @@ class ImageCollection(Folder, Persistent nr=0 if selected: - return "last set" + return ""+text+"" else: - return "last sets" + return ""+text+"" - def nextSets(self,selected=None): + def nextSets(self,selected=None,text='next set'): """show nextimage""" ids=self.show_thumbs() colRows=self.getColTimesRow() + pagesize = colRows[0] * colRows[1] if ids: if colRows[1]: - if self.REQUEST.SESSION.has_key("filename"): filename=self.REQUEST.SESSION["filename"] try: - nr=ids.index(filename)+colRows[0]*colRows[1] + nr=ids.index(filename)+pagesize if nr>=len(ids): - nr=len(ids)-1 + return "" except: - nr=0 + nr=pagesize else: - nr=0 + nr = pagesize - if nr==len(ids)-1: + if nr>=len(ids)-1: return "" else: if selected: - return "next set" + return ""+text+"" else: - return "next set" + return ""+text+"" - def prevSets(self,selected=None): + def prevSets(self,selected=None,text='previous sets'): """show nextimage""" #return self.getId() @@ -1206,11 +1249,13 @@ class ImageCollection(Folder, Persistent return "" else: if selected: - return "previous sets" + return ""+text+"" else: - return "previous sets" + return ""+text+"" else: return "" + + def showFolders(self): """show subfolders""" ret="" @@ -1230,9 +1275,64 @@ class ImageCollection(Folder, Persistent ret+=link%(iC[1].absolute_url(),iC[0]) ret+="
" return ret + + + def getSetSelector(self, selected=None): + """returns the HTML select element for the sets""" + actualNr=0 + ids=self.show_thumbs() + colRows=self.getColTimesRow() + pagesize = colRows[0]*colRows[1] + numpages = int(len(ids)/pagesize) + if not ((len(ids) % pagesize)==0): + numpages+=1 + + ret="" + if numpages>1: + if selected: + ret+="""" + + return ret + + def isAllSets(self, showall=None): + """returns if there are any sets""" + ids=self.show_thumbs() + colRows=self.getColTimesRow(showall=showall) + pagesize = colRows[0]*colRows[1] + return (len(ids) <= pagesize) + + + def allSets(self, texton='show all', textoff='show groups'): + """returns HTML to toggle 'show all'""" + if self.isAllSets(showall='No'): + return "" + showall=self.REQUEST.SESSION.get('showall','no') + if showall=='no': + ret=''+texton+'' + else: + ret=''+textoff+'' + return ret + + def showRuler(self,selected=None): """show ruler""" - showall =self.REQUEST.SESSION.get('showall','no') + showall=self.REQUEST.SESSION.get('showall','no') ids=self.show_thumbs() if len(ids)==0: return "No entries" @@ -1266,7 +1366,7 @@ class ImageCollection(Folder, Persistent else: ret+=""""""%(ids[k],i) ret+="" - anf="Show thumbnail group no:
" + anf="Show thumbnail group no:
" try: @@ -1311,6 +1411,7 @@ class ImageCollection(Folder, Persistent ret="""show groups """%self.REQUEST['URL1'] return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" @@ -1347,33 +1448,39 @@ class ImageCollection(Folder, Persistent RESPONSE.setCookie("ImageViewerCols",cols) RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") - + + def setDefaultColTimesRow(self, cols, rows): + """sets default columns and rows""" + self.defaultcols = cols + self.defaultrows = rows + def getColTimesRow(self,showall='No'): """coltimesrow""" REQUEST=self.REQUEST """matrix""" if REQUEST.cookies.has_key("ImageViewerRows"): - try: rows=int(REQUEST.cookies["ImageViewerRows"]) except: - rows=6 + rows=getattr(self,'defaultrows',6) else: - rows=6 + rows=getattr(self,'defaultrows',6) if REQUEST.cookies.has_key("ImageViewerCols"): #print "COLS",REQUEST.cookies["ImageViewerCols"] cols=int(REQUEST.cookies["ImageViewerCols"]) else: - cols=2 + cols=getattr(self,'defaultcols',3) + idsnumber=len(self.show_thumbs()) if rows: if cols*rows >idsnumber: rows=int(idsnumber/cols)+1 - #print cols,rows + if showall is None: + showall=self.REQUEST.SESSION.get('showall', 'No') if showall=='yes': rows=int(idsnumber/cols)+1 @@ -1384,7 +1491,7 @@ class ImageCollection(Folder, Persistent """Ausgabe anzahl""" idsAll=self.show_thumbs() - if len(idsAll)==0: #keine Einträge + if len(idsAll)==0: #keine Eintraege return 0 if self.REQUEST.SESSION.has_key("filename") and not (showall=="yes"): filename=self.REQUEST.SESSION["filename"] @@ -1483,7 +1590,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] @@ -1502,7 +1609,7 @@ class ImageCollection(Folder, Persistent security.declareProtected('View','index_html') - def index_html(self,fn=None): + def index_html(self,fn=None,generic='No'): """main template collection""" if fn: @@ -1518,9 +1625,15 @@ class ImageCollection(Folder, Persistent self.REQUEST.SESSION['filenames']=ret #self.REQUEST.SESSION['filenamesIds']=fnIds + + overview=self.ZopeFind(self,obj_ids=['overview_selected.html']) + - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self) - return pt() + if overview and (generic =='No'): + 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'] @@ -1537,11 +1650,15 @@ class ImageCollection(Folder, Persistent overview=self.ZopeFind(self,obj_ids=['overview.html']) - if overview: + if overview and (generic == 'No'): return overview[0][1]() + elif hasattr(self,'templates'): + pt=self.templates.imgcoll_main.__of__(self) + return pt() else: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self) return pt() + def manage_AddImageCollectionForm(self): """Nothing yet"""