corrections of db name for dev version

VAMDC · Jan 12, 2018 · adf429e · adf429e
1 parent c93356f
commit adf429e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 17 deletions.
diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcInchikeyExceptions.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcInchikeyExceptions.java
@@ -20,7 +20,7 @@
  * VamdcInchikeyExceptions generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_inchikey_exceptions", catalog = "vamdc_species")
+@Table(name = "vamdc_inchikey_exceptions", catalog = "vamdc_species_dev")
 public class VamdcInchikeyExceptions implements java.io.Serializable {
 
 	private Integer id;

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMarkupTypes.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMarkupTypes.java
@@ -17,7 +17,7 @@
  * VamdcMarkupTypes generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_markup_types", catalog = "vamdc_species")
+@Table(name = "vamdc_markup_types", catalog = "vamdc_species_dev")
 public class VamdcMarkupTypes implements java.io.Serializable {
 
 	private int id;

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMemberDatabaseIdentifiers.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMemberDatabaseIdentifiers.java
@@ -19,7 +19,7 @@
  * VamdcMemberDatabaseIdentifiers generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_node_species", catalog = "vamdc_species", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_node_species", catalog = "vamdc_species_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
 		"species_id", "database_species_id", "member_database_id" }))
 public class VamdcMemberDatabaseIdentifiers implements java.io.Serializable {
 

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMemberDatabases.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcMemberDatabases.java
@@ -19,7 +19,7 @@
  * VamdcMemberDatabases generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_nodes", catalog = "vamdc_species")
+@Table(name = "vamdc_nodes", catalog = "vamdc_species_dev")
 public class VamdcMemberDatabases implements java.io.Serializable {
 
 	private Integer id;

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpecies.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpecies.java
@@ -21,7 +21,7 @@
  * VamdcSpecies generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_species", catalog = "vamdc_species", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species", catalog = "vamdc_species_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
 		"inchikey" }))
 public class VamdcSpecies implements java.io.Serializable {
 

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesNames.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesNames.java
@@ -22,7 +22,7 @@
  * VamdcSpeciesNames generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_species_names", catalog = "vamdc_species", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species_names", catalog = "vamdc_species_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
 		"species_id", "name", "markup_type_id" }))
 public class VamdcSpeciesNames implements java.io.Serializable {
 

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesStructFormulae.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesStructFormulae.java
@@ -22,7 +22,7 @@
  * VamdcSpeciesStructFormulae generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_species_struct_formulae", catalog = "vamdc_species", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species_struct_formulae", catalog = "vamdc_species_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
 		"species_id", "formula", "markup_type_id" }))
 public class VamdcSpeciesStructFormulae implements java.io.Serializable {
 

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesTypes.java b/portal.ejb/src/main/java/org/vamdc/portal/entity/species/VamdcSpeciesTypes.java
@@ -13,7 +13,7 @@
  * VamdcSpeciesTypes generated by hbm2java
  */
 @Entity
-@Table(name = "vamdc_species_types", catalog = "vamdc_species")
+@Table(name = "vamdc_species_types", catalog = "vamdc_species_dev")
 public class VamdcSpeciesTypes implements java.io.Serializable {
 
 	private int id;

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreRequest.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryLog/QueryStoreRequest.java
@@ -79,20 +79,18 @@ private QueryStoreResponse associateRequest(String token, String userIp) {
 		try {
 			String request = this.getRequest(token, this.getUserEmail(),
 					this.userIp);
-
 			// send request while no result or result is empty
 			while ((result == null || QueryStoreResponse.STATUS_EMPTY.equals(result.getStatus())) 
 					&& count < Settings.QUERYSTORE_MAX_RETRY.getInt()) {
 				result = this.doRequest(request);
+				//if(result != null)
 				Thread.sleep(Settings.QUERYSTORE_RETRY_TIMER.getInt());
 				count++;
 			}
-
 		} catch (Exception e) {		
 			log.debug(e);
-			new QueryStoreResponse(QueryStoreResponse.STATUS_ERROR, "", "Error while querying query store");
-
-		}		
+			result = new QueryStoreResponse(QueryStoreResponse.STATUS_ERROR, "", "Error while querying query store");
+		}	
 		return  result;
 	}
 
@@ -125,17 +123,14 @@ private QueryStoreResponse doRequest(String requestString)
 		//SSLHandShakeException (IOException) occurs if missing certificate
 		HttpResponse response = httpClient.execute(request);
 		Integer statusCode = response.getStatusLine().getStatusCode();
-
 		if ( statusCode == 200) {
 			BufferedReader rd = new BufferedReader(new InputStreamReader(
 					response.getEntity().getContent()));
-
 			String uuid;
 			while ((uuid = rd.readLine()) != null) {
 				result.append(uuid);
 			}
 			rd.close();
-
 		} else {
 			// empty response
 			if (statusCode == 204) {
@@ -150,7 +145,6 @@ else if (statusCode >= 400 && statusCode < 500) {
 				return new QueryStoreResponse(QueryStoreResponse.STATUS_ERROR, "",  response.getStatusLine().getReasonPhrase());
 			}
 		}
-
 		// extract uuid from json response
 		return QueryStoreResponseReader.parseResponse(result.toString());
 	}