bug fixes

Author: dehann

src/DataBlobs/services/AbstractDataEntries.jl

@@ -225,12 +225,12 @@ end
 If the blob label `datalabel` already exists, then this function will return the name `datalabel_1`.
 If the blob label `datalabel_1` already exists, then this function will return the name `datalabel_2`.
 """
-function incrBlobLabelSuffix(
+function incrDataLabelSuffix(
     dfg::AbstractDFG,
     vla,
-    bllb; 
+    bllb::S; 
     datalabel=Ref("")
-)
+) where {S <: Union{Symbol, <:AbstractString}}
     count = 1
     hasund = false
     try
@@ -253,5 +253,6 @@ function incrBlobLabelSuffix(
     end
     bllb *= !hasund || bllb[end] != '_' ? "_" : ""
     bllb *= string(count)
-    bllb
+
+    S(bllb)
 end

src/DistributedFactorGraphs.jl

@@ -199,7 +199,7 @@ export addDataEntry!, getDataEntry, updateDataEntry!, deleteDataEntry!, getDataE
 export listDataEntrySequence
 # convenience wrappers
 export addDataEntry!, mergeDataEntries!
-export incrBlobLabelSuffix
+export incrDataLabelSuffix
 # aliases
 export addData!
 

test/consol_DataEntryBlobTests.jl

@@ -95,8 +95,9 @@ ade,adb = addData!(dfg, :filestore, :x1, :random, dataset1)
 ade,adb = addData!(dfg, :filestore, :x1, :another_1, dataset1)
 gde,gdb = getData(dfg, :x1, :random)
 
-@test incrBlobLabelSuffix(dfg,:x2,:random) == :random_1
-@test incrBlobLabelSuffix(dfg,:x2,:another) == :another_2
+@test incrDataLabelSuffix(dfg,:x1,:random) == :random_1
+@test incrDataLabelSuffix(dfg,:x1,:another) == :another_2
+# @test incrDataLabelSuffix(dfg,:x1,"random") == "random_1" # TODO expand support for label::String
 
 dde,ddb = deleteData!(dfg, :x1, :random)