--- ImageArchive/ImageArchive.py 2004/11/11 19:46:37 1.32
+++ ImageArchive/ImageArchive.py 2005/04/10 13:47:25 1.52
@@ -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
@@ -12,6 +12,19 @@ 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("\\","/")
@@ -26,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"
@@ -58,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()
@@ -71,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
@@ -82,31 +160,155 @@ class ImageDigilib(Folder,Persistent,Imp
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 download(self):
+
+
+ def downloadWorkingVersion(self):
+ """download working version (2000 pixel)"""
+
+ return self.download(fmt="&dw=2000&dh=2000",suffix=".jpg")
+
+ 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"
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+fmt
+
if self.REQUEST.SESSION.has_key('filenamesIds') and self.REQUEST.SESSION['filenamesIds'].has_key(self.filename):
filename=self.REQUEST.SESSION['filenamesIds'][self.filename][0]+"_"+self.filename
else:
filename=self.filename
+
+ if suffix:
+ filename=os.path.splitext(filename)[0]+suffix
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,'rb')
+
+ self.REQUEST.RESPONSE.write(imagefh.read())
self.REQUEST.RESPONSE.close()
#return self.REQUEST.RESPONSE.redirect(path)
-
- def thumb(self):
+
+ def updateImageForm(self):
+ """form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','upDateImageForm.zpt')).__of__(self)
+ return pt()
+
+ 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")
+ newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
+ if os.path.exists(oldfolder):
+ os.rename(oldfolder,newfolder)
+ else:
+ os.mkdir(newfolder)
+
+ #schreibe info uber umbennenung
+
+ renameName=os.path.join(newfolder,"renamed")
+ if os.path.exists(renameName):
+ fh=file(renameName,'a')
+ else:
+ fh=file(renameName,'w')
+
+ tm=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime())
+ try:
+ user=self.REQUEST['AUTHENTICATED_USER']
+ except:
+ user="unknown"
+
+ str="""%s %s %s %s\n"""%(tm,user,oldname,newname)
+ fh.write(str)
+ fh.close()
+
+ #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")
+
+ if not os.path.exists(path):
+ os.mkdir(path,0775)
+ os.chmod(path,0775)
+
+ versionNumber=getattr(self,'versionNumber',0)+1
+
+ #teste ob version schon existiert
+
+ while os.path.exists(os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))):
+ versionNumber+=1
+
+ #kopieren der bestehenden Version in den Versions ordner.
+ imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.getId()))
+ os.rename(imagePath,imageNewPath)
+
+ #lesen des upload files und schreiben
+ filedata=file.read()
+ f=open(imagePath,"w")
+ f.write(filedata)
+ f.close()
+ try:
+ os.chmod(imagePath,0664)
+ except:
+ """hack"""
+ #scale thumb
+
+ self.scaleThumbs()
+
+ #scale standard
+
+ self.scaleWorkingVersions()
+
+ if rename:
+ self.renameImage(file.filename)
+
+
+ if RESPONSE:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+
+
+ return "done"
+
+ def thumb(self,url=None):
"""show thumb"""
thumbname=os.path.splitext(self.filename)[0]+".jpg"
## if not os.path.exists("/mpiwg/temp/online/scaled/small/"+self.ImageViewerPath+"/"+thumbname):
@@ -118,31 +320,31 @@ class ImageDigilib(Folder,Persistent,Imp
#DEVEL:take nausikaa for server solution
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+self.filename+"&dw=100&dh=100&mo=lores"
+ path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]+"&dw=100&dh=100&mo=lores"
#path="/mpiwg/online/"+self.ImageViewerPath+"/"+thumbname
self.REQUEST.SESSION['string']=""% path
- pt=PageTemplateFile('Products/ImageArchive/zpt/thumb.zpt').__of__(self)
- return pt()
+ if url:
+ return ""% path
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','thumb.zpt')).__of__(self)
+ return pt()
def index_html(self):
"""show image"""
#DEVELOP: take first one for server
- path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+self.filename
-
- #path="http://localhost:8080/mpiwg/online/"+self.ImageViewerPath+"/"+self.filename
- #self.REQUEST.SESSION['string']=""% path
- #pt=PageTemplateFile('Products/ImageArchive/thumb.zpt').__of__(self)
+ path="http://content.mpiwg-berlin.mpg.de/zogilib_images?lv=2&fn="+self.ImageViewerPath+"/"+os.path.splitext(self.filename)[0]
return self.REQUEST.RESPONSE.redirect(path)
def manage_AddImageDigilibForm(self):
"""Nothing yet"""
- pt=PageTemplateFile('Products/ImageArchive/zpt/AddImageDigilibForm.zpt').__of__(self)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageDigilibForm.zpt')).__of__(self)
return pt()
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)
@@ -154,10 +356,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']
@@ -165,10 +371,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):
+
+
+ def createSet(self,RESPONSE=None,local=None,version="working"):
"""download aller gewaehlten files"""
+ storeTempDir=tempfile.tempdir
tempfile.tempdir="/tmp/archivesImageServer"
tmpPath=tempfile.mktemp()
@@ -196,49 +403,85 @@ class ImageCollection(Folder, Persistent
return 0
for id in self.REQUEST.SESSION['filenames']:
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"/"+urllib.quote(id[0])+"&mo=rawfile,hires"
- image=urllib.urlopen(path).read()
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]
-
-
- fh=file(tmpPath+"/"+filename,"w")
if RESPONSE:
RESPONSE.write(str("Get File: %s
\n"%filename))
- fh.write(image)
+ 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()
- 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
-
- path="http://nausikaa2.rz-berlin.mpg.de/digitallibrary/servlet/Scaler/?fn="+self.ImageViewerPath+"&/"+ids[nr+i]+"&mo=rawfile,hires"
-
- image=urllib.urlopen(path).read()
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]
-
-
- fh=file(tmpPath+"/"+filename,"w")
if RESPONSE:
RESPONSE.write(str("
Get File: %s
\n"%filename))
- fh.write(image)
+ 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.close()
+ fh=file(tmpPath+"/"+filename,"w")
+ fh.write(image)
+ fh.close()
if RESPONSE:
RESPONSE.write("
2. step: creating the downloadable file
")
@@ -288,9 +531,26 @@ class ImageCollection(Folder, Persistent
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)
+ if RESPONSE:
+ RESPONSE.write(ret.read())
+ RESPONSE.write("\n")
+
+ return "RESCALING STARTED"
+
+ def scaleWorkingVersions(self,RESPONSE=None):
+ """scale working versions"""
- 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)
- return "RESCALING STARTED"
+ #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
@@ -299,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)
@@ -413,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):
@@ -434,7 +695,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:
@@ -445,7 +706,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]
@@ -454,17 +717,25 @@ 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
- pt=PageTemplateFile('Products/ImageArchive/zpt/overview_selected.zpt').__of__(self)
+ 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__:
@@ -477,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:
@@ -492,7 +765,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
@@ -515,11 +788,73 @@ 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 -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)
+
+ #scale thumb
+
+ self.scaleThumbs()
+
+ #scale standard
+
+ self.scaleWorkingVersions()
+
RESPONSE.redirect('manage_main')
+
+ def importStructure(self,path):
+ """import"""
+ splitted=os.path.split(path)
+ if os.path.isDir(path):
+ manage_AddImageCollection(self,splitted[1],splitted[1],path,self.ImageViewerPath,self.defaultMetaString,RESPONSE=None)
+
+ obj=getattr(self,splitted[1])
+ obj.ImportFiles()
+
+ def ImportStructure(self,RESPONSE=None):
+ """Import the existing files of a folder"""
+ files=os.listdir(self.ImageStoragePath)
+ ret=""
+ #print self.__dict__
+
+
+ for file in files:
+
+ if os.path.isdir(os.path.join(self.ImageStoragePath,file)):
+ imageStoragePath=os.path.join(self.ImageStoragePath,file)
+ imageViewerPath=os.path.join(self.ImageViewerPath,file)
+ manage_AddImageCollection(self,file,file,imageStoragePath,imageViewerPath,self.defaultMetaString)
+
+ obj=getattr(self,file)
+ obj.ImportStructure()
+ else:
+ if not file[0]==".":
+ if self.__dict__.has_key(file):
+
+ ret=ret+"
"+file+" already exists!"
+ else:
+ ret=ret+"
"+file+" created!"
+ newObj=ImageDigilib(file,file)
+ #print newObj,file
+ #print newObj
+ try:
+ self._setObject(file,newObj)
+ except:
+ """nothing yet"""
+ #print ret
+ #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+ #print self.ImageStoragePath
+
+ #scale thumb
+
+ #self.scaleThumbs()
+
+ #scale standard
+
+ #self.scaleWorkingVersions()
+
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""
@@ -541,17 +876,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):
@@ -566,9 +910,10 @@ class ImageCollection(Folder, Persistent
def show_selected_thumbs(self):
#ids=[]
-
- return self.REQUEST.SESSION['filenames']
-
+ try:
+ return self.REQUEST.SESSION['filenames']
+ except:
+ return None
def show_thumbs(self):
ids=[]
for entry in self.__dict__:
@@ -666,7 +1011,25 @@ class ImageCollection(Folder, Persistent
return "previous sets"
else:
return ""
+ def showFolders(self):
+ """show subfolders"""
+ ret=""
+ link=""" %s
"""
+ if self.aq_parent.meta_type=="ImageCollection":
+ ret+=link%(self.aq_parent.absolute_url(), "back ("+self.aq_parent.title+")")
+ ret+="
"
+
+ iCs=self.ZopeFind(self,obj_metatypes=["ImageCollection"])
+ if not iCs:
+ return ret
+ else:
+
+ link=""" %s
"""
+ for iC in iCs:
+ ret+=link%(iC[1].absolute_url(),iC[0])
+ ret+="
"
+ return ret
def showRuler(self,selected=None):
"""show ruler"""
showall =self.REQUEST.SESSION.get('showall','no')
@@ -675,6 +1038,7 @@ class ImageCollection(Folder, Persistent
return "No entries"
if showall=='no':
+ actualNr=0
ids=self.show_thumbs()
colRows=self.getColTimesRow()
num=int(len(ids)/(colRows[0]*colRows[1]))
@@ -682,19 +1046,63 @@ class ImageCollection(Folder, Persistent
num+=1
a=colRows[0]*colRows[1]
#print num,num+1
+
if num>1:
- ret="Show thumbnail group no:"
- for i in range(num):
- if (operator.mod(i,10)==0) and i>0:
- ret +="
" #alle 10 linebreak einfuegen
- k=i*a
- if selected:
- href=self.REQUEST['URL1']+"/selection?filename="+ids[k]
- else:
- href=self.REQUEST['URL1']+"?filename="+ids[int(k)]
+ ret=""
+ if selected:
+ ret+="""