Fix optional string conversion and export typo

Author: jp-dark

R/RcppExports.R

@@ -1261,6 +1261,10 @@ libtiledb_profile_save <- function(profile) {
     invisible(.Call(`_tiledb_libtiledb_profile_save`, profile))
 }
 
+libtiledb_profile_dump <- function(profile) {
+    .Call(`_tiledb_libtiledb_profile_dump`, profile)
+}
+
 vecbuf_to_shmem <- function(dir, name, buf, sz, numvar) {
     invisible(.Call(`_tiledb_vecbuf_to_shmem`, dir, name, buf, sz, numvar))
 }

src/RcppExports.cpp

@@ -3758,6 +3758,17 @@ BEGIN_RCPP
     return R_NilValue;
 END_RCPP
 }
+// libtiledb_profile_dump
+std::string libtiledb_profile_dump(XPtr<tiledb::Profile> profile);
+RcppExport SEXP _tiledb_libtiledb_profile_dump(SEXP profileSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< XPtr<tiledb::Profile> >::type profile(profileSEXP);
+    rcpp_result_gen = Rcpp::wrap(libtiledb_profile_dump(profile));
+    return rcpp_result_gen;
+END_RCPP
+}
 // vecbuf_to_shmem
 void vecbuf_to_shmem(std::string dir, std::string name, XPtr<query_buf_t> buf, int sz, int numvar);
 RcppExport SEXP _tiledb_vecbuf_to_shmem(SEXP dirSEXP, SEXP nameSEXP, SEXP bufSEXP, SEXP szSEXP, SEXP numvarSEXP) {
@@ -4146,6 +4157,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_tiledb_libtiledb_profile_set_param", (DL_FUNC) &_tiledb_libtiledb_profile_set_param, 3},
     {"_tiledb_libtiledb_profile_get_param", (DL_FUNC) &_tiledb_libtiledb_profile_get_param, 2},
     {"_tiledb_libtiledb_profile_save", (DL_FUNC) &_tiledb_libtiledb_profile_save, 1},
+    {"_tiledb_libtiledb_profile_dump", (DL_FUNC) &_tiledb_libtiledb_profile_dump, 1},
     {"_tiledb_vecbuf_to_shmem", (DL_FUNC) &_tiledb_vecbuf_to_shmem, 5},
     {"_tiledb_vlcbuf_to_shmem", (DL_FUNC) &_tiledb_vlcbuf_to_shmem, 4},
     {"_tiledb_querybuf_from_shmem", (DL_FUNC) &_tiledb_querybuf_from_shmem, 2},

src/libtiledb.cpp

@@ -5932,43 +5932,33 @@ bool libtiledb_current_domain_is_empty(XPtr<tiledb::CurrentDomain> cd) {
  * Profile (2.29.0 or later)
  */
 
+std::optional<std::string> as_optional_string(Nullable<CharacterVector> param) {
+    if (param.isNull()) {
+        return std::nullopt;
+    }
+    CharacterVector tmp(param);
+    return std::string(tmp[0]);
+}
+
 
 // [[Rcpp::export]]
 XPtr<tiledb::Profile> libtiledb_profile_new(Nullable<CharacterVector> name = R_NilValue, Nullable<CharacterVector> dir  = R_NilValue) {
-    std::optional<std::string> name_ = std::nullopt;
-    std::optional<std::string> dir_ = std::nullopt;
-    if (name.isNotNull()) {
-        name_ = as<std::string>(name);
-    }
-    if (name.isNotNull()) {
-        dir_ = as<std::string>(dir);
-    }
-     return make_xptr<tiledb::Profile>(new tiledb::Profile(name_, dir_));
+    auto name_ = as_optional_string(name);
+    auto dir_ = as_optional_string(dir);
+    return make_xptr<tiledb::Profile>(new tiledb::Profile(name_, dir_));
 }
 
 // [[Rcpp::export]]
 XPtr<tiledb::Profile> libtiledb_profile_load(Nullable<CharacterVector> name = R_NilValue, Nullable<CharacterVector> dir = R_NilValue) {
-    std::optional<std::string> name_ = std::nullopt;
-    std::optional<std::string> dir_ = std::nullopt;
-    if (name.isNotNull()) {
-        name_ = as<std::string>(name);
-    }
-    if (name.isNotNull()) {
-        dir_ = as<std::string>(dir);
-    }
+    auto name_ = as_optional_string(name);
+    auto dir_ = as_optional_string(dir);
     return make_xptr<tiledb::Profile>(new tiledb::Profile(tiledb::Profile::load(name_, dir_)));
 }
 
 // [[Rcpp:export]]
 void libtiledb_profile_remove(Nullable<CharacterVector> name = R_NilValue, Nullable<CharacterVector> dir = R_NilValue) {
-    std::optional<std::string> name_ = std::nullopt;
-    std::optional<std::string> dir_ = std::nullopt;
-    if (name.isNotNull()) {
-        name_ = as<std::string>(name);
-    }
-    if (name.isNotNull()) {
-        dir_ = as<std::string>(dir);
-    }
+    auto name_ = as_optional_string(name);
+    auto dir_ = as_optional_string(dir);
     return tiledb::Profile::remove(name_, dir_);
 }
 
@@ -6001,7 +5991,8 @@ void libtiledb_profile_save(XPtr<tiledb::Profile> profile) {
     return profile->save();
 }
 
-// [[Rcpp:export]]
+// [[Rcpp::export]]
 std::string libtiledb_profile_dump(XPtr<tiledb::Profile> profile) {
     return profile->dump();
 }
+