--- ImageArchive/ImageArchive.py 2006/05/24 09:56:58 1.93 +++ ImageArchive/ImageArchive.py 2007/01/31 14:24:17 1.103 @@ -24,9 +24,18 @@ from threading import Thread import Queue import cgi import sys -import zLOG + import shutil +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + + + from AccessControl import ClassSecurityInfo, getSecurityManager try: @@ -49,11 +58,11 @@ except: manage_options=() - -tdir = "/mpiwg/temp/tmp/archivesImageServer/" +tdir="tmp" +#tdir = "/mpiwg/temp/tmp/archivesImageServer/" #tdir="/tmp/archivesImageServer/" -imageExtensions=['jpg','jpeg','tif','tiff','png'] +imageExtensions=['.jpg','.jpeg','.tif','.tiff','.png','.gif'] def splitPath(str): str2=str.replace("\\","/") @@ -80,16 +89,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): @@ -115,26 +127,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"
@@ -488,7 +508,7 @@ class ImageDigilib(Folder,Persistent,Imp
self.scaleWorkingVersions()
- self.scaleToJpg()
+ #self.scaleToJpg()
if RESPONSE:
RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
@@ -507,12 +527,12 @@ class ImageDigilib(Folder,Persistent,Imp
newName=os.path.join(path,self.getId())
if os.path.exists(newName):
- zLOG.LOG("ImageArchive:scaleToJpg", zLOG.INFO, "%s already exists"%newName)
+ logger("ImageArchive:scaleToJpg", logging.INFO, "%s already exists"%newName)
else:
try:
os.rename(imagePath,newName)
except:
- zLOG.LOG("ImageArchive:scaleToJpg", zLOG.ERROR, "%s "%newName)
+ logger("ImageArchive:scaleToJpg", logging.ERROR, "%s "%newName)
return False
ext= os.path.splitext(imagePath)[1].lower()
@@ -553,10 +573,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))
+ #logger("ImageArchive:updateImage", logging.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))
+ logger("ImageArchive:updateImage", logging.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
#lesen des upload files und schreiben
filedata=_fileupload.read()
@@ -746,14 +766,14 @@ class ImageCollection(OrderedFolder, Per
fileStr=" -dir=%s"%fileTmp
scaleStr=scaleStr+fileStr
else:
- zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no directory or filename given")
+ 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:
- zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given")
+ logger("ImageCollection:scale",logging.ERROR,"no destionation given")
return False
if scaleTo:
@@ -763,11 +783,12 @@ class ImageCollection(OrderedFolder, Per
scaleByStr=" -scaleby=%s"%scaleBy
scaleStr=scaleStr+scaleByStr
else:
- zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given")
+ 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:
@@ -781,12 +802,12 @@ class ImageCollection(OrderedFolder, Per
name=os.path.splitext(name)[0]
for extension in imageExtensions:
- nameExt=name+"."+extension
+ nameExt=name+extension
if hasattr(self,nameExt):
return getattr(self,nameExt)
- nameExt=name+"_."+extension
+ nameExt=name+"_"+extension
if hasattr(self,nameExt):
return getattr(self,nameExt)
@@ -828,7 +849,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()
@@ -919,9 +940,9 @@ class ImageCollection(OrderedFolder, Per
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")
+ #if RESPONSE:
+ # RESPONSE.write(ret.read())
+ # RESPONSE.write("\n")
return "RESCALING STARTED"
@@ -1593,16 +1614,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"""
@@ -1718,20 +1740,12 @@ class ImageCollection(OrderedFolder, Per
else:
return ids[(row-1)*numberOfColumns:]
- def thumblistSelected_old(self):
- """main template collection"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self)
- return pt()
def thumblistSelected(self):
"""main template collection"""
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self)
return pt()
- def thumblist_old(self):
- """main template collection"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self)
- return pt()
def thumblist(self):
"""main template collection"""
@@ -1775,13 +1789,22 @@ class ImageCollection(OrderedFolder, Per
#FIXME: umlaute in filename
fn=getattr(self,repr(filename),None)
if not fn:
- filenameM=filename.split(".")[0]
-
- founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
+ if os.path.splitext(filename)[1].lower() in imageExtensions:
+ filenameM=os.path.splitext(filename)[0]
+ else:
+ filenameM=filename
+
+
+
+ founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib'])
+
for found in founds:
- foundM=found[0].split(".")[0]
+ if os.path.splitext(found[0])[1].lower() in imageExtensions:
+ foundM=os.path.splitext(found[0])[0]
+ else:
+ foundM=found[0]
if filenameM.lower()==foundM.lower():
if onlyName:
@@ -1910,6 +1933,7 @@ class ImageCollectionMD(ImageCollection,
ret=ret+"
"+file+" already exists!"
else:
+ logger("ImageArchiveMD:import", logging.INFO, "adding ZOPE: %s"%file)
ret=ret+"
"+file+" created!"
newObj=ImageDigilib(file,file)
#print newObj,file
@@ -1919,13 +1943,15 @@ class ImageCollectionMD(ImageCollection,
except:
"""nothing yet"""
-
- args={}
- args['_table']=self.imageCollectionConfig.getTable()
- args[self.imageCollectionConfig.getKey()]=file
-
- if not self.ZSQLInlineSearch(args=args):
- self.ZSQLAdd(args=args)
+ # 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
@@ -1939,7 +1965,7 @@ class ImageCollectionMD(ImageCollection,
self.scaleWorkingVersions()
- self.scaleToJpgs()
+ #self.scaleToJpgs()
if RESPONSE:
RESPONSE.redirect('manage_main')
@@ -2023,6 +2049,7 @@ class ImageCollectionMD(ImageCollection,
rc=[]
fnIds={}
+
for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
key=getattr(found,self.imageCollectionConfig.getKey())
key=self.getImageByName(key,onlyName="yes")
@@ -2225,6 +2252,9 @@ class ImageCollectionMD(ImageCollection,
#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:
@@ -2286,9 +2316,7 @@ class ImageCollectionMD(ImageCollection,
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()
-
+
def selection(self):
"""show only selected"""
if self.REQUEST.has_key('filename'):