--- ImageArchive/ImageArchive.py 2004/08/03 13:44:18 1.27 +++ ImageArchive/ImageArchive.py 2004/11/24 17:03:23 1.40 @@ -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 @@ -10,6 +10,22 @@ import os.path import urllib import xml.dom.minidom import operator +import tempfile +import shutil + + +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("\\","/") + return os.path.split(str2)[1] def getText(nodelist): @@ -52,7 +68,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() @@ -69,7 +85,8 @@ class ImageDigilib(Folder,Persistent,Imp def uploadImage(self,fileupload,path_name): """upload an Image from an Requast""" #path_name=self.ImageStoragePath - filename=path_name+"/"+fileupload.filename + fn=splitPath(fileupload.filename) + filename=path_name+"/"+fn filedata=fileupload.read() f=open(filename,"w") f.write(filedata) @@ -78,20 +95,88 @@ class ImageDigilib(Folder,Persistent,Imp os.chmod(filename,0644) 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 downloadWorkingVersion(self): + """download working version (2000 pixel)""" + + return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg") - - def download(self): + 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" - #self.REQUEST.SESSION['string']=""% path - #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) - return self.REQUEST.RESPONSE.redirect(path) - + 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) + self.REQUEST.RESPONSE.close() + #return self.REQUEST.RESPONSE.redirect(path) + + def updateImageForm(self): + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self) + return pt() + + def updateImage(self,file,RESPONSE): + """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") + print "path",path + 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 RESPONSE: + RESPONSE.redirect(self.absolute_url()) + + return "done" + def thumb(self): """show thumb""" thumbname=os.path.splitext(self.filename)[0]+".jpg" @@ -104,33 +189,30 @@ 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) + 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'] - newObj=ImageDigilib(id,fileupload.filename,meta) + fn=splitPath(fileupload.filename) + newObj=ImageDigilib(id,fn,meta) self._setObject(id,newObj) getattr(self,id).uploadImage(fileupload,self.ImageStoragePath) @@ -139,10 +221,12 @@ 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'] @@ -150,10 +234,177 @@ 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 scaleThumbs(self): + + + def createSet(self,RESPONSE=None,local=None,version="working"): + """download aller gewaehlten files""" + tempfile.tempdir="/tmp/archivesImageServer" + + tmpPath=tempfile.mktemp() + + + tmpZip=tempfile.mktemp()+".zip" + tmpFn=os.path.split(tmpZip)[1] + + + if not os.path.exists(tempfile.tempdir): + os.mkdir(tempfile.tempdir) + + if not os.path.exists(tmpPath): + os.mkdir(tmpPath) + + + if RESPONSE: + RESPONSE.setHeader("Content-Type","text/html") + RESPONSE.write("

I am creating the download archive

") + RESPONSE.write("

1. step: getting the images

") + + if not self.REQUEST.SESSION.has_key('filenames'): + RESPONSE.write("

ERROR

") + RESPONSE.write("

I forgot, the selected files. Please reselect.\n") + return 0 + + for id in self.REQUEST.SESSION['filenames']: + + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]): + filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0] + else: + filename=id[0] + + if RESPONSE: + RESPONSE.write(str("

Get File: %s
\n"%filename)) + + if local: + 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) + except: + if RESPONSE: + RESPONSE.write(str("

Error in File: %s (possible missing)
\n"%filename)) + else: + """nothing""" + else: + 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() + + + fh=file(tmpPath+"/"+filename,"w") + + + fh.write(image) + fh.close() + + #folgeseiten + if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1: + ids=self.show_thumbs() + nr=ids.index(id[0]) + + numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1] + for k in range(int(numberOfPages)-1): + i=k+1 + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]): + filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i] + else: + filename=id[0] + + if RESPONSE: + RESPONSE.write(str("

Get File: %s
\n"%filename)) + + if local: + sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+ids[nr+1] + targetPath=tmpPath+"/"+filename + try: + shutil.copyfile(sourcePath,targetPath) + except: + if RESPONSE: + RESPONSE.write(str("

Error in File: %s (missing?)
\n"%filename)) + else: + """nothing""" + else: + 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() + + + fh=file(tmpPath+"/"+filename,"w") + fh.write(image) + fh.close() + + if RESPONSE: + RESPONSE.write("

2. step: creating the downloadable file

") + RESPONSE.write("

Create Zip
") + RESPONSE.write("

This can take a while....
\n") + if RESPONSE: + fh=os.popen2("zip -u %s %s/*"%(tmpZip,tmpPath),1)[1] + RESPONSE.write("
") + for c in fh.read(): + RESPONSE.write(c) + + if c==")": + RESPONSE.write("
\n") + + + else: + os.popen("zip -u %s %s/*"%(tmpZip,tmpPath)) + + + shutil.rmtree(tmpPath) + + if RESPONSE: + RESPONSE.write("

finished
\n") + + if RESPONSE: + len=os.stat(tmpZip)[6] + downloadUrl=self.absolute_url()+"/downloadSet" + RESPONSE.write("""

Click here for download ( %i Byte)

\n"""%(tmpFn,len)) + RESPONSE.write("""

The file will be stored for a while, you can download it later, the URL is:

+

%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn)) + RESPONSE.close() + + def downloadSet(self,fn): + """download prepared set""" + filename="/tmp/archivesImageServer/"+fn + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.zip") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + len=os.stat(filename)[6] + self.REQUEST.RESPONSE.setHeader("Content-Length",len) + images=file(filename).read() + self.REQUEST.RESPONSE.write(images) + self.REQUEST.RESPONSE.close() + + + + def scaleThumbs(self,RESPONSE=None): """scale thumbs""" - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + + #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""" + + #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 @@ -162,31 +413,25 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString - manage_options = Folder.manage_options+( + if ECHO_basis: + optTMP= Folder.manage_options+ECHO_basis.manage_options + else: + 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':'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 - - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + def importMetaForm(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): @@ -223,7 +468,7 @@ class ImageCollection(Folder, Persistent return "OK" - def nextImage(self,request,selected=None): + def nextImage(self,request,selected=None,returnFn=None): """show nextimage""" try: ids=self.show_thumbs() @@ -231,14 +476,18 @@ class ImageCollection(Folder, Persistent filename=request.SESSION["filename"] try: nr=ids.index(filename) + except: nr=0 else: nr=0 if nr==len(ids)-1: - return "" + return "" else: + if returnFn: + return ids[nr+1] + if selected: return "next image" else: @@ -293,18 +542,44 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() - #print url - dom=xml.dom.minidom.parseString(xmldoc) - - images=dom.getElementsByTagName('imagename') + #return xmldoc + try: + dom=xml.dom.minidom.parseString(xmldoc) + except: + return xmldoc + images=dom.getElementsByTagName('image') + rc=[] + fnIds={} for image in images: - text=getText(image.childNodes) - if not text=="": - rc.append(str(text)) + imagename=image.getElementsByTagName('imagename')[0] + + + + idnr=image.getElementsByTagName('idnr')[0] + id=getText(idnr.childNodes) + numberOfPages=image.getElementsByTagName('numberOfPages')[0] + nopT=getText(numberOfPages.childNodes) + try: + nop=int(nopT) + except: + nop=0 + 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 - pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self) + self.REQUEST.SESSION['filenamesIds']=fnIds + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self) return pt() def recalculateMeta(self): @@ -320,7 +595,7 @@ 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): @@ -334,9 +609,10 @@ class ImageCollection(Folder, Persistent meta=None else: meta=None - - manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta) - return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename) + fn=splitPath(fileupload.filename) + + manage_AddImageDigilib(self,fn,fileupload,meta=meta) + return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) #return self.REQUEST['URL1']+'/'+fileupload.filename def ImportFiles2(self,RESPONSE=None): @@ -357,9 +633,18 @@ 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 %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): @@ -382,17 +667,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): @@ -511,23 +805,29 @@ class ImageCollection(Folder, Persistent def showRuler(self,selected=None): """show ruler""" showall =self.REQUEST.SESSION.get('showall','no') + ids=self.show_thumbs() + if len(ids)==0: + return "No entries" + if showall=='no': ids=self.show_thumbs() colRows=self.getColTimesRow() num=int(len(ids)/(colRows[0]*colRows[1])) + if not (operator.mod(len(ids),colRows[0]*colRows[1])==0): + num+=1 a=colRows[0]*colRows[1] #print num,num+1 - if num+1>1: + if num>1: ret="Show thumbnail group no:
" - for i in range(num+1): + for i in range(num): if (operator.mod(i,10)==0) and i>0: ret +="
" #alle 10 linebreak einfuegen k=i*a if selected: href=self.REQUEST['URL1']+"/selection?filename="+ids[k] else: - href=self.REQUEST['URL1']+"?filename="+ids[k] + href=self.REQUEST['URL1']+"?filename="+ids[int(k)] ret+="""%i  """%(href,i) @@ -549,13 +849,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): @@ -608,7 +908,8 @@ class ImageCollection(Folder, Persistent """Ausgabe anzahl""" idsAll=self.show_thumbs() - + if len(idsAll)==0: #keine Einträge + return 0 if self.REQUEST.SESSION.has_key("filename"): filename=self.REQUEST.SESSION["filename"] @@ -656,40 +957,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() @@ -700,7 +1002,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): @@ -710,21 +1012,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): @@ -764,7 +1066,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): @@ -774,13 +1076,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):