Changeset 1715

Timestamp:

27.10.2011 22:01:19 (7 months ago)

Author:

zmsdev

Message:

Added support for anchors in ZMS internal-links: e.g. {$e1/e2#a3} provide details to link-object.

Location:

ZMS/trunk

Files:

• _objattrs.py (modified) (3 diffs)
• _zreferableitem.py (modified) (6 diffs)

ZMS/trunk/_objattrs.py

@@ -617 +617 @@
         try:
           old = value
-          ref_obj = self.getLinkObj(value)
-          if ref_obj is not None:
-            # Repair link.
-            value = self.getRefObjPath( ref_obj)
-          elif value.find('{$__') < 0:
-            # Broken link.
-            value = '{$__' + value[2:-1] + '__}'
+          value = self.validateLinkObj(value)
           set = old != value
         except:
@@ -986 +980 @@
       #-- Url-Fields
       if datatype == _globals.DT_URL and v.startswith('{$') and not v.startswith('{$__') and self.getConfProperty('ZMS.InternalLinks.autocorrection',0)==1:
-        ref_obj = self.getLinkObj(v)
-        if ref_obj is not None:
-          # Repair link.
-          v = self.getRefObjPath(ref_obj)
-        elif v.find('{$') == 0 and v.find('{$__') < 0:
-          # Broken link.
-          v = '{$__' + v[2:-1] + '__}'
+        v = self.validateLinkObj(v)
       
       # Hook for custom formatting.
@@ -1178 +1166 @@
         if ref_obj is not None:
           ref_obj.registerRefObj(self,self.REQUEST)
-          # Repair link.
-          value = self.getRefObjPath(ref_obj)
-        elif value.startswith('{$') and not value.startswith('{$__'):
-          # Broken link.
-          value = '{$__' + value[2:-1] + '__}'
+        value = self.validateLinkObj(value)
       
       #-- Notify metaobj_manager.

ZMS/trunk/_zreferableitem.py

@@ -140 +140 @@
   #  ZReferableItem.getRefObjPath:
   # ----------------------------------------------------------------------------
-  def getRefObjPath(self, ob):
+  def getRefObjPath(self, ob, anchor=''):
     ref = ''
     if ob is not None:
@@ -160 +160 @@
             s += clientId
           path = s + '@' + path
-      ref = '{$' + path + '}'
+      ref = '{$' + path + anchor + '}'
     return ref
 
@@ -423 +423 @@
 
   # ----------------------------------------------------------------------------
+  #  ZReferableItem.validateLinkObj:
+  #
+  #  Validates internal links.
+  # ----------------------------------------------------------------------------
+  def validateLinkObj(self, url):
+    if url.startswith('{$') and not url.startswith('{$__'):
+      ref_obj = self.getLinkObj(url)
+      ref_anchor = ''
+      if url.find('#') > 0:
+        ref_anchor = url[url.find('#'):-1]
+      if ref_obj is not None:
+        # Repair link.
+        url = self.getRefObjPath( ref_obj, ref_anchor)
+      else:
+        # Broken link.
+        url = '{$__' + url[2:-1] + '__}'
+    return url
+
+
+  # ----------------------------------------------------------------------------
   #  ZReferableItem.getLinkObj:
   #
@@ -430 +450 @@
     ob = None
     if isInternalLink(url):
-      if url.find('{$__') != 0:
+      if not url.startswith('{$__'):
         docElmnt = None
         path = url[2:-1]
+        i = path.find('#')
+        if i > 0:
+          path = path[:i]
         i = path.find('@')
         if i > 0:
@@ -467 +490 @@
     REQUEST = _globals.nvl( REQUEST, self.REQUEST)
     if isInternalLink(url):
+      ref_anchor = ''
+      if url.find('#') > 0:
+        ref_anchor = url[url.find('#'):-1]
       ob = self.getLinkObj(url,REQUEST)
       if ob is None:
@@ -474 +500 @@
         if index_html == '':
           index_html = ob.getHref2IndexHtml(REQUEST)
-      return index_html
+      return index_html + ref_anchor
     elif isMailLink (url): 
       prefix = 'mailto:'