Main june23

+ndi/+cloud/+api/+datasets/get_files_bulk.m

@@ -0,0 +1,34 @@
+function [status, response, url] = get_files_bulk(dataset_id)
+%GET_FILES_BULK - get an upload URL for all file that will be published to the NDI Cloud
+%
+% [STATUS,RESPONSE,URL] = ndi.cloud.api.datasets.GET_FILES_BULK(DATASET_ID)
+%
+% Inputs:
+%   DATASET_ID - a string representing the id of the dataset
+%
+% Outputs:
+%   STATUS - did get request work? 1 for no, 0 for yes
+%   RESPONSE - the get request summary
+%   URL - the upload URL to PUT the file to
+%
+[auth_token, ~] = ndi.cloud.uilogin();
+
+url = matlab.net.URI(ndi.cloud.api.url('get_files_bulk', 'dataset_id', dataset_id));
+
+method = matlab.net.http.RequestMethod.GET;
+
+acceptField = matlab.net.http.HeaderField('accept','application/json');
+authorizationField = matlab.net.http.HeaderField('Authorization', ['Bearer ' auth_token]);
+headers = [acceptField authorizationField];
+
+request = matlab.net.http.RequestMessage(method, headers);
+response = send(request, url);
+status = 1;
+if (response.StatusCode == 200)
+    status = 0;
+    url = response.Body.Data.url;
+else
+    error('Failed to run command. %s', response.StatusLine.ReasonPhrase);
+end
+end
+

+ndi/+cloud/+api/url.m

@@ -61,5 +61,7 @@
     url = strcat(site, 'datasets/', dataset_id, '/documents/', document_id);
 elseif (strcmp(type, 'get_dataset_details'))
     url = strcat(site, 'datasets/', dataset_id, '/files/', uid, '/detail');
+elseif (strcmp(type, 'get_files_bulk'))
+    url = strcat(site, 'datasets/', dataset_id, '/files/bulk');
 end
 

+ndi/+cloud/download_dataset.m → +ndi/+cloud/+down/download_dataset.m

@@ -132,7 +132,7 @@
     fclose(fid);
 end
 
-D = ndi.cloud.fun.make_dataset_from_docs_files(output_path, [output_path filesep '.ndi' filesep 'reference.txt'],...
+D = ndi.cloud.down.make_dataset_from_docs_files(output_path, [output_path filesep '.ndi' filesep 'reference.txt'],...
 [output_path filesep 'download' filesep 'json'],[output_path filesep 'download' filesep 'files'] );
 
 end

+ndi/+cloud/+fun/make_dataset_from_docs_files.m → +ndi/+cloud/+down/make_dataset_from_docs_files.m

@@ -7,7 +7,7 @@
 %
 % DATASET_PATH is the full path of the dataset to be made.
 %
-% DATASET_REFERENCE is the full path of the dataset.
+% DATASET_REFERENCE is the dataset's reference.
 %
 % DOC_PATH is the full path of a directory with .json files of ndi.documents.
 %

+ndi/+cloud/create_cloud_metadata_struct.m → +ndi/+cloud/+up/create_cloud_metadata_struct.m

@@ -3,6 +3,13 @@
 %
 % [STATUS, DATASET] = ndi.cloud.CREATE_CLOUD_METADATA_STRUCT(S)
 %
+% Applies the MetaDataEditorApp data structure to 
+%   a) create a new dataset
+%   b) add metadata for the dataset to the cloud API
+%
+% Note: This function does not create any ndi.document representations
+% of the metadata, but only edits the metadata in the cloud API.   
+%
 % Inputs:
 %   S - a struct with the metadata to create
 %

+ndi/+cloud/+up/new_dataset.m

@@ -0,0 +1,26 @@
+function datasetId = new_dataset(D)
+% NEW_DATASET - upload a new dataset to NDI cloud
+%
+% DATASETID = NEW_DATASET(D)
+%
+% Upload an ndi.dataset object to NDI Cloud. The DATASETID on
+% NDI Cloud is returned.
+%
+
+arguments
+	D (1,1) {mustBeA(D,'ndi.dataset')}
+end
+
+ % Step 1: Create the dataset record on NDI Cloud and insert the metadata
+ %   Step 1a: Create metadata from the dataset
+
+metadata_structure = ndi.database.metadata_ds_core.ndidataset2metadataeditorstruct(D);
+
+ %   Step 1b: Create the dataset record on NDI cloud
+[status,response,datasetId] = ndi.cloud.up.create_cloud_metadata_struct(metadata_structure);
+
+ % Step 2: upload
+
+[b,msg] = ndi.cloud.up.upload_to_NDI_cloud(D,datasetId);
+
+

+ndi/+cloud/test_upload.m → +ndi/+cloud/+up/old/test_upload.m

@@ -14,6 +14,6 @@
 [auth_token, organization_id] = ndi.cloud.uilogin();
 d = struct('name',test_name);
 [status, response, dataset_id] = ndi.cloud.api.datasets.post_organization(d);
-[b, msg] = ndi.database.fun.upload_to_NDI_cloud(S, dataset_id);
+[b, msg] = ndi.cloud.up.upload_to_NDI_cloud(S, dataset_id);
 end
 

+ndi/+cloud/test_upload_old.m → +ndi/+cloud/+up/old/test_upload_old.m

@@ -200,6 +200,6 @@
 
 %%
 
-[B,MSG] = ndi.database.fun.upload_to_NDI_cloud(S, email, password, dataset_id);
+[B,MSG] = ndi.cloud.up.upload_to_NDI_cloud(S, email, password, dataset_id);
 %%
 prefix = [filesep 'Users' filesep 'cxy' filesep 'Documents' filesep 'MATLAB' filesep 'data' filesep '2021-04-01'];