Skip to content

Firefly-1978: fixed VizieR upload#1935

Merged
robyww merged 1 commit intodevfrom
FIREFLY-1978-viz-upload
Apr 16, 2026
Merged

Firefly-1978: fixed VizieR upload#1935
robyww merged 1 commit intodevfrom
FIREFLY-1978-viz-upload

Conversation

@robyww
Copy link
Copy Markdown
Contributor

@robyww robyww commented Apr 9, 2026

Firefly-1978: fixed VizieR upload

  • IRSA-7666: fixed: non-datalink service descriptor intepreted wrong
  • response to feedback: fixed several bugs

Testing

@robyww robyww added this to the 2026.1 milestone Apr 9, 2026
@robyww robyww requested review from loitly and lrebull April 9, 2026 21:41
@robyww robyww self-assigned this Apr 9, 2026
@robyww robyww added the bug label Apr 9, 2026
@robyww robyww force-pushed the FIREFLY-1978-viz-upload branch from 9b48ffd to dcfa04a Compare April 10, 2026 15:04
@lrebull
Copy link
Copy Markdown
Contributor

lrebull commented Apr 10, 2026

yes, this works! :)

Copy link
Copy Markdown
Contributor

@loitly loitly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not working for me.
Steps to duplicate:

  • TAP -> VizieR
  • Upload table
  • Select all columns
  • Unselect Temporal
  • Populate and Edit ADQL
  • Note the double double-quotes?
  • Click Search
    The search failed with:
Job has failed with the error: Incorrect ADQL query: Encountered ".5". Was expecting one of: "," "FROM"
Image

export const getAsEntryForTableName= (tableName) => tableName?.[0] ?? 'x';
export function getTableNameAlias(tableName) {
if (!tableName) return 'x';
if (tableName.length > 1 && tableName[0]==='"') return tableName[1].toLowerCase();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why it needs to be in lower case?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The VizieR sever would not accept uppercase without an error.

Comment on lines +619 to +622
if (!isTable && name.includes('.')) {
const [table,col, ...rest]= name.split('.');
if (table.length && col.length && !rest.length) return `${table}.${maybeQuote(col)}`;
}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are throwing away the leftovers(..rest). Is this to fix bad names?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, that is the bug.

@robyww robyww force-pushed the FIREFLY-1978-viz-upload branch 3 times, most recently from 64988ea to 8d3c1a3 Compare April 14, 2026 19:43
Copy link
Copy Markdown
Contributor

@loitly loitly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Merge away.


export const findDataLinkServeDescs= (sdAry=[]) =>
sdAry?.filter( (serDef) => isDataLinkServiceDesc(serDef) ?? []);
sdAry?.filter( (serDef) => Boolean(isDataLinkServiceDesc(serDef)));
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is Boolean needed? I think if anything, it may produces false positive.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for readability. the bug was the empty array.

- IRSA-7666: fixed: non-datalink service descriptor intepreted wrong
- response to feedback: fixed several bugs
- some clean up of hips
- disable webgpu on firefox
@robyww robyww force-pushed the FIREFLY-1978-viz-upload branch from 8d3c1a3 to d23d816 Compare April 16, 2026 21:35
@robyww robyww added the multi-ticket This PR implements multiple Jira tickets label Apr 16, 2026
@robyww robyww merged commit 2982d59 into dev Apr 16, 2026
@robyww robyww deleted the FIREFLY-1978-viz-upload branch April 16, 2026 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug multi-ticket This PR implements multiple Jira tickets

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants