Merge pull request #76 from mpsonntag/createDelete

Add setter methods for Section

Author: asobolev

+nix/Section.m

@@ -34,15 +34,32 @@
                section = nix.Section(handle);
            end;
         end;
-        
-        function section = link(obj)
-           handle = nix_mx('Section::link', obj.nix_handle);
+
+        % ----------------
+        % Link methods
+        % ----------------
+
+        function [] = set_link(obj, val)
+            if (isempty(val))
+                nix_mx('Section::set_none_link', obj.nix_handle);
+            else
+                if(strcmp(class(val), 'nix.Section'))
+                    addID = val.id;
+                else
+                    addID = val;
+                end;
+                nix_mx('Section::set_link', obj.nix_handle, addID);
+            end;
+        end;
+
+        function section = openLink(obj)
+           handle = nix_mx('Section::openLink', obj.nix_handle);
            section = {};
            if handle ~= 0
                section = nix.Section(handle);
            end;
         end;
-        
+
         % ----------------
         % Section methods
         % ----------------

nix_mx.cc

@@ -212,8 +212,13 @@ void mexFunction(int            nlhs,
             .reg("openSection", GETBYSTR(nix::Section, nix::Section, getSection))
             .reg("hasProperty", GETBYSTR(bool, nix::Section, hasProperty))
             .reg("hasSection", GETBYSTR(bool, nix::Section, hasSection))
-            .reg("link", GETCONTENT(nix::Section, nix::Section, link))
+            .reg("openLink", GETCONTENT(nix::Section, nix::Section, link))
+            .reg("set_link", SETTER(const std::string&, nix::Section, link))
+            .reg("set_none_link", SETTER(const boost::none_t, nix::Section, link))
             .reg("parent", GETCONTENT(nix::Section, nix::Section, parent))
+            .reg("set_type", SETTER(const std::string&, nix::Section, type))
+            .reg("set_definition", SETTER(const std::string&, nix::Section, definition))
+            .reg("set_none_definition", SETTER(const boost::none_t, nix::Section, definition))
             .reg("set_repository", SETTER(const std::string&, nix::Section, repository))
             .reg("set_none_repository", SETTER(const boost::none_t, nix::Section, repository))
             .reg("set_mapping", SETTER(const std::string&, nix::Section, mapping))

src/nixsection.cc

@@ -14,12 +14,13 @@ namespace nixsection {
 mxArray *describe(const nix::Section &section)
 {
     struct_builder sb({ 1 }, { 
-        "name", "id", "type", "repository", "mapping"
+        "name", "id", "type", "definition", "repository", "mapping"
     });
 
     sb.set(section.name());
     sb.set(section.id());
     sb.set(section.type());
+    sb.set(section.definition());
     sb.set(section.repository());
     sb.set(section.mapping());
 

tests/TestSection.m

@@ -11,6 +11,7 @@
     funcs{end+1} = @test_has_section;
     funcs{end+1} = @test_attrs;
     funcs{end+1} = @test_properties;
+    funcs{end+1} = @test_link;
 end
 
 %% Test: Create Section
@@ -89,40 +90,31 @@
 function [] = test_attrs( varargin )
 %% Test: Access Attributes / Links
     f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    s1 = f.createSection('foo', 'bar');
-
-    assert(strcmp(s1.name, 'foo'));
-    assert(strcmp(s1.type, 'bar'));
-    assert(isempty(s1.repository));
-    assert(isempty(s1.mapping));
-
-    s1.repository = 'rep1';
-    s1.mapping = 'map1';
-    assert(strcmp(s1.repository, 'rep1'));
-    assert(strcmp(s1.mapping, 'map1'));
-    
-    s1.repository = '';
-    s1.mapping = '';
-    assert(isempty(s1.repository));
-    assert(isempty(s1.mapping));
-
-    assert(isempty(s1.link));
-    
-    % TODO rewrite tests for link / parent
-    
-    f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    s1 = f.sections{3};
-    
-    assert(strcmp(s1.name, 'Sessions'));
-    assert(strcmp(s1.type, 'nix.metadata.section'));
-    assert(isempty(s1.repository));
-    assert(isempty(s1.mapping));
-    
-    subj = s1.sections{1}.sections{1}.link;
-    assert(strcmp(subj.name, 'Subject'));
-    
-    emp_ty = s1.sections{1}.link;
-    assert(isempty(emp_ty));
+    s = f.createSection('foo', 'bar');
+
+    assert(~isempty(s.id));
+
+    assert(strcmp(s.name, 'foo'));
+    assert(strcmp(s.type, 'bar'));
+    assert(isempty(s.repository));
+    assert(isempty(s.mapping));
+    assert(isempty(s.definition));
+
+    s.type = 'nixBlock';
+    s.definition = 'section definition';
+    s.repository = 'rep1';
+    s.mapping = 'map1';
+    assert(strcmp(s.type, 'nixBlock'));
+    assert(strcmp(s.definition, 'section definition'));
+    assert(strcmp(s.repository, 'rep1'));
+    assert(strcmp(s.mapping, 'map1'));
+
+    s.definition = '';
+    s.repository = '';
+    s.mapping = '';
+    assert(isempty(s.definition));
+    assert(isempty(s.repository));
+    assert(isempty(s.mapping));
 end
 
 function [] = test_properties( varargin )
@@ -142,3 +134,20 @@
 
     assert(isempty(f.sections{3}.allProperties));
 end
+
+%%Test: set, open and remove section link
+function [] = test_link( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    mainSec = f.createSection('mainSection', 'nixSection');
+    tmp = f.createSection('linkSection1', 'nixSection');
+    tmp = f.createSection('linkSection2', 'nixSection');
+    
+    assert(isempty(mainSec.openLink));
+    mainSec.set_link(f.sections{3}.id);
+    assert(strcmp(mainSec.openLink.name, 'linkSection2'));
+    mainSec.set_link(f.sections{2});
+    assert(strcmp(mainSec.openLink.name, 'linkSection1'));
+    
+    mainSec.set_link('');
+    assert(isempty(mainSec.openLink));
+end