Skip to content

Commit

Permalink
Merge branch 'master' into cimpl-1140-antlr-update
Browse files Browse the repository at this point in the history
  • Loading branch information
cmoesel authored Jul 25, 2023
2 parents c9ba07f + 8dc0129 commit 2a0cc9b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
20 changes: 9 additions & 11 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"chalk": "^3.0.0",
"commander": "^8.2.0",
"fhir": "^4.9.0",
"fhir-package-loader": "^0.4.0",
"fhir-package-loader": "^0.5.0",
"fs-extra": "^8.1.0",
"html-minifier-terser": "5.1.1",
"https-proxy-agent": "^5.0.0",
Expand Down
5 changes: 3 additions & 2 deletions src/fhirdefs/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export function loadCustomResources(
resourceJSON = converter.xmlToObj(xml);
} else {
invalidFileCount++;
logger.debug(`File not processed by SUSHI: ${file}`);
continue;
}
} catch (e) {
Expand Down Expand Up @@ -98,8 +99,8 @@ export function loadCustomResources(
if (invalidFileCount > 0) {
logger.info(
invalidFileCount > 1
? `Found ${invalidFileCount} files in input/* resource folders that were neither XML nor JSON. These files were not processed as resources by SUSHI.`
: `Found ${invalidFileCount} file in an input/* resource folder that was neither XML nor JSON. This file was not processed as a resource by SUSHI.`
? `Found ${invalidFileCount} files in input/* resource folders that were neither XML nor JSON. These files were not processed as resources by SUSHI. To see the unprocessed files in the logs, run SUSHI with the "--log-level debug" flag.`
: `Found ${invalidFileCount} file in an input/* resource folder that was neither XML nor JSON. This file was not processed as a resource by SUSHI. To see the unprocessed file in the logs, run SUSHI with the "--log-level debug" flag.`
);
}
}
Expand Down

0 comments on commit 2a0cc9b

Please sign in to comment.