Merge branch 'dev' into krona-ktimporttext-input-collision-fix

nf-core · Oct 23, 2023 · bdd514d · bdd514d
2 parents 51cf6be + 067cd2c
commit bdd514d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### `Fixed`
 
+- [#405] Fix database to tool mismatching in KAIJU2KRONA input (❤️ to @MajoroMask for reporting, fix by @jfy133)
 - [#406] Fixed overwriting of bracken-derived kraken2 outputs when the database name is shared between Bracken/Kraken2. (❤️ to @MajoroMask for reporting, fix by @jfy133)
 
 ### `Dependencies`

diff --git a/subworkflows/local/visualization_krona.nf b/subworkflows/local/visualization_krona.nf
@@ -55,8 +55,8 @@ workflow VISUALIZATION_KRONA {
         Combine Kaiju profiles with their databases
     */
     ch_input_for_kaiju2krona = ch_input_classifications.kaiju
-        .map{ [it[0]['db_name'], it[0], it[1]] }
-        .combine( databases.map{ [it[0]['db_name'], it[1]] }, by: 0 )
+        .map{ meta, profiles -> [[meta['tool'], meta['db_name']], meta, profiles] }
+        .combine( databases.map{ meta, db -> [[meta['tool'], meta['db_name']], db] }, by: 0 )
         .multiMap{
             it ->
                 profiles: [it[1], it[2]]