--- ImageArchive/ImageArchive.py 2006/05/24 09:56:58 1.93 +++ ImageArchive/ImageArchive.py 2006/08/31 11:40:06 1.99 @@ -49,11 +49,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 +80,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 +118,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" @@ -768,6 +779,7 @@ class ImageCollection(OrderedFolder, Per #ret=scaleStr + #zLOG.LOG("ImageCollection:scale",zLOG.INFO,scaleStr) ret=os.popen2(scaleStr,1)[1].read() if RESPONSE: @@ -781,12 +793,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 +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() @@ -919,9 +931,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 +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""" @@ -1775,13 +1788,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 +1932,7 @@ class ImageCollectionMD(ImageCollection, ret=ret+"
"+file+" already exists!" else: + zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding ZOPE: %s"%file) ret=ret+"
"+file+" created!" newObj=ImageDigilib(file,file) #print newObj,file @@ -1919,13 +1942,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.ZSQLInlineSearch(args=args): + zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding DB: %s"%file) + self.ZSQLAdd(args=args) + #print ret #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath @@ -1939,7 +1964,7 @@ class ImageCollectionMD(ImageCollection, self.scaleWorkingVersions() - self.scaleToJpgs() + #self.scaleToJpgs() if RESPONSE: RESPONSE.redirect('manage_main')