Advanced Search does not work correctly with multiple categories

[rpremuz]

In <<AdvancedSearch>> macro (used on FindPage) you can select multiple categories (with Ctrl + click). In case of such a selection I would expect that the user wants to search pages that have all of the selected categories.

Currently (MoinMoin 1.9.10), if you select categories CategoryCat1 and CategoryCat2, the macro creates search query that includes the following expression:
category:CategoryCat1,CategoryCat2
which does not return expected result.

Instead, the search query should include the following expression:
(category:CategoryCat1 category:CategoryCat2)
which correctly finds pages that have both categories. I tested this by using the expression in the MoinMoin default search field (top right).

Could someone improve the macro to work correctly with multiple categories selected? I had a look at MoinMoin/macro/AdvancedSearch.py but my knowledge of Python is not sufficient to make necessary changes.

[ThomasWaldmann]

IIRC I had a quick look once, but it didn't look easy to solve.