Skip to content

Update from main #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2022
Merged

Update from main #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5514ef
Remove forcing of external dependency #21
RyanJField Jun 18, 2022
f3b12da
Merge pull request #29 from FAIRDataPipeline/RyanJField-dev
RyanJField Jun 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/fdp/fdp.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ namespace FairDataPipeline {
* Whilst recording it's meta data for the code run
*
* @param data_product
* @return ghc::filesystem::path
* @return std::string
*/
ghc::filesystem::path link_read(std::string &data_product);
std::string link_read(std::string &data_product);

/**
* @brief Return a path to be used for a given data product
* whilst recording it's meta data
*
* @param data_product
* @return ghc::filesystem::path
* @return std::string
*/
ghc::filesystem::path link_write(std::string &data_product);
std::string link_write(std::string &data_product);

/**
* @brief Finalise the pipeline
Expand Down
8 changes: 4 additions & 4 deletions src/fdp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ DataPipeline::DataPipeline(
<< pimpl_->get_code_run_uuid() << "'";
}

ghc::filesystem::path FairDataPipeline::DataPipeline::link_read(std::string &data_product){
return pimpl_->link_read(data_product);
std::string FairDataPipeline::DataPipeline::link_read(std::string &data_product){
return pimpl_->link_read(data_product).string();
}

ghc::filesystem::path FairDataPipeline::DataPipeline::link_write(std::string &data_product){
return pimpl_->link_write(data_product);
std::string FairDataPipeline::DataPipeline::link_write(std::string &data_product){
return pimpl_->link_write(data_product).string();
}

void FairDataPipeline::DataPipeline::finalise(){
Expand Down