Changeset 1244

Timestamp:

09/05/06 01:38:34 (2 years ago)

Author:

cboos

Message:

DoxygenPlugin:

Follow-up to r1226, as the applied patch was mostly work in progress. The basic functionality is now restored, and the plugin seems to be usable.

Files:

• doxygenplugin/0.10 (modified) (1 prop)
• doxygenplugin/0.10/doxygentrac (modified) (1 prop)
• doxygenplugin/0.10/doxygentrac/doxygentrac.py (modified) (9 diffs)

doxygenplugin/0.10/doxygentrac/doxygentrac.py

@@ -80 +80 @@
-        if req.perm.has_permission('DOXYGEN_VIEW'):
-            # Return mainnav buttons.
-\
-html.a(self.title, href = 
+html.a(self.title,
+                             href=
-
-    # IRequestHandler methods
-
-    def match_request(self, req):
-        # Match documentation request.
-        if re.match(r'^/doxygen(?:$|/)', req.path_info):
-if 'path' not in req.args:
-    segments = filter(None, req.path_info.split('/'))
-    segments = segments[1:] # ditch 'doxygen'
-    action, path, link = self._doxygen_lookup(segments)
-    if action
-    req.args['action'] = action
-        if action == 'search' and path
-        req.args['query'] = path
-        
+segments = filter(None, req.path_info.split('/'))
+segments = segments[1:] # ditch 'doxygen'
+action, path, link = self._doxygen_lookup(segments)
+req.args['action'] = action
+if action == 'search' and link
+req.args['query'] = link
+elif action == 'redirect'
+req.args['link'] = link
+
-            return True
-            
@@ -105 +104 @@
-        path = req.args.get('path')
-        action = req.args.get('action')
-
-
+
+
+
+
-
-        # Redirect search requests.
@@ -112 +113 @@
-            req.redirect(req.href.search(q=req.args.get('query'),
-                                         doxygen='on'))
+        if action == 'redirect':
+            if link: # we need to really redirect if there is a link
+                if path:
+                    req.redirect(req.href.doxygen(path=path)+link)
+                else:
+                    req.redirect(req.href.doxygen(link))
+            else:
+                self.log.warn("redirect without link")
-
-        # Handle /doxygen request
@@ -125 +134 @@
-            path = os.path.join(self.base_path, self.default_doc, self.index)
-
-or redirect
+
-        mimetype = mimetypes.guess_type(path)[0]
-        if mimetype == 'text/html':
@@ -185 +194 @@
-        def doxygen_link(formatter, ns, params, label):
-            action, path, link = self._doxygen_lookup(params.split('/'))
-
+
+
+
+
+
+
+
+
+
+
-                return html.a(label, title=params,
-                              href=formatter.href.doxygen(link, path=path))
@@ -206 +224 @@
-         - `path` is the location on disk of the resource.
-         - `link` is the link to the resource, relative to the
-,
+ or a target in case of 'redirect'
-        """
-        doc, file = segments[:-1], segments and segments[-1]
-
+
+
+
+
+
+
+
+
+
+
+
+
-        def lookup(file, category='undefined'):
+            """Build (full path, relative link) and check if path exists."""
-            path = os.path.join(self.base_path, doc, file)
-            self.log.debug('%s file "%s" (at %s)' % (category, file, path))
-            return os.path.exists(path) and path, doc + '/' + file
-
-        if not file:
-            path, link = lookup('index.html', 'index')
-            return 'index', path, link
-
-        self.log.debug('looking up "%s" in documentation "%s"' % (file, doc))
-
-        # Direct request for searching
-        if file == 'search.php':
-
+ # keep existing 'query' arg
-
-        # Request for a documentation file.
@@ -232 +258 @@
-                return 'view', path, link
-            else:
-file, Non
+None, fil
-
-        # Request for source file documentation.
@@ -244 +270 @@
-                return 'view', path, link
-            else:
-file, Non
+None, fil
-
-        # Request for summary pages
@@ -270 +296 @@
-            name = result['name']
-            if name == file or name == class_ref:
-
-
+
+
+
+
+
+
+
-        self.log.debug('%s not found in %s' % (file, doc))
-file, Non
+None, fil
-
-    def _search_in_documentation(self, doc, keywords):