--- ImageArchive/ImageArchive.py 2004/11/12 12:34:59 1.34 +++ ImageArchive/ImageArchive.py 2005/01/27 20:21:56 1.45 @@ -1,6 +1,6 @@ from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem -from Globals import Persistent +from Globals import Persistent,package_home from Acquisition import Implicit from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplate import PageTemplate @@ -12,6 +12,19 @@ import xml.dom.minidom import operator import tempfile import shutil +from types import * + + +try: + from Products.ECHO_content.ECHO_collection import ECHO_basis +except: + print "ECHO Elements not imported" + class ECHO_basis: + """leer""" + + manage_options=() + + def splitPath(str): str2=str.replace("\\","/") @@ -26,7 +39,53 @@ def getText(nodelist): rc = rc + node.data return rc +def getTextFromNode(nodename): + nodelist=nodename.childNodes + rc = "" + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc = rc + node.data + return rc + +class metaData(SimpleItem): + """Klasse fuer metadaten""" + meta_type="metaData" + + def __init__(self,xmlurl,container=None): + """__init__""" + return self.update(xmlurl,container) + + + def update(self,xmlurl,container=None): + """update""" + try: + xmlfh=urllib.urlopen(xmlurl) + dom=xml.dom.minidom.parse(xmlfh) + except: + return None + + md=dom.getElementsByTagName(container) + mlist=[] + if md: + for node in md[0].childNodes: + if node.nodeType==dom.ELEMENT_NODE: + name=node.tagName + content=getTextFromNode(node) + setattr(self,name,content) + mlist.append(name) + self.mlist=mlist[0:] + else: + self.mlist=[] + + def index_html(self): + """index""" + ret="" + for tag in self.mlist: + ret+="

%s=%s

