Skip to content

Commit ed8ff30

Browse files
committed
Some changes and prepare release
1 parent d7968a0 commit ed8ff30

4 files changed

Lines changed: 20 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
77

8+
## [0.4.10] 2023-11-29
9+
10+
### Added
11+
12+
- Added 'annotation_field" config option, for external ES search
13+
- Added redirection from Gene subentity to Gene in url
14+
15+
816
## [0.4.10] 2023-11-23
917

1018
### Added

config.json.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"externalSearchOptions": {
1414
"url": "http://0.0.0.0:80",
1515
"gene_field": "gene_id",
16+
"annotation_field": "annotation",
1617
"query_param": "q",
1718
"field_param": "display_fields",
1819
"count_param": "max_results"

imports/api/publications.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "genoboo",
3-
"version": "0.4.10",
3+
"version": "0.4.11",
44
"repository": "https://github.com/gogepp/genoboo",
55
"description": "A portable website for browsing and querying genome sequences and annotations. Forked from genenotebook",
66
"license": "AGPL-3.0",

0 commit comments

Comments
 (0)