--- ImageArchive/ImageArchive.py 2005/07/04 11:01:02 1.61 +++ ImageArchive/ImageArchive.py 2006/05/15 15:21:07 1.79 @@ -1,4 +1,9 @@ +genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config + + + from OFS.Folder import Folder +from OFS.OrderedFolder import OrderedFolder from OFS.SimpleItem import SimpleItem from Globals import Persistent,package_home from Acquisition import Implicit @@ -18,13 +23,23 @@ import time from threading import Thread import Queue import cgi +import sys +import zLOG + + +from AccessControl import ClassSecurityInfo, getSecurityManager try: from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder except: print "ZSQL Extend Folder nicht importiert" print "Metadatendfolder funktioniert nicht!!!" - + class ZSQLExtendFolder: + """leer""" + manage_options=() + + + try: from Products.ECHO_content.ECHO_collection import ECHO_basis except: @@ -38,16 +53,18 @@ except: tdir = "/mpiwg/temp/tmp/archivesImageServer/" #tdir="/tmp/archivesImageServer/" +imageExtensions=['jpg','jpeg','tif','tiff','png'] + 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 @@ -55,7 +72,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 @@ -79,7 +96,7 @@ class generateSet: """call generate Set""" storeTempDir=tempfile.tempdir - tempfile.tempdir=tdir + tempfile.tempdir=tdir tmpPath=tempfile.mktemp() tmpZip=tempfile.mktemp()+".gtz" @@ -89,91 +106,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="
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()
+
+ if int(self.filenamesIds[id[0]][1])>1:
+ #ids=self.show_thumbs()
- try:
+ 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+="
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]
@@ -182,8 +208,8 @@ class generateSet:
self.response+=c
if c==")":
self.response+="
\n"
-
-
+
+
shutil.rmtree(tmpPath)
@@ -194,7 +220,7 @@ class generateSet:
downloadUrl=self.url+"/downloadSet"
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):
@@ -251,7 +277,7 @@ class metaData(SimpleItem):
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+(
@@ -260,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)
@@ -289,6 +347,10 @@ 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
@@ -315,83 +377,90 @@ class ImageDigilib(Folder,Persistent,Imp
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,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()
- def renameImageForm(self):
- """form"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.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:]
+ """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):
@@ -410,71 +479,78 @@ 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()
+ """lade neues Version des Bildes"""
+ #teste ob Dokumenten ordner schon vorhanden
+ #imagePath=os.path.join(self.ImageStoragePath,self.getId())
+ 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:
- os.chmod(imagePath,0664)
+ #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+ os.rename(imagePath,imageNewPath)
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)
-
+ zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
- return "done"
-
+ #lesen des upload files und schreiben
+ filedata=file.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:
+ """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"
+
+ 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
- path=self.scalerPath+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
self.REQUEST.SESSION['string']=""% path
if url:
@@ -488,8 +564,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:
@@ -504,12 +583,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)
@@ -522,7 +618,8 @@ def manage_AddImageDigilib(self,id,fileu
"""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)
@@ -533,13 +630,15 @@ def manage_AddImageDigilib(self,id,fileu
-class ImageCollection(Folder, Persistent, Implicit,ECHO_basis):
-
- """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="
+ #scalerPath="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="
zipThreads={}
zipThreads2={}
@@ -551,9 +650,36 @@ 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"""
- return self.scalerPath
+ path=getattr(self,'serverPath',genericServerPath)+"/scaledImage?fn="
def getImageViewerPath(self):
"""get ImageViewerPath"""
@@ -569,7 +695,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
@@ -597,7 +723,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()
@@ -635,50 +761,53 @@ class ImageCollection(Folder, Persistent
return ret+"