"%(tag,getattr(self,tag)) + return ret+"" + + class ImageDigilib(Folder,Persistent,Implicit): """Anzeige object fuer digilib""" meta_type="ImageDigilib" @@ -58,7 +117,7 @@ class ImageDigilib(Folder,Persistent,Imp def addMetaObjectForm(self): """Add Form""" - pt=PageTemplateFile('Products/ImageArchive/zpt/addMetaObject.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMetaObject.zpt')).__of__(self) return pt() @@ -71,7 +130,26 @@ class ImageDigilib(Folder,Persistent,Imp def getMeta(self): """ausgabe der metadaten""" return self.meta - + + def manageMetaData(self,strict=None): + """create or updateMetadata""" + + md=self.ZopeFind(self,obj_metatypes=["metaData"]) + + if not md: + self._setObject("metaData",metaData(self.meta,"ROW")) + + else: + if not strict: + md[0][1].update(self.meta,"ROW") + else: + print "strict" + if len(md[0][1].mlist)==0: + print " +++",self.getId() + md[0][1].update(self.meta,"ROW") + else: + print " ---",self.getId() + def uploadImage(self,fileupload,path_name): """upload an Image from an Requast""" #path_name=self.ImageStoragePath @@ -82,31 +160,135 @@ class ImageDigilib(Folder,Persistent,Imp f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" + #scale thumb + + self.scaleThumbs() - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + #scale standard - + self.scaleWorkingVersions() - - def download(self): + + + def downloadWorkingVersion(self): + """download working version (2000 pixel)""" + + return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg") + + def download(self,fmt="&mo=rawfile,hires",suffix=None): """download""" - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires" + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename): filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename else: filename=self.filename + + if suffix: + filename=os.path.splitext(filename)[0]+suffix self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename) self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") - image=urllib.urlopen(path).read() - self.REQUEST.RESPONSE.write(image) + #print path + imagefh=urllib.urlopen(path) + + self.REQUEST.RESPONSE.write(imagefh.read()) self.REQUEST.RESPONSE.close() #return self.REQUEST.RESPONSE.redirect(path) - - def thumb(self): + + def updateImageForm(self): + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self) + return pt() + + def renameImageForm(self): + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self) + return pt() + + def renameImage(self,newname,RESPONSE=None): + """umbenennen""" + #umbennen des files im folder + oldname=self.getId() + self.aq_parent.manage_renameObjects(ids=[oldname],new_ids=[newname]) + self.title=newname[0:] + self.filename=newname[0:] + #umbennen des files auf dem server + oldpath=os.path.join(self.ImageStoragePath,oldname) + newpath=os.path.join(self.ImageStoragePath,newname) + os.rename(oldpath,newpath) + + #umbenennen des versionsfolders + oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir") + if os.path.exists(oldfolder): + newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir") + os.rename(oldfolder,newfolder) + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + + if RESPONSE: + RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + + + 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()) + path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir") + + if not os.path.exists(path): + os.mkdir(path,0775) + os.chmod(path,0775) + + versionNumber=getattr(self,'versionNumber',0)+1 + + #teste ob version schon existiert + + while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))): + 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) + + #lesen des upload files und schreiben + filedata=file.read() + f=open(imagePath,"w") + f.write(filedata) + f.close() + try: + os.chmod(imagePath,0664) + except: + """hack""" + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + if rename: + self.renameImage(file.filename) + + + if RESPONSE: + RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + + + return "done" + + def thumb(self,url=None): """show thumb""" thumbname=os.path.splitext(self.filename)[0]+".jpg" ## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname): @@ -118,31 +300,31 @@ class ImageDigilib(Folder,Persistent,Imp #DEVEL:take nausikaa for server solution - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores" + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname self.REQUEST.SESSION['string']=""% path - pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self) - return pt() + if url: + return ""% path + else: + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self) + return pt() def index_html(self): """show image""" #DEVELOP: take first one for server - path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename - - #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename - #self.REQUEST.SESSION['string']=""% path - #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) + path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0] return self.REQUEST.RESPONSE.redirect(path) def manage_AddImageDigilibForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageDigilibForm.zpt')).__of__(self) return pt() 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) @@ -154,10 +336,14 @@ def manage_AddImageDigilib(self,id,fileu RESPONSE.redirect('manage_main') -class ImageCollection(Folder, Persistent, Implicit): + +class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): + """Sammelordner für Bilder""" meta_type="ImageCollection" + + genericMetaDataType="leiden_meta" leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] @@ -165,10 +351,11 @@ 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 - - - def createSet(self,RESPONSE=None,local=None): + + + def createSet(self,RESPONSE=None,local=None,version="working"): """download aller gewaehlten files""" + storeTempDir=tempfile.tempdir tempfile.tempdir="/tmp/archivesImageServer" tmpPath=tempfile.mktemp() @@ -206,7 +393,10 @@ class ImageCollection(Folder, Persistent RESPONSE.write(str("

Get File: %s
\n"%filename)) if local: - sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0] + if version=="working": + sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg" + else: + sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0] targetPath=tmpPath+"/"+filename try: shutil.copyfile(sourcePath,targetPath) @@ -216,9 +406,10 @@ class ImageCollection(Folder, Persistent else: """nothing""" else: - - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires" - + if version=="working": + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000" + else: + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires" image=urllib.urlopen(path).read() @@ -231,8 +422,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 @@ -255,7 +454,7 @@ class ImageCollection(Folder, Persistent else: """nothing""" else: - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+ids[nr+i]+"&mo=rawfile,hires" + path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires" image=urllib.urlopen(path).read() @@ -312,9 +511,26 @@ class ImageCollection(Folder, Persistent def scaleThumbs(self,RESPONSE=None): """scale thumbs""" + #scale thumbs + ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) + if RESPONSE: + RESPONSE.write(ret.read()) + RESPONSE.write("\n") + + return "RESCALING STARTED" + + def scaleWorkingVersions(self,RESPONSE=None): + """scale working versions""" - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) - return "RESCALING STARTED" + #scale standard + + ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath) + if RESPONSE: + RESPONSE.write(ret.read()) + RESPONSE.write("\n") + return "rescaling started" + + def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString): self.id=id @@ -323,34 +539,35 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString - manage_options = Folder.manage_options+( + optTMP= Folder.manage_options + + manage_options = optTMP+( {'label':'Main Config','action':'ImageCollection_config'}, {'label':'Import','action':'ImportFiles'}, - {'label':'Recalculate Metadata','action':'recalculateMeta'}, - {'label':'Import Metadata','action':'importMetaForm'}, + {'label':'Recalculate MetadataLink','action':'recalculateMetaLink'}, + {'label':'Import Metadata File','action':'importMetaFileForm'}, + {'label':'Import Metadata','action':'importMetaData'}, {'label':'Rescale thumbs','action':'scaleThumbs'}, - {'label':'Weight (ECHO)','action':'weightForm'}, + {'label':'Rescale working version','action':'scaleWorkingVersions'}, ) - def weightForm(self): - """Weight""" - pt=PageTemplateFile('Products/ImageArchive/zpt/changeWeight.zpt').__of__(self) - return pt() + - def changeWeight(self,weight,RESPONSE=None): - """Change weight""" - self.weight=weight + def importMetaData(self,strict=None): + """import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty""" - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]): + print image[1].getId() + image[1].manageMetaData(strict) + return "ok" - def importMetaForm(self): + + def importMetaFileForm(self): """import metadata""" - pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importMeta.zpt')).__of__(self) return pt() - def importMeta(self,fileupload,tag): + def importMetaFile(self,fileupload,tag): """import""" filedata=fileupload.read() dom=xml.dom.minidom.parseString(filedata) @@ -437,7 +654,7 @@ class ImageCollection(Folder, Persistent def meta_default(self,filename): """url der metadaten""" - return self.defaultMetaString % filename + return self.defaultMetaString % urllib.quote(filename) def getThumbAttribute(self,id,attr): if hasattr(self,id): @@ -458,7 +675,7 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() - #print url + #return xmldoc try: dom=xml.dom.minidom.parseString(xmldoc) except: @@ -469,7 +686,9 @@ class ImageCollection(Folder, Persistent fnIds={} for image in images: imagename=image.getElementsByTagName('imagename')[0] - text=getText(imagename.childNodes) + + + idnr=image.getElementsByTagName('idnr')[0] id=getText(idnr.childNodes) numberOfPages=image.getElementsByTagName('numberOfPages')[0] @@ -478,17 +697,25 @@ class ImageCollection(Folder, Persistent nop=int(nopT) except: nop=0 - if not text=="": - rc.append((str(text),id,nop)) - fnIds[str(text)]=(id,nop) + texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste + for text in texts: + if not text=="": + 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 - pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self) return pt() - def recalculateMeta(self): + def recalculateMetaLink(self): """recalculate the metadata""" for entryid in self.__dict__: @@ -501,11 +728,13 @@ class ImageCollection(Folder, Persistent def addImage(self): """Add an Image""" - pt=PageTemplateFile('Products/ImageArchive/zpt/addImage.zpt').__of__(self) + + 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: @@ -516,7 +745,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 @@ -539,9 +768,17 @@ class ImageCollection(Folder, Persistent #print newObj self._setObject(file,newObj) #print ret - #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) + #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath) + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + RESPONSE.redirect('manage_main') @@ -565,17 +802,26 @@ class ImageCollection(Folder, Persistent except: """nothing yet""" #print ret - #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) + #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) - RESPONSE.redirect('manage_main') + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + if RESPONSE: + RESPONSE.redirect('manage_main') def ImageCollection_config(self): """Nothing yet""" if not hasattr(self,'defaultMetaString'): self.defaultMetaString="" - pt=PageTemplateFile('Products/ImageArchive/zpt/ChangeImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self) return pt() def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -738,13 +984,13 @@ class ImageCollection(Folder, Persistent def setColTimesRowForm(self): """form for matrix setting""" - pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','selectColTimesRow.zpt')).__of__(self) return pt() def setDone(self): """done""" - pt=PageTemplateFile('Products/ImageArchive/zpt/changedColTimesRow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changedColTimesRow.zpt')).__of__(self) return pt() def setColTimesRow(self,cols,rows): @@ -846,40 +1092,41 @@ class ImageCollection(Folder, Persistent def thumblistSelected_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self) return pt() def thumblistSelected(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self) return pt() def thumblist_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbs.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self) return pt() def thumblist(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb2.zpt')).__of__(self) return pt() def thumblistNewWindow(self): """Thumbs mit clik neues Fenster oeffnen""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbNewWindow.zpt')).__of__(self) return pt() def navig_selected_html(self): """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] - pt=PageTemplateFile('Products/ImageArchive/zpt/navigation_selected.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_selected.zpt')).__of__(self) return pt() def navig_html(self): """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] - pt=PageTemplateFile('Products/ImageArchive/zpt/navigation.zpt').__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self) return pt() @@ -890,7 +1137,7 @@ class ImageCollection(Folder, Persistent else: filen="" self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self) return pt() def index_html(self): @@ -900,21 +1147,21 @@ class ImageCollection(Folder, Persistent else: filen="" - self.REQUEST.SESSION['filename']=filen - + self.REQUEST.SESSION['filename']=filen[0:] + 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') - - pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self) return pt() def manage_AddImageCollectionForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self) return pt() def manage_AddImageCollection(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -954,7 +1201,7 @@ class ImageCollectionIFrame(ImageCollect self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameMain.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameMain.zpt')).__of__(self) return pt() def iframe_html(self): @@ -964,13 +1211,13 @@ class ImageCollectionIFrame(ImageCollect else: filen="" self.REQUEST.response.setCookie('filename',filen) - pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameOverview.zpt')).__of__(self) return pt() def manage_AddImageCollectionIFrameForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionIFrameForm.zpt')).__of__(self) return pt() def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):