Skip to content
Snippets Groups Projects
Commit 254dc97c authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '880-minervanet-error-report-90' into 'master'

Resolve "MINERVANET - Error Report 90"

Closes #880

See merge request minerva/core!875
parents 8d03dcb7 fdc0a0c0
No related branches found
No related tags found
1 merge request!875Resolve "MINERVANET - Error Report 90"
Pipeline #12729 passed
...@@ -2,9 +2,11 @@ minerva (14.0.0~alpha.1) unstable; urgency=low ...@@ -2,9 +2,11 @@ minerva (14.0.0~alpha.1) unstable; urgency=low
* Feature removal: support for tomcat7 removed (#828) * Feature removal: support for tomcat7 removed (#828)
* Small improvement: debian package can be installed on debian:buster (#879) * Small improvement: debian package can be installed on debian:buster (#879)
* Bug fix: REST API bioEntities:search method didn't limit results to the * Bug fix: REST API bioEntities:search method didn't limit results to the
submodel id (#880) submodel id (#860)
* Bug fix: Empty Overlay colours were not preserved during export to * Bug fix: Empty Overlay colours were not preserved during export to
CellDesigner (#714) CellDesigner (#714)
* Bug fix: some project couldn't be accessed due to problem with migration of
reaction with unknown boolean operator (#880)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Mon, 12 Aug 2019 10:00:00 +0200
......
...@@ -119,7 +119,7 @@ public class PolylineData implements Serializable, Drawable { ...@@ -119,7 +119,7 @@ public class PolylineData implements Serializable, Drawable {
public PolylineData(PolylineData param) { public PolylineData(PolylineData param) {
points = new ArrayList<>(); points = new ArrayList<>();
for (Point2D point : param.getPoints()) { for (Point2D point : param.getPoints()) {
points.add(new Point2D.Double(point.getX(), point.getY())); addPoint(new Point2D.Double(point.getX(), point.getY()));
} }
beginAtd = new ArrowTypeData(param.getBeginAtd()); beginAtd = new ArrowTypeData(param.getBeginAtd());
endAtd = new ArrowTypeData(param.getEndAtd()); endAtd = new ArrowTypeData(param.getEndAtd());
......
...@@ -19,7 +19,7 @@ alter table reaction_table add column output_operator integer; ...@@ -19,7 +19,7 @@ alter table reaction_table add column output_operator integer;
update reaction_table set reactant = (select id from reaction_node_table where node_type_db='REACTANT_NODE' and reaction_id=reaction_table.id order by id limit 1); update reaction_table set reactant = (select id from reaction_node_table where node_type_db='REACTANT_NODE' and reaction_id=reaction_table.id order by id limit 1);
update reaction_table set product = (select id from reaction_node_table where node_type_db='PRODUCT_NODE' and reaction_id=reaction_table.id order by id limit 1); update reaction_table set product = (select id from reaction_node_table where node_type_db='PRODUCT_NODE' and reaction_id=reaction_table.id order by id limit 1);
update reaction_table set input_operator = (select id from reaction_node_table where node_type_db in ('AND_OPERATOR_NODE', 'ASSOCIATION_OPERATOR_NODE', 'NAND_OPERATOR_NODE', 'OR_OPERATOR_NODE') and reaction_id=reaction_table.id order by id limit 1); update reaction_table set input_operator = (select id from reaction_node_table where node_type_db in ('AND_OPERATOR_NODE', 'ASSOCIATION_OPERATOR_NODE', 'NAND_OPERATOR_NODE', 'OR_OPERATOR_NODE', 'UNKNOWN_OPERATOR_NODE') and reaction_id=reaction_table.id order by id limit 1);
update reaction_table set output_operator = (select id from reaction_node_table where node_type_db in ('DISSOCIATION_OPERATOR_NODE', 'SPLIT_OPERATOR_NODE', 'TRUNCATION_OPERATOR_NODE') and reaction_id=reaction_table.id order by id limit 1); update reaction_table set output_operator = (select id from reaction_node_table where node_type_db in ('DISSOCIATION_OPERATOR_NODE', 'SPLIT_OPERATOR_NODE', 'TRUNCATION_OPERATOR_NODE') and reaction_id=reaction_table.id order by id limit 1);
update reaction_table set start_point = (select one_before_last_point from reaction_node_table, polyline_data_table where reaction_node_table.id = reaction_table.reactant and polyline_data_table.id = line_id); update reaction_table set start_point = (select one_before_last_point from reaction_node_table, polyline_data_table where reaction_node_table.id = reaction_table.reactant and polyline_data_table.id = line_id);
......
-- just in case if any point on the map has null coordinates (it should never happen)
update point_table set point_val = '0.0,0.0' where point_val = null;
alter table point_table alter column point_val set not null;
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment