Skip to content
Snippets Groups Projects
Commit 1e71cb9f authored by Marcel Loose's avatar Marcel Loose :sunglasses:
Browse files

Bug 1503: Fixed problem with displaying documentation in the Software... 

Bug 1503: Fixed problem with displaying documentation in the Software TreeBrowser when directory name contains an underscore
parent 7479ecb1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
LCS/Tools/src/pkgdep.cc
+ 1
− 1
View file @ 1e71cb9f
...@@ -68,7 +68,7 @@ string replaceSlash (const string& str) ...@@ -68,7 +68,7 @@ string replaceSlash (const string& str)
string out = str; string out = str;
string::size_type idx = out.find('/'); string::size_type idx = out.find('/');
while (idx != string::npos) { while (idx != string::npos) {
out.replace (idx, 1, 1, '_'); out.replace (idx, 1, 1, '~');
idx = out.find('/'); idx = out.find('/');
} }
return out; return out;
......
support/tools/TreeBrowser/scripts/make_links.php
+ 8
− 7
View file @ 1e71cb9f
<?php <?php
$name = $_REQUEST["name"]; $name = $_REQUEST["name"];
$realname= str_replace("_","/",$name); $realname= str_replace("~","/",$name);
$isUsed=file_exists("../dep/".$name.".used.html"); $isUsed=file_exists("../dep/".$name.".used.html");
$isUses=file_exists("../dep/".$name.".uses.html"); $isUses=file_exists("../dep/".$name.".uses.html");
$isFlat=file_exists("../dep/".$name.".flat.html"); $isFlat=file_exists("../dep/".$name.".flat.html");
...@@ -22,7 +22,8 @@ echo $realname; ...@@ -22,7 +22,8 @@ echo $realname;
if ($isUsed) { if ($isUsed) {
?> ?>
-- <a href="../dep/<?php echo $name;?>.used.html" title="(shows in a -- <a href="../dep/<?php echo $name;?>.used.html" title="(shows in a
recursive way the packages where <?php echo $name;?> is used)" target="depend"> Used </a> recursive way the packages where <?php echo $realname;?> is used)"
target="depend"> Used</a>
<?php <?php
} else { } else {
?> ?>
...@@ -34,7 +35,8 @@ if ($isUsed) { ...@@ -34,7 +35,8 @@ if ($isUsed) {
if ($isUses) { if ($isUses) {
?> ?>
-- <a href="../dep/<?php echo $name;?>.uses.html" title="(shows in a -- <a href="../dep/<?php echo $name;?>.uses.html" title="(shows in a
recursive way the packages used by <?php echo $name;?>)" target="depend"> Uses </a> recursive way the packages used by <?php echo $realname;?>)"
target="depend"> Uses</a>
<?php <?php
} else { } else {
?> ?>
...@@ -46,13 +48,12 @@ if ($isUses) { ...@@ -46,13 +48,12 @@ if ($isUses) {
if ($isFlat) { if ($isFlat) {
?> ?>
-- <a href="../dep/<?php echo $name;?>.flat.html" title="(shows the -- <a href="../dep/<?php echo $name;?>.flat.html" title="(shows the
packages used by <?php echo $name;?>)" target="depend"> Flat </a> packages used by <?php echo $realname;?>)" target="depend"> Flat</a>
<?php <?php
} }
?> ?>
--- Build results: --- <a href="http://svn.astron.nl/CDash/index.php?project=LOFAR"
<A HREF="../../BuildResults/thisWeek/" target="_top">this week</a> target="_blank">Build results</a>
-- <A HREF="../../BuildResults/lastWeek/" target="_top">last week</a>
</center> </center>
</body> </body>
</html> </html>
......
support/tools/TreeBrowser/scripts/makepage.php
+ 3
− 5
View file @ 1e71cb9f
<?php <?php
$name = $_REQUEST["name"]; $name = $_REQUEST["name"];
$realname = str_replace("_","/",$name); $realname = str_replace("~","/",$name);
$namearray = explode('_',$name); $docname = "group__" .str_replace("_","__",end(explode('~',$name))). ".html";
$shortname = $namearray[sizeof($namearray)-1];
$docname = "group__".$shortname.".html";
?> ?>
<html> <html>
<head> <head>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment