From 7f4ebe757e9cb8db0e51ca7a56af302355caeaef Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 28 Oct 2025 13:34:18 +0100 Subject: [PATCH 1/2] Bug obiuniq - don't clean the chunks --- pkg/obichunk/chunk_on_disk.go | 4 +++- pkg/obioptions/version.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/obichunk/chunk_on_disk.go b/pkg/obichunk/chunk_on_disk.go index 4347180..4e95fd9 100644 --- a/pkg/obichunk/chunk_on_disk.go +++ b/pkg/obichunk/chunk_on_disk.go @@ -10,6 +10,7 @@ import ( "git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiformats" "git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiiter" "git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiseq" + "git.metabarcoding.org/obitools/obitools4/obitools4/pkg/obiutils" ) // tempDir creates a temporary directory with a prefix "obiseq_chunks_" @@ -74,6 +75,7 @@ func find(root, ext string) []string { // status of each batch. func ISequenceChunkOnDisk(iterator obiiter.IBioSequence, classifier *obiseq.BioSequenceClassifier) (obiiter.IBioSequence, error) { + obiutils.RegisterAPipe() dir, err := tempDir() if err != nil { return obiiter.NilIBioSequence, err @@ -86,7 +88,7 @@ func ISequenceChunkOnDisk(iterator obiiter.IBioSequence, go func() { defer func() { os.RemoveAll(dir) - log.Debugln("Clear the cache directory") + obiutils.UnregisterPipe() }() newIter.Wait() diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index 76d4cf6..dd74f62 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -8,7 +8,7 @@ import ( // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "29bf4ce" +var _Commit = "5150947" var _Version = "Release 4.4.0" // Version returns the version of the obitools package. From 0844dcc607a04ad3dce05a2d9132c25d4071a12a Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 28 Oct 2025 13:50:38 +0100 Subject: [PATCH 2/2] bug obimatrix --- pkg/obioptions/version.go | 2 +- pkg/obitools/obimatrix/obimatrix.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go index dd74f62..1f7b858 100644 --- a/pkg/obioptions/version.go +++ b/pkg/obioptions/version.go @@ -8,7 +8,7 @@ import ( // corresponds to the last commit, and not the one when the file will be // commited -var _Commit = "5150947" +var _Commit = "7f4ebe7" var _Version = "Release 4.4.0" // Version returns the version of the obitools package. diff --git a/pkg/obitools/obimatrix/obimatrix.go b/pkg/obitools/obimatrix/obimatrix.go index 0a77159..2ff4aee 100644 --- a/pkg/obitools/obimatrix/obimatrix.go +++ b/pkg/obitools/obimatrix/obimatrix.go @@ -123,7 +123,7 @@ func (data *MatrixData) Update(s *obiseq.BioSequence, mapkey string, strict bool ok := false switch attrname { case "id": - value = s.Id + value = s.Id() ok = true case "count": value = s.Count()