1.1 --- a/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Mon Jun 04 16:05:45 2012 +0300
     1.2 +++ b/endpoint/src/main/java/eu/earthobservatory/org/StrabonEndpoint/StrabonBeanWrapper.java	Mon Jun 04 22:15:17 2012 +0300
     1.3 @@ -37,27 +37,35 @@
     1.4  			this.statement = statement;
     1.5  			this.format = format;
     1.6  		}
     1.7 +		
     1.8  		public String getLabel() {
     1.9  			return label;
    1.10  		}
    1.11 +		
    1.12  		public void setLabel(String label) {
    1.13  			this.label = label;
    1.14  		}
    1.15 +		
    1.16  		public String getBean() {
    1.17  			return bean;
    1.18  		}
    1.19 +		
    1.20  		public void setBean(String bean) {
    1.21  			this.bean = bean;
    1.22  		}
    1.23 +		
    1.24  		public String getStatement() {
    1.25  			return statement;
    1.26  		}
    1.27 +		
    1.28  		public void setStatement(String statement) {
    1.29  			this.statement = statement;
    1.30  		}
    1.31 +		
    1.32  		public String getFormat() {
    1.33  			return format;
    1.34  		}
    1.35 +		
    1.36  		public void setFormat(String format) {
    1.37  			this.format = format;
    1.38  		}
    1.39 @@ -81,48 +89,8 @@
    1.40  		this.strabon = strabon;
    1.41  	}
    1.42  
    1.43 -//	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable, String query1, String query2, String query3, String query4, String query5, String query6, String query7, String query8) {
    1.44 -//		this.serverName = serverName;
    1.45 -//		this.port = port;
    1.46 -//		this.databaseName = databaseName;
    1.47 -//		this.user = user;
    1.48 -//		this.password = password;
    1.49 -//		this.checkForLockTable = checkForLockTable;
    1.50 -//		//this.strabon = new Strabon(databaseName, user, password, port, serverName, checkForLockTable);
    1.51 -//		this.query1 = query1;/
    1.52 -//		this.query2 = query2;
    1.53 -//		this.query3 = query3;
    1.54 -//		this.query4 = query4;
    1.55 -//		this.query5 = query5;
    1.56 -//		this.query6 = query6;
    1.57 -//		this.query7 = query7;
    1.58 -//		this.query8 = query8;
    1.59 -//		format = "format=HTML";
    1.60 -//		init();
    1.61 -//	}
    1.62 -//
    1.63 -//	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable, String query1, String query2, String query3, String query4, String query5, String query6, String query7, String query8, String format) {
    1.64 -//		this.serverName = serverName;
    1.65 -//		this.port = port;
    1.66 -//		this.databaseName = databaseName;
    1.67 -//		this.user = user;
    1.68 -//		this.password = password;
    1.69 -//		this.checkForLockTable = checkForLockTable;
    1.70 -//		//this.strabon = new Strabon(databaseName, user, password, port, serverName, checkForLockTable);
    1.71 -//		this.query1 = query1;
    1.72 -//		this.query2 = query2;
    1.73 -//		this.query3 = query3;
    1.74 -//		this.query4 = query4;
    1.75 -//		this.query5 = query5;
    1.76 -//		this.query6 = query6;
    1.77 -//		this.query7 = query7;
    1.78 -//		this.query8 = query8;
    1.79 -//		this.format = format;
    1.80 -//
    1.81 -//		init();
    1.82 -//	}
    1.83 -
    1.84 -	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName, boolean checkForLockTable, List<List<String>> args) {
    1.85 +	public StrabonBeanWrapper(String databaseName, String user, String password, 
    1.86 +			int port, String serverName, boolean checkForLockTable, List<List<String>> args) {
    1.87  		this.serverName = serverName;
    1.88  		this.port = port;
    1.89  		this.databaseName = databaseName;
    1.90 @@ -184,7 +152,8 @@
    1.91  		return true;
    1.92  	}
    1.93  
    1.94 -	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName) throws SQLException, ClassNotFoundException {
    1.95 +	public StrabonBeanWrapper(String databaseName, String user, String password, int port, String serverName) 
    1.96 +	throws SQLException, ClassNotFoundException {
    1.97  		this.strabon = new Strabon(databaseName, user, password, port, serverName, true);
    1.98  	}
    1.99  
   1.100 @@ -201,7 +170,8 @@
   1.101  	}
   1.102  
   1.103  	public Object query(String queryString, String answerFormatStrabon)
   1.104 -	throws MalformedQueryException, RepositoryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException, ClassNotFoundException {
   1.105 +	throws MalformedQueryException, RepositoryException, QueryEvaluationException, 
   1.106 +	TupleQueryResultHandlerException, IOException, ClassNotFoundException {
   1.107  		logger.info("[StrabonEndpoint] Received SELECT query.");
   1.108  		if ((this.strabon == null) && (!init())) {
   1.109  			throw new RepositoryException("Could not connect to Strabon.");
   1.110 @@ -211,26 +181,15 @@
   1.111  	}
   1.112  
   1.113  	public Object update(String updateString, String answerFormatStrabon) 
   1.114 -	throws MalformedQueryException, RepositoryException, QueryEvaluationException, TupleQueryResultHandlerException, IOException, ClassNotFoundException {
   1.115 +	throws MalformedQueryException, RepositoryException, QueryEvaluationException, 
   1.116 +	TupleQueryResultHandlerException, IOException, ClassNotFoundException {
   1.117  		logger.info("[StrabonEndpoint] Received UPDATE query.");
   1.118  		logger.info("[StrabonEndpoint] Answer format: " + answerFormatStrabon);
   1.119  		
   1.120  		if ((this.strabon == null) && (!init())) {
   1.121  			throw new RepositoryException("Could not connect to Strabon.");
   1.122  		} 
   1.123 -		
   1.124 -		//String newQueryString = TemporalWrapper.rebuildQuery(queryString);
   1.125  
   1.126 -//		System.out.println("================================================================");
   1.127 -//		System.out.println("Update:");
   1.128 -//		System.out.println(updateString);
   1.129 -//		System.out.println("================================================================");
   1.130 -//		System.out.println("================================================================");
   1.131 -		//System.out.println("Rewritten query:");
   1.132 -		//System.out.println(newQueryString);
   1.133 -		//System.out.println("================================================================");
   1.134 -
   1.135 -		//return strabon.query(newQueryString, answerFormatStrabon, strabon.getSailRepoConnection());
   1.136  		strabon.update(updateString, strabon.getSailRepoConnection());
   1.137  		return "OK!";
   1.138  	}
   1.139 @@ -298,76 +257,6 @@
   1.140  		return details;
   1.141  	}
   1.142  
   1.143 -//	public String getQuery1() {
   1.144 -//		return query1;
   1.145 -//	}
   1.146 -//
   1.147 -//	public void setQuery1(String query1) {
   1.148 -//		this.query1 = query1;
   1.149 -//	}
   1.150 -//
   1.151 -//	public String getQuery2() {
   1.152 -//		return query2;
   1.153 -//	}
   1.154 -//
   1.155 -//	public void setQuery2(String query2) {
   1.156 -//		this.query2 = query2;
   1.157 -//	}
   1.158 -//
   1.159 -//	public String getQuery3() {
   1.160 -//		return query3;
   1.161 -//	}
   1.162 -//
   1.163 -//	public void setQuery3(String query3) {
   1.164 -//		this.query3 = query3;
   1.165 -//	}
   1.166 -//
   1.167 -//	public String getQuery4() {
   1.168 -//		return query4;
   1.169 -//	}
   1.170 -//
   1.171 -//	public void setQuery4(String query4) {
   1.172 -//		this.query4 = query4;
   1.173 -//	}
   1.174 -//
   1.175 -//	public String getQuery5() {
   1.176 -//		return query5;
   1.177 -//	}
   1.178 -//
   1.179 -//	public void setQuery5(String query5) {
   1.180 -//		this.query5 = query5;
   1.181 -//	}
   1.182 -//
   1.183 -//	public String getQuery6() {
   1.184 -//		return query6;
   1.185 -//	}
   1.186 -//
   1.187 -//	public void setQuery6(String query6) {
   1.188 -//		this.query6 = query6;
   1.189 -//	}
   1.190 -//
   1.191 -//	public String getQuery7() {
   1.192 -//		return query7;
   1.193 -//	}
   1.194 -//
   1.195 -//	public void setQuery7(String query7) {
   1.196 -//		this.query7 = query7;
   1.197 -//	}
   1.198 -//	public String getQuery8() {
   1.199 -//		return query8;
   1.200 -//	}
   1.201 -//
   1.202 -//	public void setQuery8(String query8) {
   1.203 -//		this.query8 = query8;
   1.204 -//	}
   1.205 -//
   1.206 -//	public String getFormat() {
   1.207 -//		return format;
   1.208 -//	}
   1.209 -//
   1.210 -//	public void setFormat(String format) {
   1.211 -//		this.format = format;
   1.212 -//	}
   1.213  	public List<Entry> getEntries() {
   1.214  		return this.entries;
   1.215  	}