--- ImageArchive/ImageArchive.py 2005/08/09 16:48:29 1.63 +++ ImageArchive/ImageArchive.py 2005/10/12 19:33:39 1.66 @@ -1,3 +1,8 @@ + +#genericServerPath="http://content.mpiwg-berlin.mpg.de/zogilib_images" +genericServerPath="http://127.0.0.1:8080/zogilib_images" + + from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem from Globals import Persistent,package_home @@ -18,14 +23,17 @@ import time from threading import Thread import Queue import cgi + from AccessControl import ClassSecurityInfo + try: from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder except: print "ZSQL Extend Folder nicht importiert" print "Metadatendfolder funktioniert nicht!!!" - class ZSQLExtendFolder: - """leer""" + + + try: from Products.ECHO_content.ECHO_collection import ECHO_basis except: @@ -40,15 +48,15 @@ tdir = "/mpiwg/temp/tmp/archivesImageSer #tdir="/tmp/archivesImageServer/" def splitPath(str): - str2=str.replace("\\","/") - return os.path.split(str2)[1] + str2=str.replace("\\","/") + return os.path.split(str2)[1] def getText(nodelist): rc = "" for node in nodelist: - if node.nodeType == node.TEXT_NODE: + if node.nodeType == node.TEXT_NODE: rc = rc + node.data return rc @@ -56,7 +64,7 @@ def getTextFromNode(nodename): nodelist=nodename.childNodes rc = "" for node in nodelist: - if node.nodeType == node.TEXT_NODE: + if node.nodeType == node.TEXT_NODE: rc = rc + node.data return rc @@ -80,7 +88,7 @@ class generateSet: """call generate Set""" storeTempDir=tempfile.tempdir - tempfile.tempdir=tdir + tempfile.tempdir=tdir tmpPath=tempfile.mktemp() tmpZip=tempfile.mktemp()+".gtz" @@ -90,92 +98,100 @@ class generateSet: os.mkdir(tempfile.tempdir) if not os.path.exists(tmpPath): - os.mkdir(tmpPath) - - self.response="" + os.mkdir(tmpPath) + + self.response="" self.response="

1. step: getting the images

" for id in self.filenames: - if self.filenamesIds.has_key(id[0]): - filename=self.filenamesIds[id[0]][0]+"_"+id[0] - else: - filename=id[0] + if self.filenamesIds.has_key(id[0]): + filename=self.filenamesIds[id[0]][0]+"_"+id[0] + else: + filename=id[0] self.response+=str("

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

Error in File: %s (possible missing)
\n"%filename)) - else: - if self.version=="working": - path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000" - else: - path=self.scalerPath+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() + else: + if self.version=="working": + requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000" + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString + + else: + requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires" + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString + + + image=urllib.urlopen(path).read() + + + fh=file(tmpPath+"/"+filename,"w") + + + fh.write(image) + fh.close() #folgeseiten - if int(self.filenamesIds[id[0]][1])>1: - #ids=self.show_thumbs() - nr=self.ids.index(id[0]) - try: + + if int(self.filenamesIds[id[0]][1])>1: + #ids=self.show_thumbs() + + try: nr=self.ids.index(id[0]) - except: + except: self.response+=str("

Error in File: %s (possible missing)
\n"%id[0]) nr=0 - numberOfPages=self.filenamesIds[id[0]][1] - for k in range(int(numberOfPages)-1): - i=k+1 - if self.filenamesIds.has_key(id[0]): - filename=self.filenamesIds[id[0]][0]+"_"+self.ids[nr+i] - else: - filename=id[0] + numberOfPages=self.filenamesIds[id[0]][1] + for k in range(int(numberOfPages)-1): + i=k+1 + if self.filenamesIds.has_key(id[0]): + filename=self.filenamesIds[id[0]][0]+"_"+self.ids[nr+i] + else: + filename=id[0] self.response+=str("

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

Error in File: %s (missing?)
\n"%filename) - - else: - path=self.scalerPath+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() + + else: + + requestString=self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires" + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString + + image=urllib.urlopen(path).read() + + + fh=file(tmpPath+"/"+filename,"w") + fh.write(image) + fh.close() self.response+="

2. step: creating the downloadable file

" - self.response+="

Create gtar
" + self.response+="

Create gtar
" self.response+="

This can take a while....
\n" fh=os.popen2("gnutar zcvf %s %s/*"%(tmpZip,tmpPath),1)[1] @@ -184,8 +200,8 @@ class generateSet: self.response+=c if c==")": self.response+="
\n" - - + + shutil.rmtree(tmpPath) @@ -196,7 +212,7 @@ class generateSet: downloadUrl=self.url+"/downloadSet" self.response+="""

Click here for download ( %i Byte)

\n"""%(tmpFn,len) self.response+="""

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

-

%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn) +

%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn) self.done=True def getResult(self): @@ -291,6 +307,7 @@ class ImageDigilib(Folder,Persistent,Imp self.filename=filename self.meta=meta + def getMeta(self): """ausgabe der metadaten""" return self.meta @@ -327,74 +344,79 @@ class ImageDigilib(Folder,Persistent,Imp os.chmod(filename,0664) except: """hack""" - #scale thumb - + #scale thumb + self.scaleThumbs() - #scale standard + #scale standard - self.scaleWorkingVersions() + self.scaleWorkingVersions() - - + + def downloadWorkingVersion(self): - """download working version (2000 pixel)""" - - return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg") + """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=self.scalerPath+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") + + requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString + + + 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") #print path - imagefh=urllib.urlopen(path,'rb') + imagefh=urllib.urlopen(path,'rb') - self.REQUEST.RESPONSE.write(imagefh.read()) - self.REQUEST.RESPONSE.close() + self.REQUEST.RESPONSE.write(imagefh.read()) + 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() + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self) + return pt() + + security.declareProtected('View management screens','renameImageForm') def renameImageForm(self): - """form""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self) - return pt() + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self) + return pt() security.declareProtected('View management screens','renameImage') 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:] + """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) + 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") + + #umbenennen des versionsfolders + oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir") newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir") - if os.path.exists(oldfolder): + if os.path.exists(oldfolder): os.rename(oldfolder,newfolder) else: os.mkdir(newfolder) - #schreibe info uber umbennenung + #schreibe info uber umbennenung renameName=os.path.join(newfolder,"renamed") if os.path.exists(renameName): @@ -413,71 +435,72 @@ class ImageDigilib(Folder,Persistent,Imp fh.close() #scale thumb - - self.scaleThumbs() - - #scale standard + + self.scaleThumbs() + + #scale standard - self.scaleWorkingVersions() + self.scaleWorkingVersions() if RESPONSE: - RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) - + 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) - + """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 - return "done" - + #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" + requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString - path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" self.REQUEST.SESSION['string']=""% path if url: @@ -491,8 +514,11 @@ class ImageDigilib(Folder,Persistent,Imp """show thumb mit Metadaten erwarten image in ImageCollectionMD """ thumbname=os.path.splitext(self.filename)[0]+".jpg" - - path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" + + requestString=self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores" + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="+requestString + + self.REQUEST.SESSION['string']=""% path if url: @@ -507,12 +533,29 @@ class ImageDigilib(Folder,Persistent,Imp return pt() + def image(self,dw=None,dh=None): + """show image only with scaler""" + str=[] + if (not dw) and (not dh): + str.append("mo=file") + if dw: + str.append("dw=%s"%dw) + if dh: + str.append("dw=%s"%dh) + + str.append("lv=2&fn=%s"%self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]) + + + requestString="&".join(str) + + self.REQUEST.RESPONSE.redirect(getattr(self,'serverPath',genericServerPath)+"/scaledImage?"+requestString) + def index_html(self): - """show image""" + """show image with zogilib""" #DEVELOP: take first one for server #path="http://127.0.0.1:8080/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0] - path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0] + path=getattr(self,'serverPath',genericServerPath)+"?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0] return self.REQUEST.RESPONSE.redirect(path) @@ -537,12 +580,14 @@ def manage_AddImageDigilib(self,id,fileu class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): - - """Sammelordner für Bilder""" + """Sammelordner fuer Bilder""" meta_type="ImageCollection" + + security=ClassSecurityInfo() + #scalerPath="http://127.0.0.1:18080/digitallibrary/servlet/Scaler/?fn=" - scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn=" + #scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn=" zipThreads={} zipThreads2={} @@ -556,7 +601,7 @@ class ImageCollection(Folder, Persistent def getScalerPath(self): """get ScalerPath""" - return self.scalerPath + path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn=" def getImageViewerPath(self): """get ImageViewerPath""" @@ -572,7 +617,7 @@ class ImageCollection(Folder, Persistent return """ 2;url=%s?repeat=%s """%(self.absolute_url()+"/createSet",tn) def createSet(self,RESPONSE=None,local=None,version="working",repeat=None): - """download aller gewaehlten files""" + """download aller gewaehlten files""" threadName=repeat @@ -600,7 +645,7 @@ class ImageCollection(Folder, Persistent wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) if wait_template: - return wait_template[0][1]() + return wait_template[0][1]() pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self) return pt() @@ -638,50 +683,51 @@ class ImageCollection(Folder, Persistent return ret+"" def downloadSet(self,fn): - """download prepared set""" - filename=os.path.join(tdir,fn) + """download prepared set""" + filename=os.path.join(tdir,fn) - - self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.tgz") - 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() + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.tgz") + 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""" - - #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") - + if RESPONSE: + RESPONSE.write(ret.read()) + RESPONSE.write("\n") + return "RESCALING STARTED" def scaleWorkingVersions(self,RESPONSE=None): """scale working versions""" - - #scale standard + + #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" + 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): + def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath): self.id=id self.title=title self.ImageStoragePath=ImageStoragePath self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString + self.serverPath=serverPath optTMP= Folder.manage_options @@ -692,7 +738,7 @@ class ImageCollection(Folder, Persistent {'label':'Import Metadata File','action':'importMetaFileForm'}, {'label':'Import Metadata','action':'importMetaData'}, {'label':'Rescale thumbs','action':'scaleThumbs'}, - {'label':'Rescale working version','action':'scaleWorkingVersions'}, + {'label':'Rescale working version','action':'scaleWorkingVersions'}, ) @@ -753,18 +799,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 returnFn: + return ids[nr+1] + if selected: return "next image" else: @@ -814,48 +860,48 @@ class ImageCollection(Folder, Persistent def xmlinput(self,url): - """Anzeige von ausgewaehlten thumbs""" + """Anzeige No entries" if showall=='no': - actualNr=0 + actualNr=0 ids=self.show_thumbs() colRows=self.getColTimesRow() num=int(len(ids)/(colRows[0]*colRows[1])) @@ -1170,51 +1222,51 @@ class ImageCollection(Folder, Persistent num+=1 a=colRows[0]*colRows[1] #print num,num+1 - + if num>1: ret="" if selected: - ret+="""" - anf="Show thumbnail group no:
" - - - try: - if selected: + ret+="""" + anf="Show thumbnail group no:
" + + + try: + if selected: href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr-1)*a] else: href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr-1)*a)] - - anf+="""%s  """%(href,"prev") - except: - pass - ret=anf+ret - - try: - - if selected: + + anf+="""%s  """%(href,"prev") + except: + pass + ret=anf+ret + + try: + + if selected: href=self.REQUEST['URL1']+"/selection?filename="+ids[(actualNr+1)*a] else: href=self.REQUEST['URL1']+"?filename="+ids[int((actualNr+1)*a)] - - end="""%s  """%(href,"next") - except: - end="" - ret=ret+end + + end="""%s  """%(href,"next") + except: + end="" + ret=ret+end #for i in range(num): @@ -1225,7 +1277,7 @@ class ImageCollection(Folder, Persistent # href=self.REQUEST['URL1']+"/selection?filename="+ids[k] # else: # href=self.REQUEST['URL1']+"?filename="+ids[int(k)] - # + # # ret+="""%i  """%(href,i) else: @@ -1241,7 +1293,7 @@ class ImageCollection(Folder, Persistent ids=self.show_selected_thumbs() if not ids: - return None + return None self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 self.REQUEST.SESSION['number']=range(number) @@ -1423,6 +1475,9 @@ class ImageCollection(Folder, Persistent return filename else: return fn + + + security.declareProtected('View','index_html') def index_html(self,fn=None): """main template collection""" @@ -1488,7 +1543,7 @@ class ImageCollectionMD(ImageCollection, {'label':'ZSQLExtend','action':'changeZSQLExtendForm'}, ) - try: + try: changeZSQLExtendForm=ZSQLExtendFolder.changeZSQLExtendForm except: pass @@ -1535,10 +1590,10 @@ class ImageCollectionIFrame(ImageCollect return "" def rotate(self,angle,url,RESPONSE): - """rotate""" - - RESPONSE.redirect("javascript:document.domain='mpg.de';parent.iframe.right.rotation(%i)"%int(angle)) - RESPONSE.redirect(url) + """rotate""" + + RESPONSE.redirect("javascript:document.domain='mpg.de';parent.iframe.right.rotation(%i)"%int(angle)) + RESPONSE.redirect(url) def request(self): """request""" return self.REQUEST @@ -1585,7 +1640,7 @@ class ImageZogiLib(ImageDigilib): ImageViewerPath und ImageStoragePath und wenn vorhanden Pfad zur Collection werden zusaetzlich abgespeichert """ - + #TODO: scaler path notwendig? meta_type="ImageZogiLib" manage_options=ImageDigilib.manage_options+(