pnbp

commit 0ce4dd52eb5c6a87e9da754c4be7973a1ddf2856
parent f6d11d1bea54e7c862a701dea15fae00d515a17a
Author: Paul Longtine <paullongtine@gmail.com>
Date:   Thu May 22 20:22:27 2014

Fixed bug when there was no config assosiated with pagevar date

Diffstat:
 mod/blog.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/mod/blog.py b/mod/blog.py
@@ -39,13 +39,16 @@ def getPages(template,settings,name,page):
         if datedata[0] in dates:
             if datedata[1] in dates[datedata[0]]:
                 dates[datedata[0]][datedata[1]][datedata[2]] = i['title']
+
             else:
                 dates[datedata[0]][datedata[1]] = {}
                 dates[datedata[0]][datedata[1]][datedata[2]] = i['title']
+
         else:
             dates[datedata[0]] = {}
             dates[datedata[0]][datedata[1]] = {}
             dates[datedata[0]][datedata[1]][datedata[2]] = i['title']
+
     a = "<ul>"
     for year,months in sorted(dates.items(),reverse=True):
         a = a + "<li>{}</li><li><ul>".format(year)
@@ -53,8 +56,11 @@ def getPages(template,settings,name,page):
             a = a + "<li>{}</li><li><ul>".format(month)
             for day,title in sorted(days.items(),reverse=True):
                 a = a + "<li>{} - <a href=\"{}\">{}</a></li>".format(day,slug(title),title)
+
             a = a + "</ul></li>"
+
         a = a + "</ul></li>"
+
     pages['post']['default'] = template.replace("%content%", a)
     return pages
 
@@ -65,6 +71,7 @@ def generatePost(data, post, page):
         if name == 'title':
             if page == "index":
                 page = ""
+
             else:
                 page = page + "/"
 
@@ -75,6 +82,8 @@ def generatePost(data, post, page):
             config = getConfig("%date:",post)
             if config == "none":
                 post = post.replace("%date:none%",x)
+            elif config == "-1":
+                post = post.replace("%date%",x)
             else:
                 post = post.replace(
                     "%date:"+config+"%",
@@ -110,9 +119,8 @@ def getConfig(index,data):
         pointer = data.index(index)+len(index)
     except:
         retVal = "-1"
-
-    while data[pointer] != "%" and retVal != "-1":
-        retVal = retVal + data[pointer]
-        pointer += 1
-    
+    if retVal != "-1":
+        while data[pointer] != "%" and retVal != "-1":
+            retVal = retVal + data[pointer]
+            pointer += 1
     return retVal