ImageArchive/ImageArchive.py - diff

Return to ImageArchive.py CVS log

Up to [Repository] / ImageArchive

Diff for /ImageArchive/ImageArchive.py between versions 1.84 and 1.88

version 1.84, 2006/05/17 19:10:49	version 1.88, 2006/05/17 21:42:49
Line 1	Line 1
genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config	genericServerPath="http://www.mpiwg-berlin.mpg.de/zogilib_images" #can be changed with main config


	from Ft.Xml.Domlette import NonvalidatingReader
from OFS.Folder import Folder	from OFS.Folder import Folder
from OFS.OrderedFolder import OrderedFolder	from OFS.OrderedFolder import OrderedFolder
from OFS.SimpleItem import SimpleItem	from OFS.SimpleItem import SimpleItem
Line 390 class ImageDigilib(Folder,Persistent,Imp	Line 390 class ImageDigilib(Folder,Persistent,Imp
"""hack"""	"""hack"""
#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()



Line 480 class ImageDigilib(Folder,Persistent,Imp	Line 480 class ImageDigilib(Folder,Persistent,Imp

#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()


if RESPONSE:	if RESPONSE:
Line 532 class ImageDigilib(Folder,Persistent,Imp	Line 532 class ImageDigilib(Folder,Persistent,Imp
pass	pass
#scale thumb	#scale thumb

self.scaleThumbs()	#self.scaleThumbs()

#scale standard	#scale standard

self.scaleWorkingVersions()	#self.scaleWorkingVersions()

if _rename:	if _rename:
self.renameImage(file.filename)	self.renameImage(file.filename)
Line 789 class ImageCollection(OrderedFolder, Per	Line 789 class ImageCollection(OrderedFolder, Per
"""scale thumbs"""	"""scale thumbs"""

#scale thumbs	#scale thumbs
ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/docuserver/scaled/thumb -scaleto=100 &"% self.ImageViewerPath)	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:	if RESPONSE:
RESPONSE.write(ret.read())	RESPONSE.write(ret.read())
RESPONSE.write("\n")	RESPONSE.write("\n")
Line 801 class ImageCollection(OrderedFolder, Per	Line 801 class ImageCollection(OrderedFolder, Per

#scale standard	#scale standard

ret=os.popen("/docuserver/lib/scaleomat/scaleomat.pl -src=/mpiwg/online/ -dir=%s -dest=/mpiwg/temp/online/scaled/small -scaleto=2000 &"% self.ImageViewerPath)	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:	if RESPONSE:
RESPONSE.write(ret.read())	RESPONSE.write(ret.read())
RESPONSE.write("\n")	RESPONSE.write("\n")
Line 1631 class ImageCollection(OrderedFolder, Per	Line 1631 class ImageCollection(OrderedFolder, Per

def getImageByName(self,filename,onlyName=None):	def getImageByName(self,filename,onlyName=None):
"""get filename"""	"""get filename"""
print repr(filename)	#print repr(filename)
#FIXME: umlaute in filename	#FIXME: umlaute in filename
fn=getattr(self,repr(filename),None)	fn=getattr(self,repr(filename),None)
if not fn:	if not fn:
Line 1870 class ImageCollectionMD(ImageCollection,	Line 1870 class ImageCollectionMD(ImageCollection,

def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):	def searchDB(self,REQUEST=None,RESPONSE=None,xml=None):
"""search"""	"""search"""
#context.ZSQLFind(_table='vision_main')
urlTmp=REQUEST['URL1']

url=urlTmp+'/searchResultXML?-table=%s&'%self.imageCollectionConfig.getTable()+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)

if xml is None:	rc.sort()
RESPONSE.redirect('xmlinput?url='+urllib.quote(url))	self.REQUEST.SESSION['filenames']=rc
	self.REQUEST.SESSION['filenamesIds']=fnIds

	overview=self.ZopeFind(self,obj_ids=['overview_selectedMD.html'])

	if overview:
	return overview[0][1]()
else:	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):	def index_html(self,fn=None,selection=None,generic='No',REQUEST=None,RESPONSE=None):
"""main template collection"""	"""main template collection"""
Line 1919 class ImageCollectionMD(ImageCollection,	Line 1942 class ImageCollectionMD(ImageCollection,

self.REQUEST.SESSION['filename']=filen[0:]	self.REQUEST.SESSION['filename']=filen[0:]

if not self.REQUEST.SESSION['filename']=="":	# if not self.REQUEST.SESSION['filename']=="":
url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()	# url=getattr(self.getImageByName(self.REQUEST.SESSION['filename']),'absolute_url')()
if mode=="view":	# if mode=="view":
self.REQUEST.RESPONSE.redirect(url)	# self.REQUEST.RESPONSE.redirect(url)
elif mode=="download":	# elif mode=="download":
self.REQUEST.RESPONSE.redirect(url+"/download")	# self.REQUEST.RESPONSE.redirect(url+"/download")
	#
if self.REQUEST.has_key('showall'):	if self.REQUEST.has_key('showall'):

self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')	self.REQUEST.SESSION['showall']=self.REQUEST.get('showall')
Line 1939 class ImageCollectionMD(ImageCollection,	Line 1962 class ImageCollectionMD(ImageCollection,


if overview and (generic =='No'):#	if overview and (generic =='No'):#
print "selected"
print repr(overview[0][1])
return overview[0][1]()	return overview[0][1]()
else:	else:
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','overview_selectedMD.zpt')).__of__(self)
Line 2056 class ImageCollectionMD(ImageCollection,	Line 2078 class ImageCollectionMD(ImageCollection,
xmldoc=urllib.urlopen(url).read()	xmldoc=urllib.urlopen(url).read()
#return xmldoc	#return xmldoc
try:	try:
dom=xml.dom.minidom.parseString(xmldoc)	dom=NonvalidatingReader.parseUri(url)

except:	except:
return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)	return "ERROR: (%s %s) %s"%(sys.exc_info()[0],sys.exc_info()[1],xmldoc)

images=dom.getElementsByTagName('image')

	images=dom.xpath("//image")
rc=[]	rc=[]
fnIds={}	fnIds={}
for image in images:	for image in images:
imagename=image.getElementsByTagName('imagename')[0]

	imagename=image.xpath('./imagename')[0]



idnr=image.getElementsByTagName('idnr')[0]
	idnr=image.xpath('./idnr')[0]
id=getText(idnr.childNodes)	id=getText(idnr.childNodes)
try:	try:
numberOfPages=image.getElementsByTagName('numberOfPages')[0]	numberOfPages=image.xpath('./numberOfPages')[0]
except:	except:
numberOfPages=None	numberOfPages=None

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.84
changed lines
	Added in v.1.88