--- ImageArchive/ImageArchive.py 2004/11/23 17:48:38 1.39 +++ ImageArchive/ImageArchive.py 2005/04/29 09:45:57 1.55 @@ -12,14 +12,24 @@ import xml.dom.minidom import operator import tempfile import shutil - +from types import * +import time +from threading import Thread +import Queue try: from Products.ECHO_content.ECHO_collection import ECHO_basis except: print "ECHO Elements not imported" - ECHO_basis=None - + class ECHO_basis: + """leer""" + + manage_options=() + + +tdir = "/mpiwg/temp/tmp/archivesImageServer/" +#tdir="/tmp/archivesImageServer/" + def splitPath(str): str2=str.replace("\\","/") return os.path.split(str2)[1] @@ -33,7 +43,198 @@ 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 generateSet: + """generateSetThread""" + + + def __init__(self,filenames,filenamesIds,ImageViewerPath,ids,url,local=None,version="full"): + """init generateSet""" + self.filenames=filenames + self.filenamesIds=filenamesIds + self.ImageViewerPath=ImageViewerPath + self.ids=ids + self.local=local + self.url=url + self.version=version + self.done=None + + + def __call__(self): + """call generate Set""" + + storeTempDir=tempfile.tempdir + tempfile.tempdir=tdir + + 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) + + 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] + + 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: + shutil.copyfile(sourcePath,targetPath) + except: + self.response+=(str("

Error in File: %s (possible missing)
\n"%filename)) + else: + if self.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.filenamesIds[id[0]][1])>1: + #ids=self.show_thumbs() + + try: + nr=self.ids.index(id[0]) + except: + self.reponse+=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] + + self.response+=str("

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

Error in File: %s (missing?)
\n"%filename) + + 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() + + self.response+="

2. step: creating the downloadable file

" + self.response+="

Create Zip
" + self.response+="

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

finished
\n" + + len=os.stat(tmpZip)[6] + 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) + + self.done=True + def getResult(self): + """get result""" + return self.response + + def isDone(self): + if self.done: + return True + else: + return False + +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" @@ -78,7 +279,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 @@ -89,7 +309,7 @@ class ImageDigilib(Folder,Persistent,Imp f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" #scale thumb @@ -121,8 +341,10 @@ class ImageDigilib(Folder,Persistent,Imp 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,'rb') + + self.REQUEST.RESPONSE.write(imagefh.read()) self.REQUEST.RESPONSE.close() #return self.REQUEST.RESPONSE.redirect(path) @@ -131,12 +353,68 @@ class ImageDigilib(Folder,Persistent,Imp pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self) return pt() - def updateImage(self,file,RESPONSE): + 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") + newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir") + if os.path.exists(oldfolder): + os.rename(oldfolder,newfolder) + else: + os.mkdir(newfolder) + + #schreibe info uber umbennenung + + renameName=os.path.join(newfolder,"renamed") + if os.path.exists(renameName): + fh=file(renameName,'a') + else: + fh=file(renameName,'w') + + tm=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + try: + user=self.REQUEST['AUTHENTICATED_USER'] + except: + user="unknown" + + str="""%s %s %s %s\n"""%(tm,user,oldname,newname) + fh.write(str) + fh.close() + + #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") - print "path",path + if not os.path.exists(path): os.mkdir(path,0775) os.chmod(path,0775) @@ -169,12 +447,17 @@ class ImageDigilib(Folder,Persistent,Imp self.scaleWorkingVersions() + if rename: + self.renameImage(file.filename) + + if RESPONSE: - RESPONSE.redirect(self.absolute_url()) + RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + return "done" - def thumb(self): + 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): @@ -189,8 +472,11 @@ class ImageDigilib(Folder,Persistent,Imp 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(os.path.join(package_home(globals()),'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""" @@ -207,6 +493,7 @@ def manage_AddImageDigilibForm(self): 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) @@ -218,10 +505,16 @@ def manage_AddImageDigilib(self,id,fileu RESPONSE.redirect('manage_main') -class ImageCollection(Folder, Persistent, Implicit, ECHO_basis): + +class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): + """Sammelordner für Bilder""" meta_type="ImageCollection" + + zipThreads={} + zipThreads2={} + genericMetaDataType="leiden_meta" leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] @@ -230,142 +523,81 @@ 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,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() + def refreshTxt(self): + """txt fuer refresh""" + tn=self.REQUEST.SESSION['threadName'] + return """ 2;url=%s?repeat=%s """%(self.absolute_url()+"/createSet",tn) - #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] + def createSet(self,RESPONSE=None,local=None,version="working",repeat=None): + """download aller gewaehlten files""" - if RESPONSE: - RESPONSE.write(str("

