fd6a2cf70e84116158bf945e95e4c16e63a4f536
hiram
Wed Aug 21 14:27:31 2024 -0700
correct order of output columns refs #32596
diff --git src/hg/js/assemblySearch.js src/hg/js/assemblySearch.js
index b80ee0e..30b4e45 100644
--- src/hg/js/assemblySearch.js
+++ src/hg/js/assemblySearch.js
@@ -111,31 +111,31 @@
}
}
document.getElementById("measureTiming").style.display = "none";
});
// refresh the thead columns in the specified table
function headerRefresh(tableHead) {
// clear existing content
tableHead.innerHTML = '';
// re-populate header row - the sortable system added a class to
// the last sorted column, need to rebuild the headerRow to get the
// header back to pristine condition for the next sort
var headerRow = '
';
headerRow += '
view/ request ⓘ"view" opens the genome browser for an existing assembly, "request" opens an assembly request form.
';
headerRow += '
English common name ⓘEnglish common name
';
- headerRow += '
scientific name (count) ⓘbinomial scientific name
';
+ headerRow += '
scientific name ⓘscientific name
';
headerRow += '
NCBI Assembly ⓘLinks to NCBI resource record or UCSC downloads for local UCSC assemblies
';
headerRow += '
genark clade ⓘclade specification as found in the GenArk system.
';
headerRow += '
description ⓘother meta data for this assembly.
';
headerRow += '
';
tableHead.innerHTML = headerRow;
}
// Function to generate the table and extra information
function populateTableAndInfo(jsonData) {
var tableHeader = document.getElementById('tableHeader');
var tableBody = document.getElementById('tableBody');
var metaData = document.getElementById('metaData');
document.getElementById('resultCounts').innerHTML = "";
document.getElementById('elapsedTime').innerHTML = "0";
@@ -163,32 +163,32 @@
var dataRow = '
';
var browserUrl = id;
var asmInfoUrl = id;
if (genomicEntries[id].browserExists) {
if (id.startsWith("GC")) {
browserUrl = "view";
asmInfoUrl = "" + id + "";
} else {
browserUrl = "view";
asmInfoUrl = "" + id + "";
}
dataRow += "
" + browserUrl + "
";
} else {
dataRow += "
";
}
- dataRow += "
" + genomicEntries[id].scientificName + "
";
dataRow += "
" + genomicEntries[id].commonName + "
";
+ dataRow += "
" + genomicEntries[id].scientificName + "
";
dataRow += "
" + asmInfoUrl + "
";
dataRow += "
" + genomicEntries[id].clade + "
";
dataRow += "
" + genomicEntries[id].description + "
";
dataRow += '
';
tableBody.innerHTML += dataRow;
}
var dataTable = document.getElementById('dataTable');
sorttable.makeSortable(dataTable);
var itemCount = parseInt(extraInfo.itemCount, 10);
var totalMatchCount = parseInt(extraInfo.totalMatchCount, 10);
var availableAssemblies = parseInt(extraInfo.availableAssemblies, 10);
var resultCounts = "results for search string: '" + extraInfo.genomeSearch + "', ";
if ( itemCount === totalMatchCount ) {