From 305737d883ce034483e2ebe8ba8d85659d372e5b Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 12 Jun 2019 12:35:53 +0200
Subject: [PATCH] cache of chemical database is disabled due to IP blockng
policy from ctd
---
CHANGELOG | 6 ++++++
.../annotation/services/ChemicalParser.java | 3 ++-
.../mapviewer/services/impl/ProjectService.java | 16 +++++++++-------
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index eb71d783ae..fa320caa67 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+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
* Small improvement: model_name renamed to map_name in data overlay columns
(#827)
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java b/annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java
index 3277764f58..d4601ae308 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/services/ChemicalParser.java
@@ -687,7 +687,8 @@ public class ChemicalParser extends CachableInterface implements IExternalServic
String cachedData = getCacheValue(cacheQuery);
List<String> result;
if (cachedData == null) {
- result = getSuggestedQueryListWithoutCache(project, diseaseMiriam);
+// result = getSuggestedQueryListWithoutCache(project, diseaseMiriam);
+ result = new ArrayList<>();
cachedData = StringUtils.join(result, "\n");
setCacheValue(cacheQuery, cachedData);
} else {
diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
index 7e1d6149ef..298daf77db 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
@@ -863,13 +863,15 @@ public class ProjectService implements IProjectService {
updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_MIRIAM, progress, params);
}
});
-
- chemicalService.cacheDataForModel(originalModel, new IProgressUpdater() {
- @Override
- public void setProgress(double progress) {
- updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_CHEMICAL, progress, params);
- }
- });
+
+ logger.warn("Cache of chemicals data is disabled");
+
+// chemicalService.cacheDataForModel(originalModel, new IProgressUpdater() {
+// @Override
+// public void setProgress(double progress) {
+// updateProjectStatus(originalModel.getProject(), ProjectStatus.CACHING_CHEMICAL, progress, params);
+// }
+// });
drugService.cacheDataForModel(originalModel, new IProgressUpdater() {
@Override
--
GitLab