Skip to content

Default to SVG name for display for non-base DC #1956

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

Draft
n-h-diaz wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Default to SVG name for display for non-base DC #1956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dec4b21
Default to SVG name for display for non-base DC
n-h-diaz Jun 23, 2026
c22a92b
split
n-h-diaz Jun 23, 2026
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: 6 additions & 1 deletion internal/server/spanner/dsutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,9 +813,14 @@ func isCuratedHierarchy(svg string) bool {
return strings.HasPrefix(svg, "dc/g/UN") || strings.HasPrefix(svg, "dc/g/SDG")
}

// isCustomHierarchy checks if the SVG is part of a non-base DC.
func isCustomHierarchy(svg string) bool {
return !strings.HasPrefix(svg, "dc/")
}
Comment on lines +816 to +819

@gemini-code-assist gemini-code-assist Bot Jun 23, 2026

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.

medium

The name isCustomHierarchy is potentially misleading because "Custom" is already used in the codebase (e.g., CustomSVGPrefix = "dc/g/Custom_") to refer to local custom SVGs, which do start with dc/. Since this function specifically checks for SVGs from a non-base Data Commons instance (which do not start with dc/), renaming it to isNonBaseDCHierarchy or isExternalHierarchy would be much clearer and prevent future confusion. Additionally, adding a check for an empty string makes the helper more robust.

Suggested change
// isCustomHierarchy checks if the SVG is part of a non-base DC.
func isCustomHierarchy(svg string) bool {
return !strings.HasPrefix(svg, "dc/")
}
// isNonBaseDCHierarchy checks if the SVG is part of a non-base DC.
func isNonBaseDCHierarchy(svg string) bool {
return svg != "" && !strings.HasPrefix(svg, "dc/")
}
References
  1. Ensure that function docstrings accurately reflect the function's signature and return values.


// getSpecializedEntity returns the specialized entity for a child SVG given its parent SVG.
func getSpecializedEntity(parent, child, childName string) string {
if !strings.Contains(child, "_") || isCuratedHierarchy(child) { // Child is likely curated.
if childName != "" && (!strings.Contains(child, "_") || isCuratedHierarchy(child) || isCustomHierarchy(child)) { // Child is likely curated.
return childName
}
Comment on lines 822 to 825

@gemini-code-assist gemini-code-assist Bot Jun 23, 2026

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.

medium

Update the call to use the renamed isNonBaseDCHierarchy function for clarity.

Suggested change
func getSpecializedEntity(parent, child, childName string) string {
if !strings.Contains(child, "_") || isCuratedHierarchy(child) { // Child is likely curated.
if childName != "" && (!strings.Contains(child, "_") || isCuratedHierarchy(child) || isCustomHierarchy(child)) { // Child is likely curated.
return childName
}
func getSpecializedEntity(parent, child, childName string) string {
if childName != "" && (!strings.Contains(child, "_") || isCuratedHierarchy(child) || isNonBaseDCHierarchy(child)) { // Child is likely curated.
return childName
}

parentParts := processSvgId(parent)
Expand Down
Loading