Debug changes

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@26 e7d03fd6-7b0d-0410-9947-9c21f3af8025

ChangeLog

@@ -1,3 +1,9 @@
+11.3.2000
+	* Better debugging:
+	  -D implies -t0
+	  HTML data in debug output
+	  print line number in UrlData.__str__()
+
 8.3.2000 Version 1.1.1
 	* FastCGI modules added (no script yet)
 	* CGI script fixes

Makefile

@@ -11,6 +11,7 @@ CPPFLAGS = $(SSL_INCLDIR) $(PY_INCLDIR)
 VERSION=1.1.1
 #HOST=treasure.calvinsplayground.de
 HOST=fsinfo.cs.uni-sb.de
+PROXY=www-proxy.uni-sb.de:3128
 PACKAGE = linkchecker
 BZ2PACKAGE = $(PACKAGE)-$(VERSION).tar.bz2
 DEBPACKAGE = $(PACKAGE)_$(VERSION)_i386.deb
@@ -28,8 +29,9 @@ ssl.so:	ssl.o
 clean:
 	rm -f ssl.{so,o} $(ALLPACKAGES) $(PACKAGE)-out.*
 
-files: all
-	./$(PACKAGE) -q -Wtext -Whtml -Wgml -Wsql -R -r2 -v -i "$(HOST)" http://$(HOST)/~calvin/
+.files-stamp: all
+	./$(PACKAGE) -q -Wtext -Whtml -Wgml -Wsql -R -r2 -v -P $(PROXY) -i $(HOST) http://$(HOST)/~calvin/
+	@touch .files-stamp
 
 install:	install-dirs
 	install -m644 linkcheck/*.py? $(DESTDIR)/usr/share/$(PACKAGE)/linkcheck
@@ -45,13 +47,13 @@ install-dirs:
 	$(DESTDIR)/usr/bin \
 	$(DESTDIR)/etc
 
-dist:	files
+dist:	.files-stamp
 	dh_clean
 	cd .. && $(TAR) cIhf $(BZ2PACKAGE) $(PACKAGE)
 	cd .. && $(ZIP) -r $(ZIPPACKAGE) $(PACKAGE)
 	fakeroot debian/rules binary
         
-homepage:	files
+homepage:	.files-stamp
 	scp *-out.* shell1.sourceforge.net:/home/groups/linkchecker/htdocs/
 	scp ChangeLog shell1.sourceforge.net:/home/groups/linkchecker/htdocs/changes.txt
 
@@ -64,4 +66,3 @@ test:
 	  echo "Testing $$i. Results are in $$i.result"; \
 	  ./$(PACKAGE) -t0 -v -a $$i > $$i.result 2>&1; \
         done
-        

debian/changelog

@@ -1,3 +1,15 @@
+linkchecker (1.1.2) unstable; urgency=low
+
+  * See ChangeLog
+
+ -- Bastian Kleineidam <calvin@cs.uni-sb.de>  Sat, 11 Mar 2000 04:04:52 +0100
+
+linkchecker (1.1.1) unstable; urgency=low
+
+  * See ChangeLog
+
+ -- Bastian Kleineidam <calvin@cs.uni-sb.de>  Wed,  8 Mar 2000 21:08:21 +0100
+
 linkchecker (1.1.0) unstable; urgency=low
 
   * See ChangeLog

debian/files

@@ -1 +1 @@
-linkchecker_1.1.0_i386.deb web optional
+linkchecker_1.1.1_i386.deb web optional

linkcheck/Config.py

@@ -2,7 +2,7 @@ import ConfigParser,sys,os,re,UserDict,string
 from os.path import expanduser,normpath,normcase,join,isfile
 import Logging
 
-Version = "1.1.1"
+Version = "1.1.2"
 AppName = "LinkChecker"
 App = AppName+" "+Version
 UserAgent = AppName+"/"+Version

linkcheck/HttpUrlData.py

@@ -124,6 +124,7 @@ class HttpUrlData(UrlData):
         self.urlConnection = self.urlConnection.getfile()
         data = StringUtil.stripHtmlComments(self.urlConnection.read())
         self.time = time.time() - t
+        Config.debug(Config.DebugDelim+data+Config.DebugDelim)
         return data
         
     def isHtml(self):

linkcheck/UrlData.py

@@ -252,7 +252,8 @@ class UrlData:
         return "urlname="+`self.urlName`+"\nparentName="+`self.parentName`+\
                "\nbaseRef="+`self.baseRef`+"\ncached="+`self.cached`+\
                "\nrecursionLevel="+`self.recursionLevel`+\
-               "\nurlConnection="+str(self.urlConnection)
+               "\nurlConnection="+str(self.urlConnection)+\
+	       "\nline="+`self.line`
 
     def _getUserPassword(self, config):
         for rx, _user, _password in config["authentication"]:

linkchecker

@@ -160,6 +160,7 @@ for opt,arg in options:
 
     elif opt=="-D" or opt=="--debug":
         linkcheck.Config.DebugFlag = 1
+        config.disableThreading()
     
     elif opt=="-e" or opt=="--extern":
         config["externlinks"].append((re.compile(arg), 0))
@@ -214,7 +215,7 @@ for opt,arg in options:
     
     elif opt=="-t" or opt=="--threads":
         num = int(arg)
-        if config["threads"]:
+        if config["threads"] and not linkcheck.Config.DebugFlag:
             if num>0:
                 config.enableThreading(num)
             else: