Bug 707278 - Grouping of results fail when using built-in javascript search

Dimitri van Heesch · Dimitri van Heesch · commit 0615b1b023f7 · 2016-12-18T14:59:11.000+01:00
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
@@ -1263,10 +1263,10 @@ SearchIndexList::~SearchIndexList()
 
 void SearchIndexList::append(Definition *d)
 {
-  SearchDefinitionList *l = find(d->name());
+  QCString dispName = d->localName();
+  SearchDefinitionList *l = find(dispName);
   if (l==0)
   {
-    QCString dispName = d->localName();
     if (d->definitionType()==Definition::TypeGroup)
     {
       dispName = ((GroupDef*)d)->groupTitle();
@@ -1276,7 +1276,7 @@ void SearchIndexList::append(Definition *d)
       dispName = ((PageDef*)d)->title();
     }
     l=new SearchDefinitionList(searchId(dispName),dispName);
-    SDict< SearchDefinitionList >::append(d->name(),l);
+    SDict< SearchDefinitionList >::append(dispName,l);
   }
   l->append(d);
 }

Original file line number	Diff line number	Diff line change
`@@ -1263,10 +1263,10 @@ SearchIndexList::~SearchIndexList()`
`1263`	`1263`
`1264`	`1264`	`void SearchIndexList::append(Definition *d)`
`1265`	`1265`	`{`
`1266`		`- SearchDefinitionList *l = find(d->name());`
	`1266`	`+ QCString dispName = d->localName();`
	`1267`	`+ SearchDefinitionList *l = find(dispName);`
`1267`	`1268`	`if (l==0)`
`1268`	`1269`	`{`
`1269`		`- QCString dispName = d->localName();`
`1270`	`1270`	`if (d->definitionType()==Definition::TypeGroup)`
`1271`	`1271`	`{`
`1272`	`1272`	`dispName = ((GroupDef*)d)->groupTitle();`
`@@ -1276,7 +1276,7 @@ void SearchIndexList::append(Definition *d)`
`1276`	`1276`	`dispName = ((PageDef*)d)->title();`
`1277`	`1277`	`}`
`1278`	`1278`	`l=new SearchDefinitionList(searchId(dispName),dispName);`
`1279`		`- SDict< SearchDefinitionList >::append(d->name(),l);`
	`1279`	`+ SDict< SearchDefinitionList >::append(dispName,l);`
`1280`	`1280`	`}`
`1281`	`1281`	`l->append(d);`
`1282`	`1282`	`}`