--- ImageArchive/ImageArchive.py 2004/09/01 17:40:15 1.28 +++ ImageArchive/ImageArchive.py 2005/03/15 20:31:10 1.46 @@ -1,6 +1,6 @@ from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem -from Globals import Persistent +from Globals import Persistent,package_home from Acquisition import Implicit from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplate import PageTemplate @@ -10,6 +10,25 @@ import os.path import urllib import xml.dom.minidom import operator +import tempfile +import shutil +from types import * +import time + +try: + from Products.ECHO_content.ECHO_collection import ECHO_basis +except: + print "ECHO Elements not imported" + class ECHO_basis: + """leer""" + + manage_options=() + + + +def splitPath(str): + str2=str.replace("\\","/") + return os.path.split(str2)[1] def getText(nodelist): @@ -20,7 +39,53 @@ def getText(nodelist): rc = rc + node.data return rc +def getTextFromNode(nodename): + nodelist=nodename.childNodes + rc = "" + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc = rc + node.data + return rc + +class metaData(SimpleItem): + """Klasse fuer metadaten""" + meta_type="metaData" + + def __init__(self,xmlurl,container=None): + """__init__""" + return self.update(xmlurl,container) + + def update(self,xmlurl,container=None): + """update""" + + try: + xmlfh=urllib.urlopen(xmlurl) + dom=xml.dom.minidom.parse(xmlfh) + except: + return None + + md=dom.getElementsByTagName(container) + mlist=[] + if md: + for node in md[0].childNodes: + if node.nodeType==dom.ELEMENT_NODE: + name=node.tagName + content=getTextFromNode(node) + setattr(self,name,content) + mlist.append(name) + self.mlist=mlist[0:] + else: + self.mlist=[] + + def index_html(self): + """index""" + ret="
" + for tag in self.mlist: + ret+="%s=%s
"%(tag,getattr(self,tag)) + return ret+"" + + class ImageDigilib(Folder,Persistent,Implicit): """Anzeige object fuer digilib""" meta_type="ImageDigilib" @@ -52,7 +117,7 @@ class ImageDigilib(Folder,Persistent,Imp def addMetaObjectForm(self): """Add Form""" - pt=PageTemplateFile('Products/ImageArchive/zpt/addMetaObject.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addMetaObject.zpt')).__of__(self) return pt() @@ -65,34 +130,185 @@ class ImageDigilib(Folder,Persistent,Imp def getMeta(self): """ausgabe der metadaten""" return self.meta - + + def manageMetaData(self,strict=None): + """create or updateMetadata""" + + md=self.ZopeFind(self,obj_metatypes=["metaData"]) + + if not md: + self._setObject("metaData",metaData(self.meta,"ROW")) + + else: + if not strict: + md[0][1].update(self.meta,"ROW") + else: + print "strict" + if len(md[0][1].mlist)==0: + print " +++",self.getId() + md[0][1].update(self.meta,"ROW") + else: + print " ---",self.getId() + def uploadImage(self,fileupload,path_name): """upload an Image from an Requast""" #path_name=self.ImageStoragePath - filename=path_name+"/"+fileupload.filename + fn=splitPath(fileupload.filename) + filename=path_name+"/"+fn filedata=fileupload.read() f=open(filename,"w") f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" + #scale thumb + + self.scaleThumbs() - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + #scale standard - + self.scaleWorkingVersions() + + + def downloadWorkingVersion(self): + """download working version (2000 pixel)""" + + return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg") - - def download(self): + def download(self,fmt="&mo=rawfile,hires",suffix=None): """download""" - path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&mo=rawfile,hires" - #self.REQUEST.SESSION['string']="I forgot, the selected files. Please reselect.\n") + return 0 + + for id in self.REQUEST.SESSION['filenames']: + + if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]): + filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+id[0] + else: + filename=id[0] + + if RESPONSE: + RESPONSE.write(str("
Get File: %s
\n"%filename))
+
+ if local:
+ if version=="working":
+ sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
+ else:
+ sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+id[0]
+ targetPath=tmpPath+"/"+filename
+ try:
+ shutil.copyfile(sourcePath,targetPath)
+ except:
+ if RESPONSE:
+ RESPONSE.write(str("
Error in File: %s (possible missing)
\n"%filename))
+ else:
+ """nothing"""
+ else:
+ if version=="working":
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
+ else:
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&mo=rawfile,hires"
+ image=urllib.urlopen(path).read()
+
+
+ fh=file(tmpPath+"/"+filename,"w")
+
+
+ fh.write(image)
+ fh.close()
+
+ #folgeseiten
+ if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1:
+ ids=self.show_thumbs()
+ try:
+ nr=ids.index(id[0])
+ except:
+ if RESPONSE:
+ RESPONSE.write(str("
Error in File: %s (possible missing)
\n"%id[0]))
+ else:
+ """nothing"""
+
+ nr=0
+
+ numberOfPages=self.REQUEST.SESSION['filenamesIds'][id[0]][1]
+ for k in range(int(numberOfPages)-1):
+ i=k+1
+ if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(id[0]):
+ filename=self.REQUEST.SESSION['filenamesIds'][id[0]][0]+"_"+ids[nr+i]
+ else:
+ filename=id[0]
+
+ if RESPONSE:
+ RESPONSE.write(str("
Get File: %s
\n"%filename))
+
+ if local:
+ sourcePath="/mpiwg/online/"+self.ImageViewerPath+"/"+ids[nr+1]
+ targetPath=tmpPath+"/"+filename
+ try:
+ shutil.copyfile(sourcePath,targetPath)
+ except:
+ if RESPONSE:
+ RESPONSE.write(str("
Error in File: %s (missing?)
\n"%filename))
+ else:
+ """nothing"""
+ else:
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(ids[nr+i])[0]+"&mo=rawfile,hires"
+
+ image=urllib.urlopen(path).read()
+
+
+ fh=file(tmpPath+"/"+filename,"w")
+ fh.write(image)
+ fh.close()
+
+ if RESPONSE:
+ RESPONSE.write("
Create Zip
")
+ RESPONSE.write("
This can take a while....
\n")
+ if RESPONSE:
+ fh=os.popen2("zip -u %s %s/*"%(tmpZip,tmpPath),1)[1]
+ RESPONSE.write("
")
+ for c in fh.read():
+ RESPONSE.write(c)
+
+ if c==")":
+ RESPONSE.write("
\n")
+
+
+ else:
+ os.popen("zip -u %s %s/*"%(tmpZip,tmpPath))
+
+
+ shutil.rmtree(tmpPath)
+
+ if RESPONSE:
+ RESPONSE.write("
finished
\n")
+
+ if RESPONSE:
+ len=os.stat(tmpZip)[6]
+ downloadUrl=self.absolute_url()+"/downloadSet"
+ RESPONSE.write("""
The file will be stored for a while, you can download it later, the URL is:
+%s?fn=%s\n"""%(tmpFn,downloadUrl,tmpFn)) + RESPONSE.close() + + def downloadSet(self,fn): + """download prepared set""" + filename="/tmp/archivesImageServer/"+fn + + self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%"image.zip") + self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") + len=os.stat(filename)[6] + self.REQUEST.RESPONSE.setHeader("Content-Length",len) + images=file(filename).read() + self.REQUEST.RESPONSE.write(images) + self.REQUEST.RESPONSE.close() + + + + def scaleThumbs(self,RESPONSE=None): """scale thumbs""" - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + + #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) + if RESPONSE: + RESPONSE.write(ret.read()) + RESPONSE.write("\n") + return "RESCALING STARTED" + + def scaleWorkingVersions(self,RESPONSE=None): + """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) + if RESPONSE: + RESPONSE.write(ret.read()) + RESPONSE.write("\n") + return "rescaling started" + + def __init__(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString): self.id=id @@ -162,34 +559,35 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString - manage_options = Folder.manage_options+( + optTMP= Folder.manage_options + + manage_options = optTMP+( {'label':'Main Config','action':'ImageCollection_config'}, {'label':'Import','action':'ImportFiles'}, - {'label':'Recalculate Metadata','action':'recalculateMeta'}, - {'label':'Import Metadata','action':'importMetaForm'}, + {'label':'Recalculate MetadataLink','action':'recalculateMetaLink'}, + {'label':'Import Metadata File','action':'importMetaFileForm'}, + {'label':'Import Metadata','action':'importMetaData'}, {'label':'Rescale thumbs','action':'scaleThumbs'}, - {'label':'Weight (ECHO)','action':'weightForm'}, + {'label':'Rescale working version','action':'scaleWorkingVersions'}, ) - def weightForm(self): - """Weight""" - pt=PageTemplateFile('Products/ImageArchive/zpt/changeWeight.zpt').__of__(self) - return pt() + - def changeWeight(self,weight,RESPONSE=None): - """Change weight""" - self.weight=weight + def importMetaData(self,strict=None): + """import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty""" - if RESPONSE is not None: - RESPONSE.redirect('manage_main') - + for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]): + print image[1].getId() + image[1].manageMetaData(strict) + return "ok" - def importMetaForm(self): + + def importMetaFileForm(self): """import metadata""" - pt=PageTemplateFile('Products/ImageArchive/zpt/importMeta.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importMeta.zpt')).__of__(self) return pt() - def importMeta(self,fileupload,tag): + def importMetaFile(self,fileupload,tag): """import""" filedata=fileupload.read() dom=xml.dom.minidom.parseString(filedata) @@ -223,7 +621,7 @@ class ImageCollection(Folder, Persistent return "OK" - def nextImage(self,request,selected=None): + def nextImage(self,request,selected=None,returnFn=None): """show nextimage""" try: ids=self.show_thumbs() @@ -231,14 +629,18 @@ class ImageCollection(Folder, Persistent filename=request.SESSION["filename"] try: nr=ids.index(filename) + except: nr=0 else: nr=0 if nr==len(ids)-1: - return "" + return "" else: + if returnFn: + return ids[nr+1] + if selected: return "next image" else: @@ -272,7 +674,7 @@ class ImageCollection(Folder, Persistent def meta_default(self,filename): """url der metadaten""" - return self.defaultMetaString % filename + return self.defaultMetaString % urllib.quote(filename) def getThumbAttribute(self,id,attr): if hasattr(self,id): @@ -293,21 +695,47 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() - #print url - dom=xml.dom.minidom.parseString(xmldoc) - - images=dom.getElementsByTagName('imagename') + #return xmldoc + try: + dom=xml.dom.minidom.parseString(xmldoc) + except: + return xmldoc + images=dom.getElementsByTagName('image') + rc=[] + fnIds={} for image in images: - text=getText(image.childNodes) - if not text=="": - rc.append(str(text)) + imagename=image.getElementsByTagName('imagename')[0] + + + + idnr=image.getElementsByTagName('idnr')[0] + id=getText(idnr.childNodes) + numberOfPages=image.getElementsByTagName('numberOfPages')[0] + nopT=getText(numberOfPages.childNodes) + try: + nop=int(nopT) + except: + nop=0 + texts=getText(imagename.childNodes).split("\n") #mehrere bilder in return getrennter liste + for text in texts: + if not text=="": + try: + rc.append((str(text),id,nop)) + fnIds[str(text)]=(id,nop) + except: + rc.append((repr(text),id,nop)) + fnIds[repr(text)]=(id,nop) + + rc.sort() self.REQUEST.SESSION['filenames']=rc - pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self) + self.REQUEST.SESSION['filenamesIds']=fnIds + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected.zpt')).__of__(self) return pt() - def recalculateMeta(self): + def recalculateMetaLink(self): """recalculate the metadata""" for entryid in self.__dict__: @@ -320,11 +748,13 @@ class ImageCollection(Folder, Persistent def addImage(self): """Add an Image""" - pt=PageTemplateFile('Products/ImageArchive/zpt/addImage.zpt').__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImage.zpt')).__of__(self) return pt() def addImage2(self,fileupload,meta,use_default=None,RESPONSE=None): """Add""" + #print "FU",fileupload if use_default: @@ -334,9 +764,10 @@ class ImageCollection(Folder, Persistent meta=None else: meta=None - - manage_AddImageDigilib(self,fileupload.filename,fileupload,meta=meta) - return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fileupload.filename) + fn=splitPath(fileupload.filename) + + manage_AddImageDigilib(self,fn,fileupload,meta=meta) + return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) #return self.REQUEST['URL1']+'/'+fileupload.filename def ImportFiles2(self,RESPONSE=None): @@ -357,9 +788,18 @@ class ImageCollection(Folder, Persistent #print newObj self._setObject(file,newObj) #print ret - #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) + #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + RESPONSE.redirect('manage_main') def ImportFiles(self,RESPONSE=None): @@ -382,17 +822,26 @@ class ImageCollection(Folder, Persistent except: """nothing yet""" #print ret - #pt=PageTemplateFile('Products/ImageArchive/out.zpt').__of__(self) + #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self) #print self.ImageStoragePath - os.popen("ssh nausikaa2.rz-berlin.mpg.de /usr/local/mpiwg/scripts/scaleomat.pl %s /mpiwg/temp/online/scaled/small 100 &"% self.ImageViewerPath) - RESPONSE.redirect('manage_main') + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + if RESPONSE: + RESPONSE.redirect('manage_main') def ImageCollection_config(self): """Nothing yet""" if not hasattr(self,'defaultMetaString'): self.defaultMetaString="" - pt=PageTemplateFile('Products/ImageArchive/zpt/ChangeImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self) return pt() def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -555,13 +1004,13 @@ class ImageCollection(Folder, Persistent def setColTimesRowForm(self): """form for matrix setting""" - pt=PageTemplateFile('Products/ImageArchive/zpt/selectColTimesRow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','selectColTimesRow.zpt')).__of__(self) return pt() def setDone(self): """done""" - pt=PageTemplateFile('Products/ImageArchive/zpt/changedColTimesRow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changedColTimesRow.zpt')).__of__(self) return pt() def setColTimesRow(self,cols,rows): @@ -618,7 +1067,7 @@ class ImageCollection(Folder, Persistent return 0 if self.REQUEST.SESSION.has_key("filename"): filename=self.REQUEST.SESSION["filename"] - + filename=self.getImageByName(filename,onlyName="yes") try: startId=filename @@ -663,40 +1112,41 @@ class ImageCollection(Folder, Persistent def thumblistSelected_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected.zpt')).__of__(self) return pt() def thumblistSelected(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbselected2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbselected2.zpt')).__of__(self) return pt() def thumblist_old(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbs.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbs.zpt')).__of__(self) return pt() def thumblist(self): """main template collection""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumb2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb2.zpt')).__of__(self) return pt() def thumblistNewWindow(self): """Thumbs mit clik neues Fenster oeffnen""" - pt=PageTemplateFile('Products/ImageArchive/zpt/thumbNewWindow.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumbNewWindow.zpt')).__of__(self) return pt() def navig_selected_html(self): """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] - pt=PageTemplateFile('Products/ImageArchive/zpt/navigation_selected.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation_selected.zpt')).__of__(self) return pt() def navig_html(self): """navigation""" #self.REQUEST.SESSION['URL']=self.REQUEST['URL0'] - pt=PageTemplateFile('Products/ImageArchive/zpt/navigation.zpt').__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self) return pt() @@ -707,9 +1157,27 @@ class ImageCollection(Folder, Persistent else: filen="" self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected2.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selected2.zpt')).__of__(self) return pt() + + def getImageByName(self,filename,onlyName=None): + """get filename""" + fn=getattr(self,filename,None) + if not fn: + filenameM=filename.split(".")[0] + founds=self.ZopeFind(self,obj_metatypes=['ImageDigilib']) + for found in founds: + foundM=found[0].split(".")[0] + if filenameM.lower()==foundM.lower(): + if onlyName: + return found[0] + else: + return found[1] + if onlyName: + return filename + else: + return fn def index_html(self): """main template collection""" if self.REQUEST.has_key('filename'): @@ -717,21 +1185,21 @@ class ImageCollection(Folder, Persistent else: filen="" - self.REQUEST.SESSION['filename']=filen - + self.REQUEST.SESSION['filename']=filen[0:] + if self.REQUEST.has_key('showall'): self.REQUEST.SESSION['showall']=self.REQUEST.get('showall') else: self.REQUEST.SESSION['showall']=self.REQUEST.SESSION.get('showall','no') - - pt=PageTemplateFile('Products/ImageArchive/zpt/overview.zpt').__of__(self) + + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self) return pt() def manage_AddImageCollectionForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionForm.zpt')).__of__(self) return pt() def manage_AddImageCollection(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None): @@ -771,7 +1239,7 @@ class ImageCollectionIFrame(ImageCollect self.REQUEST.SESSION['filename']=filen - pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameMain.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameMain.zpt')).__of__(self) return pt() def iframe_html(self): @@ -781,13 +1249,13 @@ class ImageCollectionIFrame(ImageCollect else: filen="" self.REQUEST.response.setCookie('filename',filen) - pt=PageTemplateFile('Products/ImageArchive/zpt/IFrameOverview.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','IFrameOverview.zpt')).__of__(self) return pt() def manage_AddImageCollectionIFrameForm(self): """Nothing yet""" - pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageCollectionIFrameForm.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionIFrameForm.zpt')).__of__(self) return pt() def manage_AddImageCollectionIFrame(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):