Commit b9ae2af2 authored by metzlerd's avatar metzlerd
Browse files

Merge branch '7.x-3.x' of metzlerd@git.drupal.org:project/forena.git into 7.x-3.x

parents d5632e5b 8af4f838
......@@ -246,7 +246,12 @@ class FrxDataSource{
}
public function error($msg='', $log='') {
FrxReportGenerator::instance()->app->error($msg, $log);
if ($msg) {
drupal_set_message(check_markup($msg), 'error');
}
if ($log) {
watchdog('forena', $log, NULL, WATCHDOG_ERROR);
}
}
public function parseXMLFile($contents) {
......
......@@ -227,11 +227,11 @@ class FrxOracle extends FrxDataSource {
$e = oci_error($stmt); // For oci_execute errors pass the statement handle
//drupal_set_message(e_display_array($e));
if ($e['code'] != '1403') {
$msg .= htmlentities($e['message']);
$msg = htmlentities($e['message']);
$msg .= "\n<pre>\n";
$msg .= htmlentities($e['sqltext']);
$msg .= "\n</pre>\n";
ora_error('', $msg);
$this->error('', $msg);
}
}
}
......@@ -241,7 +241,7 @@ class FrxOracle extends FrxDataSource {
$msg .= htmlentities($e['sqltext']);
//printf("\n%".($e['offset']+1)."s", "^");
$msg .= "\n</pre>\n";
ora_error('Database error, see logs for info', $msg);
$this->error('Database error, see logs for info', $msg);
}
// Retrieve any clob data.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment