RM-6318: Search for "derived by" and classification reasons: Automate AC

This commit is contained in:
jcule
2018-05-21 13:38:21 +01:00
parent 398d7c2f14
commit 89fefe1747
2 changed files with 13 additions and 12 deletions

View File

@@ -65,8 +65,7 @@ public class SearchAPI extends BaseAPI
/** RM document search filters */
private static final String RM_DEFAULT_RECORD_FILTERS =
"records/true,undeclared/true,vital/false,folders/false,categories/false,frozen/false,cutoff/false";
"records/true,undeclared/true,vital/false,folders/{0},categories/{1},frozen/false,cutoff/false";
/**
* Perform search request on search endpoint as a user.
* <p>
@@ -120,7 +119,7 @@ public class SearchAPI extends BaseAPI
}
/**
* Search as a user for records on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted
* Search as a user for nodes on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted
* by sortby
* <br>
* If more fine-grained control of search parameters is required, use rmSearch() directly.
@@ -131,12 +130,12 @@ public class SearchAPI extends BaseAPI
* @return list of record names
*/
public List<String> searchForRecordsAsUser(
String username,
String password,
String query,
String sortby)
String username, String password,
String query, String sortby,
Boolean includeCategories, Boolean includeFolders)
{
return getItemNames(rmSearch(username, password, "rm", query, RM_DEFAULT_RECORD_FILTERS, sortby));
String searchFilterParamaters = MessageFormat.format(RM_DEFAULT_RECORD_FILTERS, Boolean.toString(includeFolders), Boolean.toString(includeCategories));
return getItemNames(rmSearch(username, password, "rm", query, searchFilterParamaters, sortby));
}
/**