--- ECHO_content/ECHO_helpers.py 2008/08/21 07:44:56 1.88 +++ ECHO_content/ECHO_helpers.py 2009/04/14 16:31:27 1.97 @@ -27,6 +27,10 @@ def logger(txt,method,txt2): displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','extVersionedFileFolder','ECHO_movie'] +def normalizeCt(str): + """normalizes content_type""" + #str= str.replace(" ","_") + return str.replace("-"," ").lower() #decode and compress for xmlrpc communication with OSAS_server @@ -84,6 +88,35 @@ class ECHO_basis: management_page_charset="utf-8" isVisible = True + # Managment for the PID + def setPID(self,pid): + """set the pid""" + logging.debug(self.getID()+" PID set to "+pid) + self.pid=pid + return True + + def getPID(self): + """get the pid""" + + pid =getattr(self,'pid',None) + + if pid == self.getParentPID(): + return None + else: + return pid + + + def getParentPID(self): + """get the PID of the parent""" + parent = self.aq_parent + + pidF = getattr(parent,'getPID',None) + + if pidF is None: + return None + + else: + return pidF() def unicodify(self, s): """return unicode object for string (utf-8 or latin1) or unicode object s""" @@ -109,7 +142,8 @@ class ECHO_basis: def showRDF(self): """showrdf""" self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml') - ret="""\n\n""" + ret="""\n\n""" ret+=self.getRDF(urn="echo:collectionroot")+"\n" @@ -172,8 +206,8 @@ class ECHO_basis: nurn=self.absolute_url()+'/showMetaDataXML' ret+=getRDFDescription(self,self.absolute_url()+'/showMetaDataXML',urn=nurn,nameDef="Metadata",typeName="ECHO_metaData") + return ret - def content_html_XMLRpc(self): """xml_rpc_version""" return encodeRPC(self.content_html()) @@ -207,6 +241,12 @@ class ECHO_basis: return self.isVisible return True + def getDescription(self): + """get content of description field""" + + + return self.unicodify(getattr(self,'description','')); + def getTitle(self): """title""" if hasattr(self,'getLanguage'): @@ -419,20 +459,33 @@ class ECHO_basis: """generate map link""" bt = BrowserCheck(self) id = ob.getFullId() - link = ob.getLinkId() + url = ob.getTargetUrl() + if url == "": + # ECHOResource with empty link -> no link + href = 'href="#" onclick="return false;"' + else: + href = 'href="%s"'%ob.getLinkId() + + if target is None: + targetattr = "" + else: + targetattr = 'target="%s"'%target + if text is None: text = ob.getLabel() + if text is None: text = "link" + tiptext = ob.getTip() tag = "" if bt.isN4: # N4 needs layer for highlighting - tag += '" else: # a-element - tag = '" @@ -443,6 +496,17 @@ class ECHO_basis: bt = BrowserCheck(self) id = ob.getFullId() link = ob.getLinkId() + url = ob.getTargetUrl() + if url == "": + # ECHOResource with empty link -> no link + href = 'href="#" onclick="return false;"' + else: + href = 'href="%s"'%ob.getLinkId() + + if target is None: + targetattr = "" + else: + targetattr = 'target="%s"'%target tiptext = ob.getTip() tag = "" @@ -468,7 +532,7 @@ class ECHO_basis: if float(rot) < 0: marksrc = circlesrc - tag += ''%(link,marksrc,rot) + tag += ''%(href,marksrc,rot) elif ob.isTypeText(): # N4 - Text tag += '
'%(id,id,id,link,target) + tag = ''%(id,id,id,href,targetattr) if ob.isTypeArrow(): # DOM - Arrow rot = ob.angle @@ -633,10 +697,10 @@ def getSubCols(self, sortfield=None, return cmp(x[0],y[0]) else: if type(x[0])==types.StringType: - tmpX=unicode(x[0]) + tmpX=unicodify(x[0]) tmpY=y[0] else: - tmpY=unicode(y[0]) + tmpY=unicodify(y[0]) tmpX=x[0] return cmp(tmpX,tmpY) @@ -758,7 +822,7 @@ def reloadMetaDataFromStorage(self,RESPO return ret -def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None): +def getRDFDescription(self,linkURL,urn=None,nameDef=None,typeName=None,ap=""): """rdf""" ret="" @@ -768,7 +832,14 @@ def getRDFDescription(self,linkURL,urn=N clickable="""%s""" #link="""""" type="""%s""" - #xlink="""""" + + #xlink="""""" + + if ap=="": + ap2="" + else: + ap2 = """%s"""%ap + if not urn: #urn="urn:"+re.sub('/',':',self.absolute_url()) urn=self.absolute_url() @@ -795,8 +866,9 @@ def getRDFDescription(self,linkURL,urn=N else: type2=type%typeName + #ret=about2+"\n"+name2+"\n"+link2+"\n"+type2+"\n"+clickable2+"\n" - ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n" + ret=about2+"\n"+name2+"\n"+type2+"\n"+clickable2+"\n"+ap2+"\n" return ret def getCopyrightsFromForm(self,argv): @@ -1229,6 +1301,21 @@ class MapArea(SimpleItem): return self.aq_parent.label or self.aq_parent.id return self.label + def getTargetUrl(self): + """returns the URL of the linked object""" + if hasattr(self, 'aq_parent'): + p = self.aq_parent + # ECHOResource and ECHOLink have 'link' attribute + if hasattr(p, 'link'): + if p.link is None: + # return empty string for empty link + return "" + else: + return p.link + + # return None for unknown type + return None + def setLabel(self, label): """sets the label""" self.label = label