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.125 and 1.134

version 1.125, 2004/06/22 14:47:57	version 1.134, 2004/07/05 18:15:16
Line 184 class BrowserCheck:	Line 184 class BrowserCheck:
self.isIEMac = self.isIE and self.isMac	self.isIEMac = self.isIE and self.isMac




def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):	def writeMetadata(url,metadict,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""	"""Einlesen der Metadaten und und erstellen des geaenderten XML file"""
def updateTextToolNode(tag,value):	def updateTextToolNode(tag,value):
print dom,tag,value	#print dom,tag,value
metanode=dom.getElementsByTagName('texttool')[0]	metanode=dom.getElementsByTagName('texttool')[0]
try:	try:
nodeOld=metanode.getElementsByTagName(tag)	nodeOld=metanode.getElementsByTagName(tag)
Line 484 class ECHO_resource(Folder,Persistent):	Line 486 class ECHO_resource(Folder,Persistent):

getSubCols = ECHO_helpers.getSubCols	getSubCols = ECHO_helpers.getSubCols

	def getAccessRightSelectorHTML(self,outlook="select"):
	"""htmlselector"""
	values=['free','mpiwg']

	if outlook=="select":
	ret="""<select name="%s">"""%self.getId()

	for value in values:
	if value==self.getAccessRightMD():
	ret+="<option selected>%s</option>"%value
	else:
	ret+="<option>%s</option>"%value
	return ret+"</select>"

	else:
	ret=""
	for value in values:
	print
	if value==self.getAccessRightMD():
	ret+="""<input type="radio" name="%s" value="%s" checked>%s"""%(self.getId(),value,value)
	else:
	ret+="""<input type="radio" name="%s" value="%s">%s"""%(self.getId(),value,value)
	return ret



	def getAccessRightMD(self):
	"""set accessright"""
	url=self.metalink

	try:
	geturl=""
	for line in urllib.urlopen(url).readlines():
	geturl=geturl+line


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

	try:
	dom=xml.dom.minidom.parseString(geturl)
	root=dom.getElementsByTagName('resource')[0]
	except:
	return (None,"Cannot parse: "+url+"<br>"+geturl)

	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

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

	params="accessright=%s"%accessright


	#print urllib.urlopen(self.absolute_url()+'/setAccessRightXML'+'?'+params).read()


	urllib.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()


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


	def setAccessRightXML(self,accessright):
	"""set accessright"""
	url=self.metalink

	try:
	geturl=""
	for line in urllib.urlopen(url).readlines():
	geturl=geturl+line


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

	try:
	dom=xml.dom.minidom.parseString(geturl)
	root=dom.getElementsByTagName('resource')[0]
	except:
	return (None,"Cannot parse: "+url+"<br>"+geturl)

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

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

	accesses=metanode.getElementsByTagName('access')

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

	internal=metanode.getElementsByTagName('internal')

	if internal:
	metanode2.removeChild(internal[0]).unlink()

	free=metanode.getElementsByTagName('free')

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


	if accessright=='free':
	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')

def setStartPageForm(self):	def setStartPageForm(self):
"""Form for changing the startpage"""	"""Form for changing the startpage"""

Line 505 class ECHO_resource(Folder,Persistent):	Line 640 class ECHO_resource(Folder,Persistent):

params="startpage=%s"%startpage	params="startpage=%s"%startpage


urllib.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'+urllib.quote('?'+params))).read()	urllib.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'+urllib.quote('?'+params))).read()

#print "http://xserve02.mpiwg-berlin.mpg.de:18880/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s"%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params))
path=self.metalink	path=self.metalink

	path=re.sub(self.REQUEST['SERVER_URL'],'',path)
	path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)

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.mpiwg-berlin.mpg.de','',path) # falls foxridge als server

Line 552 class ECHO_resource(Folder,Persistent):	Line 689 class ECHO_resource(Folder,Persistent):
paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']	paramList=['project','startpage','xslt','thumbtemplate','topbar','digiLibTemplate']


#print writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)	#writeMetadata(self.metalink,self.metaDataHash,project,None,xslt,thumbtemplate,topbar,digiLibTemplate)

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

Line 562 class ECHO_resource(Folder,Persistent):	Line 699 class ECHO_resource(Folder,Persistent):
# hack Pfad auf die Dokumente	# hack Pfad auf die Dokumente
path=self.metalink	path=self.metalink

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('/index.meta','',path)	path=re.sub('/index.meta','',path)

	path=re.sub(self.REQUEST['SERVER_URL'],'',path)
	path=re.sub('http://'+self.REQUEST['HTTP_HOST'],'',path)

print urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()	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


	return urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')
Line 576 class ECHO_resource(Folder,Persistent):	Line 719 class ECHO_resource(Folder,Persistent):

