Updated the IDL to match the table name in the sql: template_output => event_output

Added an is_error column to event_output
Updated event.error_output to link to event_output table
Storing error text in event_output table with is_error='t'

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12748 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index abb273a..04aecbf 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -580,18 +580,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
         </links>
     </class>
 
-       <class id="atto" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action_trigger::template_output" oils_persist:tablename="action_trigger.template_output" reporter:label="Event output">
-               <fields oils_persist:primary="id" oils_persist:sequence="action_trigger.template_output_id_seq">
+       <class id="ateo" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="action_trigger::event_output" oils_persist:tablename="action_trigger.event_output" reporter:label="Event output">
+               <fields oils_persist:primary="id" oils_persist:sequence="action_trigger.event_output_id_seq">
                        <field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
                        <field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
                        <field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
                        <field reporter:label="Output ID" name="id" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id"/>
                        <field reporter:label="Create Date/Time" name="create_time" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="timestamp"/>
                        <field reporter:label="Data" name="data" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="text"/>
-                       <field reporter:label="Events" name="events" oils_obj:array_position="6" oils_persist:virtual="true"  reporter:datatype="link"/>
+                       <field reporter:label="Is Error" name="is_error" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="bool"/>
+                       <field reporter:label="Events" name="events" oils_obj:array_position="7" oils_persist:virtual="true"  reporter:datatype="link"/>
+                       <field reporter:label="Events" name="error_events" oils_obj:array_position="8" oils_persist:virtual="true"  reporter:datatype="link"/>
                </fields>
                <links>
             <link field="events" reltype="has_many" key="template_output" map="" class="atev"/>
+            <link field="error_events" reltype="has_many" key="error_output" map="" class="atev"/>
                </links>
                <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
                        <actions>
@@ -783,7 +786,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                </fields>
                <links>
                        <link field="event_def" reltype="has_a" key="id" map="" class="atevdef"/>
-                       <link field="template_output" reltype="has_a" key="id" map="" class="atto"/>
+                       <link field="template_output" reltype="has_a" key="id" map="" class="ateo"/>
+                       <link field="error_output" reltype="has_a" key="id" map="" class="ateo"/>
                </links>
        </class>
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Reactor.pm b/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Reactor.pm
index 0257d92..292caac 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Reactor.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Trigger/Reactor.pm
@@ -70,22 +70,28 @@ sub run_TT {
     my $nostore = shift;
     return undef unless $env->{template};
 
+    my $error;
     my $output = '';
     my $tt = Template->new;
     $env->{helpers} = $_TT_helpers;
 
-    $tt->process(\$env->{template}, $env, \$output) or 
-        $logger->error("Error processing Trigger template: " . $tt->error);
+    unless( $tt->process(\$env->{template}, $env, \$output) ) {
+        $output = undef;
+        ($error = $tt->error) =~ s/\n/ /og;
+        $logger->error("Error processing Trigger template: $error");
+    }
 
-    if (!$nostore && $output) {
-        my $t_o = Fieldmapper::action_trigger::template_output->new;
-        $t_o->data( $output );
+    if ( $error or (!$nostore && $output) ) {
+        my $t_o = Fieldmapper::action_trigger::event_output->new;
+        $t_o->data( ($error) ? $error : $output );
+        $t_o->is_error( ($error) ? 't' : 'f' );
 
         $env->{EventProcessor}->editor->xact_begin;
-        $t_o = $env->{EventProcessor}->editor->create_action_trigger_template_output( $t_o );
+        $t_o = $env->{EventProcessor}->editor->create_action_trigger_event_output( $t_o );
 
         my $state = (ref $$env{event} eq 'ARRAY') ? $$env{event}->[0]->state : $env->{event}->state;
-        $env->{EventProcessor}->update_state( $state, { template_output => $t_o->id } );
+        my $key = ($error) ? 'error_output' : 'template_output';
+        $env->{EventProcessor}->update_state( $state, { $key => $t_o->id } );
     }
        
     return $output;

diff --git a/Open-ILS/src/sql/Pg/400.schema.action_trigger.sql b/Open-ILS/src/sql/Pg/400.schema.action_trigger.sql
index 75f7359..90078c0 100644 (file)
--- a/Open-ILS/src/sql/Pg/400.schema.action_trigger.sql
+++ b/Open-ILS/src/sql/Pg/400.schema.action_trigger.sql
@@ -123,6 +123,7 @@ CREATE TABLE action_trigger.environment (
 CREATE TABLE action_trigger.event_output (
     id              BIGSERIAL   PRIMARY KEY,
     create_time     TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    is_error        BOOLEAN     NOT NULL DEFAULT FALSE,
     data            TEXT        NOT NULL
 );
 
@@ -138,7 +139,7 @@ CREATE TABLE action_trigger.event (
     update_process  INT,
     state           TEXT        NOT NULL DEFAULT 'pending' CHECK (state IN ('pending','invalid','found','collecting','collected','validating','valid','reacting','reacted','cleaning','complete','error')),
     template_output BIGINT      REFERENCES action_trigger.event_output (id),
-    error_output    TEXT
+    error_output    BIGINT      REFERENCES action_trigger.event_output (id),
 );
 
 CREATE TABLE action_trigger.event_params (