Skip to content

Fix JSON encoding #100

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

Merged
jmckenna merged 2 commits into from
Dec 1, 2022
Merged

Fix JSON encoding #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb6bdec
Update wfs_get_feature.c
GabGr25 Nov 16, 2022
71305ef
Fix JSON encoding
kdubuc Nov 16, 2022
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
7 changes: 2 additions & 5 deletions src/wfs/wfs_get_feature.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,13 +545,9 @@ static buffer *wfs_retrieve_sql_request_select(ows * o, wfs_request * wr, buffer
}
/* Columns are written in quotation marks */
else {
if (wr->format == WFS_GEOJSON)
buffer_add_str(select, "to_json(");
buffer_add_str(select, "\"");
buffer_copy(select, an->key);
buffer_add_str(select, "\"");
if (wr->format == WFS_GEOJSON)
buffer_add_str(select, ")");
}

if (an->next) buffer_add_str(select, ",");
Expand Down Expand Up @@ -857,10 +853,11 @@ static void wfs_geojson_display_results(ows * o, wfs_request * wr, mlist * reque
else buffer_add_str(prop, ", \"");

buffer_copy(prop, an->key);
buffer_add_str(prop, "\": ");
buffer_add_str(prop, "\": \"");
value_enc = buffer_encode_json_str(PQgetvalue(res, i, j));
buffer_copy(prop, value_enc);
buffer_free(value_enc);
buffer_add(prop, '"');
}
}

Expand Down