ToC Macro doesn't work with relative links

[Jim Sermersheim]

The second ToC here does not work -- gives "Error: Page ./sub does not exist"

[[TOC(inline,noheading,depth=1, test/sub, test/sub2)]]

[[TOC(inline,noheading,depth=1, ./sub, ./sub2)]]

[./sub sub][[BR]]
[./sub2 sub2]

Note that the first ToC works (but I need relative links) as do the relative links at the bottom.

[Duane Buss]

A dirty hack for jimse was to insert the following code at the bottom of expandmacro()

for pagename in pagenames:

new if pagename.startswith('.'): new rel_url = get_relative_url(self.env, self.resource, self.context.href, pagename) new pagename = rel_url.lstrip(self.context.href.base+'/'+self.resource.realm)

page_resource = self.resource(id=pagename) if not 'WIKI_VIEW' in self.context.perm(page_resource):

# Not access to the page, so should not be included continue

if 'title_index' in params:

self._render_title_index(ol, page_resource, active and \

pagename == current_page, paramsmin_depth? < 2)

else:

self._render_page_outline(ol, page_resource, active, params)

return base

[Duane Buss]

      for pagename in pagenames:
            // the three lines below this comment are new
            if pagename.startswith('.'):
               rel_url = get_relative_url(self.env, self.resource,  self.context.href, pagename)
               pagename = rel_url.lstrip(self.context.href.base+'/'+self.resource.realm)
            page_resource = self.resource(id=pagename)
            if not 'WIKI_VIEW' in self.context.perm(page_resource):
                # Not access to the page, so should not be included
                continue
            if 'title_index' in params:
                self._render_title_index(ol, page_resource, active and \
                            pagename == current_page,
                            params['min_depth'] < 2)
            else:
                self._render_page_outline(ol, page_resource, active, params)
        return base

[anonymous]

Please attach patches as unified diffs (diff -u or svn diff)

[Duane Buss]

It's not a diff because I don't think that is the perfect fix. A better fix would be to have a relative resource id generator function in trac which could be used.