version 1.93, 2006/05/24 09:56:58
|
version 1.94, 2006/05/25 15:49:42
|
Line 49 except:
|
Line 49 except:
|
|
|
manage_options=() |
manage_options=() |
|
|
|
tdir="tmp" |
tdir = "/mpiwg/temp/tmp/archivesImageServer/" |
#tdir = "/mpiwg/temp/tmp/archivesImageServer/" |
#tdir="/tmp/archivesImageServer/" |
#tdir="/tmp/archivesImageServer/" |
|
|
imageExtensions=['jpg','jpeg','tif','tiff','png'] |
imageExtensions=['jpg','jpeg','tif','tiff','png'] |
Line 80 class generateSet:
|
Line 80 class generateSet:
|
"""generateSetThread""" |
"""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""" |
"""init generateSet""" |
self.filenames=filenames |
self.filenames=filenames |
self.filenamesIds=filenamesIds |
self.filenamesIds=filenamesIds |
self.ImageViewerPath=ImageViewerPath |
self.ImageViewerPath=ImageViewerPath |
|
self.ImageStoragePath=ImageStoragePath |
|
self.destBasis=destBasis |
self.ids=ids |
self.ids=ids |
self.local=local |
self.local=local |
self.url=url |
self.url=url |
self.version=version |
self.version=version |
self.done=None |
self.done=None |
|
self.response="" |
|
|
|
|
def __call__(self): |
def __call__(self): |
Line 115 class generateSet:
|
Line 118 class generateSet:
|
|
|
for id in self.filenames: |
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] |
filename=self.filenamesIds[id[0]][0]+"_"+id[0] |
else: |
else: |
filename=id[0] |
filename=id[0] |
|
|
self.response+=str("<p>Get File: %s<br>\n"%filename) |
self.response+=str("<p>Get File: %s<br>\n"%filename) |
|
|
|
toggle=False |
|
|
if self.local: |
if self.local: |
|
|
if self.version=="working": |
if self.version=="working": |
|
|
sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg" |
sourcePath=self.destBasis+"/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg" |
else: |
if not os.path.exists(sourcePath): |
sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0] |
self.response+=str("<p>%s doesn't exist I'll try the non scaled image</p>"%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 |
targetPath=tmpPath+"/"+filename |
try: |
try: |
shutil.copyfile(sourcePath,targetPath) |
shutil.copyfile(sourcePath,targetPath) |
except: |
except: |
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%filename)) |
self.response+=(str("<p>Error in File: %s (possible missing)<br>\n"%sourcePath)) |
else: |
else: |
if self.version=="working": |
if self.version=="working": |
requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000" |
requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000" |
Line 828 class ImageCollection(OrderedFolder, Per
|
Line 839 class ImageCollection(OrderedFolder, Per
|
|
|
|
|
if not threadName or threadName=="": |
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=Thread(target=threadStart) |
|
|
thread.start() |
thread.start() |