- REST Interface:

  Fixed issue that leads to crashes of AOLserver under Windows

tcl/intranet-rest-procs.tcl

@@ -315,6 +315,8 @@ ad_proc -private im_rest_page {
     }
 
     set result [ad_parse_template -params $params $file]
+    # set result "{success:false, message: 'ad_parse_template -params $params $file'}"
+    
     switch $format {
 	json { set mime_type "application/json" }
 	default { set mime_type "text/html" }

www/data-source/domain-proxy.adp

+@json;noquote@
\ No newline at end of file

www/data-source/domain-proxy.tcl

@@ -25,14 +25,8 @@ ns_log Notice "/intranet-rest/data-source/domain-proxy.tcl: url=$url"
 # --------------------------------------------
 # Fetch and return the page
 #
-
 if {[catch {
     set json [ns_httpget $url]
 } err_msg]} {
-    ad_return_complaint 1 "Domain-proxy: Error retreiving url:<br><pre>[ns_quotehtml $err_msg]</pre>"
-    ad_script_abort    
+    set json "{'success': false, 'message': 'Error message: $err_msg'}"
 }
-
-
-
-doc_return 200 "application/json" $json

www/data-source/project-task-tree-action.adp

+{success:true, message: 'Successfully performed action=$action'}
\ No newline at end of file

www/data-source/project-task-tree-action.tcl

@@ -50,8 +50,3 @@ if {[info exists json_hash(_array_)]} {
     }
 }
 
-# ---------------------------------------------------------------
-# Return a success JSON
-# ---------------------------------------------------------------
-
-doc_return 200 "text/plain" "\{success:true, message: 'Successfully performed action=$action'\}"

www/data-source/project-task-tree.json.adp

+{'text':'.','children': [
+@task_json@
+}

www/data-source/project-task-tree.json.tcl

@@ -238,9 +238,3 @@ while {$level < $old_level} {
     for {set i 0} {$i < $old_level} {incr i} { append indent "\t" }
 }
 
-doc_return 200 "text/plain" "{'text':'.','children': \[
-$task_json
-}
-"
-
-ad_script_abort

www/data-source/success.adp

+{'success': true, 'message': 'success'}