Get File: %s
\n"%filename)) + threadName=repeat + + + if not threadName or threadName=="": + threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.show_thumbs(),self.absolute_url(),local=local,version=version) + thread=Thread(target=threadStart) + + thread.start() - 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" + + self.zipThreads[thread.getName()[0:]]=threadStart + self.zipThreads2[thread.getName()[0:]]=thread + self.REQUEST.SESSION['threadName']=thread.getName()[0:] + wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['zip_wait_template']) + if wait_template: + return wait_template[0][1]() + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self) + return pt() + #xmltrans.run() + else: + self.REQUEST.SESSION['threadName']=threadName - image=urllib.urlopen(path).read() - + if (self.zipThreads[threadName].getResult()==None): - fh=file(tmpPath+"/"+filename,"w") - fh.write(image) - fh.close() + wait_template=self.aq_parent.ZopeFind(self.aq_parent,obj_ids=['wait_template']) + if wait_template: + return wait_template[0][1]() + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait.zpt')).__of__(self) + return pt() + else: + if self.zipThreads[threadName].isDone(): + self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult() + self.zipThreads2[threadName].join() + del(self.zipThreads2[threadName]) + del(self.zipThreads[threadName]) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_result.zpt')).__of__(self) + return pt() + + else: + self.REQUEST.SESSION['result']=self.zipThreads[threadName].getResult() + self.REQUEST.SESSION['threadName']=threadName + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','zip_wait_result.zpt')).__of__(self) + return pt() - 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 checkThreads(self): + """teste running threads""" + ret=""" + +

Threads of %s

