Merge pull request #169 from pixlise/development

Fixing breadboard importer crash for Joel with < 10 spectra in zip, a…
pixlise · Nov 22, 2023 · cc9d495 · cc9d495
2 parents 73257c3 + bfce477
commit cc9d495
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/data-import/data-converter/converter.go b/data-import/data-converter/converter.go
@@ -260,9 +260,9 @@ func SelectImporter(localFS fileaccess.FileAccess, remoteFS fileaccess.FileAcces
 	}
 
 	log.Infof("SelectImporter: Path contains %v files...", len(items))
-	for c, item := range items {
+	/*for c, item := range items {
 		log.Infof("  %v. %v", c+1, item)
-	}
+	}*/
 
 	// Check if it's a combined dataset
 	combinedFiles, _ /*imageFileNames*/, _ /*combinedFile1Meta*/, _ /*combinedFile2Meta*/, err := combined.GetCombinedBeamFiles(importPath, log)

diff --git a/data-import/internal/data-converters/jplbreadboard/spectra.go b/data-import/internal/data-converters/jplbreadboard/spectra.go
@@ -126,6 +126,9 @@ func makeSpectraLookup(inputpath string, spectraFiles []string, singleDetectorMS
 	spectraLookup := make(dataConvertModels.DetectorSampleByPMC)
 
 	reportInterval := len(spectraFiles) / 10
+	if reportInterval == 0 {
+		reportInterval = 1
+	}
 
 	c := 1
 	for idx, f := range spectraFiles {