dberrorjournal.rb in openwferu-extras-0.9.17

- old
+ new

@@ -1,8 +1,8 @@
 #
 #--
-# Copyright (c) 2007, Tomaso Tosolini, John Mettraux, OpenWFE.org
+# Copyright (c) 2007-2008, Tomaso Tosolini, John Mettraux, OpenWFE.org
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
 # modification, are permitted provided that the following conditions are met:
 # 
@@ -36,15 +36,14 @@
 #
 # Tomaso Tosolini
 # John Mettraux
 # 
 
-require 'rubygems'
+#require 'rubygems'
 
 #require_gem 'activerecord'
-gem 'activerecord'
-require 'active_record'
+gem 'activerecord'; require 'active_record'
 
 require 'openwfe/omixins'
 require 'openwfe/expool/errorjournal'
 
 
@@ -103,11 +102,11 @@
     # A database backed error journal.
     #
     # (no synchronization needed it seems)
     #
     class DbErrorJournal < OpenWFE::ErrorJournal
-        include FeiMixin
+        include OpenWFE::FeiMixin
 
         def initialize (service_name, application_context)
 
             require 'openwfe/storage/yamlcustom'
                 # making sure this file has been required at this point
@@ -121,10 +120,10 @@
         # Returns the error log for a given workflow/process instance,
         # the older error first.
         #
         def get_error_log (wfid)
 
-            wfid = to_wfid wfid
+            wfid = extract_wfid wfid, true
             errors = ProcessError.find_all_by_wfid wfid, :order => "id asc"
             errors.collect { |e| e.owfe_error }
         end
 
         #