Revision 59277452
Added by Patrick Plitzner over 5 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java | ||
|---|---|---|
| 163 | 163 |
searchJob = Job.create(jobLabel, (ICoreRunnable) monitor -> {
|
| 164 | 164 |
monitor.beginTask(jobLabel, IProgressMonitor.UNKNOWN); |
| 165 | 165 |
int pageNumber = 0; |
| 166 |
List<T> entities = listEntities(configurator);
|
|
| 167 |
while(!entities.isEmpty()){
|
|
| 168 |
if(monitor.isCanceled()){
|
|
| 169 |
break;
|
|
| 170 |
}
|
|
| 171 |
configurator.setPageNumber(pageNumber);
|
|
| 172 |
entities = listEntities(configurator);
|
|
| 173 |
model.addAll(entities);
|
|
| 174 |
pageNumber++;
|
|
| 175 |
Collections.sort(model, queryComparator);
|
|
| 176 |
}
|
|
| 166 |
List<T> entities; |
|
| 167 |
do {
|
|
| 168 |
if (monitor.isCanceled()) {
|
|
| 169 |
break;
|
|
| 170 |
}
|
|
| 171 |
configurator.setPageNumber(pageNumber);
|
|
| 172 |
entities = listEntities(configurator);
|
|
| 173 |
model.addAll(entities);
|
|
| 174 |
pageNumber++;
|
|
| 175 |
Collections.sort(model, queryComparator);
|
|
| 176 |
} while (!entities.isEmpty());
|
|
| 177 | 177 |
monitor.done(); |
| 178 | 178 |
}); |
| 179 | 179 |
searchJob.schedule(); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java | ||
|---|---|---|
| 177 | 177 |
public List<User> findUsers(IIdentifiableEntityServiceConfigurator configurator){
|
| 178 | 178 |
String userNameSearchString = sqlizeTitleSearchString(configurator); |
| 179 | 179 |
// TODO why are users not identifiable entities? |
| 180 |
List<User> records = CdmStore.getService(IUserService.class).listByUsername(userNameSearchString, null, null, null, null, null, null); |
|
| 181 |
addUuidSearchResults(records, configurator, IUserService.class); |
|
| 180 |
List<User> records = CdmStore.getService(IUserService.class).listByUsername(userNameSearchString, |
|
| 181 |
configurator.getMatchMode(), configurator.getCriteria(), configurator.getPageSize(), |
|
| 182 |
configurator.getPageNumber(), configurator.getOrderHints(), configurator.getPropertyPaths()); |
|
| 183 |
addUuidSearchResults(records, configurator, IUserService.class); |
|
| 182 | 184 |
return records; |
| 183 | 185 |
} |
| 184 | 186 |
|
| ... | ... | |
| 186 | 188 |
public List<Group> findGroups(IIdentifiableEntityServiceConfigurator configurator){
|
| 187 | 189 |
String groupNameSearchString = sqlizeTitleSearchString(configurator); |
| 188 | 190 |
// TODO why are groups not identifiable entities? |
| 189 |
List<Group> records = CdmStore.getService(IGroupService.class).listByName(groupNameSearchString, null, null, null, null, null, null); |
|
| 190 |
addUuidSearchResults(records, configurator, IGroupService.class); |
|
| 191 |
List<Group> records = CdmStore.getService(IGroupService.class).listByName(groupNameSearchString, |
|
| 192 |
configurator.getMatchMode(), configurator.getCriteria(), configurator.getPageSize(), |
|
| 193 |
configurator.getPageNumber(), configurator.getOrderHints(), configurator.getPropertyPaths()); |
|
| 194 |
addUuidSearchResults(records, configurator, IGroupService.class); |
|
| 191 | 195 |
return records; |
| 192 | 196 |
} |
| 193 | 197 |
|
Also available in: Unified diff
ref #6321 Fix search service invocation for users and groups