Commit 8cc32a40 authored by Piotr Gawron's avatar Piotr Gawron

Merge branch 'disable-ctd-caching' into 'devel_13.1.x'

cache of chemical database is disabled due to IP blockng policy from ctd

See merge request !815
parents c8ad25d9 305737d8
Pipeline #11146 passed with stage
in 8 minutes and 41 seconds
minerva (13.1.0~beta.2) unstable; urgency=low
* Bug fix: due to blocking of our requests from ctdbase the autocomplete for
this database is disabled
-- Piotr Gawron <piotr.gawron@uni.lu> Fri, 12 Jun 2019 17:00:00 +0200
minerva (13.1.0~beta.1) unstable; urgency=low minerva (13.1.0~beta.1) unstable; urgency=low
* Small improvement: model_name renamed to map_name in data overlay columns * Small improvement: model_name renamed to map_name in data overlay columns
(#827) (#827)
......
...@@ -687,7 +687,8 @@ public class ChemicalParser extends CachableInterface implements IExternalServic ...@@ -687,7 +687,8 @@ public class ChemicalParser extends CachableInterface implements IExternalServic
String cachedData = getCacheValue(cacheQuery); String cachedData = getCacheValue(cacheQuery);
List<String> result; List<String> result;
if (cachedData == null) { if (cachedData == null) {
result = getSuggestedQueryListWithoutCache(project, diseaseMiriam); // result = getSuggestedQueryListWithoutCache(project, diseaseMiriam);
result = new ArrayList<>();
cachedData = StringUtils.join(result, "\n"); cachedData = StringUtils.join(result, "\n");
setCacheValue(cacheQuery, cachedData); setCacheValue(cacheQuery, cachedData);
} else { } else {
......
...@@ -863,13 +863,15 @@ public class ProjectService implements IProjectService { ...@@ -863,13 +863,15 @@ public class ProjectService implements IProjectService {
updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_MIRIAM, progress, params); updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_MIRIAM, progress, params);
} }
}); });
chemicalService.cacheDataForModel(originalModel, new IProgressUpdater() { logger.warn("Cache of chemicals data is disabled");
@Override
public void setProgress(double progress) { // chemicalService.cacheDataForModel(originalModel, new IProgressUpdater() {
updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_CHEMICAL, progress, params); // @Override
} // public void setProgress(double progress) {
}); // updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_CHEMICAL, progress, params);
// }
// });
drugService.cacheDataForModel(originalModel, new IProgressUpdater() { drugService.cacheDataForModel(originalModel, new IProgressUpdater() {
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment