Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#940 Fix for qid query error #941

Merged
merged 6 commits into from
Jan 24, 2025
Merged

#940 Fix for qid query error #941

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2880d7
#940 Fix for qid query error
nickdos Jan 23, 2025
d768db8
#941 Revert change not needed
nickdos Jan 23, 2025
880138b
Revert "#941 Revert change not needed"
nickdos Jan 23, 2025
6f1d0cc
#941 replace null with empty string
nickdos Jan 23, 2025
7da4852
#941 Code review fix and unit tests
nickdos Jan 24, 2025
a68fbd8
#941 Fix for broken unit test
nickdos Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/main/java/au/org/ala/biocache/util/QueryFormatUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,11 @@ public Map[] formatSearchQuery(SpatialSearchRequestDTO searchParams, boolean for
Map<String, Facet> activeFacetMap = new HashMap();
Map<String, List<Facet>> activeFacetObj = new HashMap<>();
Map[] fqMaps = {activeFacetMap, activeFacetObj};
Boolean isIncludeUnfilteredFacetValues = searchParams.getIncludeUnfilteredFacetValues();

//Only format the query if it doesn't already supply a formattedQuery.
if (forceQueryFormat || StringUtils.isEmpty(searchParams.getFormattedQuery())) {
String[] originalFqs = Arrays.copyOf(searchParams.getFq(), searchParams.getFq().length); // copy by value
String[] originalFqs = searchParams.getFq();

String [] formatted = formatQueryTerm(searchParams.getQ(), searchParams);
searchParams.setDisplayString(formatted[0]);
Expand All @@ -149,15 +150,15 @@ public Map[] formatSearchQuery(SpatialSearchRequestDTO searchParams, boolean for
searchParams.setFormattedFq(null);

// Apply filter tagging and excluding filters if flag is set
if (searchParams.getIncludeUnfilteredFacetValues()) {
if (isIncludeUnfilteredFacetValues) {
applyFilterTagging(searchParams);
}

//format fqs for facets that need ranges substituted
if (searchParams.getFq() != null) {
for (int i = 0; i < searchParams.getFq().length; i++) {
String fq = searchParams.getFq()[i];
String fqOriginal = originalFqs[i]; // not altered by `applyFilterTagging()`
String fqOriginal = (originalFqs.length > i) ? originalFqs[i] : ""; // not altered by `applyFilterTagging()`
adam-collins marked this conversation as resolved.
Show resolved Hide resolved

if (fq != null && !fq.isEmpty()) {
formatted = formatQueryTerm(fq, searchParams);
Expand All @@ -167,11 +168,11 @@ public Map[] formatSearchQuery(SpatialSearchRequestDTO searchParams, boolean for
addFormattedFq(new String[]{formatted[1]}, searchParams);
}

//add to activeFacetMap fqs that are not inserted by a qid, and the q of qids in fqs.
//do not add spatial fields
if (originalFqs != null && i < originalFqs.length && !formatted[1].contains(spatialField + ":")) {
// add to activeFacetMap fqs that are not inserted by a qid, and the q of qids in fqs.
// do not add spatial fields
if (originalFqs != null && originalFqs.length > i && !formatted[1].contains(spatialField + ":")) {
Facet facet = new Facet();
facet.setDisplayName(formattedOriginal[0]);
facet.setDisplayName(isIncludeUnfilteredFacetValues ? formattedOriginal[0] : formatted[0]);
String[] fv = fqOriginal.split(":");
if (fv.length >= 2) {
facet.setName(fv[0]);
Expand All @@ -184,7 +185,8 @@ public Map[] formatSearchQuery(SpatialSearchRequestDTO searchParams, boolean for
// activeFacetObj which is [StringKey: List<Facet>]
String fqKey = parseFQ(fqOriginal);
if (fqKey != null) {
Facet fct = new Facet(fqKey, formattedOriginal[0]); // display name is the formatted name, for example '11' to 'November'
String formattedFacet = (isIncludeUnfilteredFacetValues) ? formattedOriginal[0] : formatted[0];
Facet fct = new Facet(fqKey, formattedFacet); // display name is the formatted name, for example '11' to 'November'
fct.setValue(fqOriginal); // value in activeFacetMap is the part with key replaced by '', but here is the original fq because front end will need it
List<Facet> valList = activeFacetObj.getOrDefault(fqKey, new ArrayList<>());
valList.add(fct);
Expand Down