query the production species database instead of the dev one, as intr…

…oduced from merge with dev version
VAMDC · Mar 23, 2018 · 63d6e09 · 63d6e09
1 parent 10ed816
commit 63d6e09
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 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_dev")
+@Table(name = "vamdc_inchikey_exceptions", catalog = "vamdc_species")
 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_dev")
+@Table(name = "vamdc_markup_types", catalog = "vamdc_species")
 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_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_node_species", catalog = "vamdc_species", 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_dev")
+@Table(name = "vamdc_nodes", catalog = "vamdc_species")
 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_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species", catalog = "vamdc_species", 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_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species_names", catalog = "vamdc_species", 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_dev", uniqueConstraints = @UniqueConstraint(columnNames = {
+@Table(name = "vamdc_species_struct_formulae", catalog = "vamdc_species", 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_dev")
+@Table(name = "vamdc_species_types", catalog = "vamdc_species")
 public class VamdcSpeciesTypes implements java.io.Serializable {
 
 	private int id;

diff --git a/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/RadiativeForm.java b/portal.ejb/src/main/java/org/vamdc/portal/session/queryBuilder/forms/RadiativeForm.java
@@ -28,13 +28,12 @@ public RadiativeForm(){
 		addField(wlField);
 		AbstractField field = new UnitConvRangeField(Restrictable.StateEnergy, "Upper state energy", new EnergyUnitConverter());
 		field.setPrefix("upper");
-		addField(field);
-		//addField(new RangeField("upper",Restrictable.StateEnergy,"Upper state energy"));
+		addField(field);;
 		field = new UnitConvRangeField(Restrictable.StateEnergy, "Lower state energy", new EnergyUnitConverter());
 		field.setPrefix("lower");
 		addField(field);
-		//addField(new RangeField("lower",Restrictable.StateEnergy,"Lower state energy"));
 		addField(new RangeField(Restrictable.RadTransProbabilityA,"Probability, A"));
+		addField(new RangeField(Restrictable.RadTransProbabilityLineStrength,"Line strength"));
 	}
 
 	static ProxyRangeField setupWLField() {