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.248 and 1.263

version 1.248, 2005/11/03 15:58:16	version 1.263, 2006/02/14 19:29:45
Line 15 try:	Line 15 try:
except:	except:
print "PDF generation will not work"	print "PDF generation will not work"

	import urlparse
import string	import string
import tempfile	import tempfile
import re	import re
Line 50 from Ft.Xml import EMPTY_NAMESPACE	Line 50 from Ft.Xml import EMPTY_NAMESPACE
import Ft.Xml.XPath	import Ft.Xml.XPath
import cStringIO	import cStringIO
import zLOG	import zLOG
	import sys

try:	try:
from psycopg import libpq	from psycopg import libpq
Line 68 from ECHO_helpers import *	Line 69 from ECHO_helpers import *
from ECHO_language import *	from ECHO_language import *
from ECHO_movie import *	from ECHO_movie import *
import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen	import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
	import xmlrpclib


def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):	def setECHO_collectionInformation(self,title,label,description,contentType,responsible,credits,weight,coordstrs=""):
Line 83 def setECHO_collectionInformation(self,t	Line 84 def setECHO_collectionInformation(self,t
self.credits=toList(credits)	self.credits=toList(credits)
self.weight=weight	self.weight=weight

	class ECHO_partner(Image,Persistent,ECHO_basis):
	"""ECHO Partner"""

	meta_type="ECHO_partner"

	def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
	self.__name__=id
	self.title=title
	self.url=url
	self.person=person
	self.email=email
	self.country=country
	self.color=color
	self.precondition=precondition
	self.copyrightType=copyrightType
	data, size = self._read_data(file)
	content_type=self._get_content_type(file, data, id, content_type)
	self.update_data(data, content_type, size)

	manage_options = Image.manage_options+(
	{'label':'Partner Information','action':'ECHO_partner_config'},
	)


	def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
	"""Change main information"""
	self.url=url
	self.person=person
	self.email=email
	self.country=country
	self.color=color
	self.copyrightType=copyrightType
	if RESPONSE is not None:
	RESPONSE.redirect('manage_main')



	def ECHO_partner_config(self):
	"""Main configuration"""
	if not hasattr(self,'url'):
	self.url=""
	pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
	return pt()


	manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
	Kind='ECHO_partner',kind='ECHO_partner')



	def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
	REQUEST=None):
	"""
	Add a new ECHO_partner object.

	Creates a new ECHO_partner object 'id' with the contents of 'file'.
	Based on Image.manage_addImage
	"""

	id=str(id)
	title=str(title)
	content_type=str(content_type)
	precondition=str(precondition)

	id, title = OFS.Image.cookId(id, title, file)

	self=self.this()

	# First, we create the image without data:
	self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))

	# Now we "upload" the data. By doing this in two steps, we
	# can use a database trick to make the upload more efficient.
	if file:
	self._getOb(id).manage_upload(file)
	if content_type:
	self._getOb(id).content_type=content_type

	if REQUEST is not None:
	try: url=self.DestinationURL()
	except: url=REQUEST['URL1']
	REQUEST.RESPONSE.redirect('%s/manage_main' % url)
	return id

class ECHO_locale(ZopePageTemplate):	class ECHO_locale(ZopePageTemplate):
"""localisierung"""	"""localisierung"""

