Logging and exception cleanup

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java
index c517291..9c0169a 100644
--- a/src/main/java/com/c2kernel/scripting/Script.java
+++ b/src/main/java/com/c2kernel/scripting/Script.java
@@ -387,6 +387,8 @@ public class Script
 

         // execute the child scripts

         for (Script importScript : mIncludes) {

+        	if (Logger.doLog(8))

+        		Logger.msg(8, "Import script:\n"+importScript.mScript);

             importScript.execute();

         }

 

@@ -395,10 +397,13 @@ public class Script
         try

         {

             Logger.msg(7, "Script.execute() - Executing script");

+        	if (Logger.doLog(8))

+        		Logger.msg(8, "Script:\n"+mScript);

+            

             if (engine == null)

             	throw new ScriptingEngineException("Script engine not set. Cannot execute scripts.");

             returnValue = engine.eval(mScript, beans);

-            Logger.msg(8, "Script.execute() - script returned \"" + returnValue + "\"");

+            Logger.msg(7, "Script.execute() - script returned \"" + returnValue + "\"");

         }

         catch (Exception ex)

         {