BibIndex: infinite loop in beautify_range_list

* Fixes infinite loop in beautify_range_list() function that was triggered in particular conditions. Signed-off-by: Samuele Kaplun <[email protected]>
kaplun · Jul 21, 2015 · 64333fe · 64333fe
1 parent 799cf16
commit 64333fe
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/modules/bibindex/lib/bibindex_engine.py b/modules/bibindex/lib/bibindex_engine.py
@@ -394,20 +394,10 @@ def create_range_list(res):
 
 def beautify_range_list(range_list):
     """Returns a non overlapping, maximal range list"""
-    ret_list = []
-    for new in range_list:
-        found = 0
-        for old in ret_list:
-            if new[0] <= old[0] <= new[1] + 1 or new[0] - 1 <= old[1] <= new[1]:
-                old[0] = min(old[0], new[0])
-                old[1] = max(old[1], new[1])
-                found = 1
-                break
-
-        if not found:
-            ret_list.append(new)
-
-    return ret_list
+    tmp_list = intbitset()
+    for range in range_list:
+        tmp_list |= intbitset(xrange(range[0], range[1]+1))
+    return create_range_list(tmp_list)
 
 
 def truncate_index_table(index_name):