migrateToGlue: remove has_metadata

mpsonntag · mpsonntag · commit 76d3fd980fd3 · 2015-02-26T17:34:35.000+01:00
diff --git a/+nix/Block.m b/+nix/Block.m
@@ -104,10 +104,6 @@
         % Metadata methods
         % -----------------
         
-        function hasMetadata = has_metadata(obj)
-            hasMetadata = nix_mx('Block::hasMetadataSection', obj.nix_handle);
-        end;
-        
         function metadata = open_metadata(obj)
             [obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
                 'Block::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);
diff --git a/+nix/DataArray.m b/+nix/DataArray.m
@@ -91,10 +91,6 @@
         % Metadata methods
         % -----------------
         
-        function hasMetadata = has_metadata(obj)
-            hasMetadata = nix_mx('DataArray::hasMetadataSection', obj.nix_handle);
-        end;
-        
         function metadata = open_metadata(obj)
             [obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
                 'DataArray::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);
diff --git a/+nix/MultiTag.m b/+nix/MultiTag.m
@@ -190,10 +190,6 @@
         % Metadata methods
         % ------------------
         
-        function hasMetadata = has_metadata(obj)
-            hasMetadata = nix_mx('MultiTag::hasMetadataSection', obj.nix_handle);
-        end;
-        
         function metadata = open_metadata(obj)
             [obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
                 'MultiTag::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);
diff --git a/+nix/Source.m b/+nix/Source.m
@@ -73,10 +73,6 @@
         % Metadata methods
         % ------------------
         
-        function hasMetadata = has_metadata(obj)
-            hasMetadata = nix_mx('Source::hasMetadataSection', obj.nix_handle);
-        end;
-        
         function metadata = open_metadata(obj)
             [obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
                 'Source::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);
diff --git a/+nix/Tag.m b/+nix/Tag.m
@@ -168,10 +168,6 @@
         % Metadata methods
         % ------------------
 
-        function hasMetadata = has_metadata(obj)
-            hasMetadata = nix_mx('Tag::hasMetadataSection', obj.nix_handle);
-        end;
-        
         function metadata = open_metadata(obj)
             [obj.metadataCache, metadata] = nix.Utils.fetchObj(obj.updatedAt, ...
                 'Tag::openMetadataSection', obj.nix_handle, obj.metadataCache, @nix.Section);
diff --git a/nix_mx.cc b/nix_mx.cc
@@ -70,21 +70,18 @@ const std::vector<fendpoint> funcs = {
     { "Block::listSources", nixblock::list_sources },
     { "Block::listTags", nixblock::list_tags },
     { "Block::listMultiTags", nixblock::list_multi_tags },
-    { "Block::hasMetadataSection", nixblock::has_metadata_section },
     { "Block::openMetadataSection", nixblock::open_metadata_section },
 
     // Data Array
     { "DataArray::describe", nixdataarray::describe },
     { "DataArray::readAll", nixdataarray::read_all },
-    { "DataArray::hasMetadataSection", nixdataarray::has_metadata_section },
     { "DataArray::openMetadataSection", nixdataarray::open_metadata_section },
 
     // Tag
     { "Tag::describe", nixtag::describe },
     { "Tag::listReferences", nixtag::list_references_array },
     { "Tag::listFeatures", nixtag::list_features },
     { "Tag::listSources", nixtag::list_sources },
-    { "Tag::hasMetadataSection", nixtag::has_metadata_section },
     { "Tag::openMetadataSection", nixtag::open_metadata_section },
     { "Tag::retrieveData", nixtag::retrieve_data },
     { "Tag::featureRetrieveData", nixtag::retrieve_feature_data },
@@ -94,15 +91,13 @@ const std::vector<fendpoint> funcs = {
     { "MultiTag::listReferences", nixmultitag::list_references_array },
     { "MultiTag::listFeatures", nixmultitag::list_features },
     { "MultiTag::listSources", nixmultitag::list_sources },
-    { "MultiTag::hasMetadataSection", nixmultitag::has_metadata_section },
     { "MultiTag::openMetadataSection", nixmultitag::open_metadata_section },
     { "MultiTag::retrieveData", nixmultitag::retrieve_data },
     { "MultiTag::featureRetrieveData", nixmultitag::retrieve_feature_data },
 
     // Source
     { "Source::describe", nixsource::describe },
     { "Source::listSources", nixsource::list_sources },
-    { "Source::hasMetadataSection", nixsource::has_metadata_section },
     { "Source::openMetadataSection", nixsource::open_metadata_section },
 
     // Feature
diff --git a/src/nixblock.cc b/src/nixblock.cc
@@ -77,12 +77,6 @@ namespace nixblock {
         output.set(0, sb.array());
     }
 
-    void has_metadata_section(const extractor &input, infusor &output)
-    {
-        nix::Block currObj = input.entity<nix::Block>(1);
-        output.set(0, nixgen::has_metadata_section(currObj.metadata()));
-    }
-
     void open_metadata_section(const extractor &input, infusor &output)
     {
         nix::Block currObj = input.entity<nix::Block>(1);
diff --git a/src/nixblock.h b/src/nixblock.h
@@ -15,8 +15,6 @@ namespace nixblock {
 
     void list_multi_tags(const extractor &input, infusor &output);
 
-    void has_metadata_section(const extractor &input, infusor &output);
-
     void open_metadata_section(const extractor &input, infusor &output);
 
 } // namespace nixblock
diff --git a/src/nixdataarray.cc b/src/nixdataarray.cc
@@ -63,12 +63,6 @@ namespace nixdataarray {
         output.set(0, data);
     }
 
-    void has_metadata_section(const extractor &input, infusor &output)
-    {
-        nix::DataArray currObj = input.entity<nix::DataArray>(1);
-        output.set(0, nixgen::has_metadata_section(currObj.metadata()));
-    }
-
     void open_metadata_section(const extractor &input, infusor &output)
     {
         nix::DataArray currObj = input.entity<nix::DataArray>(1);
diff --git a/src/nixdataarray.h b/src/nixdataarray.h
@@ -9,8 +9,6 @@ namespace nixdataarray {
     
     void read_all(const extractor &input, infusor &output);
 
-    void has_metadata_section(const extractor &input, infusor &output);
-
     void open_metadata_section(const extractor &input, infusor &output);
 
 } // namespace nixdataarray
diff --git a/src/nixgen.cc b/src/nixgen.cc
@@ -33,18 +33,6 @@ namespace nixgen {
         return sb.array();
     }
 
-    mxArray* has_metadata_section(nix::Section currSection)
-    {
-        bool hasMetadataSection = false;
-        // check if an actual, initialized section has been returned
-        if (currSection != nix::none)
-        {
-            hasMetadataSection = true;
-        }
-
-        return make_mx_array(hasMetadataSection);
-    }
-
     mxArray* list_features(std::vector<nix::Feature> featIn)
     {
         std::vector<nix::Feature> arr = featIn;
diff --git a/src/nixgen.h b/src/nixgen.h
@@ -18,8 +18,6 @@ namespace nixgen {
 
     handle open_feature(nix::Feature featIn);
 
-    mxArray* has_metadata_section(nix::Section currSection);
-
     template<typename T>
     uint64_t get_handle_or_none(T &&obj) {
         if (obj) {
diff --git a/src/nixmultitag.cc b/src/nixmultitag.cc
@@ -43,12 +43,6 @@ namespace nixmultitag {
         output.set(0, nixgen::list_sources(currObj.sources()));
     }
 
-    void has_metadata_section(const extractor &input, infusor &output)
-    {
-        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
-        output.set(0, nixgen::has_metadata_section(currObj.metadata()));
-    }
-
     void open_metadata_section(const extractor &input, infusor &output)
     {
         nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
diff --git a/src/nixmultitag.h b/src/nixmultitag.h
@@ -13,8 +13,6 @@ namespace nixmultitag {
 
     void list_sources(const extractor &input, infusor &output);
 
-    void has_metadata_section(const extractor &input, infusor &output);
-
     void open_metadata_section(const extractor &input, infusor &output);
 
     void retrieve_data(const extractor &input, infusor &output);
diff --git a/src/nixsection.h b/src/nixsection.h
@@ -7,14 +7,8 @@ namespace nixsection {
 
 void describe(const extractor &input, infusor &output);
 
-void has_section(const extractor &input, infusor &output);
-
-void open_section(const extractor &input, infusor &output);
-
 void list_sections(const extractor &input, infusor &output);
 
-void has_property(const extractor &input, infusor &output);
-
 void list_properties(const extractor &input, infusor &output);
 
 } // namespace nixfile
diff --git a/src/nixsource.cc b/src/nixsource.cc
@@ -28,12 +28,6 @@ namespace nixsource {
         output.set(0, nixgen::list_sources(currObj.sources()));
     }
 
-    void has_metadata_section(const extractor &input, infusor &output)
-    {
-        nix::Source currObj = input.entity<nix::Source>(1);
-        output.set(0, nixgen::has_metadata_section(currObj.metadata()));
-    }
-
     void open_metadata_section(const extractor &input, infusor &output)
     {
         nix::Source currObj = input.entity<nix::Source>(1);
diff --git a/src/nixsource.h b/src/nixsource.h
@@ -9,8 +9,6 @@ namespace nixsource {
 
     void list_sources(const extractor &input, infusor &output);
 
-    void has_metadata_section(const extractor &input, infusor &output);
-
     void open_metadata_section(const extractor &input, infusor &output);
 
 } // namespace nixsource
diff --git a/src/nixtag.cc b/src/nixtag.cc
@@ -46,12 +46,6 @@ namespace nixtag {
         output.set(0, nixgen::list_sources(currObj.sources()));
     }
 
-    void has_metadata_section(const extractor &input, infusor &output)
-    {
-        nix::Tag currObj = input.entity<nix::Tag>(1);
-        output.set(0, nixgen::has_metadata_section(currObj.metadata()));
-    }
-
     void open_metadata_section(const extractor &input, infusor &output)
     {
         nix::Tag currObj = input.entity<nix::Tag>(1);
diff --git a/src/nixtag.h b/src/nixtag.h
@@ -13,8 +13,6 @@ namespace nixtag {
 
     void list_sources(const extractor &input, infusor &output);
 
-    void has_metadata_section(const extractor &input, infusor &output);
-
     void open_metadata_section(const extractor &input, infusor &output);
 
     void retrieve_data(const extractor &input, infusor &output);
diff --git a/tests/TestBlock.m b/tests/TestBlock.m
@@ -13,7 +13,6 @@
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_has_multitag;
     funcs{end+1} = @test_has_tag;
-    funcs{end+1} = @test_has_metadata;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_attrs;
     funcs{end+1} = @test_create_tag;
@@ -137,18 +136,6 @@
     assert(getBlock.has_tag(getBlock.tags{1,1}.name));
 end
 
-function [] = test_has_metadata( varargin )
-%% Test: Has metadata
-    test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-
-    assert(~getBlock.has_metadata());
-   
-    %-- ToDo implement test for exising metadata
-    %getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-    %assert(getBlock.has_metadata())
-end
-
 function [] = test_open_metadata( varargin )
 %% Test: Open metadata
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
diff --git a/tests/TestDataArray.m b/tests/TestDataArray.m
@@ -4,7 +4,6 @@
 
     funcs = {};
     funcs{end+1} = @test_open_data;
-    funcs{end+1} = @test_has_metadata;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_list_sources;
 end
@@ -18,20 +17,6 @@
     assert(size(getDataArray.read_all(),2) == 36);
 end
 
-%% Test: Has metadata
-function [] = test_has_metadata( varargin )
-    test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-
-    %-- ToDo implement test for empty metadata
-    getDataArray = getBlock.data_array(getBlock.dataArrays{1,1}.id);
-    %assert(~getDataArray.has_metadata());
-    disp('Test DataArray: has empty metadata ... TODO (proper testfile)');
-    
-    getDataArray = getBlock.data_array(getBlock.dataArrays{1,1}.id);
-    assert(getDataArray.has_metadata())
-end
-
 %% Test: Open metadata
 function [] = test_open_metadata( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
diff --git a/tests/TestMultiTag.m b/tests/TestMultiTag.m
@@ -12,7 +12,6 @@
     funcs{end+1} = @test_has_positions;
     funcs{end+1} = @test_open_positions;
     funcs{end+1} = @test_open_extents;
-    funcs{end+1} = @test_has_metadata;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_retrieve_data;
     funcs{end+1} = @test_retrieve_feature_data;
@@ -148,20 +147,6 @@
     disp('Test MultiTag: open existing extents ... TODO (proper testfile)');
 end
 
-%% Test: Has metadata
-function [] = test_has_metadata( varargin )
-    test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-
-    getMultiTag = getBlock.open_multi_tag(getBlock.multiTags{1,1}.id);
-    assert(~getMultiTag.has_metadata());
-   
-    %-- ToDo implement test for existing metadata
-    %getMultiTag = getBlock.open_multi_tag(getBlock.multiTags{2,1}.id);
-    %assert(getMultiTag.has_metadata());
-    disp('Test MultiTag: has existing metadata ... TODO (proper testfile)');
-end
-
 %% Test: Open metadata
 function [] = test_open_metadata( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
diff --git a/tests/TestSource.m b/tests/TestSource.m
@@ -5,7 +5,6 @@
     funcs = {};
     funcs{end+1} = @test_list_fetch_sources;
     funcs{end+1} = @test_open_source;
-    funcs{end+1} = @test_has_metadata;
     funcs{end+1} = @test_open_metadata;
 end
 
@@ -43,20 +42,6 @@
     assert(isempty(getSource));
 end
 
-%% Test: Has metadata
-function [] = test_has_metadata( varargin )
-    test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-    
-    getSource = getBlock.open_source(getBlock.sources{1,1}.id);
-    assert(~getSource.has_metadata());
-    
-    %-- ToDo implement test for empty metadata
-    %getSource = getBlock.open_source(getBlock.sources{1,1}.id);
-    %assert(getSource.has_metadata())
-    disp('Test Source: has existing metadata ... TODO (proper testfile)');
-end
-
 %% Test: Open metadata
 function [] = test_open_metadata( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
diff --git a/tests/TestTag.m b/tests/TestTag.m
@@ -9,7 +9,6 @@
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_open_feature;
     funcs{end+1} = @test_open_reference;
-    funcs{end+1} = @test_has_metadata;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_retrieve_data;
     funcs{end+1} = @test_retrieve_feature_data;
@@ -114,18 +113,6 @@
 end
 
 
-%% Test: Has metadata
-function [] = test_has_metadata( varargin )
-    test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
-    getBlock = test_file.openBlock(test_file.blocks{1,1}.name);
-
-    getTag = getBlock.open_tag(getBlock.tags{1,1}.id);
-    assert(~getTag.has_metadata());
-    
-    getTag = getBlock.open_tag(getBlock.tags{2,1}.id);
-    assert(getTag.has_metadata());
-end
-
 %% Test: Open metadata
 function [] = test_open_metadata( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,6 @@ namespace nixblock {`
`77`	`77`	`output.set(0, sb.array());`
`78`	`78`	`}`
`79`	`79`
`80`		`- void has_metadata_section(const extractor &input, infusor &output)`
`81`		`- {`
`82`		`- nix::Block currObj = input.entity<nix::Block>(1);`
`83`		`- output.set(0, nixgen::has_metadata_section(currObj.metadata()));`
`84`		`- }`
`85`		`-`
`86`	`80`	`void open_metadata_section(const extractor &input, infusor &output)`
`87`	`81`	`{`
`88`	`82`	`nix::Block currObj = input.entity<nix::Block>(1);`
Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,6 @@ namespace nixdataarray {`
`63`	`63`	`output.set(0, data);`
`64`	`64`	`}`
`65`	`65`
`66`		`- void has_metadata_section(const extractor &input, infusor &output)`
`67`		`- {`
`68`		`- nix::DataArray currObj = input.entity<nix::DataArray>(1);`
`69`		`- output.set(0, nixgen::has_metadata_section(currObj.metadata()));`
`70`		`- }`
`71`		`-`
`72`	`66`	`void open_metadata_section(const extractor &input, infusor &output)`
`73`	`67`	`{`
`74`	`68`	`nix::DataArray currObj = input.entity<nix::DataArray>(1);`