--- ImageArchive/ImageArchive.py 2004/11/18 16:34:36 1.38 +++ ImageArchive/ImageArchive.py 2005/01/25 12:26:56 1.44 @@ -12,14 +12,20 @@ import xml.dom.minidom import operator import tempfile import shutil +from types import * try: from Products.ECHO_content.ECHO_collection import ECHO_basis except: print "ECHO Elements not imported" - ECHO_basis=None - + class ECHO_basis: + """leer""" + + manage_options=() + + + def splitPath(str): str2=str.replace("\\","/") return os.path.split(str2)[1] @@ -33,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" @@ -78,7 +130,26 @@ 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 @@ -89,7 +160,7 @@ class ImageDigilib(Folder,Persistent,Imp f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" #scale thumb @@ -121,8 +192,10 @@ class ImageDigilib(Folder,Persistent,Imp self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename="%s" """%filename) self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") - image=urllib.urlopen(path).read() - self.REQUEST.RESPONSE.write(image) + #print path + imagefh=urllib.urlopen(path) + + self.REQUEST.RESPONSE.write(imagefh.read()) self.REQUEST.RESPONSE.close() #return self.REQUEST.RESPONSE.redirect(path) @@ -131,12 +204,48 @@ class ImageDigilib(Folder,Persistent,Imp pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self) return pt() - def updateImage(self,file,RESPONSE): + def renameImageForm(self): + """form""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','renameImageForm.zpt')).__of__(self) + return pt() + + def renameImage(self,newname,RESPONSE=None): + """umbenennen""" + #umbennen des files im folder + oldname=self.getId() + self.aq_parent.manage_renameObjects(ids=[oldname],new_ids=[newname]) + self.title=newname[0:] + self.filename=newname[0:] + #umbennen des files auf dem server + oldpath=os.path.join(self.ImageStoragePath,oldname) + newpath=os.path.join(self.ImageStoragePath,newname) + os.rename(oldpath,newpath) + + #umbenennen des versionsfolders + oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir") + if os.path.exists(oldfolder): + newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir") + os.rename(oldfolder,newfolder) + + #scale thumb + + self.scaleThumbs() + + #scale standard + + self.scaleWorkingVersions() + + + if RESPONSE: + RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + + + def updateImage(self,file,rename=None,RESPONSE=None): """lade neues Version des Bildes""" #teste ob Dokumenten ordner schon vorhanden imagePath=os.path.join(self.ImageStoragePath,self.getId()) path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir") - print "path",path + if not os.path.exists(path): os.mkdir(path,0775) os.chmod(path,0775) @@ -169,9 +278,14 @@ class ImageDigilib(Folder,Persistent,Imp self.scaleWorkingVersions() + if rename: + self.renameImage(file.filename) + + if RESPONSE: - RESPONSE.redirect(self.absolute_url()) + RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename) + return "done" def thumb(self): @@ -207,6 +321,7 @@ def manage_AddImageDigilibForm(self): def manage_AddImageDigilib(self,id,fileupload,meta=None,RESPONSE=None): """Add ImageCollection""" + #fileupload=self.REQUEST['fileupload'] fn=splitPath(fileupload.filename) newObj=ImageDigilib(id,fn,meta) @@ -218,10 +333,14 @@ def manage_AddImageDigilib(self,id,fileu RESPONSE.redirect('manage_main') -class ImageCollection(Folder, Persistent, Implicit, ECHO_basis): + +class ImageCollection(Folder, Persistent, Implicit,ECHO_basis): + """Sammelordner für Bilder""" meta_type="ImageCollection" + + genericMetaDataType="leiden_meta" leiden_meta_fields=['image_id','date','country','place','people','description','photographer'] @@ -233,6 +352,7 @@ class ImageCollection(Folder, Persistent def createSet(self,RESPONSE=None,local=None,version="working"): """download aller gewaehlten files""" + storeTempDir=tempfile.tempdir tempfile.tempdir="/tmp/archivesImageServer" tmpPath=tempfile.mktemp() @@ -299,8 +419,16 @@ class ImageCollection(Folder, Persistent #folgeseiten if int(self.REQUEST.SESSION['filenamesIds'][id[0]][1])>1: ids=self.show_thumbs() - nr=ids.index(id[0]) - + 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 @@ -408,28 +536,35 @@ class ImageCollection(Folder, Persistent self.ImageViewerPath=ImageViewerPath self.defaultMetaString=defaultMetaString - if ECHO_basis: - optTMP= Folder.manage_options+ECHO_basis.manage_options - else: - optTMP= 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':'Rescale working version','action':'scaleWorkingVersions'}, ) + + def importMetaData(self,strict=None): + """import metadata, if strict ist not None then only metadata will be rebuild where metadata is empty""" - def importMetaForm(self): + for image in self.ZopeFind(self,obj_metatypes=["ImageDigilib"]): + print image[1].getId() + image[1].manageMetaData(strict) + return "ok" + + + def importMetaFileForm(self): """import metadata""" 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) @@ -516,7 +651,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): @@ -537,7 +672,7 @@ class ImageCollection(Folder, Persistent url=urllib.unquote(url) xmldoc=urllib.urlopen(url).read() - #print url + #return xmldoc try: dom=xml.dom.minidom.parseString(xmldoc) except: @@ -548,7 +683,9 @@ class ImageCollection(Folder, Persistent fnIds={} for image in images: imagename=image.getElementsByTagName('imagename')[0] - text=getText(imagename.childNodes) + + + idnr=image.getElementsByTagName('idnr')[0] id=getText(idnr.childNodes) numberOfPages=image.getElementsByTagName('numberOfPages')[0] @@ -557,13 +694,16 @@ class ImageCollection(Folder, Persistent nop=int(nopT) except: nop=0 - if not text=="": + 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 @@ -572,7 +712,7 @@ class ImageCollection(Folder, Persistent 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__: @@ -585,11 +725,13 @@ class ImageCollection(Folder, Persistent def addImage(self): """Add an Image""" + 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: @@ -600,7 +742,7 @@ class ImageCollection(Folder, Persistent else: meta=None fn=splitPath(fileupload.filename) - + manage_AddImageDigilib(self,fn,fileupload,meta=meta) return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn) #return self.REQUEST['URL1']+'/'+fileupload.filename