ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.283 and 1.284

version 1.283, 2007/01/31 13:43:36	version 1.284, 2007/01/31 14:12:39
Line 51 from Ft.Xml import EMPTY_NAMESPACE	Line 51 from Ft.Xml import EMPTY_NAMESPACE

import Ft.Xml.XPath	import Ft.Xml.XPath
import cStringIO	import cStringIO
import zLOG
import sys	import sys

try:	try:
Line 81 from ECHO_movie import *	Line 81 from ECHO_movie import *
import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen	import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
import xmlrpclib	import xmlrpclib

	import logging

	#ersetzt logging.info
	def logger(txt,method,txt2):
	"""logging"""
	logging.info(txt+ txt2)

def normalizeCt(str):	def normalizeCt(str):
"""normalizes content_type"""	"""normalizes content_type"""
Line 619 class ECHO_resource(CatalogAware,Folder,	Line 623 class ECHO_resource(CatalogAware,Folder,
try:	try:
urllib.urlopen(url)	urllib.urlopen(url)
except:	except:
zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])	logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])

return None,getattr(self,'accessRight','')	return None,getattr(self,'accessRight','')

Line 627 class ECHO_resource(CatalogAware,Folder,	Line 631 class ECHO_resource(CatalogAware,Folder,
try:	try:
dom = NonvalidatingReader.parseUri(url)	dom = NonvalidatingReader.parseUri(url)
except:	except:
zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])	logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
return (None,"Cannot parse: "+url+"<br>"+"%s (%s)"%sys.exc_info()[0:2])	return (None,"Cannot parse: "+url+"<br>"+"%s (%s)"%sys.exc_info()[0:2])


Line 763 class ECHO_resource(CatalogAware,Folder,	Line 767 class ECHO_resource(CatalogAware,Folder,


if (not resourcepath) or (not digiliburlprefix) or (not images):	if (not resourcepath) or (not digiliburlprefix) or (not images):
zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())	logger("ECHO (createImageUrl)",logging.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
return None	return None
resourcepath=resourcepath.replace('/mpiwg/online','')	resourcepath=resourcepath.replace('/mpiwg/online','')
if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"	if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
Line 896 class ECHO_resource(CatalogAware,Folder,	Line 900 class ECHO_resource(CatalogAware,Folder,
break;	break;

except:	except:
zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])	logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))	logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
#print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)	#print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
# hack Pfad auf die Dokumente	# hack Pfad auf die Dokumente
path=self.metalink	path=self.metalink
Line 913 class ECHO_resource(CatalogAware,Folder,	Line 917 class ECHO_resource(CatalogAware,Folder,
try:	try:
return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()	return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
except:	except:
zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])	logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)	logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 936 class ECHO_resource(CatalogAware,Folder,	Line 940 class ECHO_resource(CatalogAware,Folder,
"""getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""	"""getFullTextXML; gives the FullText as an XML Document, and <error></error> if somthing goes wrong."""

try:	try:
#zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)	#logger("ECHO Fulltext",logging.INFO,"open %s"%self.metalink)
fh=ECHO_helpers.urlopen(self.metalink)	fh=ECHO_helpers.urlopen(self.metalink)
#zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink)	#logger("ECHO Fulltext",logging.INFO,"opened %s"%self.metalink)
dom=xml.dom.minidom.parse(fh)	dom=xml.dom.minidom.parse(fh)
texttools=dom.getElementsByTagName('texttool')	texttools=dom.getElementsByTagName('texttool')
text=texttools[0].getElementsByTagName('text')	text=texttools[0].getElementsByTagName('text')
texturl=getText(text[0].childNodes)	texturl=getText(text[0].childNodes)

#zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)	#logger("ECHO Fulltext",logging.INFO,"found %s"%texturl)
fh.close()	fh.close()
#zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")	#logger("ECHO Fulltext",logging.INFO,"closed fh")
#keine url	#keine url
if not (texturl.split(":")[0] in ['http','ftp','file']):	if not (texturl.split(":")[0] in ['http','ftp','file']):
if not noredirect:	if not noredirect:
Line 956 class ECHO_resource(CatalogAware,Folder,	Line 960 class ECHO_resource(CatalogAware,Folder,

if not noredirect:	if not noredirect:
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)	logger("ECHO Fulltext",logging.INFO,"redirect to:%s"%texturl)
self.REQUEST.RESPONSE.redirect(texturl)	self.REQUEST.RESPONSE.redirect(texturl)
else:	else:
return texturl	return texturl
Line 1279 class ECHO_resource(CatalogAware,Folder,	Line 1283 class ECHO_resource(CatalogAware,Folder,
self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]	self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]	self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
except:	except:
zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])	logger("ECHO_collection (changeECHO_resource_metadata)",logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])

print self.newMetaXML()	print self.newMetaXML()
tries=0	tries=0
Line 1305 class ECHO_resource(CatalogAware,Folder,	Line 1309 class ECHO_resource(CatalogAware,Folder,
self.getMDValue('year',generic="yes"),self.getTitle()])	self.getMDValue('year',generic="yes"),self.getTitle()])
except:	except:

#zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),	#logger(" ECHO_collection(getMDSimpleSearchField)",logging.INFO," ".join([self.getMDValue('title',generic="yes"),
# self.getMDValue('author',generic="yes"),	# self.getMDValue('author',generic="yes"),
# self.getMDValue('year',generic="yes"),'']))	# self.getMDValue('year',generic="yes"),'']))
return ""	return ""
Line 1320 class ECHO_resource(CatalogAware,Folder,	Line 1324 class ECHO_resource(CatalogAware,Folder,
ct=self.contentType.replace(" ","_").lower()	ct=self.contentType.replace(" ","_").lower()
ct=self.contentType.replace("-","_").lower()	ct=self.contentType.replace("-","_").lower()
else:	else:
zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())	logger("ECHO_collection (getMDValue)", logging.INFO, "no_content type for %s"%self.getId())
ct=""	ct=""

#caching	#caching
Line 1348 class ECHO_resource(CatalogAware,Folder,	Line 1352 class ECHO_resource(CatalogAware,Folder,

ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))	ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))
except:	except:
zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())	logger("ECHO (line 1069)",logging.ERROR,"no md hash for %s"%self.getId())
return ""	return ""

else:	else:
Line 2434 class ECHO_collection(CatalogAware, Fold	Line 2438 class ECHO_collection(CatalogAware, Fold
if ret and RESPONSE:	if ret and RESPONSE:
RESPONSE.write("ok: %s\n"%txt)	RESPONSE.write("ok: %s\n"%txt)

#zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt)	#logger("ECHO (copyTitleToInfoXMLFolder)",logging.INFO,txt)
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.write("done!\n")	RESPONSE.write("done!\n")
RESPONSE.close()	RESPONSE.close()

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

Removed from v.1.283
changed lines
	Added in v.1.284