Line 314 class ECHO_resource(CatalogAware,Folder,	Line 399 class ECHO_resource(CatalogAware,Folder,

def reindex(self):	def reindex(self):
"""generate fields for indexing and reindex"""	"""generate fields for indexing and reindex"""
import urlparse
#TODO: korrigieren des metalink pfades konfigurierbar machen	#TODO: korrigieren des metalink pfades konfigurierbar machen
splitted= [x for x in urlparse.urlparse(self.metalink)]	splitted= [x for x in urlparse.urlparse(self.metalink)]
splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]	splitted[1]="foxridge.mpiwg-berlin.mpg.de"[0:]
Line 427 class ECHO_resource(CatalogAware,Folder,	Line 512 class ECHO_resource(CatalogAware,Folder,
return ret+self.createSubElementRDF(urn=urn)	return ret+self.createSubElementRDF(urn=urn)


def getAccessRightSelectorHTML(self,outlook="select"):	def changeAccessRightForm(self,preselect=None):
"""htmlselector"""	"""change the access rights"""
values=['free','mpiwg']

if outlook=="select":	pt=zptFile(self, 'zpt/ChangeECHO_resourceAccessRight.zpt')
ret="""<select name="%s">"""%self.getId()	return pt(preselect=preselect)

	def changeAccessRight(self):
	"""changeRights"""
	argv=self.REQUEST.form
	self.setAccessRightXML(argv["%s_xml"%self.getId()])
	self.accessRight=argv["%s_echo"%self.getId()]

	self.REQUEST.RESPONSE.redirect('manage_main')


	def getAccessRightSelectorHTML(self,outlook="select",xmldominant=None,preselect=None):
	"""htmlselector, xmldominant= in der regel wird der wert des xmlfiles ausgegeben ausser er existiert nicht"""
	values=['','free','MPIWG']

	if preselect:#set all to the preselected
	ar=(preselect,preselect)
	else:#else set to actual value
	ar=self.getAccessRightMD()

	if outlook=="select":
	ret="""<select name="%s_xml">"""%self.getId()
	ret1="""<select name="%s_echo">"""%self.getId()
for value in values:	for value in values:
if value==self.getAccessRightMD():	if value==ar[0]:
ret+="<option selected>%s</option>"%value	ret+="<option selected>%s</option>"%value
else:	else:
ret+="<option>%s</option>"%value	ret+="<option>%s</option>"%value

	if value==ar[1]:
	ret1+="<option selected>%s</option>"%value
	else:
	ret1+="<option>%s</option>"%value


	if not xmldominant:
	return ret+"</select>",ret1+"</select>"
	else:
	if ar[0] is not None:
return ret+"</select>"	return ret+"</select>"
	else:
	return "<p>No xml file (only local selection):"+ret1

else:	else:
ret=""	ret=""
	ret1=""
for value in values:	for value in values:

if value==self.getAccessRightMD():	if value==ar[0]:
ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)	ret+="""<input type="radio" name="%s_xml" value="%s" checked>%s"""%(self.getId(),value,value)
else:	else:
ret+="""<input type="radio" name="%s" value="%s">%s"""%(self.getId(),value,value)	ret+="""<input type="radio" name="%s_xml" value="%s">%s"""%(self.getId(),value,value)

	if value==ar[1]:
	ret1+="""<input type="radio" name="%s_echo" value="%s" checked>%s"""%(self.getId(),value,value)
	else:
	ret1+="""<input type="radio" name="%s_echo" value="%s">%s"""%(self.getId(),value,value)

	if not xmldominant:
	return ret,ret1
	else:
	if ar[0]:
return ret	return ret
	else:
	return "<p>No xml file (only local selection)</p>"+ret1



	def copyAccessRightsFromMD(self):
	"""kopiere rechte aus den metadaten"""
	self.accessRight=self.getAccessRightMD()[0]





Line 458 class ECHO_resource(CatalogAware,Folder,	Line 597 class ECHO_resource(CatalogAware,Folder,
url=self.metalink	url=self.metalink

try:	try:
geturl=""	urllib.urlopen(url)
for line in ECHO_helpers.urlopen(url).readlines():	except:
geturl=geturl+line	zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])

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

except:
return (None,"Cannot open: "+url)

try:	try:
dom=xml.dom.minidom.parseString(geturl)	dom = NonvalidatingReader.parseUri(url)
root=dom.getElementsByTagName('resource')[0]
except:	except:
return (None,"Cannot parse: "+url+"<br>"+geturl)	zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
	return (None,"Cannot parse: "+url+"<br>"+"%s (%s)"%sys.exc_info()[0:2])

internal=dom.getElementsByTagName('internal')
if internal:
institution=dom.getElementsByTagName('institution')
return getText(institution[0].childNodes)

free=dom.getElementsByTagName('free')
if free:
return "free"

return "free" #default free	accessright=dom.xpath("//meta/access-conditions/access/@type")
	if accessright:
	accessright=accessright[0].value
	if str(accessright)=='institution':
	tmp=dom.xpath("//meta/access-conditions/access/name")
	if tmp:
	accessright=getTextFromNode(tmp[0])

def changeAccessRightMD(self,accessright,RESPONSE=None):	if not accessright:
"""change the rights"""	accessright=""

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

	def changeAccessRightMD(self,accessright,RESPONSE=None):
	"""change the rights - not user anymore"""
	#TODO: check if method still needed
params="accessright=%s"%accessright	params="accessright=%s"%accessright


#print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()	#print ECHO_helpers.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).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()+'/setAccessRightXML'+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()+'/setAccessRightXML'+urllib.quote('?'+params))).read()


if RESPONSE is not None:	if RESPONSE is not None:
Line 502 class ECHO_resource(CatalogAware,Folder,	Line 643 class ECHO_resource(CatalogAware,Folder,
def setAccessRightXML(self,accessright):	def setAccessRightXML(self,accessright):
"""set accessright"""	"""set accessright"""
url=self.metalink	url=self.metalink
	accessrights=['MPIWG','free']#allowes rights

	if accessright =='':
	"""do nothing"""
	return ""


try:	try:
geturl=""	geturl=""
Line 518 class ECHO_resource(CatalogAware,Folder,	Line 665 class ECHO_resource(CatalogAware,Folder,
except:	except:
return (None,"Cannot parse: "+url+"<br>"+geturl)	return (None,"Cannot parse: "+url+"<br>"+geturl)

metanodes=dom.getElementsByTagName('access-conditions')	metamains=dom.getElementsByTagName('meta')

	if not metamains:
	nodenew=dom.createElement('meta')
	root.appendChild(nodenew)
	metamain=nodenew
	else:
	metamain=metamains[0]


	metanodes=metamain.getElementsByTagName('access-conditions')

if not metanodes:	if not metanodes:
nodenew=dom.createElement('access-conditions')	nodenew=dom.createElement('access-conditions')
root.appendChild(nodenew)	metamain.appendChild(nodenew)
metanode=nodenew	metanode=nodenew
else:	else:
metanode=metanodes[0]	metanode=metanodes[0]

accesses=metanode.getElementsByTagName('access')	accesses=metanode.getElementsByTagName('access')

if not accesses:	#delete old
	if accesses:
	metanode.removeChild(accesses[0]).unlink()

	#create new

nodenew2=dom.createElement('access')	nodenew2=dom.createElement('access')
metanode.appendChild(nodenew2)	metanode.appendChild(nodenew2)
metanode2=nodenew2	metanode2=nodenew2
else:
metanode2=accesses[0]

internal=metanode.getElementsByTagName('internal')	attribute=metanode2.getAttribute('type')

if internal:	if accessright=="free":
metanode2.removeChild(internal[0]).unlink()

free=metanode.getElementsByTagName('free')	metanode2.setAttribute('type','free')

if free:	elif accessright.upper()=='MPIWG':
metanode2.removeChild(internal[0]).unlink()	metanode2.setAttribute('type','institution')
	nodenew4=dom.createElement('name')
	metanodetext=dom.createTextNode('MPIWG')
	nodenew4.appendChild(metanodetext)
	nodenew2.appendChild(nodenew4)
	#print dom.toxml().encode('utf-8')
	string= encodeRPC(dom.toxml().encode('utf-8'))

	#TODO: make server configurable
	server=xmlrpclib.Server("http://foxridge.mpiwg-berlin.mpg.de/server")

if accessright=='free':	path=urlparse.urlparse(self.metalink)[2]
nodenew3=dom.createElement('free')
metanode2.appendChild(nodenew3)
elif accessright=='mpiwg':
nodenew3=dom.createElement('internal')
nodenew4=dom.createElement('institution')
metanodetext=dom.createTextNode('mpiwg')
nodenew4.appendChild(metanodetext)
nodenew3.appendChild(nodenew4)
metanode2.appendChild(nodenew3)

return dom.toxml().encode('utf-8')	server.writeMetaDataFile(path,string,"yes")

def setStartPageForm(self):	def setStartPageForm(self):
"""Form for changing the startpage"""	"""Form for changing the startpage"""
Line 694 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 705 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 1029 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 1039 class ECHO_resource(CatalogAware,Folder,	Line 1193 class ECHO_resource(CatalogAware,Folder,



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

def getMDValue(self,fieldName,empty=None,generic=None):	try:
	return " ".join([self.getMDValue('title',generic="yes"),
	self.getMDValue('author',generic="yes"),
	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):
"""get md values"""	"""get md values"""
#TODO: cache mappinghash	#TODO: cache mappinghash

	fieldName=None
if generic:	if generic:
	if self.contentType:
ct=self.contentType.replace(" ","_").lower()	ct=self.contentType.replace(" ","_").lower()
	else:
	zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
	ct=""

#caching	#caching
if not hasattr(self,'_v_mapHash'): #noch keine cachevariable	if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
Line 1062 class ECHO_resource(CatalogAware,Folder,	Line 1233 class ECHO_resource(CatalogAware,Folder,
if not fieldName and hasattr(self.standardMD,ct):	if not fieldName and hasattr(self.standardMD,ct):
fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]	fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
self._v_mapHash[ct][fieldNameTest]=fieldName	self._v_mapHash[ct][fieldNameTest]=fieldName
	if not fieldName:
	fieldName=fieldNameTest
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(fieldName,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 1147 class ECHO_resource(CatalogAware,Folder,	Line 1328 class ECHO_resource(CatalogAware,Folder,
{'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},	{'label':'Change TemplateSets and Image Viewer','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},	{'label':'set/change startpage','action':'setStartPageForm'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
	{'label':'Change AccessRights','action':'changeAccessRightForm'},
)	)


Line 1196 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 1317 class ECHO_resource(CatalogAware,Folder,	Line 1498 class ECHO_resource(CatalogAware,Folder,
return "ERROR:",error	return "ERROR:",error

if (not self.contentType) or (overwrite=="yes"):	if (not self.contentType) or (overwrite=="yes"):
self.contentType=metadict['bib_type']	self.contentType=metadict['bib_type'].lower()

if not (metadict['bib_type'].lower()==self.contentType.lower()):	if not (metadict['bib_type'].lower()==self.contentType.lower()):
self.REQUEST.SESSION['contentStorage']=metadict['bib_type']	self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
Line 1325 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 1443 class ECHO_externalLink(Folder,ECHO_basi	Line 1626 class ECHO_externalLink(Folder,ECHO_basi
security.declarePublic('content_html')	security.declarePublic('content_html')
def content_html(self):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
return 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



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 1516 class ECHO_link(ECHO_externalLink):	Line 1706 class ECHO_link(ECHO_externalLink):
"""external_link"""	"""external_link"""

meta_type="ECHO_link"	meta_type="ECHO_link"

manage_options = ECHO_externalLink.manage_options+(	manage_options = ECHO_externalLink.manage_options+(
{'label':'add links config','action':'ECHO_link_addLinksForm'},	{'label':'add links config','action':'ECHO_link_addLinksForm'},
)	)
Line 1535 class ECHO_link(ECHO_externalLink):	Line 1726 class ECHO_link(ECHO_externalLink):
def content_html(self):	def content_html(self):
"""template fuer link"""	"""template fuer link"""


if hasattr(self,"link_template"):	if hasattr(self,"link_template"):
ret=ECHO_basis.content_html(self,'link')	ret=ECHO_basis.content_html(self,'link')

else:	else:
ret=ECHO_basis.content_html(self,'collection')	ret=ECHO_basis.content_html(self,'collection')

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


def index_html(self):	def index_html(self):
"""standard link"""	"""standard link"""
Line 1588 def manage_addECHO_link(self,id,title,la	Line 1792 def manage_addECHO_link(self,id,title,la
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')


class ECHO_collection(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'

# viewClassificationList=viewClassificationListMaster	# viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes	displayTypes=displayTypes

path="/mpiwg/online/permanent/shipbuilding"	path="/mpiwg/online/permanent/shipbuilding"

	def getMDValueSimpleSearchField(self):
	"""returns value for simple search"""
	return " ".join([self.title,self.description])

def getTitleAndLabel(self):	def getTitleAndLabel(self):
"""gibt title und label zurueck"""	"""gibt title und label zurueck"""
return (getattr(self,'title',''),getattr(self,'label',''))	return (getattr(self,'title',''),getattr(self,'label',''))
Line 1706 class ECHO_collection(Folder, Persistent	Line 1917 class ECHO_collection(Folder, Persistent
pt=zptFile(self, 'zpt/changeMetaDataLinkForm')	pt=zptFile(self, 'zpt/changeMetaDataLinkForm')
pt.content_type="text/html"	pt.content_type="text/html"
return pt()	return pt()

	def changeAccessRightsCollectionForm(self,preselect=None):
	"""change access rights of all resources in this collection"""

	pt=zptFile(self, 'zpt/changeAccessRightsCollectionForm')
	pt.content_type="text/html"
	return pt(preselect=preselect)


def changeAccessRightsCollection(self):	def changeAccessRightsCollection(self):
"""change"""	"""change"""
ret=""	ret=""
Line 1714 class ECHO_collection(Folder, Persistent	Line 1934 class ECHO_collection(Folder, Persistent
resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
for resource in resources:	for resource in resources:

try:	if argv.has_key(resource[1].getId()+'_xml'):
ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"	ret+=resource[1].getId()+" "+argv[resource[1].getId()+'_xml']+"</br>"
resource[1].changeAccessRightMD(argv[resource[1].getId()])	resource[1].setAccessRightXML(argv[resource[1].getId()+'_xml'])
except:	resource[1].accessRight=argv[resource[1].getId()+'_xml']
pass	elif argv.has_key(resource[1].getId()+'_echo'):
	ret+="only local:"+resource[1].getId()+" "+argv[resource[1].getId()+'_echo']+"</br>"
	resource[1].accessRight=argv[resource[1].getId()+'_echo']
	else:
	ret+="ERROR:" +resource[0]
return ret	return ret

def changeMetaDataLinkInCollection(self):	def changeMetaDataLinkInCollection(self):
Line 1796 class ECHO_collection(Folder, Persistent	Line 2020 class ECHO_collection(Folder, Persistent
pass	pass
return ret	return ret

def updateCollection(self,RESPONSE=None):	def importCollection(self,path=None,RESPONSE=None):
"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""	"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
files=os.listdir(self.path)
	if path is None:
	pt=zptFile(self, 'zpt/importCollection.zpt')
	return pt()

	files=os.listdir(path)
ret=""	ret=""
for fileName in files:	for fileName in files:

if fileName:	if fileName:

tempPath=re.sub("/mpiwg/online","",self.path)	tempPath=re.sub("/mpiwg/online","",path)
link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"	link="http://echo.mpiwg-berlin.mpg.de/zogilib_book?fn="+tempPath+"/"+fileName+"/pageimg"

metalink=self.path+"/"+fileName+"/index.meta"	metalink=self.path+"/"+fileName+"/index.meta"
Line 1827 class ECHO_collection(Folder, Persistent	Line 2056 class ECHO_collection(Folder, Persistent
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

def updateCollectionMD(self,RESPONSE=None):
"""updateMD"""
files=os.listdir(self.path)
for fileName in files:
if fileName:
genObj=getattr(self,fileName)
genObj.copyIndex_meta2echo_resource()
genObj.generate_title()

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



def changeViewerTemplateSetsForm(self):	def changeViewerTemplateSetsForm(self):
"""change the viewer template set"""	"""change the viewer template set"""
pt=zptFile(self, 'zpt/changeViewerTemplateSet')	pt=zptFile(self, 'zpt/changeViewerTemplateSet')
Line 1931 class ECHO_collection(Folder, Persistent	Line 2146 class ECHO_collection(Folder, Persistent
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

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

for resource in resources:	for resource in resources:
Line 2087 class ECHO_collection(Folder, Persistent	Line 2302 class ECHO_collection(Folder, Persistent
areas = self.getAllMapAreas()	areas = self.getAllMapAreas()
return self.createJSAreas(areas)	return self.createJSAreas(areas)


	emptyPartner=ECHO_partner("", "","", "", "", "", "", "", "")

security.declarePublic('getCreditObject')	security.declarePublic('getCreditObject')
def getCreditObject(self,name):	def getCreditObject(self,name):
"""credit id to credititem"""	"""credit id to credititem"""
try:	try:
return getattr(self.partners,name)	return getattr(self.partners,name)
except:	except:
return ""
	return self.emptyPartner


security.declarePublic('ECHO_generateNavBar')	security.declarePublic('ECHO_generateNavBar')
def ECHO_generateNavBar(self):	def ECHO_generateNavBar(self):
Line 2161 class ECHO_collection(Folder, Persistent	Line 2381 class ECHO_collection(Folder, Persistent
{'label':'Set Startpage','action':'setStartpageFolderForm'},	{'label':'Set Startpage','action':'setStartpageFolderForm'},
{'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},	{'label':'Change Viewer Templates and Image Viewer','action':'changeViewerTemplateSetsForm'},
{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},	{'label':'Reload Metadata','action':'reloadMetaDataFromStorageWarning'},
{'label':'ImportCollection','action':'updateCollection'},	{'label':'ImportCollection','action':'importCollection'},
{'label':'Copy MD for indexing and search','action':'copySearchFields'},	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
	{'label':'Change access rights', 'action':'changeAccessRightsCollectionForm'},
)	)


Line 2259 class ECHO_collection(Folder, Persistent	Line 2480 class ECHO_collection(Folder, Persistent
#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 2327 class ECHO_collection(Folder, Persistent	Line 2544 class ECHO_collection(Folder, Persistent

getSubCols = ECHO_helpers.getSubCols	getSubCols = ECHO_helpers.getSubCols

	def getSubcolsXMLRpc(self,searchSimple):
	"""simplesearch results suitable for xml rpc, gives back array objid,url"""

	return [x.absolute_url() for x in self.getSubCols(searchSimple=searchSimple)]


Globals.InitializeClass(ECHO_collection)	Globals.InitializeClass(ECHO_collection)

def manage_addECHO_collectionForm(self):	def manage_addECHO_collectionForm(self):
Line 2624 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"

	def mod_re_sub(self,pattern,replace,string):
	"""re.sub aus mod re zur Verfuegung stellen"""
	return re.sub(pattern,replace,string)

def findObjectFromFulltext(self,existUri):	def findObjectFromFulltext(self,existUri):
'''	'''
Line 2653 class ECHO_root(Folder,Persistent,Implic	Line 2880 class ECHO_root(Folder,Persistent,Implic

for resource in resources:	for resource in resources:
resource[1].reindex()	resource[1].reindex()
print "<p> done %s </p>\n"	#print "<p> done %s </p>\n"
if RESPONSE:	if RESPONSE:
RESPONSE.write("<p> done %s </p>\n"%resource[0])	RESPONSE.write("<p> done %s </p>\n"%resource[0])

Line 2942 class ECHO_root(Folder,Persistent,Implic	Line 3169 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 3477 def manage_addECHO_copyrightType(self,id	Line 3704 def manage_addECHO_copyrightType(self,id



class ECHO_partner(Image,Persistent,ECHO_basis):
"""ECHO Partner"""

meta_type="ECHO_partner"

def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
self.__name__=id
self.title=title
self.url=url
self.person=person
self.email=email
self.country=country
self.color=color
self.precondition=precondition
self.copyrightType=copyrightType
data, size = self._read_data(file)
content_type=self._get_content_type(file, data, id, content_type)
self.update_data(data, content_type, size)

manage_options = Image.manage_options+(
{'label':'Partner Information','action':'ECHO_partner_config'},
)


def changeECHO_partner(self,url,copyrightType,person, email, country, color, RESPONSE=None):
"""Change main information"""
self.url=url
self.person=person
self.email=email
self.country=country
self.color=color
self.copyrightType=copyrightType
if RESPONSE is not None:
RESPONSE.redirect('manage_main')



def ECHO_partner_config(self):
"""Main configuration"""
if not hasattr(self,'url'):
self.url=""
pt=zptFile(self, 'zpt/ChangeECHO_partner.zpt')
return pt()


manage_addECHO_partnerForm=DTMLFile('dtml/ECHO_partnerAdd',globals(),
Kind='ECHO_partner',kind='ECHO_partner')



def manage_addECHO_partner(self, id, url, person, email, country, color, file=None, copyrightType='', title='', precondition='', content_type='',
REQUEST=None):
"""
Add a new ECHO_partner object.

Creates a new ECHO_partner object 'id' with the contents of 'file'.
Based on Image.manage_addImage
"""

id=str(id)
title=str(title)
content_type=str(content_type)
precondition=str(precondition)

id, title = OFS.Image.cookId(id, title, file)

self=self.this()

# First, we create the image without data:
self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, color, content_type, precondition))

# Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient.
if file:
self._getOb(id).manage_upload(file)
if content_type:
self._getOb(id).content_type=content_type

if REQUEST is not None:
try: url=self.DestinationURL()
except: url=REQUEST['URL1']
REQUEST.RESPONSE.redirect('%s/manage_main' % url)
return id

class ECHO_linkList(ZopePageTemplate,ECHO_basis):	class ECHO_linkList(ZopePageTemplate,ECHO_basis):
"""LinkList Objekt"""	"""LinkList Objekt"""

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

Removed from v.1.248
changed lines
	Added in v.1.263