Revision 53110
Added by Claudio Atzori about 6 years ago
| modules/dnet-openaire-exporter/trunk/src/main/java/eu/dnetlib/openaire/dsm/dao/utils/DsmMappingUtils.java | ||
|---|---|---|
| 45 | 45 |
ds.setId(d.getId()); |
| 46 | 46 |
ds.setOfficialname(d.getOfficialname()); |
| 47 | 47 |
ds.setEnglishname(d.getEnglishname()); |
| 48 |
ds.setRegisteredby(d.getRegisteredby()); |
|
| 49 |
ds.setWebsiteurl(d.getWebsiteurl()); |
|
| 48 | 50 |
return ds; |
| 49 | 51 |
} |
| 50 | 52 |
|
| modules/dnet-openaire-exporter/trunk/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterName.java | ||
|---|---|---|
| 5 | 5 |
|
| 6 | 6 |
@JsonAutoDetect |
| 7 | 7 |
@ApiModel(value = "Filter name", description = "List of the field names used to filter datasources") |
| 8 |
public enum FilterName {
|
|
| 9 |
id, managed, // exact match |
|
| 8 |
public enum |
|
| 9 |
FilterName {
|
|
| 10 |
id, managed, collectedfrom, // exact match |
|
| 10 | 11 |
officialname, englishname, websiteurl, contactemail, registeredby, typology, platform, // like match |
| 11 | 12 |
country; // exact match on related organization |
| 12 | 13 |
|
| 13 | 14 |
public static FilterType type(FilterName filterName) {
|
| 14 | 15 |
switch (filterName) {
|
| 15 |
|
|
| 16 |
case id:
|
|
| 17 |
case managed:
|
|
| 18 |
return FilterType.exact; |
|
| 19 |
case officialname: |
|
| 20 |
case englishname: |
|
| 21 |
case websiteurl: |
|
| 22 |
case contactemail: |
|
| 23 |
case registeredby: |
|
| 24 |
case typology: |
|
| 25 |
case platform: |
|
| 26 |
return FilterType.search; |
|
| 27 |
case country: |
|
| 28 |
return FilterType.searchOrgs; |
|
| 29 |
default: |
|
| 30 |
throw new IllegalStateException();
|
|
| 16 |
case id: |
|
| 17 |
case managed:
|
|
| 18 |
case collectedfrom:
|
|
| 19 |
return FilterType.exact;
|
|
| 20 |
case officialname:
|
|
| 21 |
case englishname:
|
|
| 22 |
case websiteurl:
|
|
| 23 |
case contactemail:
|
|
| 24 |
case registeredby:
|
|
| 25 |
case typology:
|
|
| 26 |
case platform:
|
|
| 27 |
return FilterType.search;
|
|
| 28 |
case country:
|
|
| 29 |
return FilterType.searchOrgs;
|
|
| 30 |
default:
|
|
| 31 |
throw new IllegalStateException("unmapped filter type for: " + filterName);
|
|
| 31 | 32 |
} |
| 32 | 33 |
} |
| 33 | 34 |
|
| modules/dnet-openaire-exporter/trunk/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java | ||
|---|---|---|
| 5 | 5 |
import io.swagger.annotations.ApiModelProperty; |
| 6 | 6 |
import org.hibernate.validator.constraints.Length; |
| 7 | 7 |
|
| 8 |
import javax.validation.constraints.Email; |
|
| 8 | 9 |
import javax.validation.constraints.NotBlank; |
| 9 | 10 |
|
| 10 | 11 |
@JsonAutoDetect |
| ... | ... | |
| 25 | 26 |
@ApiModelProperty(position = 3) |
| 26 | 27 |
private String englishname; |
| 27 | 28 |
|
| 29 |
@ApiModelProperty(position = 4) |
|
| 30 |
private String websiteurl; |
|
| 31 |
|
|
| 32 |
|
|
| 33 |
@ApiModelProperty(position = 5) |
|
| 34 |
private String registeredby; |
|
| 35 |
|
|
| 28 | 36 |
public String getId() {
|
| 29 | 37 |
return id; |
| 30 | 38 |
} |
| ... | ... | |
| 48 | 56 |
public void setEnglishname(String englishname) {
|
| 49 | 57 |
this.englishname = englishname; |
| 50 | 58 |
} |
| 59 |
|
|
| 60 |
public String getWebsiteurl() {
|
|
| 61 |
return websiteurl; |
|
| 62 |
} |
|
| 63 |
|
|
| 64 |
public void setWebsiteurl(String websiteurl) {
|
|
| 65 |
this.websiteurl = websiteurl; |
|
| 66 |
} |
|
| 67 |
|
|
| 68 |
public String getRegisteredby() {
|
|
| 69 |
return registeredby; |
|
| 70 |
} |
|
| 71 |
|
|
| 72 |
public void setRegisteredby(String registeredby) {
|
|
| 73 |
this.registeredby = registeredby; |
|
| 74 |
} |
|
| 51 | 75 |
} |
Also available in: Unified diff
allow to search by collectedfrom, included registeredBy and websiteUrl in DatasourceSnippet bean