Revision 50631
Added by Panagiotis Kanakakis about 6 years ago
Converter.java | ||
---|---|---|
33 | 33 |
repository.setAggregator(datasource.get("aggregator").toString()); |
34 | 34 |
// repository.setCertificates(datasource.get("certificates").toString()); |
35 | 35 |
// repository.setCitationGuidelineUrl(datasource.get("citationguidelineurl").toString()); |
36 |
// repository.setCollectedFrom( datasource.get("collectedfrom").toString());
|
|
36 |
repository.setCollectedFrom( datasource.get("collectedfrom").toString()); |
|
37 | 37 |
|
38 | 38 |
repository.setContactEmail(datasource.get("contactemail").toString()); |
39 | 39 |
if(repository.getContactEmail().equals("null")) |
... | ... | |
102 | 102 |
repository.setCountryCode(countryCode); |
103 | 103 |
|
104 | 104 |
|
105 |
/* String collectedFrom = datasource.get("collectedfrom").toString();
|
|
105 |
String collectedFrom = datasource.get("collectedfrom").toString(); |
|
106 | 106 |
//TODO check data consistency |
107 | 107 |
String type = "UNKNOWN"; |
108 | 108 |
if (collectedFrom.equalsIgnoreCase("openaire____::opendoar")) { |
... | ... | |
111 | 111 |
type = "re3data"; |
112 | 112 |
} else if (collectedFrom.equalsIgnoreCase("infrastruct_::openaire")) { |
113 | 113 |
type = "journal"; |
114 |
}*/ |
|
115 |
|
|
116 |
// repository.setDatasourceType(type); |
|
117 |
|
|
118 |
|
|
114 |
} |
|
115 |
repository.setDatasourceType(type); |
|
119 | 116 |
return repository; |
120 | 117 |
} |
121 | 118 |
|
... | ... | |
160 | 157 |
return resultSet; |
161 | 158 |
} |
162 | 159 |
|
163 |
public static List<RepositoryInterface> jsonToRepositoryInterfaceList(JSONArray rs) throws JSONException {
|
|
160 |
public static List<RepositoryInterface> jsonToRepositoryInterfaceList(JSONObject json) throws JSONException {
|
|
164 | 161 |
|
165 | 162 |
List<RepositoryInterface> resultSet = new ArrayList<>(); |
163 |
JSONArray rs = json.getJSONArray("api"); |
|
166 | 164 |
for(int i=0;i<rs.length();i++) |
167 | 165 |
resultSet.add(jsonToRepositoryInterfaceObject( rs.getJSONObject(i)) ); |
168 | 166 |
return resultSet; |
... | ... | |
175 | 173 |
repositoryInterface.setBaseUrl(repositoryInterfaceObject.get("baseurl").toString()); |
176 | 174 |
repositoryInterface.setContentDescription(repositoryInterfaceObject.get("contentdescription").toString()); |
177 | 175 |
repositoryInterface.setId(repositoryInterfaceObject.get("id").toString()); |
178 |
repositoryInterface.setMetadataIdentifierPath(repositoryInterfaceObject.get("metadataIdentifierPath").toString()); |
|
176 |
// repositoryInterface.setMetadataIdentifierPath(repositoryInterfaceObject.get("metadataIdentifierPath").toString());
|
|
179 | 177 |
repositoryInterface.setAccessProtocol(repositoryInterfaceObject.get("protocol").toString()); |
180 | 178 |
repositoryInterface.setTypology(repositoryInterfaceObject.get("typology").toString()); |
181 | 179 |
repositoryInterface.setDesiredCompatibilityLevel(repositoryInterfaceObject.get("compatibility").toString()); |
182 |
repositoryInterface.setActive(Boolean.parseBoolean(repositoryInterfaceObject.get("active").toString())); |
|
180 |
//repositoryInterface.setActive(Boolean.parseBoolean(repositoryInterfaceObject.get("active").toString()));
|
|
183 | 181 |
repositoryInterface.setRemovable(Boolean.parseBoolean(repositoryInterfaceObject.get("removable").toString())); |
184 | 182 |
repositoryInterface.setCompliance(repositoryInterfaceObject.get("compatibility").toString()); |
185 | 183 |
|
... | ... | |
187 | 185 |
Map<String, String> extraFields = new HashMap<>(); |
188 | 186 |
|
189 | 187 |
ObjectMapper mapper = new ObjectMapper(); |
190 |
JSONArray apiparams = repositoryInterfaceObject.getJSONArray("apiparam");
|
|
188 |
JSONArray apiparams = repositoryInterfaceObject.getJSONArray("apiParams");
|
|
191 | 189 |
|
192 | 190 |
for(int i=0;i<apiparams.length();i++) |
193 | 191 |
accessParams.put(apiparams.getJSONObject(i).getString("param"),apiparams.getJSONObject(i).getString("value")); |
Also available in: Unified diff
Changes for new api.