CSW / Fix query when user is authenticated and not admin

* Fix java.util.MissingFormatArgumentException: Format specifier '%d'
* Fix operation filter `-1` was excluding public record ie. not 1
* Fix combination OR/AND with isTemplate criteria

Author: fxprunayre

core/src/main/java/org/fao/geonet/kernel/search/EsFilterBuilder.java

@@ -37,19 +37,21 @@ private String buildPermissionsFilter(ServiceContext context) throws Exception {
         } else {
             // op0 (ie. view operation) contains one of the ids of your groups
             Set<Integer> groups = accessManager.getUserGroups(userSession, context.getIpAddress(), false);
-            final String ids = groups.stream().map(Object::toString)
+            final String ids = groups.stream()
+                .map(Object::toString)
+                .map(e -> e.replace("-", "\\\\-"))
                 .collect(Collectors.joining(" OR "));
             String operationFilter = String.format("op%d:(%s)", ReservedOperation.view.getId(), ids);
 
 
             String ownerFilter = "";
             if (userSession.getUserIdAsInt() > 0) {
                 // OR you are owner
-                ownerFilter = String.format("owner:%d");
+                ownerFilter = String.format("owner:%d", userSession.getUserIdAsInt());
                 // OR member of groupOwner
                 // TODOES
             }
-            return String.format("%s %s", operationFilter, ownerFilter).trim();
+            return String.format("(%s %s)", operationFilter, ownerFilter).trim();
         }
     }
     /**