version 1.95, 2006/05/26 17:46:07
|
version 1.99, 2006/08/31 11:40:06
|
Line 53 tdir="tmp"
|
Line 53 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','.gif'] |
|
|
def splitPath(str): |
def splitPath(str): |
str2=str.replace("\\","/") |
str2=str.replace("\\","/") |
Line 793 class ImageCollection(OrderedFolder, Per
|
Line 793 class ImageCollection(OrderedFolder, Per
|
|
|
name=os.path.splitext(name)[0] |
name=os.path.splitext(name)[0] |
for extension in imageExtensions: |
for extension in imageExtensions: |
nameExt=name+"."+extension |
nameExt=name+extension |
|
|
if hasattr(self,nameExt): |
if hasattr(self,nameExt): |
return getattr(self,nameExt) |
return getattr(self,nameExt) |
|
|
nameExt=name+"_."+extension |
nameExt=name+"_"+extension |
if hasattr(self,nameExt): |
if hasattr(self,nameExt): |
return getattr(self,nameExt) |
return getattr(self,nameExt) |
|
|
Line 1605 class ImageCollection(OrderedFolder, Per
|
Line 1605 class ImageCollection(OrderedFolder, Per
|
return ret |
return ret |
|
|
|
|
def show_thumbs_selected_rows(self,numberOfColumns): |
def show_thumbs_selected_rows(self,numberOfColumns,start=0,max=10000): |
"""Ausgabe anzahl""" |
"""Ausgabe anzahl""" |
ids=self.show_selected_thumbs() |
ids=self.show_selected_thumbs() |
|
|
if not ids: |
if not ids: |
return None |
return None |
self.REQUEST.SESSION['ids']=ids |
self.REQUEST.SESSION['ids']=ids |
number=int(len(ids)/numberOfColumns)+1 |
number=min(start+int(len(ids)/numberOfColumns)+1,max) |
self.REQUEST.SESSION['number']=range(number) |
|
return range(number+1) |
self.REQUEST.SESSION['number']=range(start,number) |
|
return range(start,number+1) |
|
|
def setColTimesRowForm(self): |
def setColTimesRowForm(self): |
"""form for matrix setting""" |
"""form for matrix setting""" |
Line 1787 class ImageCollection(OrderedFolder, Per
|
Line 1788 class ImageCollection(OrderedFolder, Per
|
#FIXME: umlaute in filename |
#FIXME: umlaute in filename |
fn=getattr(self,repr(filename),None) |
fn=getattr(self,repr(filename),None) |
if not fn: |
if not fn: |
filenameM=filename.split(".")[0] |
|
|
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']) |
founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) |
|
|
|
|
for found in founds: |
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 filenameM.lower()==foundM.lower(): |
if onlyName: |
if onlyName: |
Line 1922 class ImageCollectionMD(ImageCollection,
|
Line 1932 class ImageCollectionMD(ImageCollection,
|
ret=ret+"<br>"+file+" already exists!" |
ret=ret+"<br>"+file+" already exists!" |
|
|
else: |
else: |
|
zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding ZOPE: %s"%file) |
ret=ret+"<br>"+file+" created!" |
ret=ret+"<br>"+file+" created!" |
newObj=ImageDigilib(file,file) |
newObj=ImageDigilib(file,file) |
#print newObj,file |
#print newObj,file |
Line 1931 class ImageCollectionMD(ImageCollection,
|
Line 1942 class ImageCollectionMD(ImageCollection,
|
except: |
except: |
"""nothing yet""" |
"""nothing yet""" |
|
|
|
# check entry in database |
args={} |
args={} |
args['_table']=self.imageCollectionConfig.getTable() |
args['_table']=self.imageCollectionConfig.getTable() |
args[self.imageCollectionConfig.getKey()]=file |
args[self.imageCollectionConfig.getKey()]=file |
|
|
if not self.ZSQLInlineSearch(args=args): |
if not self.ZSQLInlineSearch(args=args): |
|
zLOG.LOG("ImageArchiveMD:import", zLOG.INFO, "adding DB: %s"%file) |
self.ZSQLAdd(args=args) |
self.ZSQLAdd(args=args) |
|
|
#print ret |
#print ret |
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) |
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) |
#print self.ImageStoragePath |
#print self.ImageStoragePath |
Line 1951 class ImageCollectionMD(ImageCollection,
|
Line 1964 class ImageCollectionMD(ImageCollection,
|
|
|
self.scaleWorkingVersions() |
self.scaleWorkingVersions() |
|
|
self.scaleToJpgs() |
#self.scaleToJpgs() |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.redirect('manage_main') |
RESPONSE.redirect('manage_main') |