Skip to content

FIREFLY-29: inadequate interpretation of the target field value #822

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
merged 1 commit into from
Jun 12, 2019
Merged

FIREFLY-29: inadequate interpretation of the target field value #822

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
6 changes: 3 additions & 3 deletions src/firefly/js/ui/TargetPanelWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ function resolveObject(posFieldDef, resolver) {
else {
return {
showHelp: false,
feedback: `Could not resolve: ${objName}`,
feedback: `Could not resolve: ${decodeURIComponent(objName)}`,
valid: false,
wpt: null
};
Expand All @@ -178,7 +178,7 @@ function resolveObject(posFieldDef, resolver) {
else {
return {
showHelp: false,
feedback: `Could not resolve: ${objName}`,
feedback: `Could not resolve: ${decodeURIComponent(objName)}`,
valid: false,
wpt: null
};
Expand All @@ -187,7 +187,7 @@ function resolveObject(posFieldDef, resolver) {
).catch((e) => {
// e is undefined when a newer request came in, and promise is rejected
if (e) {
let feedback = `Could not resolve: ${objName}`;
let feedback = `Could not resolve: ${decodeURIComponent(objName)}`;
if (e.name === 'AbortError') {
feedback += '. Unresponsive service.';
} else {
Expand Down
14 changes: 12 additions & 2 deletions src/firefly/js/util/PositionParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,21 @@ var makePositionParser = function(helper) {
isValid = true;
}
} else {
var map= getPositionMap(s);
const map= getPositionMap(s);
_coordSys= getCoordSysFromString(map[COORDINATE_SYS]);
_ra = map[RA];
_dec = map[DEC];
isValid = retPP.getCoordSys() !==CoordinateSys.UNDEFINED && !isNaN(retPP.getRa()) && !isNaN(retPP.getDec());
const validRa = !isNaN(retPP.getRa());
const validDec = !isNaN(retPP.getDec());
// determineType uses the first string to decide if the input is a position or object name.
// "12 mus" (a valid object name in NED) would be classified as a position.
if (!validDec) {
_inputType = PositionParsedInput.Name;
_objName= s;
isValid = true;
} else {
isValid = retPP.getCoordSys() !== CoordinateSys.UNDEFINED && validRa && validDec;
}
}
}

Expand Down
24 changes: 14 additions & 10 deletions src/firefly/js/util/StringUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function convertExtendedAscii(sbOriginal) {
return null;
}

const retval= sbOriginal;
let retval= sbOriginal;
let origCharAsInt;
for (let isb = 0; isb < retval.length; isb++) {

Expand All @@ -66,15 +66,15 @@ export function convertExtendedAscii(sbOriginal) {
switch (origCharAsInt) {
case 223:
case 224:
retval[isb]= '"';
retval = replaceAt(retval, isb, '"');
break;
case 150:
case 151:
retval[isb]= '-';
retval = replaceAt(retval, isb, '-');
break;
default:
if (origCharAsInt>127) {
retval[isb]= '?';
retval = replaceAt(retval, isb, '?');
}
break;
}
Expand All @@ -86,31 +86,35 @@ export function convertExtendedAscii(sbOriginal) {
case '\u201A': // lower quotation mark
case '\u2039': // Single Left-Pointing Quotation Mark
case '\u203A': // Single right-Pointing Quotation Mark
retval[isb]= '\'';
retval = replaceAt(retval, isb, '\'');
break;

case '\u201C': // left double quote
case '\u201D': // right double quote
case '\u201E': // double low quotation mark
retval[isb]= '"';
retval = replaceAt(retval, isb, '"');
break;

case '\u02DC':
retval[isb]= '~';
retval = replaceAt(retval, isb, '~');
break; // Small Tilde

case '\u2013': // En Dash
case '\u2014': // EM Dash
retval[isb]= '-';
retval = replaceAt(retval, isb, '-');
break;

default:
if (origCharAsInt>127) {
retval[isb]= '?';
retval = replaceAt(retval, isb, '?');
}
break;
}
}
}
return sbOriginal;
return retval;
}

function replaceAt(str, index, replacement) {
return str.substr(0, index) + replacement+ str.substr(index + replacement.length);
}