Merge pull request #61 from mpsonntag/createDelete

Create and delete Source

Author: asobolev

+nix/Block.m

@@ -54,6 +54,21 @@
         % Sources methods
         % -----------------
 
+        function s = create_source(obj, name, type)
+            s = nix.Source(nix_mx('Block::createSource', obj.nix_handle, name, type));
+            obj.sourcesCache.lastUpdate = 0;
+        end;
+        
+        function delCheck = delete_source(obj, del)
+            if(strcmp(class(del),'nix.Source'))
+                delID = del.id;
+            else
+                delID = del;
+            end;
+            delCheck = nix_mx('Block::deleteSource', obj.nix_handle, delID);
+            obj.sourcesCache.lastUpdate = 0;
+        end;
+        
         function retObj = open_source(obj, id_or_name)
             handle = nix_mx('Block::openSource', obj.nix_handle, id_or_name);
             retObj = {};

+nix/Source.m

@@ -51,7 +51,22 @@
         % ------------------
         % Sources methods
         % ------------------
-        
+
+        function s = create_source(obj, name, type)
+            s = nix.Source(nix_mx('Source::createSource', obj.nix_handle, name, type));
+            obj.sourcesCache.lastUpdate = 0;
+        end;
+
+        function delCheck = delete_source(obj, del)
+            if(strcmp(class(del),'nix.Source'))
+                delID = del.id;
+            else
+                delID = del;
+            end;
+            delCheck = nix_mx('Source::deleteSource', obj.nix_handle, delID);
+            obj.sourcesCache.lastUpdate = 0;
+        end;
+
         function retObj = open_source(obj, id_or_name)
             handle = nix_mx('Source::openSource', obj.nix_handle, id_or_name);
             retObj = {};

nix_mx.cc

@@ -103,6 +103,7 @@ void mexFunction(int            nlhs,
             .desc(&nixblock::describe)
             .reg("dataArrays", &nix::Block::dataArrays)
             .reg("createSource", &nix::Block::createSource)
+            .reg("deleteSource", REMOVER(nix::Source, nix::Block, deleteSource))
             //.reg("createDataArray", static_cast<nix::DataArray(nix::Block::*)(const std::string &, const std::string &, nix::DataType, const nix::NDSize &)>(&nix::Block::createDataArray))
             .reg("createTag", &nix::Block::createTag)
             .reg("createMultiTag", &nix::Block::createMultiTag)
@@ -127,6 +128,8 @@ void mexFunction(int            nlhs,
 
         classdef<nix::Source>("Source", methods)
             .desc(&nixsource::describe)
+            .reg("createSource", &nix::Source::createSource)
+            .reg("deleteSource", REMOVER(nix::Source, nix::Source, deleteSource))
             .reg("sources", &nix::Source::sources)
             .reg("openSource", GETBYSTR(nix::Source, nix::Source, getSource))
             .reg("openMetadataSection", GETCONTENT(nix::Section, nix::Source, metadata));

tests/TestBlock.m

@@ -18,6 +18,8 @@
     funcs{end+1} = @test_create_tag;
     funcs{end+1} = @test_create_data_array;
     funcs{end+1} = @test_create_data_array_from_data;
+    funcs{end+1} = @test_create_source;
+    funcs{end+1} = @test_delete_source;
 end
 
 function [] = test_list_arrays( varargin )
@@ -210,3 +212,28 @@
 
     assert(~isempty(b.dataArrays));
 end
+
+%% Test: create source
+function [] = test_create_source ( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    getBlock = test_file.createBlock('sourcetest', 'nixblock');
+    assert(isempty(getBlock.sources));
+
+    createSource = getBlock.create_source('sourcetest','nixsource');
+    assert(~isempty(getBlock.sources));
+    assert(strcmp(createSource.name, 'sourcetest'));
+    assert(strcmp(createSource.type, 'nixsource'));
+end
+
+%% Test: delete source
+function [] = test_delete_source( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    getBlock = test_file.createBlock('sourcetest', 'nixblock');
+    createSource1 = getBlock.create_source('sourcetest1','nixsource');
+    createSource2 = getBlock.create_source('sourcetest2','nixsource');
+
+    assert(getBlock.delete_source('sourcetest1'));
+    assert(getBlock.delete_source(getBlock.sources{1}.id));
+    assert(~getBlock.delete_source('I do not exist'));
+    assert(isempty(getBlock.sources));
+end

tests/TestSource.m

@@ -6,6 +6,8 @@
     funcs{end+1} = @test_list_fetch_sources;
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_open_metadata;
+    funcs{end+1} = @test_create_source;
+    funcs{end+1} = @test_delete_source;
 end
 
 %% Test: List/fetch sources
@@ -53,3 +55,30 @@
     disp('Test Source: open existing metadata ... TODO (proper testfile)');
 end
 
+%% Test: create source
+function [] = test_create_source ( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    getBlock = test_file.createBlock('sourcetest', 'nixblock');
+    getSource = getBlock.create_source('sourcetest','nixsource');
+    assert(isempty(getSource.sources));
+
+    createSource = getSource.create_source('nestedsource','nixsource');
+    assert(~isempty(getSource.sources));
+    assert(strcmp(createSource.name, 'nestedsource'));
+    assert(strcmp(createSource.type, 'nixsource'));
+end
+
+%% Test: delete source
+function [] = test_delete_source( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    getBlock = test_file.createBlock('sourcetest', 'nixblock');
+    getSource = getBlock.create_source('sourcetest','nixsource');
+    assert(isempty(getSource.sources));
+
+    createSource1 = getSource.create_source('nestedsource1','nixsource');
+    createSource2 = getSource.create_source('nestedsource2','nixsource');
+    assert(getSource.delete_source('nestedsource1'));
+    assert(getSource.delete_source(getSource.sources{1}.id));
+    assert(~getSource.delete_source('I do not exist'));
+    assert(isempty(getSource.sources));
+end