[mapguide-commits] r4260 - in
trunk/MgDev/Oem/fusionMG/templates/mapguide: aqua limegold
maroon preview slate turquoiseyellow
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Sep 23 18:25:11 EDT 2009
Author: chrisclaydon
Date: 2009-09-23 18:25:10 -0400 (Wed, 23 Sep 2009)
New Revision: 4260
Modified:
trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html
trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html
Log:
Re #1101 - Submit error handling patch on behalf of Christine Bao
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/aqua/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -106,6 +106,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -115,6 +130,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/limegold/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -94,6 +94,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -103,6 +118,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/maroon/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -117,6 +117,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -126,6 +141,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/preview/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -93,6 +93,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -102,6 +117,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/slate/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -98,6 +98,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -107,6 +122,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
Modified: trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html
===================================================================
--- trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html 2009-09-22 23:43:58 UTC (rev 4259)
+++ trunk/MgDev/Oem/fusionMG/templates/mapguide/turquoiseyellow/index.html 2009-09-23 22:25:10 UTC (rev 4260)
@@ -82,6 +82,21 @@
var fusionError = function(eventId, error) {
var errorMessage = error.toString();
var readableMessage = '';
+
+ //Case 1: For dealing with Function: convertXML (fusion.js)
+ //******************************************
+ // xml2json: function(callback, r, json) {
+ // if (json) {
+ // var o;
+ // eval("o="+r.responseText);
+ // callback(o);
+ // } else {
+ // if (r.status >= 400) {
+ // Fusion.reportError(new Fusion.Error(Fusion.Error.FATAL,
+ // 'xml2json: invalid XML document: ' + r.transport.responseText + " : " + r.request.url));
+ // return;
+ // }
+ //******************************************
var tagStart = '<h2>';
var tagEnd = '</h2>';
var indexStart = errorMessage.indexOf(tagStart);
@@ -91,6 +106,31 @@
readableMessage = readableMessage.replace(/\\\\n/g, '\n');
readableMessage = readableMessage.replace(/\\\\t/g, '\t');
}
+
+ //Case 2: For dealing with Function: ajaxException. (fusion.js)
+ //******************************************
+ // ajaxException: function(r, e) {
+ // this.reportError(new Fusion.Error(Fusion.Error.WARNING,
+ // OpenLayers.i18n('ajaxError', {'exception':e.message,
+ // 'filename':e.fileName,
+ // 'line':e.lineNumber,
+ // 'response': r.transport.responseText
+ // })));
+ // },
+ //******************************************
+ if (readableMessage == '') {
+ var ajaxCallback = 'WARNING: Exception occurred in AJAX callback.';
+ var responseError = 'Response: ERROR: ';
+ var indexAjaxCallback = errorMessage.indexOf(ajaxCallback);
+ var indexResponseError = errorMessage.indexOf(responseError);
+ if (indexAjaxCallback != -1 && indexResponseError != -1) {
+ var indexReturn = errorMessage.indexOf('\n', indexResponseError);
+ if (indexReturn != -1) {
+ readableMessage = errorMessage.substring(indexResponseError + responseError.length, indexReturn);
+ }
+ }
+ }
+
if (readableMessage != '') {
alert(readableMessage);
}
More information about the mapguide-commits
mailing list