Commit 7fcf0ddad72e31595214251160f8ef60ce30affd
1 parent
02448921
Exists in
master
Bugfix: replace new query result instead of adding it to the table (#18)
Showing
2 changed files
with
2 additions
and
16 deletions
Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapController.java
@@ -127,18 +127,4 @@ public abstract class EpnTapController { | @@ -127,18 +127,4 @@ public abstract class EpnTapController { | ||
127 | } | 127 | } |
128 | 128 | ||
129 | } | 129 | } |
130 | - | ||
131 | - /** | ||
132 | - * Send the query to the specified service, download the result and update the voTable path. | ||
133 | - * | ||
134 | - * @param query An ADQL query to send. | ||
135 | - * @param tableServiceURL the URL of the service. | ||
136 | - * @throws VOTableException Can not get the VOTable. | ||
137 | - */ | ||
138 | - public void sendQuery(String query, String tableServiceURL) throws VOTableException { | ||
139 | - resultsCtrl = new VOTableController(tableServiceURL, query); | ||
140 | - resultsCtrl.readTable(); | ||
141 | - voTablePath = resultsCtrl.getVOTablePath(); | ||
142 | - } | ||
143 | - | ||
144 | } | 130 | } |
src/main/java/eu/omp/irap/vespa/epntapclient/gui/mainpanel/MainPanelCtrl.java
@@ -114,9 +114,9 @@ public class MainPanelCtrl extends EpnTapController implements MainPanelListener | @@ -114,9 +114,9 @@ public class MainPanelCtrl extends EpnTapController implements MainPanelListener | ||
114 | 114 | ||
115 | @Override | 115 | @Override |
116 | public void sendQuery() { | 116 | public void sendQuery() { |
117 | + List<String> tableNames = servicesPanelCtrl.getServices().getTableNames(); | ||
118 | + List<String> targetUrls = servicesPanelCtrl.getServices().getTargetUrls(); | ||
117 | try { | 119 | try { |
118 | - List<String> tableNames = servicesPanelCtrl.getServices().getTableNames(); | ||
119 | - List<String> targetUrls = servicesPanelCtrl.getServices().getTargetUrls(); | ||
120 | sendQuery(tableNames, targetUrls); | 120 | sendQuery(tableNames, targetUrls); |
121 | } catch (EpnTapException e) { | 121 | } catch (EpnTapException e) { |
122 | displayError("There is no service selected.", e); | 122 | displayError("There is no service selected.", e); |