Skip to content

Fix for download/dataget operations #1889

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

Open
nedvedba wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Fix for download/dataget operations #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion python/datafed_pkg/datafed/CommandLib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ def dataGet(

reply = self._mapi.sendRecv(msg)

if reply[0].task and wait:
if reply[0].HasField("task") and wait:
msg2 = sdms.TaskViewRequest()
msg2.task_id = reply[0].task.id
elapsed = 0
Expand Down
12 changes: 10 additions & 2 deletions web/datafed-ws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,11 @@ app.get("/api/usr/register", (a_req, a_resp) => {
"Error: user registration failed - empty reply from server",
);
a_resp.status(500).send("Empty reply from server");
} else if (reply.errCode) {
} else if (
reply.errCode !== undefined &&
reply.errCode !== 0 &&
reply.errCode !== "UNSPECIFIED"
) {
if (reply.errMsg) {
logger.error(
"/api/usr/register",
Expand Down Expand Up @@ -2161,7 +2165,11 @@ function sendMessage(a_msg_name, a_msg_data, a_req, a_resp, a_cb, a_anon) {
"Error - reply handler: empty reply",
);
a_resp.status(500).send("Empty reply");
} else if (a_reply.errCode) {
} else if (
a_reply.errCode !== undefined &&
a_reply.errCode !== 0 &&
a_reply.errCode !== "UNSPECIFIED"
) {
if (a_reply.errMsg) {
logger.error(
sendMessage.name,
Expand Down