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.124 and 1.132

version 1.124, 2004/06/22 08:49:00	version 1.132, 2004/07/01 07:46:17
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):
	"""Form for changing the startpage"""


	pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resourceStartPage.zpt').__of__(self)
	pt.content_type="text/html"
	return pt()


def setStartPage(self,startpage=None,RESPONSE=None):	def setStartPage(self,startpage=None,RESPONSE=None):
"""set start page, if no startpage defined use the generic one of the resource"""	"""set start page, if no startpage defined use the generic one of the resource"""

if not startpage:	if (not (type(startpage)==StringType)) and ("__generic" in startpage): # checke ob generic in der liste
startpage=self.absolute_url()+"/startpage_html"	startpage=self.absolute_url()+"/startpage_html"

	if (not startpage) or (startpage=="__generic"):
	startpage=self.absolute_url()+"/startpage_html"


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


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

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


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

	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


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

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

def content_html(self):	def content_html(self):
"""template fuer content"""	"""template fuer content"""
Line 602 class ECHO_resource(Folder,Persistent):	Line 757 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 621 class ECHO_resource(Folder,Persistent):	Line 776 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 824 class ECHO_resource(Folder,Persistent):	Line 979 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 860 class ECHO_resource(Folder,Persistent):	Line 1016 class ECHO_resource(Folder,Persistent):
{'label':'Add coords','action':'ECHO_graphicEntry'},	{'label':'Add coords','action':'ECHO_graphicEntry'},
{'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':'Copy MD for indexing and search','action':'copySearchFields'},
)	)

def getOverview(self):	def getOverview(self):
Line 948 class ECHO_resource(Folder,Persistent):	Line 1106 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 1002 class ECHO_resource(Folder,Persistent):	Line 1166 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 1025 class ECHO_resource(Folder,Persistent):	Line 1190 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 1278 class ECHO_collection(Folder, Persistent	Line 1446 class ECHO_collection(Folder, Persistent
viewClassificationList=viewClassificationListMaster	viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes	displayTypes=displayTypes

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

	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 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 1319 class ECHO_collection(Folder, Persistent	Line 1549 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 1568 class ECHO_collection(Folder, Persistent	Line 1823 class ECHO_collection(Folder, Persistent

def ECHO_rerenderLinksMD(self,obj=None):	def ECHO_rerenderLinksMD(self,obj=None):
"""Rerender all Links"""	"""Rerender all Links"""
	ret=""

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

Line 1575 class ECHO_collection(Folder, Persistent	Line 1832 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")
entry[1].generate_title()	entry[1].generate_title()
entry[1].generate_label()	entry[1].generate_label()
	ret+="OK:"+entry[0]+"-- "+entry[1].getLabel().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 1626 class ECHO_collection(Folder, Persistent	Line 1887 class ECHO_collection(Folder, Persistent
{'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 2050 class ECHO_root(Folder,Persistent,Implic	Line 2314 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 2593 class ECHO_partner(Image,Persistent):	Line 2867 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 2611 class ECHO_partner(Image,Persistent):	Line 2886 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 2636 manage_addECHO_partnerForm=DTMLFile('dtm	Line 2912 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 2655 def manage_addECHO_partner(self, id,file	Line 2931 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.124
changed lines
	Added in v.1.132