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.259 and 1.266

version 1.259, 2005/12/04 09:10:55	version 1.266, 2006/03/03 20:34:11
Line 342 class ECHO_fullText(ZopePageTemplate,ECH	Line 342 class ECHO_fullText(ZopePageTemplate,ECH
def getPage(self,nr='1'):	def getPage(self,nr='1'):
"""get page n"""	"""get page n"""
#return self().encode('latin-1','ignore')	#return self().encode('latin-1','ignore')
dom=xml.dom.minidom.parseString(self().encode('utf-8','ignore'))	dom=xml.dom.minidom.parseString(self())
pages=dom.getElementsByTagName('page')	pages=dom.getElementsByTagName('page')

return pages[int(nr)-1].toxml()	return pages[int(nr)-1].toxml()
Line 852 class ECHO_resource(CatalogAware,Folder,	Line 852 class ECHO_resource(CatalogAware,Folder,

params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)	params="project=%s&xslt=%s&thumbtemplate=%s&topbar=%s&digiLibTemplate=%s&digiliburlprefix=%s"%(project,xslt,thumbtemplate,topbar,digiLibTemplate,digiliburlprefix)

	try:
ECHO_helpers.urlopen('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))).read()	ECHO_helpers.urlopen('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))).read()
	except:
	zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.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)))
#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 863 class ECHO_resource(CatalogAware,Folder,	Line 865 class ECHO_resource(CatalogAware,Folder,

path=re.sub('/index.meta','',path)	path=re.sub('/index.meta','',path)

path=re.sub(self.REQUEST['SERVER_URL'],'',path)	#TODO: direct access to the file system necessary, fix that also xmlrpc to the server where the index file is stored is possible
path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)	parsedUrl=urlparse.urlparse(path)
	path=parsedUrl[2]
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.mpiwg-berlin.mpg.de','',path) # falls foxridge als server

path=re.sub('http://foxridge.rz-berlin.mpg.de:8080','',path) # falls foxridge als server
path=re.sub('http://foxridge.rz-berlin.mpg.de','',path) # falls foxridge als server
path=re.sub('http://content.mpiwg-berlin.mpg.de','',path) # falls content als server
path=re.sub('http://echo.mpiwg-berlin.mpg.de','',path) # falls echo

path=re.sub('http://vision.rz-berlin.mpg.de','',path) # falls vision als server

	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:
	zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.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)

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 1187 class ECHO_resource(CatalogAware,Folder,	Line 1182 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:
"""nothing"""	zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])

	print self.newMetaXML()
ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()	ECHO_helpers.urlopen('http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML')).read()


