|
hotsanic |
Subversion Repositories: |
| Line No. | Rev | Author | Line |
|---|---|---|---|
| 1 | 31 | simandl | --- .svn/text-base/diagrams.pl.svn-base Sat May 9 09:04:48 2009 |
| 2 | +++ .svn/tmp/diagrams.pl.tmp Tue Aug 14 23:56:44 2012 |
||
| 3 | @@ -83,7 +83,16 @@ |
||
| 4 | $dbfile=$host."_".$port; |
||
| 5 | $dbfile=~ s/\./:/g; |
||
| 6 | |
||
| 7 | - } else { $name=$device; $name =~ s/:/_/g; $dbfile=$name; } |
||
| 8 | +<<<<<<< .mine |
||
| 9 | + } else { $name=$device; $name =~ s/:/_/g; $dbfile=$name; $name =~ s/\./_/g; } |
||
| 10 | +======= |
||
| 11 | + } else { |
||
| 12 | + $name=$device; |
||
| 13 | + $name =~ s/:/_/g; |
||
| 14 | + $dbfile=$name; |
||
| 15 | + $name =~ s/\./_/g; |
||
| 16 | + } |
||
| 17 | +>>>>>>> .r21 |
||
| 18 | } |
||
| 19 | # if database exists, create images... |
||
| 20 | print "creating images for $device ...\n"; |
||
| 21 | |