--- ImageArchive/ImageArchive.py 2004/03/15 17:11:43 1.19 +++ ImageArchive/ImageArchive.py 2005/03/15 20:31:10 1.46 @@ -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 @@ -9,6 +9,26 @@ import os import os.path import urllib import xml.dom.minidom +import operator +import tempfile +import shutil +from types import * +import time + +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): @@ -19,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" @@ -38,8 +104,7 @@ class ImageDigilib(Folder,Persistent,Imp request=self.REQUEST objectCreate=objectType.createObjectManager(id,request) - #for field in self.leiden_meta_fields: - # self.REQUEST[field]=argv[field] + self._setObject(id,objectCreate) objectCreate.propertysheets.meta.manage_editProperties(request) @@ -52,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() @@ -65,30 +130,185 @@ 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 - filename=path_name+"/"+fileupload.filename + fn=splitPath(fileupload.filename) + filename=path_name+"/"+fn filedata=fileupload.read() f=open(filename,"w") f.write(filedata) f.close() - os.chmod(filename,0644) - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) - - - + try: + os.chmod(filename,0664) + except: + """hack""" + #scale thumb + + self.scaleThumbs() + + #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,highres" - #self.REQUEST.SESSION['string']=""% path - #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self) - return self.REQUEST.RESPONSE.redirect(path) - - def thumb(self): + 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") + #print path + imagefh=urllib.urlopen(path) + + 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() + + 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") + + 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): @@ -100,33 +320,34 @@ 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://nausikaa2.rz-berlin.mpg.de:18080/digitallibrary/digilib.jsp?lv=1&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) @@ -135,10 +356,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'] @@ -146,10 +371,186 @@ 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""" + storeTempDir=tempfile.tempdir + 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() + 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 + 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 @@ -158,21 +559,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':'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('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) @@ -206,7 +621,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() @@ -214,14 +629,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: @@ -255,7 +674,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): @@ -276,21 +695,47 @@ 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): + def recalculateMetaLink(self): """recalculate the metadata""" for entryid in self.__dict__: @@ -303,11 +748,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: @@ -317,9 +764,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): @@ -340,9 +788,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): @@ -365,17 +822,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): @@ -490,7 +956,44 @@ class ImageCollection(Folder, Persistent return "previous sets" else: return "" - + + 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: + + 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+="""%i  """%(href,i) + + else: + ret="" + ret+="""show all """%self.REQUEST['URL1'] + else: + ret="""show groups """%self.REQUEST['URL1'] + + return ret + def show_thumbs_selected_rows(self,numberOfColumns): """Ausgabe anzahl""" ids=self.show_selected_thumbs() @@ -501,13 +1004,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): @@ -524,7 +1027,7 @@ class ImageCollection(Folder, Persistent RESPONSE.redirect(self.REQUEST['URL1']+"/setDone") - def getColTimesRow(self): + def getColTimesRow(self,showall='No'): """coltimesrow""" REQUEST=self.REQUEST @@ -534,20 +1037,25 @@ class ImageCollection(Folder, Persistent try: rows=int(REQUEST.cookies["ImageViewerRows"]) except: - rows=None + rows=6 else: - rows=None + rows=6 if REQUEST.cookies.has_key("ImageViewerCols"): #print "COLS",REQUEST.cookies["ImageViewerCols"] cols=int(REQUEST.cookies["ImageViewerCols"]) else: - cols=3 + cols=2 idsnumber=len(self.show_thumbs()) if rows: if cols*rows >idsnumber: rows=int(idsnumber/cols)+1 + + #print cols,rows + if showall=='yes': + rows=int(idsnumber/cols)+1 + return (cols,rows) @@ -555,33 +1063,42 @@ 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"] + filename=self.getImageByName(filename,onlyName="yes") + try: startId=filename + if startId=="": + startId=idsAll[0][0:] except: - startId=idsAll[0] + startId=idsAll[0][0:] else: - startId=idsAll[0] + startId=idsAll[0][0:] - print "NOR:",numberOfRows + if numberOfRows: + + startPic=idsAll.index(startId) try: + startPic=idsAll.index(startId) endPic=startPic+numberOfColumns*numberOfRows ids=idsAll[startPic:endPic] except: ids=idsAll else: + ids=idsAll - + self.REQUEST.SESSION['ids']=ids number=int(len(ids)/numberOfColumns)+1 - + return range(number+1) def show_thumbs_columns(self,row,numberOfColumns): @@ -595,34 +1112,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(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() @@ -633,22 +1157,49 @@ 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 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'): filen=self.REQUEST['filename'] else: filen="" - self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self) + + 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(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): @@ -661,11 +1212,20 @@ def manage_AddImageCollection(self,id,ti class ImageCollectionIFrame(ImageCollection): - """Class für Collection set als IFrame""" + """Class fuer Collection set als IFrame""" meta_type="ImageCollectionIFrame" label=ImageCollection.title + def getImageTag(self): + """ hack : method needed by echo_content""" + 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) def request(self): """request""" return self.REQUEST @@ -679,7 +1239,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): @@ -689,13 +1249,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):