Skip to content

Commit

Permalink
#27 - Fixed the OAL causing the internal parse error.
Browse files Browse the repository at this point in the history
  • Loading branch information
John Wolfe committed Jul 9, 2014
1 parent 1ba288a commit 1ecdc79
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,24 @@ INSERT INTO SM_ACT
VALUES ("4c799586-a213-493c-8525-7d7046820ad2",
"7fc80988-4415-437c-acc5-4c130cc2715d",
1,
'// Stop executing this goal and begin executing the next one, if there is one.

// First, add this goal to the collection of those that have already executed.
select one session related by self->WorkoutSession[R11.''is currently executing within''];
relate self to session across R13.''was executed within'';

// Next, remove this goal from the collection of currently executing ones.
unrelate self from session across R11.''is currently executing within'';

// Finally, find the next goal specification in the sequence and start executing it, if it exists.
select one currentGoalSpec related by self->GoalSpec[R9.''specified by''];
select any nextGoalSpec related by session->GoalSpec[R10.includes]
where ( selected.SequenceNumber == (currentGoalSpec.SequenceNumber + 1) );
if ( not empty nextGoalSpec )
Goal::create( sequenceNumber: (currentGoalSpec + 1) );
end if;
'// Stop executing this goal and begin executing the next one, if there is one.

// First, add this goal to the collection of those that have already executed.
select one session related by self->WorkoutSession[R11.''is currently executing within''];
relate self to session across R13.''was executed within'';

// Next, remove this goal from the collection of currently executing ones.
unrelate self from session across R11.''is currently executing within'';

// Finally, find the next goal specification in the sequence and start executing it, if it exists.
select one currentGoalSpec related by self->GoalSpec[R9.''specified by''];

select any nextGoalSpec related by session->GoalSpec[R10.''includes'']
where ( selected.SequenceNumber == (currentGoalSpec.SequenceNumber + 1) );

if ( not empty nextGoalSpec )
Goal::create( sequenceNumber: (currentGoalSpec.SequenceNumber + 1) );
end if;
',
'');
INSERT INTO SM_TAH
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ INSERT INTO DIM_ND
0.000000,
"75a0a8f3-1b58-4555-83a2-c94327f6402c");
INSERT INTO DIM_GE
VALUES (4377.000000,
VALUES (4356.000000,
2991.000000,
"75a0a8f3-1b58-4555-83a2-c94327f6402c",
"00000000-0000-0000-0000-000000000000");
Expand Down Expand Up @@ -1166,15 +1166,15 @@ INSERT INTO DIM_WAY
"9cb3540f-3851-4f83-bde8-59fe96be92fd");
INSERT INTO DIM_WAY
VALUES ("83cdcbe5-dfe9-47bc-921e-98e48983f76a",
4372.000000,
4351.000000,
3047.000000,
"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
"00000000-0000-0000-0000-000000000000",
"00000000-0000-0000-0000-000000000000");
INSERT INTO DIM_WAY
VALUES ("c882baba-fd55-4114-b47f-008086268d67",
4372.000000,
2927.000000,
4351.000000,
2928.000000,
"61caeb60-d784-4cc9-9e84-f6fc041b2fdb",
"00000000-0000-0000-0000-000000000000",
"00000000-0000-0000-0000-000000000000");
Expand Down Expand Up @@ -2349,7 +2349,7 @@ INSERT INTO R_SIMP
INSERT INTO R_REL
VALUES ("c43c8e88-54fd-4de3-9adf-b324850fd9ec",
10,
'Established when a goal specification is created and exists
'Established when a goal specification is created and exists
for the duration of a workout session.',
"00000000-0000-0000-0000-000000000000");
INSERT INTO R_PART
Expand Down Expand Up @@ -2444,7 +2444,7 @@ INSERT INTO R_SIMP
INSERT INTO R_REL
VALUES ("b8328a39-3292-4b79-9990-82aae21a82e6",
12,
'Established when an achievement period begins and exists for
'Established when an achievement period begins and exists for
the duration of the associated workout session.',
"00000000-0000-0000-0000-000000000000");
INSERT INTO R_PART
Expand Down Expand Up @@ -2486,7 +2486,7 @@ INSERT INTO O_OBJ_PROXY
'Achievement',
10,
'Achievement',
'Each instance represents one contiguous period of time during
'Each instance represents one contiguous period of time during
which a particular goal was being met (achieved).',
"00000000-0000-0000-0000-000000000000",
'./Achievement/Achievement.xtuml');
Expand All @@ -2501,7 +2501,7 @@ INSERT INTO R_SIMP
INSERT INTO R_REL
VALUES ("3755f3e3-3d22-4f05-a9f0-c93d3c6abd63",
13,
'Established when a goal completes execution and exists for the
'Established when a goal completes execution and exists for the
duration of the associated workout session.',
"00000000-0000-0000-0000-000000000000");
INSERT INTO R_PART
Expand Down

0 comments on commit 1ecdc79

Please sign in to comment.