--- ECHO_content/ECHO_collection.py 2004/06/08 12:42:16 1.106
+++ ECHO_content/ECHO_collection.py 2004/06/28 14:42:32 1.131
@@ -184,9 +184,25 @@ class BrowserCheck:
self.isIEMac = self.isIE and self.isMac
-def writeMetadata(url,metadict):
+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"""
+ def updateTextToolNode(tag,value):
+ #print dom,tag,value
+ metanode=dom.getElementsByTagName('texttool')[0]
+ try:
+ nodeOld=metanode.getElementsByTagName(tag)
+ except:
+ nodeOld=None
+
+ if nodeOld:
+ metanode.removeChild(nodeOld[0]).unlink()
+
+ node=dom.createElement(tag)
+ nodetext=dom.createTextNode(value)
+ node.appendChild(nodetext)
+ metanode.appendChild(node)
+
try:
geturl=""
for line in urllib.urlopen(url).readlines():
@@ -235,6 +251,26 @@ def writeMetadata(url,metadict):
metanodeneu.appendChild(metanodetext)
metanode.appendChild(metanodeneu)
+
+
+
+
+ if project:
+ updateTextToolNode('project',project)
+
+ if startpage:
+ updateTextToolNode('startpage',startpage)
+
+ if topbar:
+ updateTextToolNode('toptemplate',topbar)
+
+ if thumbtemplate:
+ updateTextToolNode('thumbtemplate',thumbtemplate)
+
+ if xslt:
+ updateTextToolNode('xslt',xslt)
+
+
return dom.toxml().encode('utf-8')
@@ -342,7 +378,7 @@ class ECHO_copyright(Folder):
pt.content_type="text/html"
return pt()
- def ECHO_copyright_config(self,title,RESPONSE):
+ def ECHO_copyright_config(self,title,RESPONSE=None):
"""change"""
self.title=title
self.copyrights=[]
@@ -441,20 +477,118 @@ def manage_addECHO_layoutTemplate(self,
class ECHO_resource(Folder,Persistent):
"""ECHO Ressource"""
+ security=ClassSecurityInfo()
meta_type='ECHO_resource'
viewClassificationList=viewClassificationListMaster
getSubCols = ECHO_helpers.getSubCols
+ 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):
+ """set start page, if no startpage defined use the generic one of the resource"""
+
+ if (not (type(startpage)==StringType)) and ("__generic" in startpage): # checke ob generic in der liste
+ startpage=self.absolute_url()+"/startpage_html"
+
+ if (not startpage) or (startpage=="__generic"):
+ startpage=self.absolute_url()+"/startpage_html"
+
+
+ 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()
+
+
+ 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','',path) # falls foxridge als server
+
+ path=re.sub('/index.meta','',path)
+
+
+ urllib.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
+
+ if RESPONSE is not None:
+ RESPONSE.redirect('manage_main')
+
+ def changeViewerTemplateSetForm(self):
+ """change the viewer template set"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/changeResourceViewerTemplateSet').__of__(self)
+ return pt()
+
+
+ def getTextToolsField(self,name,default=''):
+ """Lese Textoolsfelder aus index.meta im path aus"""
+
+ try:
+ dom=xml.dom.minidom.parse(self.metalink)
+ node=dom.getElementsByTagName('texttool')[0] #getNode
+ subnode=node.getElementsByTagName(name)[0]
+
+ # bei text wird nur der Folder gebraucht
+ if name=="text":
+ splitted=getText(subnode.childNodes).split("/")
+ return splitted[len(splitted)-2]
+ else:
+ return getText(subnode.childNodes)
+ except:
+ return default
+
+
+ def changeViewerTemplateSet(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+ """changeit"""
+
+ paramList=['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)
+
+
+ urllib.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()
+
+ # hack Pfad auf die Dokumente
+ path=self.metalink
+
+
+
+ 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
+
+
+ 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:
+ RESPONSE.redirect('manage_main')
+
def getTitle(self):
"""title"""
- return self.title.encode('utf-8')
+ return self.title.decode('utf-8','ignore')
def getLabel(self):
"""title"""
- return self.label.encode('utf-8')
+ return self.label.decode('utf-8','ignore')
def content_html(self):
"""template fuer content"""
@@ -488,10 +622,10 @@ class ECHO_resource(Folder,Persistent):
return "no fulltext available"
def getCopyrightsHTML(self):
- """gib link auf copyright notiz aus"""
+ """gib (link auf copyright link, mediatyp, institution, copyrightType, label von copyrightType) aus"""
- if hasattr(self,'copyrightModell'):
- obj=self.copyrightModell
+ if hasattr(self,'copyrightModel'):
+ obj=self.copyrightModel
else:
return "ERROR"
@@ -502,8 +636,17 @@ class ECHO_resource(Folder,Persistent):
link="copyrightTypes/"+copyright[2]+'/copyright.html'
try:
- label=getattr(self.copyrightTypes,copyright[2]).label
- ret.append(("""%s"""%(link,label),copyright[0],copyright[0],copyright[1],copyright[2]))
+ copyrightTypeObj=getattr(self.copyrightTypes,copyright[2])
+ label=copyrightTypeObj.label
+ url=copyrightTypeObj.url
+
+ if url!='':
+ ret.append((url,copyright[0],copyright[1],copyright[2],label))
+ else:
+ if hasattr(copyrightTypeObj, 'copyright.html'):
+ ret.append(("""%s?partner=%s"""%(link,copyright[1]),copyright[0],copyright[1],copyright[2],label))
+ else:
+ ret.append(('empty',copyright[0],copyright[1],copyright[2],label))
except:
"""nothing"""
@@ -610,7 +753,7 @@ class ECHO_resource(Folder,Persistent):
self.contentType=self.bib_type
for data in self.metadata:
data_neu=re.sub('-','_',data)
- self.metaDataHash[data_neu]=getattr(self,data)
+ self.metaDataHash[data_neu]=getattr(self,data)[0:]
pt=PageTemplateFile('Products/ECHO_content/zpt/ChangeECHO_resource_metadata.zpt').__of__(self)
@@ -668,7 +811,7 @@ class ECHO_resource(Folder,Persistent):
"""change metadata"""
tags=self.findTagsFromMapping(self.contentType)
for field in tags[1]:
- 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)][0:]
@@ -686,8 +829,9 @@ class ECHO_resource(Folder,Persistent):
except:
"""nothing"""
- return 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')).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')).read()
+
+
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -695,13 +839,19 @@ class ECHO_resource(Folder,Persistent):
def getMDValue(self,fieldName):
return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
- def newMetaXML(self):
+ def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""new index.meta"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- return writeMetadata(self.metalink,self.OSAS_meta)
+ if not hasattr(self,'metaDataHash'):
+
+ self.copyIndex_meta2echo_resource()
+ try:
+ return writeMetadata(self.metalink,self.OSAS_meta,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
+ except:
+ return writeMetadata(self.metalink,self.metaDataHash,project,startpage,xslt,thumbtemplate,topbar,digiLibTemplate)
- def getMetaDataXML(self):
+ def getMetaDataXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None):
"""prints out metadata as stored in the echo environment, format is the index.meta format"""
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
return writeMetadata(self.metalink,self.metaDataHash)
@@ -730,6 +880,9 @@ class ECHO_resource(Folder,Persistent):
{'label':'Change Coords','action':'ECHO_resource_config_coords'},
{'label':'Add coords','action':'ECHO_graphicEntry'},
{'label':'Sync Metadata','action':'ECHO_getResourceMD'},
+ {'label':'Change TemplateSets','action':'changeViewerTemplateSetForm'},
+ {'label':'set/change startpage','action':'setStartPageForm'},
+ {'label':'Copy MD for indexing and search','action':'copySearchFields'},
)
def getOverview(self):
@@ -818,6 +971,12 @@ class ECHO_resource(Folder,Persistent):
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):
"""gib hash mit label -> generic zurueck"""
@@ -872,8 +1031,9 @@ class ECHO_resource(Folder,Persistent):
bibdata={}
retdata={}
fieldlist=self.standardMD.fieldList
-
+ fields=[]
for referenceTypeF in temp:
+ #print referenceType
if referenceTypeF[1].title.lower() == referenceType.lower():
try:
@@ -889,15 +1049,20 @@ class ECHO_resource(Folder,Persistent):
return retdata,fieldlist,temp,fields
-
+ security.declarePublic('copyIndex_meta2echo_resource') # has to be change, presentlyset because of OSAS koordination
def copyIndex_meta2echo_resource(self,RESPONSE=None):
"""copy MD von Index_meta to the echo_resource"""
(metadict, error)=readMetadata(self.metalink)
+
+
self.metaDataHash={}
if not error=="": #Fehler beim Auslesen des Metafiles
+
return "ERROR:",error
+
+ self.contentType=metadict['bib_type'][0:]
fields=self.findTagsFromMapping(self.contentType)
#fields=self.findLabelsFromMapping(self.contentType)
@@ -981,21 +1146,25 @@ class ECHO_resource(Folder,Persistent):
return sp[0][1]()
-
+ security.declarePublic('generate_label') # has to be change, presentlyset because of OSAS koordination
def generate_label(self):
"""Erzeugt_standard_Label aus Template"""
- pt=getattr(self,"label_template_"+self.bib_type)
+ pt=getattr(self,"label_template_"+self.contentType.lower())
+ self.label=pt()[0:]
return pt()
+ security.declarePublic('generate_title') # has to be change, presentlyset because of OSAS koordination
def generate_title(self,RESPONSE=None):
"""Erzeugt_standard_Label aus Template"""
- pt=getattr(self,"label_template_"+self.contentType)
+ pt=getattr(self,"label_template_"+self.contentType.lower())
- self.title=pt()
+ self.title=pt()[0:]
return pt()
+Globals.InitializeClass(ECHO_resource)
+
def manage_addECHO_resourceForm(self):
"""Form for adding a ressource"""
pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_resourceForm.zpt').__of__(self)
@@ -1142,6 +1311,125 @@ class ECHO_collection(Folder, Persistent
viewClassificationList=viewClassificationListMaster
displayTypes=displayTypes
+ path="/mpiwg/online/permanent/shipbuilding"
+
+ 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+"
"
+ except:
+ print "ERROR"
+ ret+="ERROR:"+fileName+"
"
+
+ 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):
+ """change the viewer template set"""
+ pt=PageTemplateFile('Products/ECHO_content/zpt/changeViewerTemplateSet').__of__(self)
+ return pt()
+
+ def getViewerTemplateSets(self,obj_ids=None):
+ """Get the ViewerTemplateSet title for configuration"""
+ ret=[]
+
+ try:
+ viewerTemplateSets=self.ZopeFind(self.viewerTemplateSets,obj_metatypes=['OSAS_viewerTemplateSet'],obj_ids=obj_ids)#assumes viewerTemplateSets folder somewhere in the hierarchie.
+
+ for viewerTemplateSet in viewerTemplateSets:
+ ret.append((viewerTemplateSet[1].title,viewerTemplateSet[0],viewerTemplateSet[1]))
+
+ return ret
+
+ except:
+ return [('no ViewerTemplateSetfolders','')]
+
+ def getTextToolsField(self,name,default=''):
+ """Lese viewerTemplateSet der Collection not implemented yet!"""
+
+ return default
+
+
+ def isSelectedViewerTemplateSet(self,obj,id):
+ """is ausgewählt"""
+
+ if self.REQUEST['viewerTemplateSet']==id:
+ return 1
+ else:
+ return None
+
+ def changeViewerTemplateSets(self,project,xslt,thumbtemplate,topbar,digiLibTemplate,RESPONSE=None):
+ """change the templates"""
+
+ resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+
+ for resource in resources:
+
+ resource[1].changeViewerTemplateSet(project,xslt,thumbtemplate,topbar,digiLibTemplate)
+
+ if RESPONSE is not None:
+ 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())+"
"
+
+
+ if RESPONSE is not None:
+ # RESPONSE.redirect('manage_main')
+ return ret
+
def getPartnerCopyright(self,name,sonst="generic"):
"""gibt generisches copyright eines partners aus, sonst behalte jetzige einsteillung"""
#print "hi",name,sonst
@@ -1215,7 +1503,7 @@ class ECHO_collection(Folder, Persistent
def addResource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None):
"""SSS"""
try:
- manage_addECHO_resource(self,id,title,label,description,contentType,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
+ manage_addECHO_resource(self,id,title,label,description,responsible,link,metalink,weight,credits=None,coords=None,RESPONSE=None)
return "done"
except:
return None
@@ -1384,6 +1672,8 @@ class ECHO_collection(Folder, Persistent
def ECHO_rerenderLinksMD(self,obj=None):
"""Rerender all Links"""
+ ret=""
+
if not obj:
obj = self
@@ -1391,14 +1681,20 @@ class ECHO_collection(Folder, Persistent
for entry in entries:
if entry[1].meta_type == 'ECHO_resource':
- entry[1].ECHO_getResourceMD(template="no")
+ try:
+ entry[1].ECHO_getResourceMD(template="no")
+ entry[1].generate_title()
+ entry[1].generate_label()
+ ret+="OK:"+entry[0]+"-- "+entry[1].getLabel().decode('utf-8')+"-- "+entry[1].getTitle().decode('utf-8')+"
"
+ except:
+ ret+="Error:"+entry[0]+"
"
else:
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')
@@ -1439,7 +1735,10 @@ class ECHO_collection(Folder, Persistent
{'label':'Rerender Links','action':'ECHO_rerenderLinksMD'},
{'label':'Graphics','action':'ECHO_graphicEntry'},
{'label':'create resources from XML','action':'createRessourcesFromXMLForm'},
-
+ {'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):
@@ -1864,6 +2163,16 @@ class ECHO_root(Folder,Persistent,Implic
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):
"""get field tag für index-meta-generation"""
@@ -2127,7 +2436,7 @@ class ECHO_root(Folder,Persistent,Implic
if str:
str=re.sub("\&","&",str)
- dom=xml.dom.minidom.parseString(""+str+"")
+ dom=xml.dom.minidom.parseString(""+str+"")
links=dom.getElementsByTagName("link")
@@ -2137,9 +2446,31 @@ class ECHO_root(Folder,Persistent,Implic
if self.checkRef(ref):
link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
- return dom.toxml('utf-8')
+ newxml=dom.toxml('utf-8')
+ match=re.sub(r'<\?xml version=\"1.0\" encoding=\"utf-8\"\?>\n','',newxml)
+ match=re.sub(r'','',match)
+
+ return match
+
return ""
+ def xml2html(self,str):
+ """link2html fuer VLP muss hier noch raus"""
+ if str:
+
+ str=re.sub("\&","&",str)
+ dom=xml.dom.minidom.parseString(str)
+ links=dom.getElementsByTagName("link")
+
+
+ for link in links:
+ link.tagName="a"
+ ref=link.getAttribute("ref")
+ if self.checkRef(ref):
+ link.setAttribute("href",self.aq_parent.absolute_url()+"/vlp_coll?id="+ref)
+
+ return dom.toxml('utf-8')
+ return ""
def checkRef(self,ref):
dbs={'vl_literature':'AND CD LIKE \'%lise%\'','vl_technology':'','vl_people':''}
@@ -2275,12 +2606,50 @@ class ECHO_root(Folder,Persistent,Implic
self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
self.REQUEST.RESPONSE.write(ret)
+
+
+ def getMetaDatasXML(self,viewerType=None,filter=None):
+ """gebe all ressourcen aus"""
+ ret="""
+ """
+ for resource in self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1):
+
+ echo_url=resource[1].absolute_url()
+ if resource[1].getFullTextXML(noredirect="yes"):
+ if hasattr(resource[1],'link'):
+ viewer_url=echo_url+"/getMetaDataXML"
+ else:
+ viewer_url="NO URL"
+ if filter:
+ if re.search(filter,viewer_url):
+ ret+="""\n"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+ else:
+ ret+="""\n"""%(urllib.quote(echo_url,safe='/:?'),urllib.quote(viewer_url,safe='/:?'))
+ ret +="""\n"""
+
+
+ self.REQUEST.RESPONSE.setHeader("Content-Type", "text/xml")
+ self.REQUEST.RESPONSE.write(ret)
+
def findPartners(self):
"""find all partners in partners"""
- par=self.ZopeFind(self.partners, obj_metatypes='ECHO_partners')
+ par=self.ZopeFind(self.partners, obj_metatypes='ECHO_partner')
return par
+ def getPartnerFromID(self):
+ """find partner form ID return object"""
+ pa=self.REQUEST['partner']
+ par=self.ZopeFind(self.partners, obj_ids=[pa])
+ return par
+
+ def getPartnerFromIDParameter(self, id):
+ """ find partners from ID"""
+ par=self.ZopeFind(self.partners, obj_ids=[id])
+ return par
+
+
+
def manage_addECHO_root(self,id,title,RESPONSE=None):
"""Add an ECHO_root"""
self._setObject(id,ECHO_root(id,title))
@@ -2298,11 +2667,12 @@ class ECHO_copyrightType(Folder):
meta_type="ECHO_copyrightType"
- def __init__(self,id,title,label):
+ def __init__(self,id,title,label,url):
"""init"""
self.id=id
self.title=title
self.label=label
+ self.url=url
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'ECHO_copyrightType_config_mainForm'},
@@ -2314,10 +2684,11 @@ class ECHO_copyrightType(Folder):
pt.content_type="text/html"
return pt()
- def ECHO_copyrightType_config_main(self,title,label,RESPONSE=None):
+ def ECHO_copyrightType_config_main(self,title,label,url,RESPONSE=None):
"""change"""
self.title=title
self.label=label
+ self.url=url
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -2328,10 +2699,10 @@ def manage_addECHO_copyrightTypeForm(sel
return pt()
-def manage_addECHO_copyrightType(self,id,title,label,RESPONSE=None):
+def manage_addECHO_copyrightType(self,id,title,label,url,RESPONSE=None):
"""addaresource"""
- newObj=ECHO_copyrightType(id,title,label)
+ newObj=ECHO_copyrightType(id,title,label,url)
self._setObject(id,newObj)
@@ -2345,13 +2716,14 @@ class ECHO_partner(Image,Persistent):
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.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)
@@ -2363,12 +2735,13 @@ 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"""
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')
@@ -2388,7 +2761,7 @@ 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):
"""
Add a new ECHO_partner object.
@@ -2407,7 +2780,7 @@ def manage_addECHO_partner(self, id,file
self=self.this()
# 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
# can use a database trick to make the upload more efficient.