--- ImageArchive/ImageArchive.py 2005/10/25 20:03:31 1.70 +++ ImageArchive/ImageArchive.py 2009/01/06 16:13:51 1.107 @@ -1,8 +1,11 @@ -genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config +"""version 1 des Imageservers, wird ersetzt durch version2""" +genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config +from Ft.Xml.Domlette import NonvalidatingReader 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 @@ -22,6 +25,21 @@ import time from threading import Thread import Queue import cgi +import sys + +import shutil + +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + +def logTime(msg=""): + """log the time""" + logging.info("%s %s"%(msg,time.clock())) + from AccessControl import ClassSecurityInfo, getSecurityManager @@ -45,10 +63,12 @@ except: manage_options=() - -tdir = "/mpiwg/temp/tmp/archivesImageServer/" +tdir="tmp" +#tdir = "/mpiwg/temp/tmp/archivesImageServer/" #tdir="/tmp/archivesImageServer/" +imageExtensions=['.jpg','.jpeg','.tif','.tiff','.png','.gif'] + def splitPath(str): str2=str.replace("\\","/") return os.path.split(str2)[1] @@ -74,16 +94,19 @@ class generateSet: """generateSetThread""" - def __init__(self,filenames,filenamesIds,ImageViewerPath,ids,url,local=None,version="working"): + def __init__(self,filenames,filenamesIds,ImageViewerPath,ImageStoragePath,destBasis,ids,url,local=None,version="working"): """init generateSet""" self.filenames=filenames self.filenamesIds=filenamesIds self.ImageViewerPath=ImageViewerPath + self.ImageStoragePath=ImageStoragePath + self.destBasis=destBasis self.ids=ids self.local=local self.url=url self.version=version self.done=None + self.response="" def __call__(self): @@ -109,26 +132,34 @@ class generateSet: for id in self.filenames: - if self.filenamesIds.has_key(id[0]): + if self.filenamesIds.has_key(id[0]) and self.filenamesIds[id[0]][0]: filename=self.filenamesIds[id[0]][0]+"_"+id[0] else: filename=id[0] self.response+=str("
Get File: %s
\n"%filename)
-
+ toggle=False
+
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]
+
+ sourcePath=self.destBasis+"/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
+ if not os.path.exists(sourcePath):
+ self.response+=str("
%s doesn't exist I'll try the non scaled image
"%sourcePath) + toggle=True + if (self.version!="working") or toggle: + toggle=False + sourcePath=self.ImageStoragePath+"/"+id[0] + if not os.path.exists(sourcePath): + sourcePath=self.ImageStoragePath+"/"+os.path.splitext(id[0])[0]+".jpg" + targetPath=tmpPath+"/"+filename try: shutil.copyfile(sourcePath,targetPath) except: - self.response+=(str("Error in File: %s (possible missing)
\n"%filename))
+ self.response+=(str("
Error in File: %s (possible missing)
\n"%sourcePath))
else:
if self.version=="working":
requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
@@ -277,17 +308,25 @@ class ImageDigilib(Folder,Persistent,Imp
manage_options = Folder.manage_options+(
{'label':'Add Metadata','action':'addMetaObjectForm'},
-
+ {'label':'View Info','action':'editImageDigilib'},
)
+ def editImageDigilib(self):
+ """edit image date"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','editImageDigilib.zpt')).__of__(self)
+ return pt()
+
+
+
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"""
-
+ logTime("isaccessible")
#TODO: implement rights, currently true if external and false if internal, and true if user has role authenticated
username=self.REQUEST['AUTHENTICATED_USER']
@@ -296,6 +335,13 @@ class ImageDigilib(Folder,Persistent,Imp
user=getSecurityManager().getUser()
roles=user.getRoles()
+
+
+ if self.getRightsQuery()=="":
+ #query empty then always true
+ return True
+
+
if 'Authenticated' in roles:
return True
@@ -363,17 +409,20 @@ 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)
+ fn = os.path.splitext(fn)[0]+os.path.splitext(fileupload.filename)[1] # Extensions des gespeicherten Files sollte gleich dem hochgeladenen File sein.
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
+ #< thumb
self.scaleThumbs()
@@ -433,13 +482,13 @@ class ImageDigilib(Folder,Persistent,Imp
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.getImageStoragePath(),oldname)
+ newpath=os.path.join(self.getImageStoragePath(),newname)
os.rename(oldpath,newpath)
#umbenennen des versionsfolders
- oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")
- newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
+ oldfolder=os.path.join(self.getImageStoragePath(),"."+oldname+".dir")
+ newfolder=os.path.join(self.getImageStoragePath(),"."+newname+".dir")
if os.path.exists(oldfolder):
os.rename(oldfolder,newfolder)
else:
@@ -471,59 +520,126 @@ class ImageDigilib(Folder,Persistent,Imp
self.scaleWorkingVersions()
-
+ #self.scaleToJpg()
if RESPONSE:
RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+ def scaleToJpg(self,RESPONSE=None):
+ """create a jpg"""
+
+ #create backup of the original file
+
+ imagePath=os.path.join(self.getImageStoragePath(),self.filename)
+ path=os.path.join(self.getImageStoragePath(),"."+self.getId()+".dir")
+
+ if not os.path.exists(path):
+ os.mkdir(path,0775)
+ os.chmod(path,0775)
+
+ newName=os.path.join(path,self.getId()+str(time.time()))
- 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 os.path.exists(newName):
+ logger("ImageArchive:scaleToJpg", logging.INFO, "%s already exists"%newName)
+ else:
+ try:
+ os.rename(imagePath,newName)
+ except:
+ logger("ImageArchive:scaleToJpg", logging.ERROR, "%s "%newName)
+ return False
- if not os.path.exists(path):
- os.mkdir(path,0775)
- os.chmod(path,0775)
-
- versionNumber=getattr(self,'versionNumber',0)+1
+ ext= os.path.splitext(imagePath)[1].lower()
+ if ext.rstrip()==".jpg":
+ shutil.copy(newName,imagePath)
+ print "copy",imagePath
+ return True
- #teste ob version schon existiert
- while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))):
- versionNumber+=1
+ dir=self.getId()
+ src=path
+ self.scale(dest=self.getImageStoragePath(),dir=dir,src=path,scaleBy=1,RESPONSE=RESPONSE)
+ return True
+
+ def updateImage(self,_fileupload,_rename=None,RESPONSE=None):
+ """lade neues Version des Bildes"""
+ #teste ob Dokumenten ordner schon vorhanden
+ #imagePath=os.path.join(self.getImageStoragePath(),self.getId())
+
+ logging.error("updateImage:"+self.filename)
+ identifyField="filename"
+
+ if _fileupload and _fileupload.filename!="":
+ imagePath=os.path.join(self.getImageStoragePath(),self.filename)
+ idWithoutSuffix= os.path.splitext(self.getId())[0]
+ path=os.path.join(self.getImageStoragePath(),"."+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.getId()))
- os.rename(imagePath,imageNewPath)
-
+ imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
+ try:
+ #logger("ImageArchive:updateImage", logging.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+ os.rename(imagePath,imageNewPath)
+ except:
+ logger("ImageArchive:updateImage ", logging.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
+
#lesen des upload files und schreiben
- filedata=file.read()
- f=open(imagePath,"w")
+ filedata=_fileupload.read()
+
+ #passe suffix an
+ oldNameBase=os.path.splitext(imagePath)[0]
+ uploadFileExt=os.path.splitext(_fileupload.filename)[1]
+
+ newImagePath=oldNameBase+uploadFileExt
+
+ f=open(newImagePath,"w") # if we wanted to have filename=id we should do it here!
+ logging.error("saving:"+newImagePath)
f.write(filedata)
f.close()
try:
- os.chmod(imagePath,0664)
+ os.chmod(newImagePath,0664)
except:
- """hack"""
+ pass
#scale thumb
-
- self.scaleThumbs()
+ self.scaleThumbs()
+
#scale standard
-
+
self.scaleWorkingVersions()
-
- if rename:
- self.renameImage(file.filename)
-
+ #self.scaleToJpg()
+ if _rename:
+ self.renameImage(_fileupload.filename)
+
+ else:
+ self.filename=os.path.splitext(self.filename)[0]+uploadFileExt # Aendere zumindest die Extensiion
+
+ try: #todo: sollte nur aufgerufen werden, wenn eine Datenbank dahinter liegt.
+ args=self.REQUEST.form
+
+ args['-identify']=identifyField+"="+args['_identifyField']
+
+ self.ZSQLChange(args=args)
+
+ except:
+ pass
- if RESPONSE:
- RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+ if RESPONSE:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
- return "done"
-
+ return "done"
+
+ security.declarePublic('thumb')
def thumb(self,url=None):
"""show thumb"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"
@@ -549,7 +665,8 @@ class ImageDigilib(Folder,Persistent,Imp
- self.REQUEST.SESSION['string']=""% path
+ imageString=""% path
+ self.REQUEST.SESSION['string']=imageString
if url:
return ""% path
else:
@@ -559,7 +676,7 @@ class ImageDigilib(Folder,Persistent,Imp
return getattr(self,overview[0][0])()
else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbMD.zpt')).__of__(self)
- return pt()
+ return pt(imageString=imageString)
def image(self,dw=None,dh=None):
@@ -597,18 +714,19 @@ 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)
- getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)
+ getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
-class ImageCollection(Folder, Persistent, Implicit,ECHO_basis):
+class ImageCollection(OrderedFolder, Persistent, Implicit,ECHO_basis):
"""Sammelordner fuer Bilder"""
meta_type="ImageCollection"
@@ -629,8 +747,101 @@ 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())
+ destBasis="/docuserver/scaled/"
+ scaledBasis=destBasis
+ srcBasis="/docuserver/images"
+ scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl"
+
+ #dest="/Volumes/paviaExtern/docuserver/images/exhibitionImages/"
+
+ def configScaleForm(self):
+ """configure the scaler form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','configScale.zpt')).__of__(self)
+ return pt()
+
+ def configScale(self,scaleomatStr,RESPONSE=None):
+ """config the scaler"""
+ self.scaleomatStr=scaleomatStr
+
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+ def scale(self,dest=None,dir=None,src=None,scaleTo=None,scaleBy=None,RESPONSE=None):
+ """scaler"""
+ #scaleomatStr="ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ %s"
+ scaleomatStr=self.scaleomatStr
+
+ destBasis=self.destBasis
+ srcBasis=self.srcBasis
+
+
+ if src:
+ srcStr=" -src=%s"%src
+ else:
+ srcStr=" -src=%s"%srcBasis
+
+ scaleStr=scaleomatStr+srcStr
+ if dir:
+ dirTmp=dir.replace(srcBasis,'')
+ dirStr=" -dir=%s"%dirTmp
+ scaleStr=scaleStr+dirStr
+ elif filename:
+ fileTmp=filename.replace(srcBasis,'')
+ fileStr=" -dir=%s"%fileTmp
+ scaleStr=scaleStr+fileStr
+ else:
+ logger("ImageCollection:scale",logging.ERROR,"no directory or filename given")
+ return False
+
+ if dest is not None:
+ destStr=" -dest=%s"%os.path.join(destBasis,dest)
+ scaleStr=scaleStr+destStr
+ else:
+ logger("ImageCollection:scale",logging.ERROR,"no destionation given")
+ return False
+
+ if scaleTo:
+ scaleToStr=" -scaleto=%s"%scaleTo
+ scaleStr=scaleStr+scaleToStr
+ elif scaleBy:
+ scaleByStr=" -scaleby=%s"%scaleBy
+ scaleStr=scaleStr+scaleByStr
+ else:
+ logger("ImageCollection:scale",logging.ERROR,"no destionation given")
+ return False
+
+
+ #ret=scaleStr
+ logger("ImageCollection:scale",logging.INFO,scaleStr)
+ ret=os.popen2(scaleStr,1)[1].read()
+
+ if RESPONSE:
+ RESPONSE.write(ret)
+ return True
+
+ 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)
@@ -645,7 +856,15 @@ class ImageCollection(Folder, Persistent
def getImageStoragePath(self):
"""get ImageStoragePath"""
- return self.ImageStoragePath
+ if self.ImageViewerPath[0]=="/":
+ if len(self.ImageViewerPath)>1:
+ iv=self.ImageViewerPath[1:]
+ else:
+ iv=""
+ else:
+ iv=self.ImageViewerPath
+
+ return os.path.join(self.srcBasis,iv)
def refreshTxt(self):
"""txt fuer refresh"""
@@ -659,7 +878,7 @@ class ImageCollection(Folder, Persistent
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)
+ threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.ImageStoragePath,self.destBasis,self.show_thumbs(),self.absolute_url(),local=local,version=version)
thread=Thread(target=threadStart)
thread.start()
@@ -731,16 +950,28 @@ class ImageCollection(Folder, Persistent
self.REQUEST.RESPONSE.write(images)
self.REQUEST.RESPONSE.close()
-
+
+ def scaleToJpgs(self,RESPONSE=None):
+ """scale all tifs to jps"""
+
+ for x in self._objects:
+
+ if (not hasattr(getattr(self,x['id']),'scaleToJpg')) or (not getattr(self,x['id']).scaleToJpg()):
+ if RESPONSE:
+ RESPONSE.write('error:%s'%x)
+
+
def scaleThumbs(self,RESPONSE=None):
"""scale thumbs"""
#scale thumbs
- ret=os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
- if RESPONSE:
- RESPONSE.write(ret.read())
- RESPONSE.write("\n")
+ dest=os.path.join(self.scaledBasis,'thumb')
+ self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=100,RESPONSE=RESPONSE)
+ #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"
@@ -748,22 +979,28 @@ class ImageCollection(Folder, Persistent
"""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)
+
+ dest=os.path.join(self.scaledBasis,'small')
+ self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=1000,RESPONSE=RESPONSE)
+
+ dest=os.path.join(self.scaledBasis,'medium')
+ self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=2000,RESPONSE=RESPONSE)
+
+ #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,serverPath=genericServerPath):
+ def __init__(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath):
self.id=id
self.title=title
- self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
self.serverPath=serverPath
+ self.destBasis=destBasis
+ self.srcBasis=srcBasis
self.defaultrows = 6
self.defaultcols = 2
@@ -771,6 +1008,7 @@ class ImageCollection(Folder, Persistent
manage_options = optTMP+(
{'label':'Main Config','action':'ImageCollection_config'},
+ {'label':'Config Scaler','action':'configScaleForm'},
{'label':'Import','action':'ImportFiles'},
{'label':'Recalculate MetadataLink','action':'recalculateMetaLink'},
{'label':'Import Metadata File','action':'importMetaFileForm'},
@@ -785,7 +1023,7 @@ class ImageCollection(Folder, Persistent
"""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"
@@ -907,27 +1145,38 @@ class ImageCollection(Folder, Persistent
try:
dom=xml.dom.minidom.parseString(xmldoc)
except:
- return xmldoc
+ return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
+
images=dom.getElementsByTagName('image')
rc=[]
fnIds={}
for image in images:
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)
+ numberOfPages=image.getElementsByTagName('numberOfPages')[0]
except:
- nop=0
+ numberOfPages=None
+
+ if numberOfPages:
+ nopT=getText(numberOfPages.childNodes)
+ try:
+ nop=int(nopT)
+ except:
+ nop=0
+ else:
+ nop=0
+
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
for text in texts:
if not text=="":
+ text=self.getImageByName(text,onlyName="yes")
try:
rc.append((str(text),id,nop))
fnIds[str(text)]=(id,nop)
@@ -940,6 +1189,14 @@ class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['filenames']=rc
self.REQUEST.SESSION['filenamesIds']=fnIds
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+
+ if overview:
+ return overview[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
+ return pt()
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self)
return pt()
@@ -973,10 +1230,7 @@ class ImageCollection(Folder, Persistent
else:
meta=None
- if fileName:
- fn=fileName
- else:
- fn=splitPath(fileupload.filename)
+ fn=fileName or splitPath(fileupload.filename)
manage_AddImageDigilib(self,fn,fileupload,meta=meta)
@@ -986,12 +1240,13 @@ class ImageCollection(Folder, Persistent
def ImportFiles2(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
ret=""
#print self.__dict__
for file in files:
- if not file[0]==".":
- if self.__dict__.has_key(file):
+ fn=os.path.splitext(file)[0]
+ if not (file[0]=="."):
+ if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :
ret=ret+"
"+file+" already exists!"
else:
@@ -1003,7 +1258,7 @@ class ImageCollection(Folder, Persistent
self._setObject(file,newObj)
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1027,17 +1282,17 @@ class ImageCollection(Folder, Persistent
def ImportStructure(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
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)
+ if os.path.isdir(os.path.join(self.getImageStoragePath(),file)):
+ ImageStoragePath=os.path.join(self.getImageStoragePath(),file)
imageViewerPath=os.path.join(self.ImageViewerPath,file)
- manage_AddImageCollection(self,file,file,imageStoragePath,imageViewerPath,self.defaultMetaString)
+ manage_AddImageCollection(self,file,file,self.getImageStoragePath(),imageViewerPath,self.defaultMetaString)
obj=getattr(self,file)
obj.ImportStructure()
@@ -1057,29 +1312,31 @@ class ImageCollection(Folder, Persistent
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
- #self.scaleThumbs()
+ self.scaleThumbs()
#scale standard
- #self.scaleWorkingVersions()
+ self.scaleWorkingVersions()
if RESPONSE:
RESPONSE.redirect('manage_main')
def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
ret=""
#print self.__dict__
for file in files:
- if not file[0]==".":
- if self.__dict__.has_key(file):
+ fn=os.path.splitext(file)[0]
+ if not (file[0]=="."):
+ if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :
ret=ret+"
"+file+" already exists!"
+
else:
ret=ret+"
"+file+" created!"
newObj=ImageDigilib(file,file)
@@ -1091,7 +1348,7 @@ class ImageCollection(Folder, Persistent
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1112,13 +1369,14 @@ class ImageCollection(Folder, Persistent
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self)
return pt()
- def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath,RESPONSE=None):
+ def ChangeImageCollection(self,title,ImageViewerPath,defaultMetaString,serverPath,destBasis,srcBasis,RESPONSE=None):
"""Change"""
self.title=title
- self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
self.serverPath=serverPath
+ self.destBasis=destBasis
+ self.srcBasis=srcBasis
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1385,16 +1643,17 @@ class ImageCollection(Folder, Persistent
return ret
- def show_thumbs_selected_rows(self,numberOfColumns):
+ def show_thumbs_selected_rows(self,numberOfColumns,start=0,max=10000):
"""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)
- return range(number+1)
+ number=min(start+int(len(ids)/numberOfColumns)+1,max)
+
+ self.REQUEST.SESSION['number']=range(start,number)
+ return range(start,number+1)
def setColTimesRowForm(self):
"""form for matrix setting"""
@@ -1425,7 +1684,7 @@ class ImageCollection(Folder, Persistent
"""sets default columns and rows"""
self.defaultcols = cols
self.defaultrows = rows
-
+
def getColTimesRow(self,showall='No'):
"""coltimesrow"""
@@ -1435,15 +1694,16 @@ class ImageCollection(Folder, Persistent
try:
rows=int(REQUEST.cookies["ImageViewerRows"])
except:
- rows=self.defaultrows
+ rows=getattr(self,'defaultrows',6)
else:
- rows=self.defaultrows
+ rows=getattr(self,'defaultrows',6)
if REQUEST.cookies.has_key("ImageViewerCols"):
#print "COLS",REQUEST.cookies["ImageViewerCols"]
cols=int(REQUEST.cookies["ImageViewerCols"])
else:
- cols=self.defaultcols
+ cols=getattr(self,'defaultcols',3)
+
idsnumber=len(self.show_thumbs())
if rows:
@@ -1454,7 +1714,8 @@ class ImageCollection(Folder, Persistent
showall=self.REQUEST.SESSION.get('showall', 'No')
if showall=='yes':
rows=int(idsnumber/cols)+1
-
+
+ logTime("getColTimesRow finished")
return (cols,rows)
@@ -1497,32 +1758,26 @@ class ImageCollection(Folder, Persistent
self.REQUEST.SESSION['ids']=ids
number=int(len(ids)/numberOfColumns)+1
-
+
+ logTime("show_thumbs_rows finished (%s)"%str(number))
return range(number+1)
def show_thumbs_columns(self,row,numberOfColumns):
"""Ausgabe einer Liste der Reihe"""
ids=self.REQUEST.SESSION['ids']
max=len(ids)
+ logTime("show_thumb_columns finishes row: %s"%row)
if (row*numberOfColumns)
"+file+" created!"
+ newObj=ImageDigilib(file,file)
+ #print newObj,file
+ #print newObj
+ try:
+ self._setObject(file,newObj)
+ except:
+ """nothing yet"""
+
+ # check entry in database
+ args={}
+ args['_table']=self.imageCollectionConfig.getTable()
+ args[self.imageCollectionConfig.getKey()]=file
+
+ if not self.ZSQLInline(args=args):
+ logger("ImageArchiveMD:import", logging.INFO, "adding DB: %s"%file)
+ self.ZSQLAdd(args=args)
+
+ #print ret
+ #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+ #print self.ImageStoragePath
+
+ #scale thumb
+
+
+ self.scaleThumbs()
+
+ #scale standard
+ self.scaleWorkingVersions()
+
+ #self.scaleToJpgs()
+
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
+
+ def addImage(self):
+ """Add an Image"""
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImageMD.zpt')).__of__(self)
+ return pt()
+
+ def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None):
+ """Add"""
+
+ filenameKey="filename"
+ #print "FU",fileupload
+
+ if _use_default:
+ try:
+ meta=self.meta_default(_fileupload.filename)
+ except:
+ meta=None
+ else:
+ meta=None
+
+ fn=_fileName or splitPath(_fileupload.filename)
+
+ manage_AddImageDigilib(self,fn,_fileupload,meta=meta)
+
+ args=self.REQUEST.form
+ args[filenameKey]=fn
+
+ self.ZSQLAdd(args=args)
+
+ self.scaleThumbs()
+ self.scaleWorkingVersions()
+
+ getattr(self,fn).scaleToJpg()
+ if RESPONSE:
+ return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
+ #return self.REQUEST['URL1']+'/'+fileupload.filename
+
+ def navig_html(self):
+ """navigation"""
+ #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigationMD.zpt')).__of__(self)
+ return pt()
+
+ def navig_selected_html(self):
+ """navigation"""
+ #self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_selectedMD.zpt')).__of__(self)
+
+ return pt()
+
+ def decode(self,str):
+ """decoder"""
+ if not str:
+ return ""
+ if type(str) is StringType:
+ try:
+ return str.decode('utf-8')
+ except:
+ return str.decode('latin-1')
+ else:
+
+ return str
+
+ def standardSearch(self):
+ """standard search page"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','standardSearchPage.zpt')).__of__(self)
+ return pt()
+
+ def searchResultXML(self):
+ """xmlformat"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','searchResultXML.zpt')).__of__(self)
+ return pt()
+
+ def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
+ """search"""
+
+ rc=[]
+ fnIds={}
+
+ for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
+ key=getattr(found,self.imageCollectionConfig.getKey())
+ key=self.getImageByName(key,onlyName="yes")
+ rc.append((key,'',0))
+ fnIds[key]=('',0)
+
+ rc.sort()
+ self.REQUEST.SESSION['filenames']=rc
+ self.REQUEST.SESSION['filenamesIds']=fnIds
+
+ overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+
+ if overview:
+ return overview[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ #urlTmp=REQUEST['URL1']
+
+ #url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+
+ #if xml is None:
+ # RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+ #else:
+ # RESPONSE.redirect(url)
+
+ def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
+ """main template collection"""
+
+ logTime("index_html %s"%self.REQUEST['QUERY_STRING'])
+ mode=self.REQUEST.get('mode','view')
+ if fn:
+ ret=[]
+
+ if type(fn) is ListType:
+ """experimentell mehr als ein filename"""
+ for filename in fn:
+ if not (filename == ""):
+ ret.append((filename,'',1))
+ else:
+ ret.append((fn,'',1))
+
+ self.REQUEST.SESSION['filenames']=ret
+ #self.REQUEST.SESSION['filenamesIds']=fnIds
+
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+
+
+ if overview and (generic =='No'):
+ return overview[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+
+ # filename given, then only display this file
+ if self.REQUEST.has_key('filename'):
+
+ filen=self.REQUEST['filename']
+ else:
+ filen=""
+
+
+ self.REQUEST.SESSION['filename']=filen[0:]
+
+# if not self.REQUEST.SESSION['filename']=="":
+# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
+# if mode=="view":
+# self.REQUEST.RESPONSE.redirect(url)
+# elif mode=="download":
+# self.REQUEST.RESPONSE.redirect(url+"/download")
+#
+ 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')
+
+
+ if selection:
+ #selection i.e. selection already stored at self.REQUEST.SESSION['filenames']
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
+
+
+ if overview and (generic =='No'):#
+
+ return overview[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+
+ #no filename then show overview
+
+ overview=self.ZopeFind(self,obj_ids=['overview.html'])
+ if overview and (generic == 'No'):
+
+
+ return overview[0][1]()
+ elif hasattr(self,'templates'):
+
+ pt=self.templates.imgcoll_mainMD.__of__(self)
+ return pt()
+ else:
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overviewMD.zpt')).__of__(self)
+ return pt()
+
+ def nextImage(self,request,selected=None,returnFn=None):
+ """show nextimage"""
+
+ if not selected and self.REQUEST.has_key('fn'):
+ imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
+ nr=self.getObjectPosition(imagename)
+
+ objects=self.objectIds()
+ if len(objects)==nr+1:
+ return ""
+ else:
+ fn="/".join(self.REQUEST['fn'].split('/')[0:-1])+"/"+objects[nr+1]
+ return "next image"
+
+ def prevImage(self,request,selected=None,returnFn=None):
+ """show nextimage"""
+
+ if not selected and self.REQUEST.has_key('fn'):
+ imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
+ nr=self.getObjectPosition(imagename)
+
+ objects=self.objectIds()
+ if nr==0:
+ return ""
+ else:
+ fn="/".join(self.REQUEST['fn'].split('/')[0:-1])+"/"+objects[nr-1]
+ return "prev image"
+
+
def changeRightsQueryForm(self):
"""change Rights Query"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeRightsQueryForm.zpt')).__of__(self)
@@ -1695,28 +2266,118 @@ class ImageCollectionMD(ImageCollection,
def thumblistMD(self):
"""main template collection"""
+ logTime("thumbList MD %s"%self.REQUEST['QUERY_STRING'])
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbListMD.zpt')).__of__(self)
+ self.REQUEST.RESPONSE.setHeader('Cache-Control','max-age=3600')
+ self.REQUEST.RESPONSE.setHeader('Last-Modified',self.bobobase_modification_time().toZone('GMT').rfc822())
return pt()
+
def getRights(self,id):
"""get the rights from a database"""
#print self.rightsQuery%id
results=self.ZSQLSimpleSearch(self.getRightsQuery()%id)
+ logging.error("rightsQuery: %s"%(self.getRightsQuery()%id))
if results:
result = getattr(results[0],self.getRightsQueryField())
else:
result = ''
return result
+
+ def xmlinput(self,url):
+ """Anzeige von ausgewaehlten thumbs"""
+ #return url
+ url=urllib.unquote(url)
+
+ url=url.replace(" ","+") # ersetze Leerzeichen in der URL durch "+"
+ print url
+ xmldoc=urllib.urlopen(url).read()
+ #return xmldoc
+ try:
+ dom=NonvalidatingReader.parseUri(url)
+
+ except:
+ return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
+
+ imagenames=dom.xpath("//imagename")
+ rc=[]
+ fnIds={}
+ for imagename in imagenames:
+
+ #imagename=image.xpath('./imagename')[0]
+ #print "im",imagename
+
+
+
+ idnr=imagename.xpath('../idnr')[0]
+ id=getText(idnr.childNodes)
+ try:
+ numberOfPages=imagename.xpath('../numberOfPages')[0]
+ except:
+ numberOfPages=None
+
+ if numberOfPages:
+ nopT=getText(numberOfPages.childNodes)
+ try:
+ nop=int(nopT)
+ except:
+ nop=0
+ else:
+ nop=0
+
+ texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
+ for text in texts:
+ if not text=="":
+ #print "a"
+ text=self.getImageByName(text,onlyName="yes")
+ #print "b"
+ try:
+ rc.append((str(text),id,nop))
+ fnIds[str(text)]=(id,nop)
+ except:
+ rc.append((repr(text),id,nop))
+ fnIds[repr(text)]=(id,nop)
+
+ #print "done"
+ rc.sort()
+ self.REQUEST.SESSION['filenames']=rc
+ self.REQUEST.SESSION['filenamesIds']=fnIds
+
+ overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+
+ if overview:
+ return overview[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+
+ def selection(self):
+ """show only selected"""
+ if self.REQUEST.has_key('filename'):
+ filen=self.REQUEST['filename']
+ else:
+ filen=""
+ self.REQUEST.SESSION['filename']=filen
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ def thumblistSelectedMD(self):
+ """main template collection"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselectedMD.zpt')).__of__(self)
+ return pt()
+
def manage_AddImageCollectionMDForm(self):
"""Nothing yet"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)
return pt()
-def manage_AddImageCollectionMD(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
+def manage_AddImageCollectionMD(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):
"""Add ImageCollection"""
- newObj=ImageCollectionMD(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
+ newObj=ImageCollectionMD(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath)
self._setObject(id,newObj)
if RESPONSE is not None:
@@ -1854,7 +2515,7 @@ def manage_AddImageZogiLib(self,id=None,
self._setObject(id,newObj)
getattr(self,id).caption=caption[0:]
if fileUpload:
- getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)
+ getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())
if RESPONSE is not None:
RESPONSE.redirect('manage_main')