"""%(self.absolute_url(),self.getId()) + + for threadName in self.zipThreads.keys(): + if self.zipThreads2[threadName].isAlive(): + ret+="

%s --> alive

"%threadName + else: + ret+="

%s --> dead

"%threadName + return ret+"" + def downloadSet(self,fn): """download prepared set""" - filename="/tmp/archivesImageServer/"+fn + filename=os.path.join(tdir,fn) + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.zip") self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") @@ -408,28 +640,35 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString - if ECHO_basis: - optTMP= Folder.manage_options+ECHO_basis.manage_options - else: - optTMP= 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':'Rescale working version','action':'scaleWorkingVersions'}, ) + + def importMetaData(self,strict=None): + """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" - def importMetaForm(self): + + def importMetaFileForm(self): """import metadata""" 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) @@ -516,7 +755,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): @@ -577,7 +816,7 @@ class ImageCollection(Folder, Persistent 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__: @@ -590,11 +829,13 @@ class ImageCollection(Folder, Persistent def addImage(self): """Add an Image""" + 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: @@ -605,7 +846,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 @@ -641,6 +882,60 @@ class ImageCollection(Folder, Persistent RESPONSE.redirect('manage_main') + + def importStructure(self,path): + """import""" + splitted=os.path.split(path) + if os.path.isDir(path) and (len(splitted[1])>0) and (splitted[1][0]=="."): + manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None) + + obj=getattr(self,splitted[1]) + obj.ImportFiles() + + def ImportStructure(self,RESPONSE=None): + """Import the existing files of a folder""" + files=os.listdir(self.ImageStoragePath) + ret="" + #print self.__dict__ + + + for file in files: + + if os.path.isdir(os.path.join(self.ImageStoragePath,file)): + imageStoragePath=os.path.join(self.ImageStoragePath,file) + imageViewerPath=os.path.join(self.ImageViewerPath,file) + manage_AddImageCollection(self,file,file,imageStoragePath,imageViewerPath,self.defaultMetaString) + + obj=getattr(self,file) + obj.ImportStructure() + else: + if not file[0]==".": + if self.__dict__.has_key(file): + + ret=ret+"
"+file+" already exists!" + else: + ret=ret+"
"+file+" created!" + newObj=ImageDigilib(file,file) + #print newObj,file + #print newObj + try: + self._setObject(file,newObj) + except: + """nothing yet""" + #print ret + #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) + #print self.ImageStoragePath + + #scale thumb + + #self.scaleThumbs() + + #scale standard + + #self.scaleWorkingVersions() + + if RESPONSE: + RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): """Import the existing files of a folder""" @@ -696,9 +991,10 @@ class ImageCollection(Folder, Persistent def show_selected_thumbs(self): #ids=[] - - return self.REQUEST.SESSION['filenames'] - + try: + return self.REQUEST.SESSION['filenames'] + except: + return None def show_thumbs(self): ids=[] for entry in self.__dict__: @@ -796,7 +1092,25 @@ class ImageCollection(Folder, Persistent return "previous sets" else: return "" + def showFolders(self): + """show subfolders""" + ret="" + link=""" %s
""" + if self.aq_parent.meta_type=="ImageCollection": + ret+=link%(self.aq_parent.absolute_url(), "back ("+self.aq_parent.title+")") + ret+="
" + + iCs=self.ZopeFind(self,obj_metatypes=["ImageCollection"]) + if not iCs: + return ret + else: + + link=""" %s
""" + for iC in iCs: + ret+=link%(iC[1].absolute_url(),iC[0]) + ret+="
" + return ret def showRuler(self,selected=None): """show ruler""" showall =self.REQUEST.SESSION.get('showall','no') @@ -805,6 +1119,7 @@ class ImageCollection(Folder, Persistent return "No entries" if showall=='no': + actualNr=0 ids=self.show_thumbs() colRows=self.getColTimesRow() num=int(len(ids)/(colRows[0]*colRows[1])) @@ -812,19 +1127,63 @@ class ImageCollection(Folder, Persistent num+=1 a=colRows[0]*colRows[1] #print num,num+1 + if num>1: - ret="Show thumbnail group no:
" - 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[int(k)] + ret="" + 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: + 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 - ret+="""%i  """%(href,i) + + #for i in range(num): + # + # 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[int(k)] + # + # ret+="""%i  """%(href,i) else: ret="" @@ -837,6 +1196,9 @@ class ImageCollection(Folder, Persistent def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() + + if not ids: + return None self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 self.REQUEST.SESSION['number']=range(number) @@ -907,7 +1269,7 @@ class ImageCollection(Folder, Persistent return 0 if self.REQUEST.SESSION.has_key("filename"): filename=self.REQUEST.SESSION["filename"] - + filename=self.getImageByName(filename,onlyName="yes") try: startId=filename @@ -999,7 +1361,25 @@ class ImageCollection(Folder, Persistent self.REQUEST.SESSION['filename']=filen pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self) return pt() + + def getImageByName(self,filename,onlyName=None): + """get filename""" + fn=getattr(self,filename,None) + if not fn: + filenameM=filename.split(".")[0] + founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) + for found in founds: + foundM=found[0].split(".")[0] + if filenameM.lower()==foundM.lower(): + if onlyName: + return found[0] + else: + return found[1] + if onlyName: + return filename + else: + return fn def index_html(self): """main template collection""" if self.REQUEST.has_key('filename'):