diff -r 9ddb1d67ebaf -r 9644881fedd0 commsfwtools/commstools/svg/relations.pl --- a/commsfwtools/commstools/svg/relations.pl Tue May 11 17:20:19 2010 +0300 +++ b/commsfwtools/commstools/svg/relations.pl Tue May 25 14:00:39 2010 +0300 @@ -154,9 +154,12 @@ my $tabToFontAdjustTopY = 2; my $tabToFontAdjustBottomY = 1; my $tabLineLengthY = 5; +my $outputPath = ""; # output path as specified by "-o " argument +our($opt_x,$opt_v,$opt_V, $opt_o); +Getopts("x:vVo:"); -our($opt_x,$opt_v,$opt_V); -Getopts("x:vV"); +$outputPath = processPathArgument($opt_o); + readRelationshipFile(); print "Reading sequences\n" if ($opt_V); @@ -225,9 +228,15 @@ outputRelationsHTMLEmbedder($width, $height); sub createOutputFile() - { - open SVG, ">relations.svg" || die "Cannot open relations.svg for writing\n"; +{ + # Have already created the directory $outputPath, just create the "html" subdirectory + my $path = $outputPath . "html"; + if (! -d $path) { + mkdir $path; } + $path .= "/relations.svg"; + open SVG, ">$path" || die "Cannot open $path for writing\n"; +} sub closeOutputFile() { @@ -835,7 +844,9 @@ sub outputRelationsHTMLEmbedder($$) { my ($width,$height) = @_; - open HTML, ">relations.html" || die "Cannot open relations.html for writing\n"; + # Should have already created $outputPath/html directory. + my $path = $outputPath . "html/relations.html"; + open HTML, ">$path" || die "Cannot open $path for writing\n"; print HTML qq{\n\n}; print HTML qq{

\n}; print HTML qq{\n}; @@ -875,7 +886,13 @@ # sub outputAnimateHTML() { - open HTML, ">animate.html" || die "Cannot open animate.html for writing\n"; + # Should have already created $outputPath directory, create html/ subdirectory. + my $path = $outputPath . "html"; + if (! -d $path) { + mkdir $path; + } + $path .= "/animate.html"; + open HTML, ">$path" || die "Cannot open $path for writing\n"; ################################# # Begin Interpolated Text... # ################################# @@ -2096,3 +2113,31 @@ { print SVG ");\n\n"; } + +sub processPathArgument($) +{ + my $path = $_[0]; + if ($path) { + # ensure "/" at the end + if ($path !~ /\/$/) { + $path .= "/"; + } + mkdirp($path); + return $path; + } else { + return ""; + } +} + +sub mkdirp($) +{ + my $dirName = @_[0]; + if ($dirName =~ m/^(.*)\//i) { + if ($1 ne "") { + mkdirp($1); + } + } + if (! -d $dirName) { + mkdir($dirName); + } +}