--- ImageArchive/ImageArchive.py 2004/11/17 15:38:23 1.36 +++ ImageArchive/ImageArchive.py 2004/12/23 14:08:05 1.42 @@ -12,6 +12,18 @@ 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" + class ECHO_basis: + """leer""" + manage_options=() + + def splitPath(str): str2=str.replace("\\","/") @@ -82,7 +94,7 @@ class ImageDigilib(Folder,Persistent,Imp f.write(filedata) f.close() try: - os.chmod(filename,0644) + os.chmod(filename,0664) except: """hack""" #scale thumb @@ -190,10 +202,6 @@ class ImageDigilib(Folder,Persistent,Imp #DEVELOP: take first one for server path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0] - - #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename - #self.REQUEST.SESSION['string']=""% path - #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt')).__of__(self) return self.REQUEST.RESPONSE.redirect(path) @@ -204,6 +212,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) @@ -215,10 +224,14 @@ def manage_AddImageDigilib(self,id,fileu RESPONSE.redirect('manage_main') -class ImageCollection(Folder, Persistent, Implicit): + +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'] @@ -226,10 +239,11 @@ class ImageCollection(Folder, Persistent 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 - - + + def createSet(self,RESPONSE=None,local=None,version="working"): """download aller gewaehlten files""" + storeTempDir=tempfile.tempdir tempfile.tempdir="/tmp/archivesImageServer" tmpPath=tempfile.mktemp() @@ -268,7 +282,7 @@ class ImageCollection(Folder, Persistent if local: if version=="working": - sourcePath="/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+id[0] + 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 @@ -296,8 +310,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
@@ -405,28 +427,18 @@ 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':'Rescale thumbs','action':'scaleThumbs'},
{'label':'Rescale working version','action':'scaleWorkingVersions'},
- {'label':'Weight (ECHO)','action':'weightForm'},
)
- def weightForm(self):
- """Weight"""
- pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeWeight.zpt')).__of__(self)
- return pt()
-
- def changeWeight(self,weight,RESPONSE=None):
- """Change weight"""
- self.weight=weight
-
- if RESPONSE is not None:
- RESPONSE.redirect('manage_main')
-
+
def importMetaForm(self):
"""import metadata"""
@@ -541,7 +553,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:
@@ -552,7 +564,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]
@@ -561,9 +575,17 @@ class ImageCollection(Folder, Persistent
nop=int(nopT)
except:
nop=0
- if not text=="":
- rc.append((str(text),id,nop))
- fnIds[str(text)]=(id,nop)
+ 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
self.REQUEST.SESSION['filenamesIds']=fnIds
@@ -584,11 +606,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:
@@ -599,7 +623,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
@@ -979,6 +1003,7 @@ class ImageCollection(Folder, Persistent
def navig_html(self):
"""navigation"""
#self.REQUEST.SESSION['URL']=self.REQUEST['URL0']
+
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','navigation.zpt')).__of__(self)
return pt()
@@ -1000,15 +1025,15 @@ 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(os.path.join(package_home(globals()),'zpt','overview.zpt')).__of__(self)
return pt()