def getTitle(self):	def getTitle(self):
"""title"""	"""title"""
return self.title.encode('utf-8')	return self.title.encode('utf-8','ignore')

def getLabel(self):	def getLabel(self):
"""title"""	"""title"""
return self.label.encode('utf-8')
	return self.label.encode('utf-8','ignore')

def content_html(self):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
Line 614 class ECHO_resource(Folder,Persistent):	Line 758 class ECHO_resource(Folder,Persistent):
return "<error>no fulltext available</error>"	return "<error>no fulltext available</error>"

def getCopyrightsHTML(self):	def getCopyrightsHTML(self):
"""gib (link auf copyright notiz, mediatyp, institution, copyrightType, label von copyrightType) aus"""	"""gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""

if hasattr(self,'copyrightModell'):	if hasattr(self,'copyrightModel'):
obj=self.copyrightModell	obj=self.copyrightModel

else:	else:
return "ERROR"	return "ERROR"
Line 633 class ECHO_resource(Folder,Persistent):	Line 777 class ECHO_resource(Folder,Persistent):
url=copyrightTypeObj.url	url=copyrightTypeObj.url

if url!='':	if url!='':
ret.append(("""<a target="_blank" href="%s">%s</a>"""%(url,label),copyright[0],copyright[1],copyright[2],label))	ret.append((url,copyright[0],copyright[1],copyright[2],label))
else:	else:
if hasattr(copyrightTypeObj, 'copyright.html'):	if hasattr(copyrightTypeObj, 'copyright.html'):
ret.append(("""<a target="_blank" href="%s?partner=%s">%s</a>"""%(link,copyright[1],label),copyright[0],copyright[1],copyright[2],label))	ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
else:	else:
ret.append((label,copyright[0],copyright[1],copyright[2],label))	ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
except:	except:
"""nothing"""	"""nothing"""

Line 745 class ECHO_resource(Folder,Persistent):	Line 889 class ECHO_resource(Folder,Persistent):
self.contentType=self.bib_type	self.contentType=self.bib_type
for data in self.metadata:	for data in self.metadata:
data_neu=re.sub('-','_',data)	data_neu=re.sub('-','_',data)
self.metaDataHash[data_neu]=getattr(self,data)[0:]	self.meta
	DataHash[data_neu]=getattr(self,data)[0:]


pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)	pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
Line 836 class ECHO_resource(Folder,Persistent):	Line 981 class ECHO_resource(Folder,Persistent):
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')	self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')

if not hasattr(self,'metaDataHash'):	if not hasattr(self,'metaDataHash'):

self.copyIndex_meta2echo_resource()	self.copyIndex_meta2echo_resource()
try:	try:
return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)	return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
Line 873 class ECHO_resource(Folder,Persistent):	Line 1019 class ECHO_resource(Folder,Persistent):
{'label':'Sync Metadata','action':'ECHO_getResourceMD'},	{'label':'Sync Metadata','action':'ECHO_getResourceMD'},
{'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},	{'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
{'label':'set/change startpage','action':'setStartPageForm'},	{'label':'set/change startpage','action':'setStartPageForm'},
	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)	)

def getOverview(self):	def getOverview(self):
Line 961 class ECHO_resource(Folder,Persistent):	Line 1108 class ECHO_resource(Folder,Persistent):
self.metaDataHash[field]=value[0:]	self.metaDataHash[field]=value[0:]


	def copySearchFields(self):
	"""copys metadatafields to the object"""
	fields=['author','title','year']
	for field in fields:
	setattr(self,'MD_'+field,self.getFieldValue(field))


def findLabelsFromMapping(self,referenceType):	def findLabelsFromMapping(self,referenceType):
"""gib hash mit label -> generic zurueck"""	"""gib hash mit label -> generic zurueck"""
Line 1015 class ECHO_resource(Folder,Persistent):	Line 1168 class ECHO_resource(Folder,Persistent):
bibdata={}	bibdata={}
retdata={}	retdata={}
fieldlist=self.standardMD.fieldList	fieldlist=self.standardMD.fieldList
	fields=[]
for referenceTypeF in temp:	for referenceTypeF in temp:
	#print referenceType

if referenceTypeF[1].title.lower() == referenceType.lower():	if referenceTypeF[1].title.lower() == referenceType.lower():
try:	try:
Line 1038 class ECHO_resource(Folder,Persistent):	Line 1192 class ECHO_resource(Folder,Persistent):

(metadict, error)=readMetadata(self.metalink)	(metadict, error)=readMetadata(self.metalink)

self.contentType=metadict['bib_type'][0:]

self.metaDataHash={}	self.metaDataHash={}
if not error=="": #Fehler beim Auslesen des Metafiles	if not error=="": #Fehler beim Auslesen des Metafiles

return "ERROR:",error	return "ERROR:",error

	self.contentType=metadict['bib_type'][0:]
fields=self.findTagsFromMapping(self.contentType)	fields=self.findTagsFromMapping(self.contentType)

#fields=self.findLabelsFromMapping(self.contentType)	#fields=self.findLabelsFromMapping(self.contentType)
Line 1057 class ECHO_resource(Folder,Persistent):	Line 1214 class ECHO_resource(Folder,Persistent):
if RESPONSE:	if RESPONSE:
return RESPONSE.redirect('manage_main')	return RESPONSE.redirect('manage_main')

def ECHO_getResourceMD(self,template="yes"):	def ECHO_getResourceMD(self,template="yes",back=None):
"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""	"""Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
(metadict, error)=readMetadata(self.metalink)	(metadict, error)=readMetadata(self.metalink)

	if back:
	self.REQUEST.SESSION['back']=back

