Get File: %s
\n"%filename)
-
+ toggle=False
+
if self.local:
if self.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]
+
+ sourcePath=self.destBasis+"/"+self.ImageViewerPath+"/"+os.path.splitext(id[0])[0]+".jpg"
+ if not os.path.exists(sourcePath):
+ self.response+=str("
%s doesn't exist I'll try the non scaled image
"%sourcePath) + toggle=True + if (self.version!="working") or toggle: + toggle=False + sourcePath=self.ImageStoragePath+"/"+id[0] + if not os.path.exists(sourcePath): + sourcePath=self.ImageStoragePath+"/"+os.path.splitext(id[0])[0]+".jpg" + targetPath=tmpPath+"/"+filename try: shutil.copyfile(sourcePath,targetPath) except: - self.response+=(str("Error in File: %s (possible missing)
\n"%filename))
+ self.response+=(str("
Error in File: %s (possible missing)
\n"%sourcePath))
else:
if self.version=="working":
requestString=self.ImageViewerPath+"/"+os.path.splitext(urllib.quote(id[0]))[0]+"&dh=2000&dw=2000"
@@ -286,6 +297,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])
@@ -307,7 +320,7 @@ class ImageDigilib(Folder,Persistent,Imp
if self.getRightsQuery()=="":
#query empty then always true
- return True
+ return True
if 'Authenticated' in roles:
@@ -388,7 +401,7 @@ class ImageDigilib(Folder,Persistent,Imp
os.chmod(filename,0664)
except:
"""hack"""
- #scale thumb
+ #< thumb
self.scaleThumbs()
@@ -448,13 +461,13 @@ class ImageDigilib(Folder,Persistent,Imp
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)
+ oldpath=os.path.join(self.getImageStoragePath(),oldname)
+ newpath=os.path.join(self.getImageStoragePath(),newname)
os.rename(oldpath,newpath)
#umbenennen des versionsfolders
- oldfolder=os.path.join(self.ImageStoragePath,"."+oldname+".dir")
- newfolder=os.path.join(self.ImageStoragePath,"."+newname+".dir")
+ oldfolder=os.path.join(self.getImageStoragePath(),"."+oldname+".dir")
+ newfolder=os.path.join(self.getImageStoragePath(),"."+newname+".dir")
if os.path.exists(oldfolder):
os.rename(oldfolder,newfolder)
else:
@@ -486,63 +499,108 @@ class ImageDigilib(Folder,Persistent,Imp
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.getImageStoragePath(),self.filename)
+ path=os.path.join(self.getImageStoragePath(),"."+self.getId()+".dir")
+
+ if not os.path.exists(path):
+ os.mkdir(path,0775)
+ os.chmod(path,0775)
+
+ newName=os.path.join(path,self.getId())
- 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())
- imagePath=os.path.join(self.ImageStoragePath,self.filename)
- path=os.path.join(self.ImageStoragePath,"."+self.getId()+".dir")
+ 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
+ ext= os.path.splitext(imagePath)[1].lower()
+ if ext.rstrip()==".jpg":
+ shutil.copy(newName,imagePath)
+ print "copy",imagePath
+ return True
+
+
+
+ dir=self.getId()
+ src=path
+ self.scale(dest=self.getImageStoragePath(),dir=dir,src=path,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
+ #imagePath=os.path.join(self.getImageStoragePath(),self.getId())
+
+ identifyField="filename"
+
+ if _fileupload and _fileupload.filename!="":
+ imagePath=os.path.join(self.getImageStoragePath(),self.filename)
+ path=os.path.join(self.getImageStoragePath(),"."+self.getId()+".dir")
+
if not os.path.exists(path):
- os.mkdir(path,0775)
- os.chmod(path,0775)
-
+ 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.filename))):
- versionNumber+=1
-
+ versionNumber+=1
+
#kopieren der bestehenden Version in den Versions ordner.
imageNewPath=os.path.join(path,"V%i_%s"%(versionNumber,self.filename))
- try:
- #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
- os.rename(imagePath,imageNewPath)
- except:
- zLOG.LOG("ImageArchive:updateImage", zLOG.ERROR, "rename: %s -> %s didn't work!"%(imagePath,imageNewPath))
-
+ try:
+ #zLOG.LOG("ImageArchive:updateImage", zLOG.INFO, "rename: %s -> %s"%(imagePath,imageNewPath))
+ os.rename(imagePath,imageNewPath)
+ except:
+ 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()
try:
- os.chmod(imagePath,0664)
+ os.chmod(imagePath,0664)
except:
- """hack"""
+ pass
#scale thumb
-
- self.scaleThumbs()
+ self.scaleThumbs()
+
#scale standard
-
+
self.scaleWorkingVersions()
-
- if rename:
- self.renameImage(file.filename)
-
+ self.scaleToJpg()
+ if _rename:
+ self.renameImage(_fileupload.filename)
- if RESPONSE:
- RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
+
+ args=self.REQUEST.form
+
+ args['-identify']=identifyField+"="+args['_identifyField']
+
+ self.ZSQLChange(args=args)
+
+ if RESPONSE:
+ RESPONSE.redirect(self.aq_parent.absolute_url()+"?filename="+self.filename)
- return "done"
+ return "done"
security.declarePublic('thumb')
def thumb(self,url=None):
@@ -623,7 +681,7 @@ def manage_AddImageDigilib(self,id,fileu
newObj=ImageDigilib(id,fn,meta)
self._setObject(id,newObj)
- getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)
+ getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -655,6 +713,78 @@ class ImageCollection(OrderedFolder, Per
imgcoll_thumb = PageTemplateFile('zpt/thumb', globals())
imgcoll_thumbMD = PageTemplateFile('zpt/thumbMD', globals())
+ destBasis="/docuserver/scaled/"
+ scaledBasis=destBasis
+ srcBasis="/docuserver/images"
+ scaleomatStr="/docuserver/libs/scaleomat/scaleomat.pl"
+
+ #dest="/Volumes/paviaExtern/docuserver/images/exhibitionImages/"
+
+ def configScaleForm(self):
+ """configure the scaler form"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','configScale.zpt')).__of__(self)
+ return pt()
+
+ def configScale(self,scaleomatStr,RESPONSE=None):
+ """config the scaler"""
+ self.scaleomatStr=scaleomatStr
+
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+ def scale(self,dest=None,dir=None,src=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=self.scaleomatStr
+
+ destBasis=self.destBasis
+ srcBasis=self.srcBasis
+
+
+ if src:
+ srcStr=" -src=%s"%src
+ else:
+ 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
+
+
+ #ret=scaleStr
+ ret=os.popen2(scaleStr,1)[1].read()
+
+ if RESPONSE:
+ RESPONSE.write(ret)
+ return True
+
def getImageObject(self,name):
"""gibt objeckt name zurueck"""
if hasattr(self,name):
@@ -687,7 +817,15 @@ class ImageCollection(OrderedFolder, Per
def getImageStoragePath(self):
"""get ImageStoragePath"""
- return self.ImageStoragePath
+ if self.ImageViewerPath[0]=="/":
+ if len(self.ImageViewerPath)>1:
+ iv=self.ImageViewerPath[1:]
+ else:
+ iv=""
+ else:
+ iv=self.ImageViewerPath
+
+ return os.path.join(self.srcBasis,iv)
def refreshTxt(self):
"""txt fuer refresh"""
@@ -701,7 +839,7 @@ class ImageCollection(OrderedFolder, Per
if not threadName or threadName=="":
- threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.show_thumbs(),self.absolute_url(),local=local,version=version)
+ threadStart=generateSet(self.REQUEST.SESSION['filenames'],self.REQUEST.SESSION['filenamesIds'],self.ImageViewerPath,self.ImageStoragePath,self.destBasis,self.show_thumbs(),self.absolute_url(),local=local,version=version)
thread=Thread(target=threadStart)
thread.start()
@@ -773,13 +911,25 @@ class ImageCollection(OrderedFolder, Per
self.REQUEST.RESPONSE.write(images)
self.REQUEST.RESPONSE.close()
-
+
+ def scaleToJpgs(self,RESPONSE=None):
+ """scale all tifs to jps"""
+
+ 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.getImageStoragePath(),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")
@@ -790,22 +940,28 @@ 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.getImageStoragePath(),dest=dest,scaleTo=1000,RESPONSE=RESPONSE)
+
+ dest=os.path.join(self.scaledBasis,'medium')
+ self.scale(dir=self.getImageStoragePath(),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):
+ def __init__(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath):
self.id=id
self.title=title
- self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
self.serverPath=serverPath
+ self.destBasis=destBasis
+ self.srcBasis=srcBasis
self.defaultrows = 6
self.defaultcols = 2
@@ -813,6 +969,7 @@ class ImageCollection(OrderedFolder, Per
manage_options = optTMP+(
{'label':'Main Config','action':'ImageCollection_config'},
+ {'label':'Config Scaler','action':'configScaleForm'},
{'label':'Import','action':'ImportFiles'},
{'label':'Recalculate MetadataLink','action':'recalculateMetaLink'},
{'label':'Import Metadata File','action':'importMetaFileForm'},
@@ -1044,12 +1201,13 @@ class ImageCollection(OrderedFolder, Per
def ImportFiles2(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
ret=""
#print self.__dict__
for file in files:
- if not file[0]==".":
- if self.__dict__.has_key(file):
+ fn=os.path.splitext(file)[0]
+ if not (file[0]=="."):
+ if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :
ret=ret+"
"+file+" already exists!"
else:
@@ -1061,7 +1219,7 @@ class ImageCollection(OrderedFolder, Per
self._setObject(file,newObj)
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1085,17 +1243,17 @@ class ImageCollection(OrderedFolder, Per
def ImportStructure(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
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)
+ if os.path.isdir(os.path.join(self.getImageStoragePath(),file)):
+ ImageStoragePath=os.path.join(self.getImageStoragePath(),file)
imageViewerPath=os.path.join(self.ImageViewerPath,file)
- manage_AddImageCollection(self,file,file,imageStoragePath,imageViewerPath,self.defaultMetaString)
+ manage_AddImageCollection(self,file,file,self.getImageStoragePath(),imageViewerPath,self.defaultMetaString)
obj=getattr(self,file)
obj.ImportStructure()
@@ -1115,29 +1273,31 @@ class ImageCollection(OrderedFolder, Per
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
- #self.scaleThumbs()
+ self.scaleThumbs()
#scale standard
- #self.scaleWorkingVersions()
+ self.scaleWorkingVersions()
if RESPONSE:
RESPONSE.redirect('manage_main')
def ImportFiles(self,RESPONSE=None):
"""Import the existing files of a folder"""
- files=os.listdir(self.ImageStoragePath)
+ files=os.listdir(self.getImageStoragePath())
ret=""
#print self.__dict__
for file in files:
- if not file[0]==".":
- if self.__dict__.has_key(file):
+ fn=os.path.splitext(file)[0]
+ if not (file[0]=="."):
+ if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :
ret=ret+"
"+file+" already exists!"
+
else:
ret=ret+"
"+file+" created!"
newObj=ImageDigilib(file,file)
@@ -1149,7 +1309,7 @@ class ImageCollection(OrderedFolder, Per
"""nothing yet"""
#print ret
#pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
- #print self.ImageStoragePath
+ #print self.getImageStoragePath()
#scale thumb
@@ -1170,13 +1330,14 @@ class ImageCollection(OrderedFolder, Per
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','ChangeImageCollectionForm.zpt')).__of__(self)
return pt()
- def ChangeImageCollection(self,title,ImageStoragePath,ImageViewerPath,defaultMetaString,serverPath,RESPONSE=None):
+ def ChangeImageCollection(self,title,ImageViewerPath,defaultMetaString,serverPath,destBasis,srcBasis,RESPONSE=None):
"""Change"""
self.title=title
- self.ImageStoragePath=ImageStoragePath
self.ImageViewerPath=ImageViewerPath
self.defaultMetaString=defaultMetaString
self.serverPath=serverPath
+ self.destBasis=destBasis
+ self.srcBasis=srcBasis
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1621,19 +1782,33 @@ class ImageCollection(OrderedFolder, Per
def getImageByName(self,filename,onlyName=None):
"""get filename"""
- print repr(filename)
+ #print repr(filename)
#FIXME: umlaute in filename
fn=getattr(self,repr(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]
+ return found[1]
+ #HACK teste noch ob am ende des filenames eventuell ein "_" und loesche das.
+ if foundM[-1]=="_":
+ foundM=foundM[0:-1]
+
+ if filenameM.lower()==foundM.lower():
+ if onlyName:
+ return found[0]
+ else:
+ return found[1]
+
if onlyName:
return filename
else:
@@ -1702,9 +1877,10 @@ def manage_AddImageCollectionForm(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):
+def manage_AddImageCollection(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):
+
"""Add ImageCollection"""
- newObj=ImageCollection(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
+ newObj=ImageCollection(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath=genericServerPath)
self._setObject(id,newObj)
if RESPONSE is not None:
@@ -1730,6 +1906,54 @@ class ImageCollectionMD(ImageCollection,
except:
pass
+
+ def ImportFiles(self,RESPONSE=None):
+ """Import the existing files of a folder"""
+ files=os.listdir(self.getImageStoragePath())
+ ret=""
+ #print self.__dict__
+ for file in files:
+
+ if not (file[0]=="."):
+ fn=os.path.splitext(file)[0]
+ if self.__dict__.has_key(file) or self.__dict__.has_key(fn+'.tif') or self.__dict__.has_key(fn+'.tiff') :
+
+ 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"""
+
+
+ args={}
+ args['_table']=self.imageCollectionConfig.getTable()
+ args[self.imageCollectionConfig.getKey()]=file
+
+ if not self.ZSQLInlineSearch(args=args):
+ self.ZSQLAdd(args=args)
+ #print ret
+ #pt=PageTemplateFile('Products/ImageArchive/out.zpt')).__of__(self)
+ #print self.ImageStoragePath
+
+ #scale thumb
+
+
+ self.scaleThumbs()
+
+ #scale standard
+
+ self.scaleWorkingVersions()
+
+ self.scaleToJpgs()
+
+ if RESPONSE:
+ RESPONSE.redirect('manage_main')
def addImage(self):
"""Add an Image"""
@@ -1737,7 +1961,7 @@ class ImageCollectionMD(ImageCollection,
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addImageMD.zpt')).__of__(self)
return pt()
- def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None,**argv):
+ def addImage2(self,_fileupload,_fileName=None,_meta=None,_use_default=None,RESPONSE=None):
"""Add"""
filenameKey="filename"
@@ -1755,10 +1979,15 @@ class ImageCollectionMD(ImageCollection,
manage_AddImageDigilib(self,fn,_fileupload,meta=meta)
- args[key]=_filename
+ args=self.REQUEST.form
+ args[filenameKey]=fn
+
+ self.ZSQLAdd(args=args)
- self.ZSQLAdd(args=argv)
+ self.scaleThumbs()
+ self.scaleWorkingVersions()
+ getattr(self,fn).scaleToJpg()
if RESPONSE:
return RESPONSE.redirect(self.REQUEST['URL1']+'/'+fn)
#return self.REQUEST['URL1']+'/'+fileupload.filename
@@ -1802,15 +2031,38 @@ class ImageCollectionMD(ImageCollection,
def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
"""search"""
- #context.ZSQLFind(_table='vision_main')
- urlTmp=REQUEST['URL1']
- url=urlTmp+'/searchResultXML?-table=vision_main&'+REQUEST['QUERY_STRING']
+ rc=[]
+ fnIds={}
+ for found in self.ZSQLInlineSearch(args=self.REQUEST.form):
+ key=getattr(found,self.imageCollectionConfig.getKey())
+ key=self.getImageByName(key,onlyName="yes")
+ rc.append((key,'',0))
+ fnIds[key]=('',0)
+
+ rc.sort()
+ self.REQUEST.SESSION['filenames']=rc
+ self.REQUEST.SESSION['filenamesIds']=fnIds
- if xml is None:
- RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+ overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+
+ if overview:
+ return overview[0][1]()
else:
- RESPONSE.redirect(url)
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
+ return pt()
+
+ #urlTmp=REQUEST['URL1']
+
+ #url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+REQUEST['QUERY_STRING']
+
+ #if xml is None:
+ # RESPONSE.redirect('xmlinput?url='+urllib.quote(url))
+ #else:
+ # RESPONSE.redirect(url)
def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
"""main template collection"""
@@ -1831,7 +2083,7 @@ class ImageCollectionMD(ImageCollection,
self.REQUEST.SESSION['filenames']=ret
#self.REQUEST.SESSION['filenamesIds']=fnIds
- overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
if overview and (generic =='No'):
@@ -1851,13 +2103,13 @@ class ImageCollectionMD(ImageCollection,
self.REQUEST.SESSION['filename']=filen[0:]
- if not self.REQUEST.SESSION['filename']=="":
- url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
- if mode=="view":
- self.REQUEST.RESPONSE.redirect(url)
- elif mode=="download":
- self.REQUEST.RESPONSE.redirect(url+"/download")
-
+# if not self.REQUEST.SESSION['filename']=="":
+# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
+# if mode=="view":
+# self.REQUEST.RESPONSE.redirect(url)
+# elif mode=="download":
+# self.REQUEST.RESPONSE.redirect(url+"/download")
+#
if self.REQUEST.has_key('showall'):
self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
@@ -1867,12 +2119,11 @@ class ImageCollectionMD(ImageCollection,
if selection:
#selection i.e. selection already stored at self.REQUEST.SESSION['filenames']
- overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview_selected.html'])
if overview and (generic =='No'):#
- print "selected"
- print repr(overview[0][1])
+
return overview[0][1]()
else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
@@ -1881,7 +2132,7 @@ class ImageCollectionMD(ImageCollection,
#no filename then show overview
- overview=self.ZopeFind(self,obj_ids=['overviewMD.html'])
+ overview=self.ZopeFind(self,obj_ids=['overview.html'])
if overview and (generic == 'No'):
@@ -1900,6 +2151,9 @@ class ImageCollectionMD(ImageCollection,
if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
nr=self.getObjectPosition(imagename)
objects=self.objectIds()
@@ -1914,6 +2168,9 @@ class ImageCollectionMD(ImageCollection,
if not selected and self.REQUEST.has_key('fn'):
imagename=self.REQUEST['fn'].split('/')[-1]
+
+ imagename=self.getImageByName(imagename,onlyName=True)
+
nr=self.getObjectPosition(imagename)
objects=self.objectIds()
@@ -1982,24 +2239,26 @@ class ImageCollectionMD(ImageCollection,
xmldoc=urllib.urlopen(url).read()
#return xmldoc
try:
- dom=xml.dom.minidom.parseString(xmldoc)
+ dom=NonvalidatingReader.parseUri(url)
+
except:
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)
- images=dom.getElementsByTagName('image')
+ imagenames=dom.xpath("//imagename")
rc=[]
fnIds={}
- for image in images:
- imagename=image.getElementsByTagName('imagename')[0]
-
+ for imagename in imagenames:
+
+ #imagename=image.xpath('./imagename')[0]
+ #print "im",imagename
- idnr=image.getElementsByTagName('idnr')[0]
+ idnr=imagename.xpath('../idnr')[0]
id=getText(idnr.childNodes)
try:
- numberOfPages=image.getElementsByTagName('numberOfPages')[0]
+ numberOfPages=imagename.xpath('../numberOfPages')[0]
except:
numberOfPages=None
@@ -2015,7 +2274,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)
@@ -2023,7 +2284,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
@@ -2059,9 +2320,9 @@ def manage_AddImageCollectionMDForm(self
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','AddImageCollectionFormMD.zpt')).__of__(self)
return pt()
-def manage_AddImageCollectionMD(self,id,title,ImageStoragePath,ImageViewerPath,defaultMetaString,RESPONSE=None):
+def manage_AddImageCollectionMD(self,id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath,RESPONSE=None):
"""Add ImageCollection"""
- newObj=ImageCollectionMD(id,title,ImageStoragePath,ImageViewerPath,defaultMetaString)
+ newObj=ImageCollectionMD(id,title,ImageViewerPath,defaultMetaString,destBasis,srcBasis,serverPath)
self._setObject(id,newObj)
if RESPONSE is not None:
@@ -2199,7 +2460,7 @@ def manage_AddImageZogiLib(self,id=None,
self._setObject(id,newObj)
getattr(self,id).caption=caption[0:]
if fileUpload:
- getattr(self,id).uploadImage(fileupload,self.ImageStoragePath)
+ getattr(self,id).uploadImage(fileupload,self.getImageStoragePath())
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -2207,4 +2468,4 @@ def manage_AddImageZogiLib(self,id=None,
def manage_AddImageZogiLibForm(self):
"""to be done"""
-
\ No newline at end of file
+