version 1.90, 2006/05/22 15:29:33
|
version 1.91, 2006/05/22 20:20:17
|
Line 517 class ImageDigilib(Folder,Persistent,Imp
|
Line 517 class ImageDigilib(Folder,Persistent,Imp
|
|
|
|
|
|
|
|
dest="/Volumes/paviaExtern/docuserver/images/exhibitionImages/" |
|
dir=self.getId() |
self.scale(dest=self.srcBasis,filename=newName,scaleBy=1,RESPONSE=RESPONSE) |
src=path |
|
self.scale(dest=dest,dir=dir,src=path,scaleBy=1,RESPONSE=RESPONSE) |
return True |
return True |
|
|
def updateImage(self,_fileupload,_rename=None,RESPONSE=None): |
def updateImage(self,_fileupload,_rename=None,RESPONSE=None): |
Line 699 class ImageCollection(OrderedFolder, Per
|
Line 700 class ImageCollection(OrderedFolder, Per
|
|
|
destBasis="/docuserver/scaled/" |
destBasis="/docuserver/scaled/" |
srcBasis="/docuserver/images" |
srcBasis="/docuserver/images" |
def scale(self,dest=None,dir=None,filename=None,scaleTo=None,scaleBy=None,RESPONSE=None): |
def scale(self,dest=None,dir=None,src=None,scaleTo=None,scaleBy=None,RESPONSE=None): |
"""scaler""" |
"""scaler""" |
#scaleomatStr="ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ %s" |
#scaleomatStr="ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl -src=/mpiwg/online/ %s" |
scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl" |
scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl" |
|
|
destBasis=self.destBasis |
destBasis=self.destBasis |
srcBasis=self.srcBasis |
srcBasis=self.srcBasis |
|
if src: |
|
srcStr=" -src=%s"%src |
|
else: |
srcStr=" -src=%s"%srcBasis |
srcStr=" -src=%s"%srcBasis |
|
|
scaleStr=scaleomatStr+srcStr |
scaleStr=scaleomatStr+srcStr |
if dir: |
if dir: |
dirTmp=dir.replace(srcBasis,'') |
dirTmp=dir.replace(srcBasis,'') |
Line 738 class ImageCollection(OrderedFolder, Per
|
Line 742 class ImageCollection(OrderedFolder, Per
|
zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given") |
zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given") |
return False |
return False |
|
|
print scaleStr |
|
ret=scaleStr |
#ret=scaleStr |
#ret=os.popen(scaleStr) |
ret=os.popen2(scaleStr,1)[1].read() |
|
|
if RESPONSE: |
if RESPONSE: |
RESPONSE.write(ret) |
RESPONSE.write(ret) |
Line 867 class ImageCollection(OrderedFolder, Per
|
Line 871 class ImageCollection(OrderedFolder, Per
|
|
|
def scaleToJpgs(self,RESPONSE=None): |
def scaleToJpgs(self,RESPONSE=None): |
"""scale all tifs to jps""" |
"""scale all tifs to jps""" |
print self._objects |
|
for x in self._objects: |
for x in self._objects: |
|
|
if (not hasattr(getattr(self,x['id']),'scaleToJpg')) or (not getattr(self,x['id']).scaleToJpg()): |
if (not hasattr(getattr(self,x['id']),'scaleToJpg')) or (not getattr(self,x['id']).scaleToJpg()): |
Line 1156 class ImageCollection(OrderedFolder, Per
|
Line 1160 class ImageCollection(OrderedFolder, Per
|
ret="" |
ret="" |
#print self.__dict__ |
#print self.__dict__ |
for file in files: |
for file in files: |
if not file[0]==".": |
fn=os.path.splitext(file)[0] |
if self.__dict__.has_key(file): |
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+"<br>"+file+" already exists!" |
ret=ret+"<br>"+file+" already exists!" |
else: |
else: |
Line 1242 class ImageCollection(OrderedFolder, Per
|
Line 1247 class ImageCollection(OrderedFolder, Per
|
ret="" |
ret="" |
#print self.__dict__ |
#print self.__dict__ |
for file in files: |
for file in files: |
if not file[0]==".": |
fn=os.path.splitext(file)[0] |
if self.__dict__.has_key(file): |
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+"<br>"+file+" already exists!" |
ret=ret+"<br>"+file+" already exists!" |
|
|
else: |
else: |
ret=ret+"<br>"+file+" created!" |
ret=ret+"<br>"+file+" created!" |
newObj=ImageDigilib(file,file) |
newObj=ImageDigilib(file,file) |
Line 1859 class ImageCollectionMD(ImageCollection,
|
Line 1866 class ImageCollectionMD(ImageCollection,
|
ret="" |
ret="" |
#print self.__dict__ |
#print self.__dict__ |
for file in files: |
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+"<br>"+file+" already exists!" |
ret=ret+"<br>"+file+" already exists!" |
|
|
else: |
else: |
ret=ret+"<br>"+file+" created!" |
ret=ret+"<br>"+file+" created!" |
newObj=ImageDigilib(file,file) |
newObj=ImageDigilib(file,file) |