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