Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
acs-workflow
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
acs-workflow
Commits
d4654d72
Commit
d4654d72
authored
Apr 09, 2017
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- exec -> im_exec changes from Gustaf
parent
e3cdb91d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
16 deletions
+5
-16
graph-procs.tcl
tcl/graph-procs.tcl
+5
-16
No files found.
tcl/graph-procs.tcl
View file @
d4654d72
...
...
@@ -388,16 +388,6 @@ ad_proc wf_graphviz_dot_exec {
return -code error
"Graphviz is not installed."
}
# 091031 fraber: Doesn't work like this with Windows installer.
# if { ![file executable $graphviz_dot_path
]
}
{
# return -code error "Can't execute graphviz binary at $graphviz_dot_path"
#
}
# 091103 fraber: Doesn't work like this with Windows installer.
# if { ![file isdirectory $tmp_path
]
}
{
# return -code error "Parameter acs-workflow.tmp_path points to a non-existing directory: $tmp_path"
#
}
set output
[
string
tolower
$output
]
if
{
[
regexp
{[
^a-z
]}
$output
]
}
{
return -code error
"Only a-z allowed in 'output'"
...
...
@@ -414,13 +404,12 @@ ad_proc wf_graphviz_dot_exec {
close
$fw
if
{[
catch
{
if
{
$to
_file_p
}
{
exec -keepnewline
$graphviz
_dot_path -T$output -Gcharset=latin1 -o
$tmp
_out
$tmp
_dot
ns_log Notice
"wf_graphviz_dot_exec: exec -keepnewline
$graphviz
_dot_path -T
$output
-o
$tmp
_out
$tmp
_dot"
if
{
$to
_file_p
}
{
im_exec -keepnewline
$graphviz
_dot_path -T$output -Gcharset=latin1 -o
$tmp
_out
$tmp
_dot
ns_log Notice
"wf_graphviz_dot_exec: im_exec -keepnewline
$graphviz
_dot_path -T
$output
-o
$tmp
_out
$tmp
_dot"
}
else
{
set result
[
exec
-keepnewline
$graphviz
_dot_path -Gcharset=latin1 -T$output
$tmp
_dot
]
ns_log Notice
"wf_graphviz_dot_exec: exec -keepnewline
$graphviz
_dot_path -T
$output
$tmp
_dot"
set result
[
im_
exec -keepnewline
$graphviz
_dot_path -Gcharset=latin1 -T$output
$tmp
_dot
]
ns_log Notice
"wf_graphviz_dot_exec:
im_
exec -keepnewline
$graphviz
_dot_path -T
$output
$tmp
_dot"
ad_return_complaint 1
$result
}
}
err_msg
]}
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment