--- ImageArchive/ImageArchive.py 2005/10/25 19:42:59 1.69 +++ ImageArchive/ImageArchive.py 2006/05/15 08:18:02 1.77 @@ -3,6 +3,7 @@ genericServerPath="http://www.mpiwg-berl from OFS.Folder import Folder +from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem from Globals import Persistent,package_home from Acquisition import Implicit @@ -22,6 +23,9 @@ import time from threading import Thread import Queue import cgi +import sys +import zLOG + from AccessControl import ClassSecurityInfo, getSecurityManager @@ -30,6 +34,9 @@ try: except: print "ZSQL Extend Folder nicht importiert" print "Metadatendfolder funktioniert nicht!!!" + class ZSQLExtendFolder: + """leer""" + manage_options=() @@ -46,6 +53,8 @@ except: tdir = "/mpiwg/temp/tmp/archivesImageServer/" #tdir="/tmp/archivesImageServer/" +imageExtensions=['jpg','jpeg','tif','tiff','png'] + def splitPath(str): str2=str.replace("\\","/") return os.path.split(str2)[1] @@ -281,7 +290,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""" @@ -293,6 +303,13 @@ 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 @@ -330,6 +347,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""" @@ -357,12 +377,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: @@ -473,7 +494,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): @@ -484,16 +506,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: @@ -517,7 +543,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" @@ -591,7 +618,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) @@ -602,7 +630,7 @@ def manage_AddImageDigilib(self,id,fileu -class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): +class ImageCollection(OrderedFolder, Persistent, Implicit,ECHO_basis): """Sammelordner fuer Bilder""" meta_type="ImageCollection" @@ -622,6 +650,29 @@ 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_mainMD = PageTemplateFile('zpt/overviewMD', globals()) + imgcoll_thumb = PageTemplateFile('zpt/thumb', globals()) + imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals()) + + def getImageObject(self,name): + """gibt objeckt name zurueck""" + if hasattr(self,name): + return getattr(self,name) + + name=os.path.splitext(name)[0] + for extension in imageExtensions: + nameExt=name+"."+extension + + if hasattr(self,nameExt): + return getattr(self,nameExt) + + nameExt=name+"_."+extension + if hasattr(self,nameExt): + return getattr(self,nameExt) + + return getattr(self,"defaultImg") + def getServerPath(self): """get Server path""" return getattr(self,'serverPath',genericServerPath) @@ -755,6 +806,8 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString self.serverPath=serverPath + self.defaultrows = 6 + self.defaultcols = 2 optTMP= Folder.manage_options @@ -774,7 +827,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" @@ -887,7 +940,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() @@ -1151,39 +1220,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() @@ -1210,11 +1279,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="" @@ -1234,9 +1305,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" @@ -1270,7 +1396,7 @@ class ImageCollection(Folder, Persistent else: ret+=""""""%(ids[k],i) ret+="" - anf="Show thumbnail group no:
" + anf="Show thumbnail group no:
" try: @@ -1315,6 +1441,7 @@ class ImageCollection(Folder, Persistent ret="""show groups """%self.REQUEST['URL1'] return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" @@ -1351,33 +1478,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 @@ -1388,7 +1521,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"] @@ -1465,7 +1598,8 @@ class ImageCollection(Folder, Persistent """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_selected.zpt')).__of__(self) - return pt() + + return pt().data def navig_html(self): """navigation""" @@ -1487,8 +1621,9 @@ class ImageCollection(Folder, Persistent def getImageByName(self,filename,onlyName=None): """get filename""" - - fn=getattr(self,filename,None) + print repr(filename) + #FIXME: umlaute in filename + fn=getattr(self,repr(filename),None) if not fn: filenameM=filename.split(".")[0] founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) @@ -1506,9 +1641,9 @@ 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: ret=[] @@ -1522,9 +1657,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'] @@ -1541,11 +1682,20 @@ 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 navigation(self): + """generate navigation bar""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_fragment')).__of__(self) + return pt() def manage_AddImageCollectionForm(self): """Nothing yet""" @@ -1561,7 +1711,7 @@ def manage_AddImageCollection(self,id,ti RESPONSE.redirect('manage_main') - + class ImageCollectionMD(ImageCollection,ZSQLExtendFolder): """Imageviewer and Metadata""" meta_type="ImageCollection MD" @@ -1576,10 +1726,204 @@ class ImageCollectionMD(ImageCollection, ) try: - changeZSQLExtendForm=ZSQLExtendFolder.changeZSQLExtendForm + changeZSQLExtendForm=ZSQLExtendFolder.changeZSQLExtendForm except: - pass + pass + + + def addImage(self): + """Add an Image""" + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImageMD.zpt')).__of__(self) + return pt() + + def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None,**argv): + """Add""" + + filenameKey="filename" + #print "FU",fileupload + + if _use_default: + try: + meta=self.meta_default(_fileupload.filename) + except: + meta=None + else: + meta=None + + fn=_fileName or splitPath(_fileupload.filename) + + manage_AddImageDigilib(self,fn,_fileupload,meta=meta) + + args[key]=_filename + + self.ZSQLAdd(args=argv) + + if RESPONSE: + return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) + #return self.REQUEST['URL1']+'/'+fileupload.filename + + def navig_html(self): + """navigation""" + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigationMD.zpt')).__of__(self) + return pt() + + def navig_selected_html(self): + """navigation""" + #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_selectedMD.zpt')).__of__(self) + + return pt() + + def decode(self,str): + """decoder""" + if not str: + return "" + if type(str) is StringType: + try: + return str.decode('utf-8') + except: + return str.decode('latin-1') + else: + + return str + + def standardSearch(self): + """standard search page""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','standardSearchPage.zpt')).__of__(self) + return pt() + + def searchResultXML(self): + """xmlformat""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','searchResultXML.zpt')).__of__(self) + return pt() + + def searchDB(self,REQUEST=None,RESPONSE=None,xml=None): + """search""" + #context.ZSQLFind(_table='vision_main') + urlTmp=REQUEST['URL1'] + + url=urlTmp+'/searchResultXML?-table=vision_main&'+REQUEST['QUERY_STRING'] + + if xml is None: + RESPONSE.redirect('xmlinput?url='+urllib.quote(url)) + else: + RESPONSE.redirect(url) + + def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None): + """main template collection""" + + mode=self.REQUEST.get('mode','view') + if fn: + ret=[] + + if type(fn) is ListType: + """experimentell mehr als ein filename""" + for filename in fn: + if not (filename == ""): + ret.append((filename,'',1)) + else: + ret.append((fn,'',1)) + + self.REQUEST.SESSION['filenames']=ret + #self.REQUEST.SESSION['filenamesIds']=fnIds + + overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + + + if overview and (generic =='No'): + return overview[0][1]() + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) + return pt() + + + # filename given, then only display this file + if self.REQUEST.has_key('filename'): + + filen=self.REQUEST['filename'] + else: + filen="" + + + self.REQUEST.SESSION['filename']=filen[0:] + + if not self.REQUEST.SESSION['filename']=="": + url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')() + if mode=="view": + self.REQUEST.RESPONSE.redirect(url) + elif mode=="download": + self.REQUEST.RESPONSE.redirect(url+"/download") + + if self.REQUEST.has_key('showall'): + + self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') + else: + self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no') + + + if selection: + #selection i.e. selection already stored at self.REQUEST.SESSION['filenames'] + overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + + + if overview and (generic =='No'):# + print "selected" + print repr(overview[0][1]) + return overview[0][1]() + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) + return pt() + + + #no filename then show overview + + overview=self.ZopeFind(self,obj_ids=['overviewMD.html']) + if overview and (generic == 'No'): + + + return overview[0][1]() + elif hasattr(self,'templates'): + + pt=self.templates.imgcoll_mainMD.__of__(self) + return pt() + else: + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overviewMD.zpt')).__of__(self) + return pt() + + def nextImage(self,request,selected=None,returnFn=None): + """show nextimage""" + + if not selected and self.REQUEST.has_key('fn'): + imagename=self.REQUEST['fn'].split('/')[-1] + nr=self.getObjectPosition(imagename) + + objects=self.objectIds() + if len(objects)==nr+1: + return "" + else: + fn="/".join(self.REQUEST['fn'].split('/')[0:-1])+"/"+objects[nr+1] + return "next image" + + def prevImage(self,request,selected=None,returnFn=None): + """show nextimage""" + + if not selected and self.REQUEST.has_key('fn'): + imagename=self.REQUEST['fn'].split('/')[-1] + nr=self.getObjectPosition(imagename) + + objects=self.objectIds() + if nr==0: + return "" + else: + fn="/".join(self.REQUEST['fn'].split('/')[0:-1])+"/"+objects[nr-1] + return "prev image" + + def changeRightsQueryForm(self): """change Rights Query""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeRightsQueryForm.zpt')).__of__(self) @@ -1629,8 +1973,87 @@ class ImageCollectionMD(ImageCollection, else: result = '' return result + + def xmlinput(self,url): + """Anzeige von ausgewaehlten thumbs""" + #return url + url=urllib.unquote(url) + xmldoc=urllib.urlopen(url).read() + #return xmldoc + try: + dom=xml.dom.minidom.parseString(xmldoc) + except: + return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc) + images=dom.getElementsByTagName('image') + + rc=[] + fnIds={} + for image in images: + imagename=image.getElementsByTagName('imagename')[0] + + + + + idnr=image.getElementsByTagName('idnr')[0] + id=getText(idnr.childNodes) + try: + numberOfPages=image.getElementsByTagName('numberOfPages')[0] + except: + 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=="": + text=self.getImageByName(text,onlyName="yes") + try: + rc.append((str(text),id,nop)) + fnIds[str(text)]=(id,nop) + except: + rc.append((repr(text),id,nop)) + fnIds[repr(text)]=(id,nop) + + + rc.sort() + self.REQUEST.SESSION['filenames']=rc + self.REQUEST.SESSION['filenamesIds']=fnIds + + overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html']) + + if overview: + return overview[0][1]() + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) + return pt() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) + return pt() + + def selection(self): + """show only selected""" + if self.REQUEST.has_key('filename'): + filen=self.REQUEST['filename'] + else: + filen="" + self.REQUEST.SESSION['filename']=filen + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self) + return pt() + + def thumblistSelectedMD(self): + """main template collection""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselectedMD.zpt')).__of__(self) + return pt() + def manage_AddImageCollectionMDForm(self): """Nothing yet""" pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)