051d8d750d9ee269ea2a26575a90a8591fb4cd84
markd
  Mon Jun 8 09:34:32 2026 -0700
added option to get accession with version from blast xml

diff --git src/hg/blastToPsl/tests/makefile src/hg/blastToPsl/tests/makefile
index bdd58c92770..e49b2164bd1 100644
--- src/hg/blastToPsl/tests/makefile
+++ src/hg/blastToPsl/tests/makefile
@@ -139,31 +139,31 @@
 	diff -u expected/$@.bscores output/$@.bscores
 
 # PSI-BLASTP produces bogus blocks where query starts at 0 and there is not
 # ending number on the line. Sbjct may be empty or have sequence.  These 
 # are ignored
 psiBadFormatTest: mkdirs
 	${blastToPsl} -scores=output/$@.bscores input/psiBadFormat.blast output/$@.psl >output/$@.err 2>&1
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 	diff -u expected/$@.bscores output/$@.bscores
 	diff -u expected/$@.err output/$@.err
 
 ###
 # blastXmlToPsl
 ###
-testBlastXmlToPsl: mrna1Test mrna1TsvTest prot1Test prot2Test prot1NucCoordTest sp1PsiBlastTest qtName1Test qtName2Test misclassedPsiBlastTest
+testBlastXmlToPsl: mrna1Test mrna1TsvTest prot1Test prot2Test prot1NucCoordTest sp1PsiBlastTest qtName1Test qtName2Test hitIdIdTest misclassedPsiBlastTest
 
 mrna1Test: mkdirs
 	${blastXmlToPsl} -scores=output/$@.bscores input/mrna1.blastn.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 	diff -u expected/$@.bscores output/$@.bscores
 
 # -tsv writes scores with a TSV header (no leading #)
 mrna1TsvTest: mkdirs
 	${blastXmlToPsl} -tsv -scores=output/$@.tsv input/mrna1.blastn.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 	diff -u expected/$@.tsv output/$@.tsv
 
 prot1Test: mkdirs
@@ -186,27 +186,33 @@
 sp1PsiBlastTest: mkdirs
 	${blastXmlToPsl} -tName=Hit_accession input/sp1.psiBlast.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 
 qtName1Test: mkdirs
 	${blastXmlToPsl} -qName=query-ID -tName=Hit_id input/sp1.psiBlast.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 
 qtName2Test: mkdirs
 	${blastXmlToPsl} -qName=query-def0 -tName=Hit_def0 input/sp1.psiBlast.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 
+# -tName=Hit_id_id pulls accession out of an id like 'gb|CM102538.1|'
+hitIdIdTest: mkdirs
+	${blastXmlToPsl} -tName=Hit_id_id input/blastn-ncbi-seqs.xml output/$@.psl
+	${pslCheck} -verbose=0 output/$@.psl
+	diff -u expected/$@.psl output/$@.psl
+
 # psiblast file that claimes to be blastp
 misclassedPsiBlastTest: mkdirs
 	${blastXmlToPsl} -forcePsiBlast -tName=Hit_accession -scores=output/$@.bscores input/misclassed.psiBlast.xml output/$@.psl
 	${pslCheck} -verbose=0 output/$@.psl
 	diff -u expected/$@.psl output/$@.psl
 	diff -u expected/$@.bscores output/$@.bscores
 
 clean::
 	rm -rf output
 
 mkdirs:
 	@${MKDIR} -p output