also quote parent url

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@1265 e7d03fd6-7b0d-0410-9947-9c21f3af8025
This commit is contained in:
calvin 2004-02-21 14:54:10 +00:00
parent a7474963b8
commit b7e54260b0
6 changed files with 9 additions and 7 deletions

View file

@ -4,7 +4,7 @@
Changed: linkcheck/httplib2.py
* catch errors earlier in recursion check
Changed: linkcheck/UrlData.py
* quote url in log output
* quote url and parent url in log output
Changed: linkcheck/log/*.py
Added: linkcheck/url.py

View file

@ -20,6 +20,7 @@ from linkcheck.log import strtime, strduration
from StandardLogger import StandardLogger
from Logger import Logger
from linkcheck import Config, i18n
from linkcheck.url import url_quote
class CSVLogger (StandardLogger):
""" CSV output. CSV consists of one line per entry. Entries are
@ -65,10 +66,10 @@ class CSVLogger (StandardLogger):
def newUrl (self, urlData):
if self.fd is None: return
row = [urlData.urlName, urlData.recursionLevel,
urlData.parentName, urlData.baseRef,
url_quote(urlData.parentName), urlData.baseRef,
urlData.errorString, urlData.validString,
urlData.warningString, urlData.infoString,
urlData.valid, urlData.url,
urlData.valid, url_quote(urlData.url),
urlData.line, urlData.column,
urlData.name, urlData.dltime,
urlData.dlsize, urlData.checktime,

View file

@ -49,7 +49,7 @@ class ColoredLogger (StandardLogger):
self.fd.write("o\n")
self.fd.write("\n"+self.field("parenturl")+
self.spaces("parenturl")+
self.colorparent+urlData.parentName+
self.colorparent+url_quote(urlData.parentName)+
self.colorreset+"\n")
self.currentPage = urlData.parentName
self.prefix = 1

View file

@ -86,7 +86,8 @@ class HtmlLogger (StandardLogger):
if urlData.parentName and self.has_field("parenturl"):
self.fd.write("<tr>\n<td>"+self.field("parenturl")+
'</td>\n<td><a target="top" href="'+
urlData.parentName+'">'+urlData.parentName+"</a>")
url_quote(urlData.parentName)+'">'+
url_quote(urlData.parentName)+"</a>")
if urlData.line:
self.fd.write(i18n._(", line %d")%urlData.line)
if urlData.column:

View file

@ -53,7 +53,7 @@ class SQLLogger (StandardLogger):
(self.dbname,
StringUtil.sqlify(urlData.urlName),
urlData.recursionLevel,
StringUtil.sqlify(urlData.parentName),
StringUtil.sqlify(url_quote(urlData.parentName)),
StringUtil.sqlify(urlData.baseRef),
StringUtil.sqlify(urlData.errorString),
StringUtil.sqlify(urlData.validString),

View file

@ -94,7 +94,7 @@ __init__(self, **args)
urlData.name+"\n")
if urlData.parentName and self.has_field('parenturl'):
self.fd.write(self.field('parenturl')+self.spaces("parenturl")+
urlData.parentName+
url_quote(urlData.parentName)+
(i18n._(", line %d")%urlData.line)+
(i18n._(", col %d")%urlData.column)+"\n")
if urlData.baseRef and self.has_field('base'):