Merge branch '1252-hgnc-id' into 'devel_14.0.x'

remove prefix from hgnc symbol

See merge request !1156

CHANGELOG

 minerva (14.0.13) stable; urgency=medium
   * Bug fix: chrome modified default css and service looked ugly in chrome
     (#1260)
+  * Bug fix: uploaded HGNC identifiers that looks like "HGNC:HGNC:1234" are
+    changed to "HGNC:1234" (#1252)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 3 Jun 2020 17:00:00 +0200
 

model/src/main/java/lcsb/mapviewer/model/map/MiriamData.java

@@ -177,6 +177,11 @@ public class MiriamData implements Comparable<MiriamData>, Serializable {
       this.resource = null;
     } else {
       this.resource = resource.replace("%3A", ":");
+      if (this.dataType == MiriamType.HGNC && this.resource.toLowerCase().startsWith("hgnc:")) {
+        String newResource = this.resource.substring(5);
+        logger.debug("hgnc identifier: \"" + this.resource + "\" is changed to: \"" + newResource + "\"");
+        this.resource = newResource;
+      }
     }
   }
 

model/src/test/java/lcsb/mapviewer/model/map/MiriamDataTest.java

@@ -79,4 +79,11 @@ public class MiriamDataTest extends ModelTestFunctions {
     md2.setAnnotator(Integer.class);
     assertTrue(md1.compareTo(md2) == 0);
   }
+  
+  @Test
+  public void testHgncIdWithPrefix() {
+    assertEquals(new MiriamData(MiriamType.HGNC,"1234"), new MiriamData(MiriamType.HGNC,"HGNC:1234"));
+  }
+
+  
 }