Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
2aa5f55c
Unverified
Commit
2aa5f55c
authored
6 years ago
by
Martyn Gigg
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #23007 from mantidproject/18529_ICat_exception_fix
Caught exception in ICat
parents
457061a0
dd5a22f8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
qt/widgets/common/src/CatalogHelper.cpp
+14
-0
14 additions, 0 deletions
qt/widgets/common/src/CatalogHelper.cpp
with
14 additions
and
0 deletions
qt/widgets/common/src/CatalogHelper.cpp
+
14
−
0
View file @
2aa5f55c
...
...
@@ -218,6 +218,19 @@ const std::map<std::string, std::string> CatalogHelper::validateProperties(
errors
.
emplace
(
iter
->
first
+
"_err"
,
documentation
);
}
}
// catch invalid date formats
std
::
string
dateField
=
"StartDate"
;
try
{
getTimevalue
(
catalogAlgorithm
->
getProperty
(
dateField
));
dateField
=
"EndDate"
;
getTimevalue
(
catalogAlgorithm
->
getProperty
(
dateField
));
}
catch
(
std
::
invalid_argument
&
)
{
std
::
string
documentation
=
propertyDocumentation
(
catalogAlgorithm
->
getProperties
(),
dateField
);
errors
.
emplace
(
dateField
+
"_err"
,
documentation
);
}
return
errors
;
}
...
...
@@ -238,6 +251,7 @@ time_t CatalogHelper::getTimevalue(const std::string &inputDate) {
std
::
string
isoDate
=
dateSegments
.
at
(
2
)
+
"-"
+
dateSegments
.
at
(
1
)
+
"-"
+
dateSegments
.
at
(
0
)
+
" 00:00:00.000"
;
// Return the date as time_t value.
return
Mantid
::
Types
::
Core
::
DateAndTime
(
isoDate
).
to_time_t
();
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment