"
+
+ 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("
This can take a while.... \n"
+
+ fh=os.popen2("gnutar zcvf %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+="
"%(tag,getattr(self,tag))
+ return ret+""
+
+
+
+
class ImageDigilib(Folder,Persistent,Implicit):
"""Anzeige object fuer digilib"""
meta_type="ImageDigilib"
-
+ security=ClassSecurityInfo()
leiden_meta_fields=['image_id','date','country','place','people','description','photographer']
manage_options = Folder.manage_options+(
@@ -39,6 +286,38 @@ class ImageDigilib(Folder,Persistent,Imp
)
+ def getAccessRight(self):
+ """get the accessright, return is string "extern" or "intern" """
+ return self.getRights(self.filename.split('.')[0])
+
+ security.declarePublic('isAccessible')
+
+ def isAccessible(self):
+ """gives true if obejct is accessible taking the rights of the user into account"""
+
+ #TODO: implement rights, currently true if external and false if internal, and true if user has role authenticated
+
+ username=self.REQUEST['AUTHENTICATED_USER']
+ #print username
+ #print self.acl_users.getUserNames()
+ user=getSecurityManager().getUser()
+
+ roles=user.getRoles()
+
+
+ if self.getRightsQuery()=="":
+ #query empty then always true
+ return True
+
+
+ if 'Authenticated' in roles:
+ return True
+
+ if self.getAccessRight()=="extern":
+ return True
+ else:
+ return False
+
def addMetaObject(self,id,RESPONSE=None):
"""Add an MetaObject"""
objectType=getattr(self.Control_Panel.Products.ImageMetaData,self.genericMetaDataType)
@@ -58,7 +337,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()
@@ -68,83 +347,289 @@ class ImageDigilib(Folder,Persistent,Imp
self.filename=filename
self.meta=meta
+ def getBasename(self):
+ """returns base filename (sans extension)"""
+ return os.path.splitext(self.filename)[0]
+
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
- fn=splitPath(fileupload.filename)
+ fn = self.filename or splitPath(fileupload.filename)
filename=path_name+"/"+fn
filedata=fileupload.read()
f=open(filename,"w")
f.write(filedata)
f.close()
+ self.filename = fn
try:
- os.chmod(filename,0644)
+ os.chmod(filename,0664)
except:
"""hack"""
+ #scale thumb
+
+ self.scaleThumbs()
- os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath)
+ #scale standard
-
+ self.scaleWorkingVersions()
-
- def download(self):
+
+
+ def downloadWorkingVersion(self):
+ """download working version (2000 pixel)"""
+
+ return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg")
+
+ def download(self,fmt="&mo=rawfile,hires",suffix=None):
"""download"""
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires"
- 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
-
- 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()
+
+ 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')
+
+ 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()
+
+
+ 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()
+
+ 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:]
+ #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,_fileupload,_rename=None,RESPONSE=None):
+ """lade neues Version des Bildes"""
+ #teste ob Dokumenten ordner schon vorhanden
+ #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+
+ identifyField="filename"
+
+ if _fileupload and _fileupload.filename!="":
+ imagePath=os.path.join(self.ImageStoragePath,self.filename)
+ 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.filename))):
+ versionNumber+=1
+
+ #kopieren der bestehenden Version in den Versions ordner.
+ imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
+ try:
+ #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+ os.rename(imagePath,imageNewPath)
+ except:
+ zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
- def thumb(self):
- """show thumb"""
- thumbname=os.path.splitext(self.filename)[0]+".jpg"
- ## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname):
-## image=urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:18080/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=150&mo=lores").read()
-## f=open("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname,"w")
-## f.write(image)
-## f.close()
-## os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 150 &"% self.ImageViewerPath)
+ #lesen des upload files und schreiben
+ filedata=_fileupload.read()
+ f=open(imagePath,"w") # if we wanted to have filename=id we should do it here!
+ f.write(filedata)
+ f.close()
+ try:
+ os.chmod(imagePath,0664)
+ except:
+ pass
+ #scale thumb
- #DEVEL:take nausikaa for server solution
+ self.scaleThumbs()
+
+ #scale standard
+
+ self.scaleWorkingVersions()
+
+ if _rename:
+ self.renameImage(_fileupload.filename)
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"
- #path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname
+
+ args=self.REQUEST.form
+
+ args['-identify']=identifyField+"="+args['_identifyField']
+
+ self.ZSQLChange(args=args)
+
+ if RESPONSE:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+
+
+ return "done"
+
+ security.declarePublic('thumb')
+ 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
+
+
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 thumbMD(self,url=None):
+ """show thumb mit Metadaten erwarten image in ImageCollectionMD
+ """
+ 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
+
+
+ self.REQUEST.SESSION['string']=""% path
+ if url:
+ return ""% path
+ else:
+
+ overview=self.ZopeFind(self.aq_parent,obj_ids=['thumb.html'])
+ if overview:
+ return getattr(self,overview[0][0])()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbMD.zpt')).__of__(self)
+ 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://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://127.0.0.1:8080/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)
def manage_AddImageDigilibForm(self):
"""Nothing yet"""
- pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageDigilibForm.zpt')).__of__(self)
return pt()
def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None):
"""Add ImageCollection"""
+
#fileupload=self.REQUEST['fileupload']
- fn=splitPath(fileupload.filename)
+ #fn=splitPath(fileupload.filename)
+ fn = id # filename is the same as id
newObj=ImageDigilib(id,fn,meta)
self._setObject(id,newObj)
@@ -154,10 +639,20 @@ def manage_AddImageDigilib(self,id,fileu
RESPONSE.redirect('manage_main')
-class ImageCollection(Folder, Persistent, Implicit):
- """Sammelordner für Bilder"""
+
+class ImageCollection(OrderedFolder, Persistent, Implicit,ECHO_basis):
+ """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="
+
+ zipThreads={}
+ zipThreads2={}
+
genericMetaDataType="leiden_meta"
leiden_meta_fields=['image_id','date','country','place','people','description','photographer']
@@ -165,181 +660,197 @@ 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
+ imgcoll_main = PageTemplateFile('zpt/overview', globals())
+ imgcoll_mainMD = PageTemplateFile('zpt/overviewMD', globals())
+ imgcoll_thumb = PageTemplateFile('zpt/thumb', globals())
+ imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals())
+
+ def getImageObject(self,name):
+ """gibt objeckt name zurueck"""
+ if hasattr(self,name):
+ return getattr(self,name)
+
+ name=os.path.splitext(name)[0]
+ for extension in imageExtensions:
+ nameExt=name+"."+extension
+
+ if hasattr(self,nameExt):
+ return getattr(self,nameExt)
+
+ nameExt=name+"_."+extension
+ if hasattr(self,nameExt):
+ return getattr(self,nameExt)
+
+ return getattr(self,"defaultImg")
+
+ def getServerPath(self):
+ """get Server path"""
+ return getattr(self,'serverPath',genericServerPath)
+
+ def getScalerPath(self):
+ """get ScalerPath"""
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="
+
+ def getImageViewerPath(self):
+ """get ImageViewerPath"""
+ return self.ImageViewerPath
+
+ def getImageStoragePath(self):
+ """get ImageStoragePath"""
+ return self.ImageStoragePath
+
+ def refreshTxt(self):
+ """txt fuer refresh"""
+ tn=self.REQUEST.SESSION['threadName']
+ 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"""
+
+ 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()
+
+
+ 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
+
+ if (self.zipThreads[threadName].getResult()==None):
-
- def createSet(self,RESPONSE=None,local=None):
- """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:
- sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]
- targetPath=tmpPath+"/"+filename
- shutil.copyfile(sourcePath,targetPath)
-
- else:
-
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[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("
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("