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"
@@ -309,7 +320,7 @@ class ImageDigilib(Folder,Persistent,Imp
if self.getRightsQuery()=="":
#query empty then always true
- return True
+ return True
if 'Authenticated' in roles:
@@ -450,13 +461,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:
@@ -497,8 +508,8 @@ class ImageDigilib(Folder,Persistent,Imp
#create backup of the original file
- imagePath=os.path.join(self.ImageStoragePath,self.filename)
- path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")
+ 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)
@@ -515,23 +526,29 @@ class ImageDigilib(Folder,Persistent,Imp
zLOG.LOG("ImageArchive:scaleToJpg", zLOG.ERROR, "%s "%newName)
return False
-
-
-
-
- self.scale(dest=self.srcBasis,filename=newName,scaleBy=1,RESPONSE=RESPONSE)
+ ext= os.path.splitext(imagePath)[1].lower()
+ if ext.rstrip()==".jpg":
+ shutil.copy(newName,imagePath)
+ print "copy",imagePath
+ return True
+
+
+
+ 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.ImageStoragePath,self.getId())
+ #imagePath=os.path.join(self.getImageStoragePath(),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")
+ 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)
@@ -547,10 +564,10 @@ class ImageDigilib(Folder,Persistent,Imp
#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)
+ #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))
+ zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
#lesen des upload files und schreiben
filedata=_fileupload.read()
@@ -664,7 +681,7 @@ def manage_AddImageDigilib(self,id,fileu
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')
@@ -688,7 +705,6 @@ class ImageCollection(OrderedFolder, Per
leiden_meta_fields=['image_id','date','country','place','people','description','photographer']
- scaledBasis="/mpiwg/temp/online/scaled"
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
@@ -698,16 +714,39 @@ class ImageCollection(OrderedFolder, Per
imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals())
destBasis="/docuserver/scaled/"
+ scaledBasis=destBasis
srcBasis="/docuserver/images"
- def scale(self,dest=None,dir=None,filename=None,scaleTo=None,scaleBy=None,RESPONSE=None):
+ 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="/docuserver/libs/scaleomat/scaleomat.pl"
+ scaleomatStr=self.scaleomatStr
destBasis=self.destBasis
srcBasis=self.srcBasis
-
- srcStr=" -src=%s"%srcBasis
+
+
+ if src:
+ srcStr=" -src=%s"%src
+ else:
+ srcStr=" -src=%s"%srcBasis
+
scaleStr=scaleomatStr+srcStr
if dir:
dirTmp=dir.replace(srcBasis,'')
@@ -738,9 +777,10 @@ class ImageCollection(OrderedFolder, Per
zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given")
return False
- print scaleStr
- ret=scaleStr
- #ret=os.popen(scaleStr)
+
+ #ret=scaleStr
+ #zLOG.LOG("ImageCollection:scale",zLOG.INFO,scaleStr)
+ ret=os.popen2(scaleStr,1)[1].read()
if RESPONSE:
RESPONSE.write(ret)
@@ -778,7 +818,15 @@ class ImageCollection(OrderedFolder, Per
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"""
@@ -792,7 +840,7 @@ class ImageCollection(OrderedFolder, Per
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()
@@ -867,7 +915,7 @@ class ImageCollection(OrderedFolder, Per
def scaleToJpgs(self,RESPONSE=None):
"""scale all tifs to jps"""
- print self._objects
+
for x in self._objects:
if (not hasattr(getattr(self,x['id']),'scaleToJpg')) or (not getattr(self,x['id']).scaleToJpg()):
@@ -881,11 +929,11 @@ class ImageCollection(OrderedFolder, Per
#scale thumbs
dest=os.path.join(self.scaledBasis,'thumb')
- self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=100,RESPONSE=RESPONSE)
+ 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")
+ #if RESPONSE:
+ # RESPONSE.write(ret.read())
+ # RESPONSE.write("\n")
return "RESCALING STARTED"
@@ -895,10 +943,10 @@ class ImageCollection(OrderedFolder, Per
#scale standard
dest=os.path.join(self.scaledBasis,'small')
- self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=1000,RESPONSE=RESPONSE)
+ self.scale(dir=self.getImageStoragePath(),dest=dest,scaleTo=1000,RESPONSE=RESPONSE)
dest=os.path.join(self.scaledBasis,'medium')
- self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=2000,RESPONSE=RESPONSE)
+ 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:
@@ -907,13 +955,14 @@ class ImageCollection(OrderedFolder, Per
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
@@ -921,6 +970,7 @@ class ImageCollection(OrderedFolder, Per
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'},
@@ -1152,12 +1202,13 @@ class ImageCollection(OrderedFolder, Per
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:
@@ -1169,7 +1220,7 @@ class ImageCollection(OrderedFolder, Per
self._setObject(file,newObj)
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1193,17 +1244,17 @@ class ImageCollection(OrderedFolder, Per
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()
@@ -1223,7 +1274,7 @@ class ImageCollection(OrderedFolder, Per
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1238,14 +1289,16 @@ class ImageCollection(OrderedFolder, Per
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)
@@ -1257,7 +1310,7 @@ class ImageCollection(OrderedFolder, Per
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1278,13 +1331,14 @@ class ImageCollection(OrderedFolder, Per
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')
@@ -1551,16 +1605,17 @@ class ImageCollection(OrderedFolder, Per
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"""
@@ -1733,13 +1788,13 @@ class ImageCollection(OrderedFolder, Per
#FIXME: umlaute in filename
fn=getattr(self,repr(filename),None)
if not fn:
- filenameM=filename.split(".")[0]
+ filenameM=os.path.splitext(filename)[0]
founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
for found in founds:
- foundM=found[0].split(".")[0]
+ foundM=os.path.splitext(found[0])[0]
if filenameM.lower()==foundM.lower():
if onlyName:
@@ -1824,9 +1879,10 @@ def manage_AddImageCollectionForm(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):
+def manage_AddImageCollection(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):
+
"""Add ImageCollection"""
- newObj=ImageCollection(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
+ newObj=ImageCollection(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath)
self._setObject(id,newObj)
if RESPONSE is not None:
@@ -1855,14 +1911,17 @@ class ImageCollectionMD(ImageCollection,
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):
+
+ if not (file[0]=="."):
+ fn=os.path.splitext(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)
@@ -2194,7 +2253,7 @@ class ImageCollectionMD(ImageCollection,
for imagename in imagenames:
#imagename=image.xpath('./imagename')[0]
- #print "im",imagename
+ #print "im",imagename
@@ -2217,9 +2276,9 @@ class ImageCollectionMD(ImageCollection,
texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste
for text in texts:
if not text=="":
- #print "a"
+ #print "a"
text=self.getImageByName(text,onlyName="yes")
- #print "b"
+ #print "b"
try:
rc.append((str(text),id,nop))
fnIds[str(text)]=(id,nop)
@@ -2263,9 +2322,9 @@ def manage_AddImageCollectionMDForm(self
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:
@@ -2403,7 +2462,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')