if not error=="": #Fehler beim Auslesen des Metafiles	if not error=="": #Fehler beim Auslesen des Metafiles
return "ERROR:",error	return "ERROR:",error
Line 1127 class ECHO_resource(Folder,Persistent):	Line 1285 class ECHO_resource(Folder,Persistent):


security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination	security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination

def generate_label(self):	def generate_label(self):
"""Erzeugt_standard_Label aus Template"""	"""Erzeugt_standard_Label aus Template"""
pt=getattr(self,"label_template_"+self.contentType.lower())	pt=getattr(self,"label_template_"+self.contentType.lower())
Line 1135 class ECHO_resource(Folder,Persistent):	Line 1294 class ECHO_resource(Folder,Persistent):
return pt()	return pt()

security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination	security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination

def generate_title(self,RESPONSE=None):	def generate_title(self,RESPONSE=None):
"""Erzeugt_standard_Label aus Template"""	"""Erzeugt_standard_Label aus Template"""
pt=getattr(self,"label_template_"+self.contentType.lower())	pt=getattr(self,"label_template_"+self.contentType.lower())
Line 1291 class ECHO_collection(Folder, Persistent	Line 1451 class ECHO_collection(Folder, Persistent
viewClassificationList=viewClassificationListMaster	viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes	displayTypes=displayTypes

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

	def changeLabels(self):
	"""change form"""
	pt=PageTemplateFile('Products/ECHO_content/zpt/changeLabelsForm').__of__(self)
	pt.content_type="text/html"
	return pt()

	def changeTitles(self):
	"""change form"""
	pt=PageTemplateFile('Products/ECHO_content/zpt/changeTitleForm').__of__(self)
	pt.content_type="text/html"
	return pt()

	def changeAccessRightsCollection(self):
	"""change"""
	ret=""
	argv=self.REQUEST.form

	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
	for resource in resources:

	try:
	ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"
	resource[1].changeAccessRightMD(argv[resource[1].getId()])
	except:
	"""not"""
	return ret

	def changeLabelsInCollection(self):
	"""change all lables of a collection"""
	ret=""
	argv=self.REQUEST.form

	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
	for resource in resources:

	try:
	ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"
	resource[1].label=argv[resource[1].getId()][0:]
	except:
	"""not"""
	return ret

	def changeTitlesInCollection(self):
	"""change all lables of a collection"""
	ret=""
	argv=self.REQUEST.form

	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
	for resource in resources:

	try:
	ret+=resource[1].getId()+" "+argv[resource[1].getId()]+"</br>"
	resource[1].title=argv[resource[1].getId()][0:]
	except:
	"""not"""
	return ret

	def updateCollection(self,RESPONSE=None):
	"""liest verzeichnisse aus dem pfad und legt sie dann als objekte in den ordner"""
	files=os.listdir(self.path)
	ret=""
	for fileName in files:

	if fileName:

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

	metalink=self.path+"/"+fileName+"/index.meta"
	try:

	#link="http://nausikaa2.mpiwg-berlin.mpg.de/cgi-bin/toc/toc.x.cgi?dir="+fileName+"&step=thumb"

	newObj=ECHO_resource(fileName,link,metalink,fileName,fileName,fileName,'generated','book','','','','','','')
	self._setObject(fileName,newObj)

	genObj=getattr(self,fileName)
	#genObj.createIndexFile()
	ret+="OK:"+fileName+"<br/>"
	except:
	print "ERROR"
	ret+="ERROR:"+fileName+"<br/>"

	return ret

	if RESPONSE is not None:
	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"""
Line 1332 class ECHO_collection(Folder, Persistent	Line 1595 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:
print resource[0]
resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)	resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)

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


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

	for resource in resources:

	resource[1].copySearchFields()

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

	def reloadMetaDataFromStorage(self,RESPONSE=None):
	"""copy metadata from the storage to ECHO"""
	ret=""
	resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])

	for resource in resources:

	ret+=str(resource[1].copyIndex_meta2echo_resource())+"<br>"


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

def getPartnerCopyright(self,name,sonst="generic"):	def getPartnerCopyright(self,name,sonst="generic"):
"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""	"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
#print "hi",name,sonst	#print "hi",name,sonst
Line 1579 class ECHO_collection(Folder, Persistent	Line 1867 class ECHO_collection(Folder, Persistent

security.declarePublic('ECHO_rerenderLinksMD')	security.declarePublic('ECHO_rerenderLinksMD')

def ECHO_rerenderLinksMD(self,obj=None):	def ECHO_rerenderLinksMD(self,obj=None,types=['title','label']):
"""Rerender all Links"""	"""Rerender all Links"""
	ret=""

if not obj:	if not obj:
obj = self	obj = self

Line 1588 class ECHO_collection(Folder, Persistent	Line 1878 class ECHO_collection(Folder, Persistent

for entry in entries:	for entry in entries:
if entry[1].meta_type == 'ECHO_resource':	if entry[1].meta_type == 'ECHO_resource':
	try:
entry[1].ECHO_getResourceMD(template="no")	entry[1].ECHO_getResourceMD(template="no")
	if "title" in types:
entry[1].generate_title()	entry[1].generate_title()
	if "label" in types:
entry[1].generate_label()	entry[1].generate_label()
	ret+="OK:"+entry[0]+"-- "+entry[1].getTitle().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"<br>"
	except:
	ret+="Error:"+entry[0]+"<br>"

else:	else:
self.ECHO_rerenderLinksMD(entry[1])	self.ECHO_rerenderLinksMD(entry[1])



return "Rerenderd all links to resources in: "+self.title	return ret+"Rerenderd all links to resources in: "+self.title

security.declarePublic('ECHO_newViewerLink')	security.declarePublic('ECHO_newViewerLink')

Line 1635 class ECHO_collection(Folder, Persistent	Line 1931 class ECHO_collection(Folder, Persistent

manage_options = Folder.manage_options+(	manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_collection_config'},	{'label':'Main Config','action':'ECHO_collection_config'},
{'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},	{'label':'Change Labels','action':'changeLabels'},
	{'label':'Change Titles','action':'changeTitles'},
	{'label':'Rerender Labels and Titles','action':'ECHO_rerenderLinksMD'},
{'label':'Graphics','action':'ECHO_graphicEntry'},	{'label':'Graphics','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},	{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
{'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},	{'label':'Change Viewer Templates','action':'changeViewerTemplateSetsForm'},
	{'label':'Reload Metadata','action':'reloadMetaDataFromStorage'},
	{'label':'ImportCollection','action':'updateCollection'},
	{'label':'Copy MD for indexing and search','action':'copySearchFields'},
)	)

def getOverview(self):	def getOverview(self):
Line 2063 class ECHO_root(Folder,Persistent,Implic	Line 2364 class ECHO_root(Folder,Persistent,Implic

meta_type="ECHO_root"	meta_type="ECHO_root"

	def showContent(self,path):
	"""return content/html"""

	return urllib.urlopen(path+"/content_html").read()

	def getImageViewers(self):
	"""images"""
	viewers=self.ZopeFind(self.standardImageViewer,obj_metatypes=['OSAS_ViewerObject'])
	return viewers


def getBibTag(self,tag,content):	def getBibTag(self,tag,content):
"""get field tag f�r index-meta-generation"""	"""get field tag f�r index-meta-generation"""
Line 2606 class ECHO_partner(Image,Persistent):	Line 2917 class ECHO_partner(Image,Persistent):

meta_type="ECHO_partner"	meta_type="ECHO_partner"

def __init__(self, id, title,url, file, copyrightType, person, email, country, content_type='', precondition=''):	def __init__(self, id, title,url, file, copyrightType, person, email, country, color, content_type='', precondition=''):
self.__name__=id	self.__name__=id
self.title=title	self.title=title
self.url=url	self.url=url
self.person=person	self.person=person
self.email=email	self.email=email
self.country=country	self.country=country
	self.color=color
self.precondition=precondition	self.precondition=precondition
self.copyrightType=copyrightType	self.copyrightType=copyrightType
data, size = self._read_data(file)	data, size = self._read_data(file)
Line 2624 class ECHO_partner(Image,Persistent):	Line 2936 class ECHO_partner(Image,Persistent):
)	)


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



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

# First, we create the image without data:	# First, we create the image without data:
self._setObject(id, ECHO_partner(id,title,url,'',copyrightType, person, email, country, content_type, precondition))	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	# Now we "upload" the data. By doing this in two steps, we
# can use a database trick to make the upload more efficient.	# can use a database trick to make the upload more efficient.

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

Removed from v.1.125
changed lines
	Added in v.1.134