--- ImageArchive/ImageArchive.py 2006/05/17 21:42:49 1.88 +++ ImageArchive/ImageArchive.py 2006/05/22 15:29:33 1.90 @@ -286,6 +286,8 @@ class ImageDigilib(Folder,Persistent,Imp ) + + def getAccessRight(self): """get the accessright, return is string "extern" or "intern" """ return self.getRights(self.filename.split('.')[0]) @@ -388,13 +390,13 @@ class ImageDigilib(Folder,Persistent,Imp os.chmod(filename,0664) except: """hack""" - #scale thumb + #< thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() + self.scaleWorkingVersions() @@ -480,17 +482,46 @@ class ImageDigilib(Folder,Persistent,Imp #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() - + self.scaleWorkingVersions() + self.scaleToJpg() if RESPONSE: RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + def scaleToJpg(self,RESPONSE=None): + """create a jpg""" + + #create backup of the original file + + imagePath=os.path.join(self.ImageStoragePath,self.filename) + path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir") + + if not os.path.exists(path): + os.mkdir(path,0775) + os.chmod(path,0775) + + newName=os.path.join(path,self.getId()) + if os.path.exists(newName): + zLOG.LOG("ImageArchive:scaleToJpg", zLOG.INFO, "%s already exists"%newName) + else: + try: + os.rename(imagePath,newName) + except: + zLOG.LOG("ImageArchive:scaleToJpg", zLOG.ERROR, "%s "%newName) + return False + + + + + + self.scale(dest=self.srcBasis,filename=newName,scaleBy=1,RESPONSE=RESPONSE) + return True + def updateImage(self,_fileupload,_rename=None,RESPONSE=None): """lade neues Version des Bildes""" #teste ob Dokumenten ordner schon vorhanden @@ -522,7 +553,7 @@ class ImageDigilib(Folder,Persistent,Imp zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath)) #lesen des upload files und schreiben - filedata=file.read() + filedata=_fileupload.read() f=open(imagePath,"w") # if we wanted to have filename=id we should do it here! f.write(filedata) f.close() @@ -532,14 +563,14 @@ class ImageDigilib(Folder,Persistent,Imp pass #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() - + self.scaleWorkingVersions() + self.scaleToJpg() if _rename: - self.renameImage(file.filename) + self.renameImage(_fileupload.filename) args=self.REQUEST.form @@ -657,6 +688,7 @@ class ImageCollection(OrderedFolder, Per leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] + scaledBasis="/mpiwg/temp/online/scaled" defaultMetaString="http://fm-web.mpiwg-berlin.mpg.de:8050/FMRes/FMPJS?-db=Wissenschaftlerportraits.fp5&-layID=69&-token=25&-max=1&-format=formvwcss.htm&-mode=browse&images::filename=%s&-find" ## TEST FUER IMAGEDATENBANK WP @@ -665,6 +697,55 @@ class ImageCollection(OrderedFolder, Per imgcoll_thumb = PageTemplateFile('zpt/thumb', globals()) imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals()) + destBasis="/docuserver/scaled/" + srcBasis="/docuserver/images" + def scale(self,dest=None,dir=None,filename=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 + scaleStr=scaleomatStr+srcStr + if dir: + dirTmp=dir.replace(srcBasis,'') + dirStr=" -dir=%s"%dirTmp + scaleStr=scaleStr+dirStr + elif filename: + fileTmp=filename.replace(srcBasis,'') + fileStr=" -dir=%s"%fileTmp + scaleStr=scaleStr+fileStr + else: + zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no directory or filename given") + return False + + if dest is not None: + destStr=" -dest=%s"%os.path.join(destBasis,dest) + scaleStr=scaleStr+destStr + else: + zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given") + return False + + if scaleTo: + scaleToStr=" -scaleto=%s"%scaleTo + scaleStr=scaleStr+scaleToStr + elif scaleBy: + scaleByStr=" -scaleby=%s"%scaleBy + scaleStr=scaleStr+scaleByStr + else: + zLOG.LOG("ImageCollection:scale",zLOG.ERROR,"no destionation given") + return False + + print scaleStr + ret=scaleStr + #ret=os.popen(scaleStr) + + if RESPONSE: + RESPONSE.write(ret) + return True + def getImageObject(self,name): """gibt objeckt name zurueck""" if hasattr(self,name): @@ -783,13 +864,25 @@ class ImageCollection(OrderedFolder, Per self.REQUEST.RESPONSE.write(images) self.REQUEST.RESPONSE.close() - + + 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()): + if RESPONSE: + RESPONSE.write('error:%s'%x) + + def scaleThumbs(self,RESPONSE=None): """scale thumbs""" #scale thumbs - 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) + dest=os.path.join(self.scaledBasis,'thumb') + self.scale(dir=self.ImageStoragePath,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") @@ -800,14 +893,19 @@ class ImageCollection(OrderedFolder, Per """scale working versions""" #scale standard - - 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/small -scaleto=2000 &"% self.ImageViewerPath) + + dest=os.path.join(self.scaledBasis,'small') + self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=1000,RESPONSE=RESPONSE) + + dest=os.path.join(self.scaledBasis,'medium') + self.scale(dir=self.ImageStoragePath,dest=dest,scaleTo=2000,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/small -scaleto=2000 &"% self.ImageViewerPath) if RESPONSE: RESPONSE.write(ret.read()) RESPONSE.write("\n") return "rescaling started" - def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath=genericServerPath): self.id=id @@ -1075,11 +1173,11 @@ class ImageCollection(OrderedFolder, Per #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() + self.scaleWorkingVersions() RESPONSE.redirect('manage_main') @@ -1129,11 +1227,11 @@ class ImageCollection(OrderedFolder, Per #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() + self.scaleWorkingVersions() if RESPONSE: RESPONSE.redirect('manage_main') @@ -1163,7 +1261,7 @@ class ImageCollection(OrderedFolder, Per #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard @@ -1789,11 +1887,13 @@ class ImageCollectionMD(ImageCollection, #scale thumb - #self.scaleThumbs() + self.scaleThumbs() #scale standard - #self.scaleWorkingVersions() + self.scaleWorkingVersions() + + self.scaleToJpgs() if RESPONSE: RESPONSE.redirect('manage_main') @@ -1827,6 +1927,10 @@ class ImageCollectionMD(ImageCollection, self.ZSQLAdd(args=args) + self.scaleThumbs() + self.scaleWorkingVersions() + + getattr(self,fn).scaleToJpg() if RESPONSE: return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) #return self.REQUEST['URL1']+'/'+fileupload.filename @@ -2084,20 +2188,20 @@ class ImageCollectionMD(ImageCollection, return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc) - images=dom.xpath("//image") + imagenames=dom.xpath("//imagename") rc=[] fnIds={} - for image in images: + for imagename in imagenames: - imagename=image.xpath('./imagename')[0] - + #imagename=image.xpath('./imagename')[0] + #print "im",imagename - idnr=image.xpath('./idnr')[0] + idnr=imagename.xpath('../idnr')[0] id=getText(idnr.childNodes) try: - numberOfPages=image.xpath('./numberOfPages')[0] + numberOfPages=imagename.xpath('../numberOfPages')[0] except: numberOfPages=None @@ -2113,7 +2217,9 @@ class ImageCollectionMD(ImageCollection, texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste for text in texts: if not text=="": + #print "a" text=self.getImageByName(text,onlyName="yes") + #print "b" try: rc.append((str(text),id,nop)) fnIds[str(text)]=(id,nop) @@ -2121,7 +2227,7 @@ class ImageCollectionMD(ImageCollection, rc.append((repr(text),id,nop)) fnIds[repr(text)]=(id,nop) - + #print "done" rc.sort() self.REQUEST.SESSION['filenames']=rc self.REQUEST.SESSION['filenamesIds']=fnIds