--- ImageArchive/ImageArchive.py 2006/03/29 18:48:00 1.76 +++ 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,8 +23,10 @@ import time from threading import Thread import Queue import cgi +import sys import zLOG + from AccessControl import ClassSecurityInfo, getSecurityManager try: @@ -50,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] @@ -299,10 +304,12 @@ class ImageDigilib(Folder,Persistent,Imp roles=user.getRoles() - if self.getRightsQuery()=="": + + if self.getRightsQuery()=="": #query empty then always true return True + if 'Authenticated' in roles: return True @@ -623,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" @@ -644,8 +651,28 @@ 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) @@ -922,13 +949,15 @@ class ImageCollection(Folder, Persistent try: dom=xml.dom.minidom.parseString(xmldoc) except: - return xmldoc + 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] + @@ -951,6 +980,7 @@ class ImageCollection(Folder, Persistent 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) @@ -1568,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""" @@ -1590,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']) @@ -1611,7 +1643,7 @@ class ImageCollection(Folder, Persistent security.declareProtected('View','index_html') def index_html(self,fn=None,generic='No'): """main template collection""" - + if fn: ret=[] @@ -1659,6 +1691,11 @@ class ImageCollection(Folder, Persistent 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""" @@ -1674,7 +1711,7 @@ def manage_AddImageCollection(self,id,ti RESPONSE.redirect('manage_main') - + class ImageCollectionMD(ImageCollection,ZSQLExtendFolder): """Imageviewer and Metadata""" meta_type="ImageCollection MD" @@ -1689,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) @@ -1742,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)