craft_error_message -> craft_error_message()

klpanagi · klpanagi · commit 89720d2f7516 · 2015-08-31T14:12:43.000+03:00
diff --git a/hop_services/services/detect_objects.service.js b/hop_services/services/detect_objects.service.js
@@ -169,6 +169,7 @@ service detect_objects ( {file_uri:'', limit: ''} )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge --> [ws//localhost:9090]';
@@ -259,6 +260,7 @@ service detect_objects ( {file_uri:'', limit: ''} )
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
 
              var logMsg = 'ERROR: Cannot open websocket' +
                'to rosbridge --> [ws//localhost:9090]';
diff --git a/hop_services/services/face_detection.service.js b/hop_services/services/face_detection.service.js
@@ -150,6 +150,7 @@ service face_detection ( {file_uri:''} )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge --> [ws//localhost:9090]\r\n' + e;
@@ -240,6 +241,7 @@ service face_detection ( {file_uri:''} )
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
 
              var logMsg = 'ERROR: Cannot open websocket' +
                'to rosbridge --> [ws//localhost:9090]\r\n' + e;
diff --git a/hop_services/services/ontology_is_subsuperclass_of.service.js b/hop_services/services/ontology_is_subsuperclass_of.service.js
@@ -118,13 +118,14 @@ service ontology_is_subsuperclass_of ( {parent_class: '', child_class: '', recur
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
         //console.log(e);
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge [ws//localhost:9090]\r\n' + e;
         postMessage( craft_slaveMaster_msg('log', logMsg) );
 
-        var resp_msg = craft_error_response;
+        var resp_msg = craft_error_response();
         sendResponse( resp_msg );
         return;
       }
@@ -210,6 +211,7 @@ service ontology_is_subsuperclass_of ( {parent_class: '', child_class: '', recur
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
              //console.log(e);
 
              var logMsg = 'ERROR: Cannot open websocket' +
diff --git a/hop_services/services/ontology_subclasses_of.service.js b/hop_services/services/ontology_subclasses_of.service.js
@@ -100,13 +100,14 @@ service ontology_subclasses_of ( {query: ''} )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
         //console.log(e);
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge [ws//localhost:9090]\r\n' + e;
         postMessage( craft_slaveMaster_msg('log', logMsg) );
 
-        var resp_msg = craft_error_response;
+        var resp_msg = craft_error_response();
         sendResponse( resp_msg );
         return;
       }
@@ -192,6 +193,7 @@ service ontology_subclasses_of ( {query: ''} )
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
              //console.log(e);
 
              var logMsg = 'ERROR: Cannot open websocket' +
diff --git a/hop_services/services/ontology_superclasses_of.service.js b/hop_services/services/ontology_superclasses_of.service.js
@@ -101,13 +101,14 @@ service ontology_superclasses_of ( {query:''} )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
         //console.log(e);
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge [ws//localhost:9090]\r\n' + e;
         postMessage( craft_slaveMaster_msg('log', logMsg) );
 
-        var resp_msg = craft_error_response;
+        var resp_msg = craft_error_response();
         sendResponse( resp_msg );
         return;
       }
@@ -193,6 +194,7 @@ service ontology_superclasses_of ( {query:''} )
         }
         catch(e){
           rosbridge_connection = false;
+          rosWS = undefined;
           //console.log(e);
 
           var logMsg = 'ERROR: Cannot open websocket' +
diff --git a/hop_services/services/qr_detection.service.js b/hop_services/services/qr_detection.service.js
@@ -149,6 +149,7 @@ service qr_detection ( {file_uri:''} )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge [ws//localhost:9090]\r\n' + e;
@@ -238,6 +239,7 @@ service qr_detection ( {file_uri:''} )
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
              //console.log(e);
 
              var logMsg = 'ERROR: Cannot open websocket' +
diff --git a/hop_services/services/set_denoise_profile.service.js b/hop_services/services/set_denoise_profile.service.js
@@ -148,6 +148,7 @@ service set_denoise_profile( {file_uri:'', audio_source:'', user:''}  )
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
 
         var logMsg = 'ERROR: Cannot open websocket' +
           'to rosbridge --> [ws//localhost:9090]\r\n' + e;
@@ -241,6 +242,7 @@ service set_denoise_profile( {file_uri:'', audio_source:'', user:''}  )
            }
            catch(e){
              rosbridge_connection = false;
+             rosWS = undefined;
 
              var logMsg = 'ERROR: Cannot open websocket' +
                'to rosbridge --> [ws//localhost:9090]';
diff --git a/hop_services/services/speech_detection_sphinx4.service.js b/hop_services/services/speech_detection_sphinx4.service.js
@@ -166,6 +166,7 @@ service speech_detection_sphinx4(
       }
       catch(e){
         rosbridge_connection = false;
+        rosWS = undefined;
         //console.log(e);
 
         var logMsg = 'ERROR: Cannot open websocket' +
@@ -174,7 +175,8 @@ service speech_detection_sphinx4(
 
         Fs.rm_file_sync(cpFilePath);
 
-        var resp_msg = craft_error_response;
+        var resp_msg = craft_error_response();
+        console.log(resp_msg);
         sendResponse( resp_msg );
         return;
       }
@@ -258,6 +260,7 @@ service speech_detection_sphinx4(
           }
           catch(e){
             rosbridge_connection = false;
+            rosWS = undefined;
             //console.log(e);
 
             var logMsg = 'ERROR: Cannot open websocket' +

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ service detect_objects ( {file_uri:'', limit: ''} )`
`169`	`169`	`}`
`170`	`170`	`catch(e){`
`171`	`171`	`rosbridge_connection = false;`
	`172`	`+ rosWS = undefined;`
`172`	`173`
`173`	`174`	`var logMsg = 'ERROR: Cannot open websocket' +`
`174`	`175`	`'to rosbridge --> [ws//localhost:9090]';`
`@@ -259,6 +260,7 @@ service detect_objects ( {file_uri:'', limit: ''} )`
`259`	`260`	`}`
`260`	`261`	`catch(e){`
`261`	`262`	`rosbridge_connection = false;`
	`263`	`+ rosWS = undefined;`
`262`	`264`
`263`	`265`	`var logMsg = 'ERROR: Cannot open websocket' +`
`264`	`266`	`'to rosbridge --> [ws//localhost:9090]';`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ service face_detection ( {file_uri:''} )`
`150`	`150`	`}`
`151`	`151`	`catch(e){`
`152`	`152`	`rosbridge_connection = false;`
	`153`	`+ rosWS = undefined;`
`153`	`154`
`154`	`155`	`var logMsg = 'ERROR: Cannot open websocket' +`
`155`	`156`	`'to rosbridge --> [ws//localhost:9090]\r\n' + e;`
`@@ -240,6 +241,7 @@ service face_detection ( {file_uri:''} )`
`240`	`241`	`}`
`241`	`242`	`catch(e){`
`242`	`243`	`rosbridge_connection = false;`
	`244`	`+ rosWS = undefined;`
`243`	`245`
`244`	`246`	`var logMsg = 'ERROR: Cannot open websocket' +`
`245`	`247`	`'to rosbridge --> [ws//localhost:9090]\r\n' + e;`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ service qr_detection ( {file_uri:''} )`
`149`	`149`	`}`
`150`	`150`	`catch(e){`
`151`	`151`	`rosbridge_connection = false;`
	`152`	`+ rosWS = undefined;`
`152`	`153`
`153`	`154`	`var logMsg = 'ERROR: Cannot open websocket' +`
`154`	`155`	`'to rosbridge [ws//localhost:9090]\r\n' + e;`
`@@ -238,6 +239,7 @@ service qr_detection ( {file_uri:''} )`
`238`	`239`	`}`
`239`	`240`	`catch(e){`
`240`	`241`	`rosbridge_connection = false;`
	`242`	`+ rosWS = undefined;`
`241`	`243`	`//console.log(e);`
`242`	`244`
`243`	`245`	`var logMsg = 'ERROR: Cannot open websocket' +`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ service set_denoise_profile( {file_uri:'', audio_source:'', user:''} )`
`148`	`148`	`}`
`149`	`149`	`catch(e){`
`150`	`150`	`rosbridge_connection = false;`
	`151`	`+ rosWS = undefined;`
`151`	`152`
`152`	`153`	`var logMsg = 'ERROR: Cannot open websocket' +`
`153`	`154`	`'to rosbridge --> [ws//localhost:9090]\r\n' + e;`
`@@ -241,6 +242,7 @@ service set_denoise_profile( {file_uri:'', audio_source:'', user:''} )`
`241`	`242`	`}`
`242`	`243`	`catch(e){`
`243`	`244`	`rosbridge_connection = false;`
	`245`	`+ rosWS = undefined;`
`244`	`246`
`245`	`247`	`var logMsg = 'ERROR: Cannot open websocket' +`
`246`	`248`	`'to rosbridge --> [ws//localhost:9090]';`