OV-GSO-DC / EpnTAPClient

Commit 8ae5b6c82178fa526fea55bb32fc16069ab75064

Authored by Nathanael Jourdane
1 parent 4b3a296c
Exists in master

Implement getServices() filter.

Showing 3 changed files with 35 additions and 11 deletions   Show diff stats
Inline Side-by-side
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapFacade.java
  Diff comments   View file @8ae5b6c
... ... @@ -115,15 +115,43 @@ public class EpnTapFacade implements EpnTapInterface {
115 115 @Override
116 116 public List<VOTABLE> getEPNServices(List<String> attributes)
117 117 throws CantGetVOTableException, VOResourceException {
118   - // TODO process attributes
119   - return null;
  118 + List<VOTABLE> voTables = new ArrayList<>();
  119 + List<String> ivoids = VOResourceCtrl.getIvoidResources(ServiceCore.EPNCORE);
  120 + // TODO: optimiser le nombre de requêtes
  121 + for (String ivoid : ivoids) {
  122 + try {
  123 + String tableName = getEPNCoreTableName(ivoid);
  124 + String query = String.format(Queries.SELECT_FROM, StringJoiner.join(attributes),
  125 + tableName);
  126 + VOTableController ctrl = new VOTableController(getTAPURL(ivoid), query);
  127 + ctrl.readTable();
  128 + voTables.add(ctrl.getVOTable());
  129 + } catch (CantGetVOTableException e) {
  130 + logger.info("Can not get the service " + ivoid + ", skipping...");
  131 + }
  132 + }
  133 + return voTables;
120 134 }
121 135  
122 136 @Override
123 137 public List<VOTABLE> getEPNServices(Map<String, String> keywords, List<String> attributes)
124 138 throws CantGetVOTableException, VOResourceException {
125   - // TODO process attributes and keywords
126   - return null;
  139 + List<VOTABLE> voTables = new ArrayList<>();
  140 + List<String> ivoids = VOResourceCtrl.getIvoidResources(ServiceCore.EPNCORE, keywords);
  141 + // TODO: optimiser le nombre de requêtes
  142 + for (String ivoid : ivoids) {
  143 + try {
  144 + String tableName = getEPNCoreTableName(ivoid);
  145 + String query = String.format(Queries.SELECT_FROM, StringJoiner.join(attributes),
  146 + tableName);
  147 + VOTableController ctrl = new VOTableController(getTAPURL(ivoid), query);
  148 + ctrl.readTable();
  149 + voTables.add(ctrl.getVOTable());
  150 + } catch (CantGetVOTableException e) {
  151 + logger.info("Can not get the service " + ivoid + ", skipping...");
  152 + }
  153 + }
  154 + return voTables;
127 155 }
128 156  
129 157 // *** Getters ***
... ...
src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java
  Diff comments   View file @8ae5b6c
... ... @@ -98,7 +98,6 @@ public class VOResourceCtrl {
98 98 parameters.put("keywords", keywordJoiner.toString());
99 99 parameters.put("max", String.valueOf(VOResourceCtrl.MAX_VORESOURCES));
100 100 String query = Network.buildQuery(GET_IVOID_RESOURCES_URL, parameters);
101   - System.out.println(query);
102 101 try {
103 102 ivoidResources = parseIvoidResources(Network.readJson(query));
104 103 } catch (CantSendQueryException e) {
... ...
src/test/java/eu/omp/irap/vespa/epntapclient/TestEpnTapFacade.java
  Diff comments   View file @8ae5b6c
... ... @@ -94,17 +94,14 @@ public class TestEpnTapFacade {
94 94 System.out.println("\n*** 4. Services ***\n");
95 95  
96 96 List<VOTABLE> epnServices = facade.getEPNServices();
97   - System.out.println("4.1 getEPNServices()\n\t"
98   - + Debug.toJson(epnServices));
  97 + System.out.println("4.1 getEPNServices()\n\t");
99 98  
100 99 List<VOTABLE> epnServices2 = facade.getEPNServices(SERVICE_ATTRIBUTES);
101   - System.out.println("4.2 getEPNServices(" + strServiceAttributes + ")\n\t"
102   - + Debug.toJson(epnServices2));
  100 + System.out.println("4.2 getEPNServices(" + strServiceAttributes + ")\n\t");
103 101  
104 102 List<VOTABLE> epnServices3 = facade.getEPNServices(KEYWORDS, SERVICE_ATTRIBUTES);
105 103 System.out.println("4.3 getEPNServices(" + strKeywords + ", "
106   - + strServiceAttributes + ")\n\t"
107   - + Debug.toJson(epnServices3));
  104 + + strServiceAttributes + ")\n\t");
108 105  
109 106 System.out.println("\n*** 5. Getters***\n");
110 107  
... ...