From d2844eab4ec18b747c9fe8a666b800a9823a0c78 Mon Sep 17 00:00:00 2001 From: Ajit Singh Date: Wed, 18 Jul 2018 17:20:36 +0100 Subject: [PATCH 1/6] EvidenceView_generate_network_for_userGenes also remove score, QTL columns from GeneView and omit QTL column from EvidenceView --- .../src/main/webapp/html/css/style.css | 2 + .../main/webapp/html/image/reset_filter.png | Bin 0 -> 867 bytes .../webapp/html/image/reset_filter_hover.png | Bin 0 -> 931 bytes .../src/main/webapp/html/javascript/utils.js | 75 +++++++++++++++--- .../ondexlocal/OndexLocalDataSource.java | 10 ++- .../ondexlocal/OndexServiceProvider.java | 35 ++++++-- 6 files changed, 103 insertions(+), 19 deletions(-) create mode 100644 common/client-base/src/main/webapp/html/image/reset_filter.png create mode 100644 common/client-base/src/main/webapp/html/image/reset_filter_hover.png diff --git a/common/client-base/src/main/webapp/html/css/style.css b/common/client-base/src/main/webapp/html/css/style.css index d167e7737..a1682083d 100644 --- a/common/client-base/src/main/webapp/html/css/style.css +++ b/common/client-base/src/main/webapp/html/css/style.css @@ -684,6 +684,8 @@ a.contact-button :hover { /* Gene View: interactive evidence summary filter */ #evidenceSummary2 {cursor:pointer; padding-top:5px; padding-bottom:5px;} #loadingDiv_GeneView {float:right; color:darkOrange; font-size:15px; font-weight:bold; width:120px; height:25px; display:none;} +#revertGeneView.unhover { cursor:pointer; border: none; width:30px; height:30px; background:url("../image/reset_filter.png") no-repeat; } +#revertGeneView.hover { cursor:pointer; border: none; width:30px; height:30px; background:url("../image/reset_filter_hover.png") no-repeat; } /* Suggestor box */ /* #suggestor_search_area {} */ diff --git a/common/client-base/src/main/webapp/html/image/reset_filter.png b/common/client-base/src/main/webapp/html/image/reset_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..63b17f95e52fc39c3c714946602629344e64e1a6 GIT binary patch literal 867 zcmV-p1DyPcP)P000>X1^@s6#OZ}&00004b3#c}2nYxW zdPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn z4jTXf02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00P5FL_t(YOWjqy zOKNc#ezY{D5|Wajts)zA3Y6BSqQ-)zsHTX(O&UVd#Rl~+DBMJD#bTCJFzoW#V$1U^1K zltp9IP1o`9G5mf%N~ID^CX;-7dwavv(-XS8yW#P8u&}Uzfq?CdLX0sw- zFc{=pYilcPHXGjG-*I?&h~?#F?Ck6aR|_>o5{U$yPA8U@mhkZK00zvbudfe7Lqk%0 zic>5Y3}Sb8S9xloE5c6N+SFJU5IUEjbZf=U7 z9&|4 z+S=OS^?IcNn1X0Dsu+DlA`yAho_=48PH04k`T2Qtc6Oqrr3Kg5*O-}^K{}nrCcp$z;Ti_KS;)>V!X0b9ZfTZ_9je(Ac&FyNE?*4VWT=0_>P000>X1^@s6#OZ}&00004b3#c}2nYxW zdPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn z4jTXf02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00RR_L_t(YOWjpV zPZMDjJ=0EGN-O166~qOJB!CYv;L?ODai@tf!GsuBEF^9;n7Hx>sKliP;)1v^>dLs# zg#mS?hKLwLK^K|`2nqpeTRNrF)^n#NYG?XLl#ORGozA^?&UfxT-#1E{z!t-n{oPWO ztR%RS#L$$69~)^%!N^e$uZj^XhLV)L{-)#P<1p@gh~wes1UmdGpO!`-C`$5iHHlMC z!ieZ;cvJ z&sJEYpptR6X+D~QlUbY1aqzyzSq#^x8q8u8>?{+ zn<`S2(pX`~{u&kJpgJHqqsJ1EBP5c@JkN(H<00mWE~)dE z{n;vkiKL!R+3B`HVXnAkVoA?Ntnuc%j+wQjkzYr*iPLgndQwKsN4S$UzFUM}ez~3r z?wvown2Rk2M2 ztg}Mivuk)Nj`J@fhJ5L@poMM|Gsvu_vl~wc#8J1pyy$Cn8P9T2@PL#v>FR`Lth|h_ zl}vG+$d?&Ni$w82y9@pMtW^k#ezc}}#0Download as TAB delimited file
'; table = table + 'Select gene(s) and click "View Network" button to see the network.

'; table = table + '
'; - table = table + 'Max number of genes to show: '; + table = table + 'Max number of genes to show: '; table = table + ''; table = table + ''; @@ -955,7 +955,8 @@ var table = ""; // dynamic Evidence Summary to be displayed above Gene View table // table = table + interactive_summary_Legend; table = table + '
'+ interactive_summary_Legend + - ''+'
'; + ''+''; + table = table + '
'; table = table + ''; table = table + ''; @@ -970,11 +971,11 @@ var table = ""; table = table + ''; table = table + ''; } - //table = table + ''; - table = table + ''; + //table = table + ''; // hide TAXID (if single organism) + // table = table + ''; // hide score for now (18/07/18) // table = table + ''; // user yes/no; DISABLED (13/09/17) if(reference_genome == true){ //QTL - table = table + ''; + //table = table + ''; // hide QTL for now (18/07/18) } table = table + ''; table = table + ''; @@ -1134,7 +1135,7 @@ var table = ""; var select = ''; //table = table + gene + chr + start + end + score + withinQTL + usersList + evidence + select; - table = table + gene + geneName + taxid + chr + start + score + /*usersList +*/ withinQTL + evidence + select; + table = table + gene + geneName + taxid + chr + start + /*score + /*usersList +*/ /*withinQTL +*/ evidence + select; // hide score & QTL for now (18/07/18) table = table + ''; } table = table+''; @@ -1213,6 +1214,14 @@ var table = ""; // $("#loadingDiv_GeneView").css("display","none"); // clear }); + $("#revertGeneView").mouseenter(function(e) { + $("#revertGeneView").removeClass('unhover').addClass('hover'); + }); + + $("#revertGeneView").mouseout(function(e) { + $("#revertGeneView").removeClass('hover').addClass('unhover'); + }); + /* * if select all targets is checked find all targets and check them. */ @@ -1285,7 +1294,7 @@ function containsKey(keyToTest, array){ * Function * */ -function createEvidenceTable(text){ +function createEvidenceTable(text, keyword){ var table = ""; var summaryArr = new Array(); var summaryText = ''; @@ -1307,7 +1316,7 @@ function createEvidenceTable(text){ table = table + ''; table = table + ''; table = table + ''; - table = table + ''; + // table = table + ''; // hide QTL for now (18/07/18) table = table + ''; table = table + ''; table = table + ''; @@ -1332,10 +1341,28 @@ function createEvidenceTable(text){ } */ table = table + ''; table = table + ''; + //table = table + ''; - table = table + ''; - table = table + ''; // user genes - table = table + ''; + table = table + ''; // all genes + + // table = table + ''; // user genes + // user genes + var userGenes= 0; + if(values[4].length >0) { + userGenes= 1; // min. 1 user gene found + values[4]= values[4].trim(); + //keyword= keyword.replace(/"/g, ''').trim(); + if(values[4].includes(",")) { // multiple user genes found + userGenes= values[4].split(",").length; + } + table = table +''; // user genes + } + else { + userGenes= 0; + table = table + ''; // zero user genes + } + + // table = table + ''; // hide QTL for now (18/07/18) table = table + ''; //Calculates the summary box if (containsKey(values[0],summaryArr)){ @@ -1404,6 +1431,28 @@ function createEvidenceTable(text){ } } +/* + * Function + * Generates evidence's network for user genes. + * @author: Ajit Singh. + */ +function generate_UserGenes_EvidenceNetwork(evi_userGenes, keyword) { + var ug_list= []; + if(evi_userGenes.includes(",")) { + var vals= evi_userGenes.split(","); + for(var i=0; i < vals.length; i++) { + ug_list.push(vals[i]); + } + } + else { + ug_list.push(evi_userGenes); + } + + console.log("generate_UserGenes_EvidenceNetwork: api_url: "+ api_url +"/network ; keyword: "+ keyword +", ug_list: "+ ug_list); + // Generate Network + generateCyJSNetwork(api_url+'/network', {keyword:keyword, list:ug_list}); +} + /* * Function * diff --git a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java index 76b38d886..2334fae1b 100644 --- a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java +++ b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java @@ -212,7 +212,7 @@ from user gene list (Set userGenes) */ // temporary... /* String genomaps_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_genomaps.xml").toString(); - this.ondexServiceProvider.writeGenomapsFile(genomaps_filename, xmlGViewer); + this.ondexServiceProvider.writeResultsFile(genomaps_filename, xmlGViewer); */ log.debug("1.) Genomaps annotation "); @@ -223,11 +223,19 @@ from user gene list (Set userGenes) */ // Gene table file String geneTable = this.ondexServiceProvider.writeGeneTable(genes, userGenes, request.getQtl(), request.getListMode()); + // temporary... + String gv_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_GeneTable.tab").toString(); + this.ondexServiceProvider.writeResultsFile(gv_filename, geneTable); + log.debug("2.) Gene table "); // Evidence table file String evidenceTable = this.ondexServiceProvider.writeEvidenceTable(qtlnetminerResults.getLuceneConcepts(), userGenes, request.getQtl()); + // temporary... + String ev_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_EvidenceTable.tab").toString(); + this.ondexServiceProvider.writeResultsFile(ev_filename, evidenceTable); + log.debug("3.) Evidence table "); // Document count (only related with genes) diff --git a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java index b70dc0254..ea5b9b0bf 100644 --- a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java +++ b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexServiceProvider.java @@ -1840,7 +1840,7 @@ public String writeAnnotationXML(String api_url, ArrayList genes, } // temporary... - public void writeGenomapsFile(String filename, String sb_string) { + public void writeResultsFile(String filename, String sb_string) { try { BufferedWriter out = new BufferedWriter(new FileWriter(filename)); out.write(sb_string); @@ -2174,15 +2174,35 @@ public String writeEvidenceTable(HashMap luceneConcepts, Se Set listOfGenes = mapConcept2Genes.get(lc.getId()); Integer numberOfGenes = listOfGenes.size(); // Creates numberOfUserGenes and numberOfQTL - Integer numberOfUserGenes = 0; + //Integer numberOfUserGenes = 0; + String user_genes=""; Integer numberOfQTL = 0; for (int log : listOfGenes) { ONDEXConcept gene = graph.getConcept(log); if ((userGenes != null) && (gene != null) && (userGenes.contains(gene))) { - numberOfUserGenes++; - } + // numberOfUserGenes++; + // retain gene Accession/Name (18/07/18) + String geneAcc=""; + for(ConceptAccession acc : gene.getConceptAccessions()) { + String accValue= acc.getAccession(); + geneAcc = accValue; + if(acc.getElementOf().getId().equalsIgnoreCase("TAIR") && accValue.startsWith("AT") + && (accValue.indexOf(".") == -1)) { + geneAcc = accValue; + break; + } + else if(acc.getElementOf().getId().equalsIgnoreCase("PHYTOZOME")) { + geneAcc = accValue; + break; + } + } + // use shortest preferred concept name + /* String geneName = getShortestPreferedName(gene.getConceptNames()); + geneAcc= geneName; */ + user_genes= user_genes + geneAcc +","; + } if (mapGene2QTL.containsKey(log)) { numberOfQTL++; @@ -2307,8 +2327,13 @@ public String writeEvidenceTable(HashMap luceneConcepts, Se // } // } } + + // omit last comma from user_genes String + if(user_genes.contains(",")) { + user_genes= user_genes.substring(0, user_genes.length()-1); + } // writes the row - out.append(type + "\t" + name + "\t" + fmt.format(score) + "\t" + numberOfGenes + "\t" + numberOfUserGenes + out.append(type + "\t" + name + "\t" + fmt.format(score) + "\t" + numberOfGenes + "\t" + /*numberOfUserGenes*/ user_genes + "\t" + numberOfQTL + "\t" + ondexId + "\n"); } //log.info("Evidence table generated..."); From 760e6d3a1a352799da30f289e79f886a655397a1 Mon Sep 17 00:00:00 2001 From: singha Date: Thu, 19 Jul 2018 16:59:59 +0100 Subject: [PATCH 2/6] EvidenceTable add api_url code to launch sub-network of user genes (when found) and search keyword --- .../src/main/webapp/html/javascript/utils.js | 99 ++++++++++--------- 1 file changed, 54 insertions(+), 45 deletions(-) diff --git a/common/client-base/src/main/webapp/html/javascript/utils.js b/common/client-base/src/main/webapp/html/javascript/utils.js index d230c05d7..4cf0869b7 100644 --- a/common/client-base/src/main/webapp/html/javascript/utils.js +++ b/common/client-base/src/main/webapp/html/javascript/utils.js @@ -1346,16 +1346,16 @@ function createEvidenceTable(text, keyword){ table = table + ''; // all genes // table = table + ''; // user genes - // user genes + // For user genes, add option to visualize their Networks in KnetMaps via web services (api_url) var userGenes= 0; - if(values[4].length >0) { - userGenes= 1; // min. 1 user gene found + if(values[4].length > 0) { + userGenes= 1; // i.e., min. 1 user gene found values[4]= values[4].trim(); - //keyword= keyword.replace(/"/g, ''').trim(); - if(values[4].includes(",")) { // multiple user genes found - userGenes= values[4].split(",").length; + if(values[4].includes(",")) { // for multiple user genes + userGenes= values[4].split(",").length; // total user genes found } - table = table +''; // user genes + // launch evidence network using 'userGenes'. + table = table + ''; } else { userGenes= 0; @@ -1404,25 +1404,56 @@ function createEvidenceTable(text, keyword){ evidencePath(values[6]); }); + /* + * click handler for generating the evidence path network for user genes (using user_genes and search keywords, passed to api_url + * @author: Ajit Singh (19/07/2018) + */ + $(".userGenes_evidenceNetwork").bind("click", {x: evidenceTable}, function(e) { + e.preventDefault(); + var evidenceNum = $(e.target).attr("id").replace("userGenes_evidenceNetwork_",""); + var values = e.data.x[evidenceNum].split("\t"); + + var evi_userGenes= values[4].trim(); // user gene(s) provided + // Add comma-separated user genes to a new (candidates) list + var ug_list= []; + if(evi_userGenes.includes(",")) { + var vals= evi_userGenes.split(","); + for(var i=0; i < vals.length; i++) { + ug_list.push(vals[i]); + } + } + else { + ug_list.push(evi_userGenes); + } + + var search_keywords= keyword.trim(); // user search keyword(s) used + // search_keywords= search_keywords.replace(/"/g, '\"').trim(); // replace all keyword double quotes with separator/quote + + // console.log("generate userGenes_evidenceNetwork: keywords: "+ search_keywords +", userGenes_list: "+ ug_list); + // Generate Network + generateCyJSNetwork(api_url+'/network', {keyword:search_keywords, list:ug_list}); + }); + $("#tablesorterEvidence").tablesorter({ - sortList: [[3,1]], //sort by score in decending order - textExtraction: function(node) { // Sort TYPE column - var attr = $(node).attr('type-sort-value'); - if (typeof attr !== 'undefined' && attr !== false) { - return attr; - } - return $(node).text(); - } - }); + sortList: [[3,1]], //sort by score in decending order + textExtraction: function(node) { // Sort TYPE column + var attr = $(node).attr('type-sort-value'); + if (typeof attr !== 'undefined' && attr !== false) { + return attr; + } + return $(node).text(); + } + }); + //Shows the evidence summary box for(key in summaryArr){ - var contype= key.trim(); - //if (key !== "Trait") { - summaryText = summaryText+'
'+summaryArr[key]+'
'; - /* } - else { // For Trait, display tooltip text as GWAS instead. - summaryText = summaryText+'
'+summaryArr[key]+'
'; - } */ + var contype= key.trim(); + // if (key !== "Trait") { + summaryText= summaryText+'
'+summaryArr[key]+'
'; + /* } + else { // For Trait, display tooltip text as GWAS instead. + summaryText= summaryText+'
'+summaryArr[key]+'
'; + }*/ } @@ -1431,28 +1462,6 @@ function createEvidenceTable(text, keyword){ } } -/* - * Function - * Generates evidence's network for user genes. - * @author: Ajit Singh. - */ -function generate_UserGenes_EvidenceNetwork(evi_userGenes, keyword) { - var ug_list= []; - if(evi_userGenes.includes(",")) { - var vals= evi_userGenes.split(","); - for(var i=0; i < vals.length; i++) { - ug_list.push(vals[i]); - } - } - else { - ug_list.push(evi_userGenes); - } - - console.log("generate_UserGenes_EvidenceNetwork: api_url: "+ api_url +"/network ; keyword: "+ keyword +", ug_list: "+ ug_list); - // Generate Network - generateCyJSNetwork(api_url+'/network', {keyword:keyword, list:ug_list}); -} - /* * Function * From 46dbcd4838e3bc467d6cae87420db02511f11294 Mon Sep 17 00:00:00 2001 From: singha Date: Mon, 23 Jul 2018 10:26:07 +0100 Subject: [PATCH 3/6] reset icons (Gene View legend) --- .../src/main/webapp/html/image/reset_filter.png | Bin 867 -> 766 bytes .../webapp/html/image/reset_filter_hover.png | Bin 931 -> 845 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/common/client-base/src/main/webapp/html/image/reset_filter.png b/common/client-base/src/main/webapp/html/image/reset_filter.png index 63b17f95e52fc39c3c714946602629344e64e1a6..1ba2f234fca0ca169540fa3c61f0397f822fd510 100644 GIT binary patch delta 673 zcmV;S0$%;&2L1&hiBL{Q4GJ0x0000DNk~Le0000M0000M2nGNE0K~LxJCPx3e_lyM zK~zXfwUob0a$yw5zZxZ42x<_y2qFGJCx0!@&DD}PC4x?Zg9t9#Chj5VqI0XD`3HiGP~vS&r&BHz3UOw$nR7aw+~Nbg<$JbP z-0$}hkH?YE=b=z2Ad|_U)oO8aa)Pt7GhAL?LMoN=-a@t}E*6V$yWKFEOc04gm`o<< z^?DGC#W*-PfL^ahBof(rEMk6L;r{*}r>Ca~1Oj+_dt-Y?M@KLkjo91Uf5T`r!qd|e zZfqfyRgvvCfG zgL{8}=XW`7p<}MqYH&}h%+bLLAi>j)BGTwE~m(?wG*mzm_2E3en<@cDdrcz9qwcQhbZS696CFB>P1 z#P9KVm`5e+jL#T=6dKocLc6sN$#irNqD|3!0Z%AXl@%00000NkvXX Hu0mjfmJ~dP delta 775 zcmV+i1Ni*@1>*)GiBL{Q4GJ0x0000DNk~Le0000P0000P2nGNE0L1BqW04_hf5S;c zK~zXf-BrCyYH=8Tv^1p>l9HgUA{%rHl-8!A#)77(rij2z8bZ>=2K6r}+(fD=XslHm zi`pt^O06{dF#FJZ@ALBW#_b$G;NF(|z~SI|-uL(X-cJobegWSMqk4ZUnvUe+;sVKJ z63@@is8lN0*w|1^V>A`X$;k;;e^yqox3`Cbg9Er+F2yv5h9Xy2SMd3KC>D#bTCJFz zoW#V$1U^1Kltp9IP1o`9G5mf%N~ID^CX;-7dwavv(-XS8yW#P8u&}Uzfq?CdLX0sw-Fc{=pYilcPHXGjG-*I?&h~?#F?Ck6aR|_>o5{U$yPA8U@f0pp@@BjwP zr?0OMLqkJSe2P;n7z|=}cUO68p)0~p+S=N}`uaM?#>Ox{K8`}6Aa$S+4~@lQ=;`T^ z^f??3Y;JCfpB{8Y;_*0MUS8zjwY4>bLLtn}&7r-$UDC%ojf{-Q?R$HBQ7)GyTKefh zQ~1}{S4>S!{l0ZL9LDJAf2eTh=jU=DzYh-&%ePc2h1Jzn7>!1$*Z%%K%x1H2RcIo~ z<#M>ay_JLd`}^T`yA=Zr4h~A4ssaROhIX{4-_6a9Vm_e}xxc@cThWQ>u~;mM(FbRz zqoYIY>6g#v74r#=NLN>vbPijVD}=SF2lAX7+SAW&w=3oo8WDC3e+P|DmzS3~J3CX1 zKFHIK_VlCwS7=1q+S=gtdZhuFf@n0V7=1({5qZ;|eqW1DXhewl`FV79cA}-F1=rWt zn3Bw0WWAeYfY-37^=UBpRd1WY4M`7r-{m?B2NB{@4gtGu*m_@~8H!AU+kI+7c6;FvN- z*z6W=C{hJ?6h-dt?xamAqE}=+G%fNs(Cw~&jsHai_z76+X6aqx5XJxi002ovPDHLk FV1nJIe*6Fc diff --git a/common/client-base/src/main/webapp/html/image/reset_filter_hover.png b/common/client-base/src/main/webapp/html/image/reset_filter_hover.png index 8278acac36d1d6f3f012e1f2079ab13e88e633b8..93c4162791ed6aeeb77b5440923958cc410980d7 100644 GIT binary patch delta 754 zcmVyF5J3s zr3p*pQdXE~@DUT;NP@B=5fvAhnxJ4X8Xj$F>9n1P=T0lMOb2U}Z!_fW;yTg@}Rw`dReNbeDy7lZS^9qf9&^SDyf5~ zZjepHLN2%jhGh+SKd0g7&=Mx*DPt9E!kL1Bn`0^tJWS%oJ_V;*-T0EykjOLib;y`J z7eLo$2`bm4=xd`HN@Ns+%diO#Oy==vQG-cKr(dKo)a}Rhm=|FgxHXo=OxnQn6Mh^b zajJ~v{6593#a82s!)ZLAe};)*czZU0?Y?5}Mb!ZH6F~)34gu3k208{4WWdCkRvGt> z_^khaQ{gzLnfQ@4p=u1R4dRL@r%@5mOvAxNIa})mwE0DfVfaZgd5SHkLYU7J9f1Er zg|M5>YD8g>MH6v44bxOlCwM91DIKz8BI03IY&jLeoLES*&M9wte;?J`3Em5yR-u18 z!}e*k37_BLMmveiWZ=!LhVEx6a<_U`zta2hCn=16*Jx+JUi!B;>MpIWQg!k^%;`Ax zIBC7-$QI26+5$xn@q_`oLLk#84;=1kpy{IwYj7OtiTMJqzRu#~f`%*^R!d#ySEh$_ zb~j15b5KDnYnVMA# kH4FbO&U^VsHb@xw1#34EhI~Xeg8%>k07*qoM6N<$f}3z&N&o-= delta 841 zcmV-P1GfCl2BQZdiBL{Q4GJ0x0000DNk~Le0000P0000P2nGNE0L1BqW04_ge**(a zL_t(YOWjpVPZMDjJ=0EGN-O166~qOJB!CYv;L?ODai@tf!GsuBEF^9;n7Hx>sKliP z;)1v^>dLs#g#mS?hKLwLK^K|`2nqpeTRNrF)^n#NYG?XLl#ORGozA^?&UfxT-#1E{ zz!t-n{oPWOtR%RS#L$$69~)^%f5FI653h<5D~6Jky#A)+L%qo9&;wrM_^f|FUB&2jL)(xqS{mByn_37lXXZwIw(f7BXzNp8N^ z(B`+}N~asEaSod*Qk2qIVaNU&7382gAWmid&!Z%YXDiLHBoQZFpVV-U#m5^R=-K1M zvX(+3B^^^R6e!2NV_wv=W$`3X=dt11+ZbjzKPy<0+?b3Z!oDxF3w>iz3GRSa3zpssY+- zW!MTvXA?L(8i9>NbMg}G^}!`3`3)u|^N|!5*4cf&skzFIPGe7G&|0mctyU$$uYJ<7 zT}5-H-N=`^1sWw6CXyA(mW4=ag;RkyBO)(6jQf};>ZERo^|>&Sf7G}YqsJ1EBP5c@ zJkN(H<00mWE~)dE{n;vkiKL!R+3B`HVXnAkVoA?Ntnuc%j+wQjkzYr*iPLgndQwKs zN4S$UzFUM}ez~3r?wvown2Rk2M2f2^}Y-m`0XDvt9nB8GhFwV;J=6En!Hrn4JQ2*gphy1eLXbs5ic zQSgA2GwJGtW~{u7u9Zx2oyeCNNQ*@AK)Vb5`>a(6ihi`FdBhC9i{aUvjz#VRS-B{a zAqRG;7&ypNmzUH=;Y3kmQOWQs~f T$9}Wa00000NkvXXu0mjf+VzY} From 7f999116d1c698da8914d2131aa5ec0744f69b11 Mon Sep 17 00:00:00 2001 From: singha Date: Mon, 23 Jul 2018 14:05:50 +0100 Subject: [PATCH 4/6] use latest cyjs_json plugin 2.1.1-snapshot (mvn) --- common/server-datasource-ondexlocal/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/common/server-datasource-ondexlocal/pom.xml b/common/server-datasource-ondexlocal/pom.xml index 8b800ce08..e5c754796 100644 --- a/common/server-datasource-ondexlocal/pom.xml +++ b/common/server-datasource-ondexlocal/pom.xml @@ -55,6 +55,7 @@ net.sourceforge.ondex.modules cyjs_json + 2.1.1-SNAPSHOT From c5dfce978b5103bf32ebaa2389f15388518f22b8 Mon Sep 17 00:00:00 2001 From: singha Date: Mon, 23 Jul 2018 14:13:09 +0100 Subject: [PATCH 5/6] skip file writing gv, ev --- .../datasource/ondexlocal/OndexLocalDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java index 2334fae1b..b98d2a945 100644 --- a/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java +++ b/common/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/OndexLocalDataSource.java @@ -224,8 +224,8 @@ from user gene list (Set userGenes) */ String geneTable = this.ondexServiceProvider.writeGeneTable(genes, userGenes, request.getQtl(), request.getListMode()); // temporary... - String gv_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_GeneTable.tab").toString(); - this.ondexServiceProvider.writeResultsFile(gv_filename, geneTable); + /* String gv_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_GeneTable.tab").toString(); + this.ondexServiceProvider.writeResultsFile(gv_filename, geneTable); */ log.debug("2.) Gene table "); @@ -233,8 +233,8 @@ from user gene list (Set userGenes) */ String evidenceTable = this.ondexServiceProvider.writeEvidenceTable(qtlnetminerResults.getLuceneConcepts(), userGenes, request.getQtl()); // temporary... - String ev_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_EvidenceTable.tab").toString(); - this.ondexServiceProvider.writeResultsFile(ev_filename, evidenceTable); + /* String ev_filename= Paths.get(this.getProperty("DataPath"), System.currentTimeMillis()+"_EvidenceTable.tab").toString(); + this.ondexServiceProvider.writeResultsFile(ev_filename, evidenceTable); */ log.debug("3.) Evidence table "); From 88dd0333949352d61507297f5750836d631f5178 Mon Sep 17 00:00:00 2001 From: singha Date: Mon, 23 Jul 2018 15:14:13 +0100 Subject: [PATCH 6/6] updated release notes --- .../client/src/main/webapp/html/release.html | 292 +++++++++--------- 1 file changed, 152 insertions(+), 140 deletions(-) diff --git a/wheat/client/src/main/webapp/html/release.html b/wheat/client/src/main/webapp/html/release.html index f13356e5d..ec1814d38 100644 --- a/wheat/client/src/main/webapp/html/release.html +++ b/wheat/client/src/main/webapp/html/release.html @@ -1,140 +1,152 @@ - - - - - - - - - - -Wheat Release Notes - - - - - - - - - - - - - - -
-

Release Notes

-

Wheat (Triticum aestivum) knowledge network is based on IWGSC RefSeq v1.0 genome annotation and contains:

- -
    -

    Datasets used for integration

    -
      -
    • Gene-Protein [Ensembl]
      • -
        -
      • RefSeq v1.0 High Confidence Genes
        • -
      • iwgsc_refseqv1.0_HighConf_2017Mar13.gff3
        • -
      • iwgsc_refseqv1.0_HighConf_PROTEIN_2017Mar13.fa
        • -
      • Concepts: 110,790 [Gene] | 137,052 [Protein]
        • -
      • Relations: 137,052 [encodes]
        • -
      -
    • Co-Expression [JIC]
      • -
        -
      • Data provided by Cristobal Uauy and Philippa Borrill from John Innes Centre
        • -
      • WGCNA global network using 850 RNA-seq samples from diverse tissues, developmental stages, stresses and varieties
        • -
      • Enriched GO and Plant Ontology terms for each Co-Expression Cluster
        • -
      • Concepts: 54,402 [Gene] | 38 [CoExpCluster] | 1 [CoExpStudy] | 43 [BioProc] | 270 [PlantOntologyTerm] -
      • Relations: 2,582 [enriched_for] | 54,440 [part_of] -
      -
    • Gene Regulation [JIC]
      • -
        -
      • Data provided by John Innes Centre
        • -
      • Top 1 million Genie3 transcription factor target predictions
        • -
      • 3,384 Transcription Factors
        • -
      • Concepts: 75,725 [Gene]
        • -
      • Relations: 1,000,000 [regulates]
        • -
      -
    • TILLING SNP-Effects [Rothamsted]
      • -
        -
      • Data provided by Robert King from Rothamsted Research
        • -
      • Filter SNP effects for stop_gained, stop_lost and start_lost
        • -
      • Filter for High Confidence Genes
        • -
      • Concepts: 52,601 [Gene] | 145,973 [SNP] | 29 [SNPEffect]
        • -
      • Relations: 145,973 [has_mutant] | 145,973 [leads_to] -
      -
    • Gene Homeologs [IWGSC]
      • -
        -
      • Concepts: 114,495 [Gene]
        • -
      • Relations: 114,862 [homeolog]
        • -
      -
    • Gene-TraitOntology [Text-Mining]
      • -
        -
      • Gene-TO sentence based co-occurrences in PubMed abstracts
        • -
      -
    • Publications [PubMed]
      • -
        -
      • PubMed articles containing wheat OR triticum aestivum
        • -
      • XML
        • -
      • 54,783 PubMed abstracts
        • -
      • Filter publications that are unconnected, i.e. not linked via citation or text-mining
        • -
      -
    • Ontologies
      • - -
    • Homology [Decypher, Ensembl]
      • -
        -
      • Wheat-Arabidopsis homologs from Ensembl
        • -
          -
        • Concepts: 79,314 [Protein]
          • -
        • Relations: 147,659 [orthologue]
          • -
        -
      • Sequence alignments to other Plants
        • -
          -
        • Wheat proteins aligned against plant proteins from UniProtKB-SP [Smith-Waterman] -
            -
          • Concepts: 65,370 [Protein]
            • -
          • Relations: 344,344 [h_s_S]
            • -
          -
        -
      -
    • References
      • -
        -
      • Arabidopsis (TAIR) see Release notes for Arabidopsis
        • -
      -
    - -
- - -
- - -
-
    -
  • - - - - -
    • -
  • -
    • -

  •   Contact and find us

     -

    keywan.hassani-pak@rothamsted.ac.uk

    - - -
    • -
- - - - + + + + + + + + + + +Wheat Release Notes + + + + + + + + + + + + + + +
+

Release Notes

+

Wheat (Triticum aestivum) knowledge network is based on IWGSC RefSeq v1.0 genome annotation and contains:

+ +
+

Old KnetMiner Wheat (using TGACv1.0 reference) archived and available: HERE.

+ +

KnetMiner version used: v2.0.

+
+ +
    +

    Datasets used for integration

    +
      +
    • Gene-Protein [Ensembl]
      • +
        +
      • RefSeq v1.0 High Confidence Genes
        • +
      • iwgsc_refseqv1.0_HighConf_2017Mar13.gff3
        • +
      • iwgsc_refseqv1.0_HighConf_PROTEIN_2017Mar13.fa
        • +
      • Concepts: 110,790 [Gene] | 137,052 [Protein]
        • +
      • Relations: 137,052 [encodes]
        • +
      +
    • Gene-SNP-Phenotype [T3]
      • +
        +
      • Wheat GWAS/QTL data for about 50 phenotypes
        • +
      • SNP markers were mapped to IWGSC RefSeq
        • +
      • Data was provided by Jean-Luc Janning and Clay Birkett and is available at Triticeae Toolbox
        • +
      +
    • Co-Expression [JIC]
      • +
        +
      • Data provided by Cristobal Uauy and Philippa Borrill from John Innes Centre
        • +
      • WGCNA global network using 850 RNA-seq samples from diverse tissues, developmental stages, stresses and varieties
        • +
      • Enriched GO and Plant Ontology terms for each Co-Expression Cluster
        • +
      • Concepts: 54,402 [Gene] | 38 [CoExpCluster] | 1 [CoExpStudy] | 43 [BioProc] | 270 [PlantOntologyTerm] +
      • Relations: 2,582 [enriched_for] | 54,440 [part_of] +
      +
    • Gene Regulation [JIC]
      • +
        +
      • Data provided by John Innes Centre
        • +
      • Top 1 million Genie3 transcription factor target predictions
        • +
      • 3,384 Transcription Factors
        • +
      • Concepts: 75,725 [Gene]
        • +
      • Relations: 1,000,000 [regulates]
        • +
      +
    • TILLING SNP-Effects [Rothamsted]
      • +
        +
      • Data provided by Robert King from Rothamsted Research
        • +
      • Filter SNP effects for stop_gained, stop_lost and start_lost
        • +
      • Filter for High Confidence Genes
        • +
      • Concepts: 52,601 [Gene] | 145,973 [SNP] | 29 [SNPEffect]
        • +
      • Relations: 145,973 [has_mutant] | 145,973 [leads_to] +
      +
    • Gene Homeologs [IWGSC]
      • +
        +
      • Concepts: 114,495 [Gene]
        • +
      • Relations: 114,862 [homeolog]
        • +
      +
    • Gene-TraitOntology [Text-Mining]
      • +
        +
      • Gene-TO sentence based co-occurrences in PubMed abstracts
        • +
      +
    • Publications [PubMed]
      • +
        +
      • PubMed articles containing wheat OR triticum aestivum
        • +
      • XML
        • +
      • 54,783 PubMed abstracts
        • +
      • Filter publications that are unconnected, i.e. not linked via citation or text-mining
        • +
      +
    • Ontologies
      • + +
    • Homology [Decypher, Ensembl]
      • +
        +
      • Wheat-Arabidopsis homologs from Ensembl
        • +
          +
        • Concepts: 79,314 [Protein]
          • +
        • Relations: 147,659 [orthologue]
          • +
        +
      • Sequence alignments to other Plants
        • +
          +
        • Wheat proteins aligned against plant proteins from UniProtKB-SP [Smith-Waterman] +
            +
          • Concepts: 65,370 [Protein]
            • +
          • Relations: 344,344 [h_s_S]
            • +
          +
        +
      +
    • References
      • +
        +
      • Arabidopsis (TAIR) see Release notes for Arabidopsis
        • +
      +
    + +
+ + +
+ + +
+
    +
  • + + + + +
    • +
  • +
    • +

  •   Contact and find us

     +

    keywan.hassani-pak@rothamsted.ac.uk

    + + +
    • +
+ + + +
'+values[3]+''+values[4]+''+values[5]+''+values[6]+''+values[5]+''+values[6]+''+values[7]+''+values[8]+''+values[8]+''+values[9]+'Select
'+header[2]+''+header[3]+''+header[4]+''+header[5]+''+header[5]+'
'+evidenceValue+''+values[2]+''+values[3]+''+values[3]+''+values[4]+''+values[5]+''+values[3]+''+values[4]+''+userGenes+''+userGenes+''+values[5]+'
'+values[3]+''+values[4]+''+userGenes+''+userGenes+'