Skip to content

Commit 97ef3da

Browse files
committed
hypothetical fixes for download/dataget
1 parent ffa8322 commit 97ef3da

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

python/datafed_pkg/datafed/CommandLib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ def dataGet(
767767

768768
reply = self._mapi.sendRecv(msg)
769769

770-
if reply[0].task and wait:
770+
if reply[0].HasField("task") and wait:
771771
msg2 = sdms.TaskViewRequest()
772772
msg2.task_id = reply[0].task.id
773773
elapsed = 0

web/datafed-ws.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,11 @@ app.get("/api/usr/register", (a_req, a_resp) => {
826826
"Error: user registration failed - empty reply from server",
827827
);
828828
a_resp.status(500).send("Empty reply from server");
829-
} else if (reply.errCode) {
829+
} else if (
830+
reply.errCode !== undefined &&
831+
reply.errCode !== 0 &&
832+
reply.errCode !== "UNSPECIFIED"
833+
) {
830834
if (reply.errMsg) {
831835
logger.error(
832836
"/api/usr/register",
@@ -2161,7 +2165,11 @@ function sendMessage(a_msg_name, a_msg_data, a_req, a_resp, a_cb, a_anon) {
21612165
"Error - reply handler: empty reply",
21622166
);
21632167
a_resp.status(500).send("Empty reply");
2164-
} else if (a_reply.errCode) {
2168+
} else if (
2169+
a_reply.errCode !== undefined &&
2170+
a_reply.errCode !== 0 &&
2171+
a_reply.errCode !== "UNSPECIFIED"
2172+
) {
21652173
if (a_reply.errMsg) {
21662174
logger.error(
21672175
sendMessage.name,

0 commit comments

Comments
 (0)