Skip to content

Commit

Permalink
Merge branch 'main' into EmailDomainToOrgId
Browse files Browse the repository at this point in the history
  • Loading branch information
amontenegro authored Oct 13, 2023
2 parents cc97b8e + 498c987 commit e51ad12
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
## v2.42.0 - 2023-10-11

[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.2...v2.42.0)

## v2.41.2 - 2023-10-11

[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.1...v2.41.2)

- [#6901](https://github.com/ORCID/ORCID-Source/pull/6901): URL comparison should be case sensitive

## v2.41.1 - 2023-10-11

[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.41.0...v2.41.1)

- [#6903](https://github.com/ORCID/ORCID-Source/pull/6903): fix: Only compare assertion origin orcid in obo

### Fix

- Only compare assertion origin orcid in obo

## v2.41.0 - 2023-10-04

[Full Changelog](https://github.com/ORCID/ORCID-Source/compare/v2.40.5...v2.41.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,12 @@ public void setSourceName(ResearchResources rr) {

public static boolean isSelfAsserted(Source source, String orcid) {
String sourceId = source.retrieveSourcePath();
String assertionOriginSourceId = source.retrieveAssertionOriginPath();
String assertionOriginOrcid = null;
if (source.getAssertionOriginOrcid() != null && source.getAssertionOriginOrcid().getPath() != null) {
assertionOriginOrcid = source.getAssertionOriginOrcid().getPath();
}
// If the affiliation source is the user himself or any member with OBO, then, it is considered self asserted
if(orcid.equals(sourceId) || orcid.equals(assertionOriginSourceId)) {
if(orcid.equals(sourceId) || orcid.equals(assertionOriginOrcid)) {
return false;
} else {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public boolean compare(Object obj) {
return false;
WebsiteForm other = (WebsiteForm) obj;

if (!WorkForm.compareTexts(url, other.getUrl(), true))
if (!WorkForm.compareTexts(url, other.getUrl(), false))
return false;
if (!WorkForm.compareStrings(urlName, other.getUrlName()))
return false;
Expand Down

0 comments on commit e51ad12

Please sign in to comment.