Revision 61487
Added by Michele Artini over 2 years ago
Project.java | ||
---|---|---|
76 | 76 |
final Matcher matcher = pattern.matcher(infoId); |
77 | 77 |
if (matcher.find()) { |
78 | 78 |
final String openaireId = ""; |
79 |
final String funder = matcher.group(1); |
|
80 |
final String program = matcher.group(2); |
|
81 |
final String code = matcher.group(3); |
|
82 |
final String jurisdiction = matcher.group(4); |
|
83 |
final String name = StringUtils.defaultIfBlank(matcher.group(5), funder + "/" + program + "/" + code); |
|
84 |
final String acronym = StringUtils.defaultIfBlank(matcher.group(6), name); |
|
79 |
final String funder = matcher.group(1).replaceAll("%2F", "/");
|
|
80 |
final String program = matcher.group(2).replaceAll("%2F", "/");
|
|
81 |
final String code = matcher.group(3).replaceAll("%2F", "/");
|
|
82 |
final String jurisdiction = matcher.group(4).replaceAll("%2F", "/");
|
|
83 |
final String name = StringUtils.defaultIfBlank(matcher.group(5).replaceAll("%2F", "/"), funder + "/" + program + "/" + code);
|
|
84 |
final String acronym = StringUtils.defaultIfBlank(matcher.group(6), name).replaceAll("%2F", "/");
|
|
85 | 85 |
|
86 | 86 |
if (StringUtils.isNotEmpty(code) && StringUtils.isNotEmpty(program) |
87 |
&& StringUtils.isNotEmpty(funder)) { return new Project(openaireId, code, name, acronym, funder, program, jurisdiction); } |
|
87 |
&& StringUtils.isNotEmpty(funder)) { |
|
88 |
return new Project(openaireId, code, name, acronym, funder, program, jurisdiction); |
|
89 |
} |
|
88 | 90 |
} |
89 | 91 |
|
90 | 92 |
log.warn("Invalid project ID: " + infoId); |
Also available in: Unified diff
project ID with /