Revision 33203
Added by Michele Artini over 9 years ago
| modules/dnet-modular-repositories-ui/branches/addRepoApi/src/main/java/eu/dnetlib/functionality/modular/ui/repositories/RepoUIUtils.java | ||
|---|---|---|
| 28 | 28 |
|
| 29 | 29 |
import eu.dnetlib.data.collector.rmi.CollectorService; |
| 30 | 30 |
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor; |
| 31 |
import eu.dnetlib.data.collector.rmi.ProtocolParameter; |
|
| 31 | 32 |
import eu.dnetlib.datasource.common.utils.DefaultDatasourceUpdater; |
| 32 | 33 |
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException; |
| 33 | 34 |
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService; |
| ... | ... | |
| 61 | 62 |
|
| 62 | 63 |
private String browseFieldsJson; |
| 63 | 64 |
|
| 64 |
private Map<String, List<String>> parametersMap = Maps.newHashMap();
|
|
| 65 |
private Map<String, List<ProtocolParameter>> parametersMap = Maps.newHashMap();
|
|
| 65 | 66 |
|
| 66 | 67 |
public List<SimpleParamEntry> browseRepoField(final String xpath, final String vocabulary) throws Exception {
|
| 67 | 68 |
final StringTemplate st = new StringTemplate(IOUtils.toString(browseRepoApisQueryTmpl.getInputStream())); |
| ... | ... | |
| 350 | 351 |
final Set<String> res = Sets.newHashSet(); |
| 351 | 352 |
if (parametersMap.containsKey(protocol.toLowerCase())) {
|
| 352 | 353 |
res.add("baseUrl");
|
| 353 |
res.addAll(parametersMap.get(protocol.toLowerCase())); |
|
| 354 |
for (ProtocolParameter p : parametersMap.get(protocol.toLowerCase())) {
|
|
| 355 |
res.add(p.getName()); |
|
| 356 |
} |
|
| 354 | 357 |
} |
| 355 | 358 |
|
| 356 | 359 |
return res; |
| modules/dnet-modular-repositories-ui/branches/addRepoApi/src/main/java/eu/dnetlib/functionality/modular/ui/repositories/AddRepoApiEntryPointController.java | ||
|---|---|---|
| 19 | 19 |
|
| 20 | 20 |
import eu.dnetlib.data.collector.rmi.CollectorService; |
| 21 | 21 |
import eu.dnetlib.data.collector.rmi.ProtocolDescriptor; |
| 22 |
import eu.dnetlib.data.collector.rmi.ProtocolParameter; |
|
| 22 | 23 |
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException; |
| 23 | 24 |
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService; |
| 24 | 25 |
import eu.dnetlib.enabling.locators.UniqueServiceLocator; |
| ... | ... | |
| 45 | 46 |
} |
| 46 | 47 |
|
| 47 | 48 |
private List<ProtocolDescriptor> listProtocols() throws ISLookUpException {
|
| 48 |
final Map<String, List<String>> mapParams = Maps.newHashMap();
|
|
| 49 |
final Map<String, List<ProtocolParameter>> mapParams = Maps.newHashMap();
|
|
| 49 | 50 |
for (ProtocolDescriptor pd : serviceLocator.getService(CollectorService.class).listProtocols()) {
|
| 50 | 51 |
mapParams.put(pd.getName().trim().toLowerCase(), pd.getParams()); |
| 51 | 52 |
} |
| ... | ... | |
| 59 | 60 |
if (mapParams.containsKey(e.getName().toLowerCase().trim())) {
|
| 60 | 61 |
pd.setParams(mapParams.get(e.getName().toLowerCase().trim())); |
| 61 | 62 |
} else {
|
| 62 |
pd.setParams(new ArrayList<String>());
|
|
| 63 |
pd.setParams(new ArrayList<ProtocolParameter>());
|
|
| 63 | 64 |
} |
| 64 | 65 |
return pd; |
| 65 | 66 |
} |
Also available in: Unified diff
ListProtocols with the new descriptors