Skip to content

Commit

Permalink
Updated references to surname in catalogs. Refs #8939.
Browse files Browse the repository at this point in the history
  • Loading branch information
jawrainey committed Feb 7, 2014
1 parent fe0974b commit c7b9b67
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/ICat/src/ICat3/ICat3Helper.cpp
Expand Up @@ -836,9 +836,9 @@ namespace Mantid
}

//investigator's surname
if(!inputs.getInvestigatorSurName().empty())
if(!inputs.getInvestigatorName().empty())
{
advancedSearchDetails->investigators.push_back(inputs.getInvestigatorSurName());
advancedSearchDetails->investigators.push_back(inputs.getInvestigatorName());
}

return advancedSearchDetails;
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
Expand Up @@ -199,12 +199,12 @@ namespace Mantid
}

// Investigators complete name.
if (!inputs.getInvestigatorSurName().empty())
if (!inputs.getInvestigatorName().empty())
{
// We join another investigationUsers & user tables as we need two aliases.
joinClause.push_back("JOIN inves.investigationUsers usrs");
joinClause.push_back("JOIN usrs.user usr");
whereClause.push_back("usr.fullName LIKE '%" + inputs.getInvestigatorSurName() + "%'");
whereClause.push_back("usr.fullName LIKE '%" + inputs.getInvestigatorName() + "%'");
}

// Similar to above. We check if either has been input,
Expand Down

0 comments on commit c7b9b67

Please sign in to comment.