@@ -86,14 +86,17 @@ Meteor.publish({
8686 let url = config . externalSearchOptions . url . replace ( / , + $ / , "" ) + "/" ;
8787 let paramsDict = { }
8888 let geneField = config . externalSearchOptions . gene_field ? config . externalSearchOptions . gene_field : "geneId"
89- let annotationField = config . externalSearchOptions . annotation_field ? config . externalSearchOptions . annotation_field : "annotation "
89+ let annotationField = config . externalSearchOptions . annotation_field ? config . externalSearchOptions . annotation_field : ""
9090 if ( config . externalSearchOptions . query_param ) {
9191 paramsDict [ config . externalSearchOptions . query_param ] = query . query
9292 } else {
9393 url += query . query
9494 }
9595 if ( config . externalSearchOptions . field_param ) {
96- paramsDict [ config . externalSearchOptions . field_param ] = geneField + "," + annotationField
96+ paramsDict [ config . externalSearchOptions . field_param ] = geneField
97+ if ( config . externalSearchOptions . annotation_field ) {
98+ paramsDict [ config . externalSearchOptions . field_param ] += "," + annotationField
99+ }
97100 }
98101
99102 if ( config . externalSearchOptions . count_param ) {
@@ -105,7 +108,11 @@ Meteor.publish({
105108 const response = HTTP . get ( url ) ;
106109 if ( response . statusCode === 200 ) {
107110 geneResults = response . data . data . map ( result => {
108- return { "ID" : result . _source [ geneField ] , "annotationName" : result . _source [ annotationField ] }
111+ if ( config . externalSearchOptions . annotation_field ) {
112+ return { "ID" : result . _source [ geneField ] , "annotationName" : result . _source [ annotationField ] }
113+ } else {
114+ return { "ID" : result . _source [ geneField ] }
115+ }
109116 } )
110117 }
111118 transformedQuery = { genomeId : { $in : queryGenomeIds } , $or : geneResults }
0 commit comments