Line 1199 class ECHO_resource(CatalogAware,Folder,	Line 1195 class ECHO_resource(CatalogAware,Folder,

def getMDValueSimpleSearchField(self):	def getMDValueSimpleSearchField(self):
"""returns value for simple search"""	"""returns value for simple search"""

	try:
return " ".join([self.getMDValue('title',generic="yes"),	return " ".join([self.getMDValue('title',generic="yes"),
self.getMDValue('author',generic="yes"),	self.getMDValue('author',generic="yes"),
self.getMDValue('year',generic="yes"),self.title])	self.getMDValue('year',generic="yes"),self.getTitle()])
	except:

	#zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
	# self.getMDValue('author',generic="yes"),
	# self.getMDValue('year',generic="yes"),'']))
	return ""

def getMDValue(self,fieldNameTest,empty=None,generic=None):	def getMDValue(self,fieldNameTest,empty=None,generic=None):
"""get md values"""	"""get md values"""
Line 1234 class ECHO_resource(CatalogAware,Folder,	Line 1238 class ECHO_resource(CatalogAware,Folder,
if not empty:	if not empty:
#FIXME: warum gibt es manchmal kein metadatahas	#FIXME: warum gibt es manchmal kein metadatahas
try:	try:
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
	ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
except:	except:
zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())	zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
return ""	return ""

else:	else:

return self.metaDataHash.get(fieldNameTest,empty)
	ret= self.metaDataHash.get(fieldNameTest,empty)

	if type(ret) is StringType:
	return ret.decode('utf-8')
	else:
	return ret

getFieldValue=getMDValue #depricated	getFieldValue=getMDValue #depricated

Line 1367 class ECHO_resource(CatalogAware,Folder,	Line 1378 class ECHO_resource(CatalogAware,Folder,
setattr(self,'metaDataHash',{})	setattr(self,'metaDataHash',{})
self.metaDataHash[field]=value[0:]	self.metaDataHash[field]=value[0:]


def copySearchFields(self):	def copySearchFields(self):
"""copys metadatafields to the object"""	"""copys metadatafields to the object"""
fields=['author','title','year']	fields=['author','title','year']
Line 1496 class ECHO_resource(CatalogAware,Folder,	Line 1506 class ECHO_resource(CatalogAware,Folder,

return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()	return zptFile(self, 'zpt/ECHO_getResourceMDErrorContentType.zpt')()

self.REQUEST.SESSION['metadict']=metadict	#self.REQUEST.SESSION['metadict']=metadict



self.REQUEST.SESSION['diffs']=checkDiffs(self,self.REQUEST.SESSION['metadict'])

	self.REQUEST.SESSION['diffs']=checkDiffs(self,metadict)


if template=="yes":	if template=="yes":
	#pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/ECHO_resourceMD.zpt'),metadict=metadict).__of__(self)
pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')	pt=zptFile(self, 'zpt/ECHO_resourceMD.zpt')
return pt()
	return pt(metadict=metadict)



Line 1616 class ECHO_externalLink(Folder,ECHO_basi	Line 1628 class ECHO_externalLink(Folder,ECHO_basi
"""template fuer content"""	"""template fuer content"""
ret= ECHO_basis.content_html(self,'externalLink')	ret= ECHO_basis.content_html(self,'externalLink')

	if type(ret) is StringType:
	return ret.decode('utf-8')
	else:
	return ret

try:
return ret.encode('utf-8')

except:
try:
return ret.decode('latin-1')
except:

return ret

def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):	def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):

Line 1787 def manage_addECHO_link(self,id,title,la	Line 1795 def manage_addECHO_link(self,id,title,la
class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis):	class ECHO_collection(CatalogAware, Folder, Persistent, Implicit, Cacheable,ECHO_basis):
"""ECHO Collection"""	"""ECHO Collection"""

	management_page_charset="utf-8"
security=ClassSecurityInfo()	security=ClassSecurityInfo()
meta_type='ECHO_collection'	meta_type='ECHO_collection'
default_catalog='resourceCatalog'	default_catalog='resourceCatalog'
Line 2471 class ECHO_collection(CatalogAware, Fold	Line 2480 class ECHO_collection(CatalogAware, Fold
#print "NN",argv	#print "NN",argv
ret = ECHO_basis.content_html(self,'collection')	ret = ECHO_basis.content_html(self,'collection')

try:	if type(ret) is StringType:
return ret.encode('utf-8')	return ret.decode('utf-8')
except:	else:

try:
return ret.decode('latin-1')
except:

return ret	return ret


def getCredits(self):	def getCredits(self):
"""Ausgabe der credits"""	"""Ausgabe der credits"""
if self.credits:	if self.credits:
Line 2842 class ECHO_root(Folder,Persistent,Implic	Line 2847 class ECHO_root(Folder,Persistent,Implic
security=ClassSecurityInfo()	security=ClassSecurityInfo()

meta_type="ECHO_root"	meta_type="ECHO_root"
	management_page_charset="utf-8"

	getSubCols = ECHO_helpers.getSubCols

	manage_options=Folder.manage_options+(
	{'label':'Main Config','action':'ECHO_copyright_configForm'},
	{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
	{'label':'Change Weights','action':'changeWeights'},
	{'label':'Generate from RDF','action':'generateFromRDFForm'},
	{'label':'update Resource Catalog','action':'updateResourceCatalog'},
	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
	)


	def copySearchFields(self,RESPONSE=None):
	"""copys < metadatafields to the object"""
	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)

	for resource in resources:

	resource[1].copySearchFields()

	if RESPONSE is not None:
	RESPONSE.redirect('manage_main')

def mod_re_sub(self,pattern,replace,string):	def mod_re_sub(self,pattern,replace,string):
"""re.sub aus mod re zur Verfuegung stellen"""	"""re.sub aus mod re zur Verfuegung stellen"""
Line 2882 class ECHO_root(Folder,Persistent,Implic	Line 2910 class ECHO_root(Folder,Persistent,Implic
if RESPONSE:	if RESPONSE:
RESPONSE.write("<p> ok </p></html></body>\n")	RESPONSE.write("<p> ok </p></html></body>\n")

def printer(self,txt):
print txt
print txt[2]
print txt[2].getImageTag()
print "HO"
return txt[2].getImageTag()

def printer2(self,txt):
print txt


def item2(self,txt):
return txt[2]

def setLanguage(self,lang):	def setLanguage(self,lang):
"""Set language cookie"""	"""Set language cookie"""
Line 2909 class ECHO_root(Folder,Persistent,Implic	Line 2924 class ECHO_root(Folder,Persistent,Implic

self.REQUEST.RESPONSE.setCookie('lang_exhibition',lang,path="/")	self.REQUEST.RESPONSE.setCookie('lang_exhibition',lang,path="/")
self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1'])	self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1'])

def getLanguage(self):	def getLanguage(self):
"""get language cookie"""	"""get language cookie"""
lang= self.REQUEST.cookies.get('lang_exhibition','de')	lang= self.REQUEST.cookies.get('lang_exhibition','de')
Line 3098 class ECHO_root(Folder,Persistent,Implic	Line 3114 class ECHO_root(Folder,Persistent,Implic
pt=zptFile(self, 'zpt/changeWeightForm')	pt=zptFile(self, 'zpt/changeWeightForm')
pt.content_type="text/html"	pt.content_type="text/html"
return pt()	return pt()
getSubCols = ECHO_helpers.getSubCols

manage_options=Folder.manage_options+(
{'label':'Main Config','action':'ECHO_copyright_configForm'},
{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
{'label':'Change Weights','action':'changeWeights'},
{'label':'Generate from RDF','action':'generateFromRDFForm'},

)



def reloadMetaDataFromStorageWarning(self,RESPONSE=None):	def reloadMetaDataFromStorageWarning(self,RESPONSE=None):
Line 3164 class ECHO_root(Folder,Persistent,Implic	Line 3170 class ECHO_root(Folder,Persistent,Implic
return ret	return ret

def getValueFromClass(self,field,found):	def getValueFromClass(self,field,found):
"""retattribute falss existing"""	"""ret attribute if existing"""
try:	try:

return getattr(found,field).decode('ascii','ignore')	return getattr(found,field).decode('ascii','ignore')
Line 3637 class ECHO_root(Folder,Persistent,Implic	Line 3643 class ECHO_root(Folder,Persistent,Implic
inst=self.ZopeFind(self.institutions, obj_ids=[id])	inst=self.ZopeFind(self.institutions, obj_ids=[id])
return inst	return inst

	def updateResourceCatalog(self,REQUEST,RESPONSE):
	"""update ressource catalog"""
	catalog=getattr(self,'resourceCatalog',None)
	if not catalog:
	return """<html><body><h3>No resourceCatalog available</h3></body></html>"""

	else:
	return catalog.manage_catalogReindex(REQUEST,RESPONSE,'manage_main')


	def checkMetaDataLinks(self,correct=None):
	"""check all metadatalinks and if correct is set change the servername to content.mpiwg-berlin.mpg.de"""

	self.REQUEST.RESPONSE.write("<html><body>")
	for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
	metalink=resource[1].metalink

	try:
	url=urllib.urlopen(metalink)
	except:

	self.REQUEST.RESPONSE.write("<p>ERROR (opening %s):"%resource[1].absolute_url() +" -- %s %s <br>"%sys.exc_info()[0:2])
	self.REQUEST.RESPONSE.write("-----------%s"%metalink)

	if correct:
	urlparsed=[x for x in urlparse.urlparse(metalink)]
	urlparsed[1]="content.mpiwg-berlin.mpg.de"
	neu=urlparse.urlunparse(urlparsed)
	resource[1].metalink=neu[0:]
	self.REQUEST.RESPONSE.write("----------changed to:%s)"%neu)

def manage_addECHO_root(self,id,title,RESPONSE=None):	def manage_addECHO_root(self,id,title,RESPONSE=None):
"""Add an ECHO_root"""	"""Add an ECHO_root"""

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

Removed from v.1.259
changed lines
	Added in v.1.266