Skip to content

Commit 1c131a0

Browse files
authored
Add strict_validation argument to manifest_generate. (#561)
1 parent 3db9b11 commit 1c131a0

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

R/schematic_rest_api.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ manifest_generate <- function(url="http://localhost:3001/v1/manifest/generate",
5757
schema_url="https://raw.githubusercontent.com/ncihtan/data-models/main/HTAN.model.jsonld", #nolint
5858
title, data_type,
5959
use_annotations="false", dataset_id=NULL,
60-
asset_view, output_format, access_token = NULL) {
60+
asset_view, output_format, access_token = NULL,
61+
strict_validation = FALSE) {
6162

6263
req <- httr::GET(url,
6364
query = list(
@@ -68,7 +69,8 @@ manifest_generate <- function(url="http://localhost:3001/v1/manifest/generate",
6869
dataset_id=dataset_id,
6970
asset_view=asset_view,
7071
output_format=output_format,
71-
access_token = access_token
72+
access_token = access_token,
73+
strict_validation = strict_validation
7274
))
7375

7476
check_success(req)

functions/schematic_rest_api.R

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ manifest_generate <- function(url="http://localhost:3001/v1/manifest/generate",
5757
schema_url="https://raw.githubusercontent.com/ncihtan/data-models/main/HTAN.model.jsonld", #nolint
5858
title, data_type,
5959
use_annotations="false", dataset_id=NULL,
60-
asset_view, output_format, access_token = NULL) {
60+
asset_view, output_format, access_token = NULL,
61+
strict_validation = FALSE) {
6162

6263
req <- httr::GET(url,
6364
query = list(
@@ -68,7 +69,8 @@ manifest_generate <- function(url="http://localhost:3001/v1/manifest/generate",
6869
dataset_id=dataset_id,
6970
asset_view=asset_view,
7071
output_format=output_format,
71-
access_token = access_token
72+
access_token = access_token,
73+
strict_validation = strict_validation
7274
))
7375

7476
check_success(req)
@@ -157,7 +159,7 @@ model_submit <- function(url="http://localhost:3001/v1/model/submit",
157159
schema_url="https://raw.githubusercontent.com/ncihtan/data-models/main/HTAN.model.jsonld", #notlint
158160
data_type, dataset_id, restrict_rules=FALSE, access_token, json_str=NULL, asset_view,
159161
use_schema_label=TRUE, manifest_record_type="table_and_file", file_name,
160-
table_manipulation="replace") {
162+
table_manipulation="replace", hide_blanks=FALSE) {
161163
req <- httr::POST(url,
162164
#add_headers(Authorization=paste0("Bearer ", pat)),
163165
query=list(
@@ -170,7 +172,8 @@ model_submit <- function(url="http://localhost:3001/v1/model/submit",
170172
asset_view=asset_view,
171173
use_schema_label=use_schema_label,
172174
manifest_record_type=manifest_record_type,
173-
table_manipulation=table_manipulation),
175+
table_manipulation=table_manipulation,
176+
hide_blanks=hide_blanks),
174177
body=list(file_name=httr::upload_file(file_name))
175178
#body=list(file_name=file_name)
176179
)

server.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,8 @@ shinyServer(function(input, output, session) {
585585
asset_view = .asset_view,
586586
use_annotations = .use_annotations,
587587
output_format = .output_format,
588-
access_token=access_token
588+
access_token=access_token,
589+
strict_validation = FALSE
589590
),
590591
{
591592
message("Downloading offline manifest")

0 commit comments

Comments
 (0)