Changeset 3550

Timestamp:

04/25/08 06:51:35 (4 months ago)

Author:

cboos

Message:

DoxygenPlugin: applied r3375 to the 0.11 branch (should fix #798)

Files:

• doxygenplugin/0.11/doxygentrac/doxygentrac.py (modified) (6 diffs)

doxygenplugin/0.11/doxygentrac/doxygentrac.py

@@ -202 +202 @@
-            # Search in documentation directories
-            path = os.path.join(self.base_path, doc)
+            path = os.path.join(path, self.html_output)
-            if os.path.isdir(path):
-                index = os.path.join(path, 'search.idx')
@@ -213 +214 @@
-
-            # Search in common documentation directory
-
+
+
-            if os.path.exists(index):
-                creation = os.path.getctime(index)
@@ -347 +349 @@
-    def _search_in_documentation(self, doc, keywords):
-        # Open index file for documentation
-
+self.html_output, 
-        if os.path.exists(index):
-            fd = open(index)
@@ -393 +395 @@
-                    for i in range(numDocs):
-                        idx = self._readInt(fd)
-
+
+
+
+
-                        results.append({'idx': idx, 'freq': freq >> 1,
-                          'hi': freq & 1, 'multi': multiplier})
@@ -403 +408 @@
-
-                    for i in range(numDocs):
+                        if results[count]['idx'] == -1:
+                            results[count]['name'] = ''
+                            results[count]['url'] = ''
+                            count += 1
+                            continue
-                        fd.seek(results[count]['idx'])
-                        name = self._readString(fd)
-                        url = self._readString(fd)
-                        results[count]['name'] = name
-
+self.html_output + '/' + 
-                        count += 1
-
@@ -441 +451 @@
-        b3 = fd.read(1)
-        b4 = fd.read(1)
+        
+        if not b1 or not b2 or not b3 or not b4:
+            return -1;
-
-        return (ord(b1) << 24) | (ord(b2) << 16) | (ord(b3) << 8) | ord(b4)