DressOrc/Blog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes bug from optimisation where deepest category was incorrectly calculated leading to misplaced pages in nav bar

Browse source
This commit is contained in:
Rosia E Evans 2023-10-13 17:27:17 +01:00
parent 8cfcf1a721
commit 7b7f967d74
10 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Resources/Output/Aardvark.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/CatTowerDefence.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/EPQProject.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/MindMap.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/SBSWork.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/TestFullArticle.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

2
Resources/Output/index.html
View file

@ -13,7 +13,6 @@
<nav>
<h1>Navigation</h1>
<li><a href=/TestFullArticle.html>Example Post</a></li>
<li><a href=/index.html>Welcome!</a></li>
<h2>Newer Work</h2>
@ -29,6 +28,7 @@
<h2>Thoughts And Essays</h2>
<li><a href=/permacomputing.html>Permacomputing</a></li>
<h2>University</h2>

6
Src/BlogPageBuilder.cpp
View file

@ -96,9 +96,7 @@ std::string NavBarGenerator::findDeepestCategory(std::string url)
{
int categoryEnd = url.rfind("/");
int categoryStart = url.rfind("/", categoryEnd-1);
if (categoryStart == -1)
categoryStart = 0;
return url.substr(categoryStart, categoryEnd);
return url.substr(categoryStart+1, categoryEnd-categoryStart-1);
}
std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, std::vector<Page*> pages)
@ -117,7 +115,7 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s
+ "</a></li>\n");
std::string categoryOpening = "\n";
int categoryStart = categories.find(findDeepestCategory(page->getRelativeInUrl()));
int categoryStart = categories.find(findDeepestCategory(page->getInUrl()));
int insertLocation = 0;
if (categoryStart != -1)
insertLocation = categories.find(categoryOpening, categoryStart) + categoryOpening.length();

9
Src/Page.cpp
View file

@ -59,15 +59,6 @@ std::string Page::getInUrl()
return sourceFileUrl;
}
// includes first /
std::string Page::getRelativeInUrl()
{
int start = strlen(SOURCE_FILE_FOLDER)+1;
std::string relativeUrl = std::string(sourceFileUrl).substr(start, sourceFileUrl.length()-start);
relativeUrl.replace(relativeUrl.length()-3, 3, ".html");
return relativeUrl;
}
FileFlags Page::getPageFlags()
{
return flags;

1
Src/Page.h
View file

@ -50,7 +50,6 @@ public:
std::string getSourceFileContents();
std::string getInUrl();
std::string getRelativeInUrl();
std::string getOutUrl();
std::string getRelativeOutUrl();