Merge branch 'devel_11.1.x' into 'master'

11.0.5 and 11.0.6 merged into master

Closes #241

See merge request piotr.gawron/minerva!151

CHANGELOG

+minerva (11.0.6) stable; urgency=medium
+  * Bug fix: fix a bug when entering invalid mirna id
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 14 Dec 2017 16:00:00 +0200
+ 
+minerva (11.0.5) stable; urgency=medium
+  * Bug fix: fix on connection to drugbank database
+  * Bug fix: posttranslational modification data was sometimes unavailable
+    in search results panel
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 30 Nov 2017 16:00:00 +0200
+
 minerva (11.0.4) stable; urgency=medium
   * Bug fix: fix on connection to taxonomy database
   * Bug fix: color coding for reactions (wrong color was chosen)
@@ -27,7 +39,7 @@ minerva (11.0.1) stable; urgency=medium
 
 minerva (11.0.0) stable; urgency=medium
 
-  * Bug fix: security issue - access to specific map can be restricted 
+  * Bug fix: security issue - access to specific map can be restricted
     by the user login
   * Bug fix: sbgn import
   * Bug fix: mesh connector

annotation/src/main/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParser.java

@@ -765,4 +765,4 @@ public class DrugbankHTMLParser extends DrugAnnotation implements IExternalServi
     super.setWebPageDownloader(webPageDownloader);
   }
 
-}
+}
\ No newline at end of file

persist/src/db/11.0.5/fix_db_20171109.sql

+---clear drugbank cache 
+delete from cachequery where type = (select iddb from cache_type where classname='lcsb.mapviewer.annotation.services.DrugbankHTMLParser');

persist/src/db/11.0.6/fix_db_20171214.sql

+-- empty file to force directory to be commited to git repo

service/src/main/java/lcsb/mapviewer/services/search/db/mirna/MiRNAService.java

@@ -110,11 +110,14 @@ public class MiRNAService extends DbSearchService implements IMiRNAService {
 			List<String> names = new ArrayList<>();
 			names.add(name);
 			List<MiRNA> miRNAs = miRNAParser.getMiRnasByNames(names);
-			return miRNAs.get(0);
+                        if (miRNAs.size() > 0) {
+                            return miRNAs.get(0);
+                        }
+			return null;
 			// return miRNAViewFactory.create(miRNAs.get(0),
 			// searchCriteria.getModel(), searchCriteria.getColorSet());
 		} catch (MiRNASearchException e) {
-			logger.error("Probleml with accessing mirna database", e);
+			logger.error("Problem with accessing mirna database", e);
 			return null;
 		}
 	}