--- ECHO_content/ECHO_helpers.py 2008/08/21 07:44:56 1.88
+++ ECHO_content/ECHO_helpers.py 2008/12/04 21:27:00 1.94
@@ -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,27 @@ class ECHO_basis:
management_page_charset="utf-8"
isVisible = True
+ # Managment for the PID
+ def setPID(self,pid):
+ """set the pid"""
+ self.pid=pid
+ return True
+
+ def getPID(self):
+ """get the pid"""
+ return getattr(self,'pid',None)
+
+ 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"""
@@ -207,6 +232,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 +450,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 +487,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 +523,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 +688,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)
@@ -1229,6 +1284,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