From 999db66eeb4574ee12fa2b46c73d99f379b57063 Mon Sep 17 00:00:00 2001 From: Gianpaolo Coro Date: Thu, 22 Oct 2015 09:48:29 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/SeaDataNetConnector@119956 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../seadatanet/DivaAnalysisGetResponse.java | 3 +-- .../seadatanet/DivaHTTPClient.java | 27 +++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/org/gcube/dataanalysis/seadatanet/DivaAnalysisGetResponse.java b/src/org/gcube/dataanalysis/seadatanet/DivaAnalysisGetResponse.java index 3edecd4..0ed1909 100644 --- a/src/org/gcube/dataanalysis/seadatanet/DivaAnalysisGetResponse.java +++ b/src/org/gcube/dataanalysis/seadatanet/DivaAnalysisGetResponse.java @@ -2,8 +2,7 @@ package org.gcube.dataanalysis.seadatanet; public class DivaAnalysisGetResponse { - public DivaAnalysisGetResponse(String id,double len,double stn, - double x0,double x1, double dx,double y0,double y1,double dy,int level) { + public DivaAnalysisGetResponse(String) { super(); this.x0 = x0; this.x1 = x1; diff --git a/src/org/gcube/dataanalysis/seadatanet/DivaHTTPClient.java b/src/org/gcube/dataanalysis/seadatanet/DivaHTTPClient.java index e9fb720..5577341 100644 --- a/src/org/gcube/dataanalysis/seadatanet/DivaHTTPClient.java +++ b/src/org/gcube/dataanalysis/seadatanet/DivaHTTPClient.java @@ -2,6 +2,7 @@ package org.gcube.dataanalysis.seadatanet; import java.io.BufferedInputStream; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.DataOutputStream; import java.io.File; import java.io.FileReader; @@ -113,6 +114,7 @@ public class DivaHTTPClient { */ public static String getAnalysis (String id,double len,double stn,double x0,double x1, double dx,double y0,double y1,double dy,double level) throws Exception { HttpURLConnection httpUrlConnection = null; + try { String get_url=WEB_HTTP+"/make_analysis?"; get_url+="sessionid="+id+"&"; @@ -142,8 +144,12 @@ public class DivaHTTPClient { new BufferedReader(new InputStreamReader(responseStream)); String line = ""; + + //DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance(); StringBuilder stringBuilder = new StringBuilder(); - + //ByteArrayInputStream input; + //DocumentBuilder builder = factory.newDocumentBuilder(); + while ((line = responseStreamReader.readLine()) != null) { stringBuilder.append(line).append("\n"); } @@ -153,10 +159,25 @@ public class DivaHTTPClient { String response = stringBuilder.toString(); + //input = new ByteArrayInputStream(stringBuilder.toString().getBytes("UTF-8")); + + System.out.println("RESPONSE STRING: "+response); + Document doc = loadXMLFromString(response); - System.out.println("DENTRO: "+ doc.getFirstChild()); + + //Node root = doc.getDocumentElement(); + System.out.println("ELEMENTBYTAG: "+doc.getElementsByTagName("stat").item(0).getTextContent()); + //System.out.println("ROOT: "+root.getTextContent()); + //System.out.println("INSIDE: "+ root.getChildNodes().item(2).getTextContent()); + + //System.out.println("BYID: "+doc.getElementById("vmin").getNodeValue()); + //System.out.println("BYID: "+doc.getChildNodes().item(2)); + Double vmin = Double.parseDouble(doc.getElementsByTagName("stat").item(0).getTextContent()); + Double vmax = Double.parseDouble(doc.getElementsByTagName("stat").item(1).getTextContent()); + Double stat_obs_count_used = Double.parseDouble(doc.getElementsByTagName("stat").item(2).getTextContent()); + Double stat_posteriori_stn = Double.parseDouble(doc.getElementsByTagName("stat").item(3).getTextContent()); responseStream.close(); httpUrlConnection.disconnect(); @@ -169,6 +190,8 @@ public class DivaHTTPClient { if (httpUrlConnection != null) httpUrlConnection.disconnect(); } + return new DivaAnalysisGetResponse(vmin, vmax, stat_obs_count_used, stat_posteriori_stn, sessionid); + }