X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=check_urls.py;h=82d4af6946aef502fe25e80298aa6e4dec6c6fdf;hb=a1b7edb2f925e22c9ad843496e13c687ce395e44;hp=75f31559b89ab3b12216d0e93b7b3eadf8535e0f;hpb=9edef5a570ea28f7c06d8d92fdd70afe0ea86809;p=bookmarks_db.git

diff --git a/check_urls.py b/check_urls.py
index 75f3155..82d4af6 100755
--- a/check_urls.py
+++ b/check_urls.py
@@ -2,11 +2,11 @@
 """
    Robot interface - check URLs from bookmarks database
 
-   Written by BroytMann, Mar 2000 - Aug 2002. Copyright (C) 2000-2002 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
 """
 
 
-import sys, os, urllib, tempfile
+import sys, os, tempfile
 tempfname = "check_urls" + tempfile.gettempprefix() + "tmp"
 
 
@@ -31,7 +31,7 @@ def run():
       pass
 
    if report_stats:
-      print "BroytMann check_urls, Copyright (C) 1997-2002 PhiloSoft Design"
+      print "BroytMann check_urls, Copyright (C) 1997-2007 PhiloSoft Design"
 
    if args:
       sys.stderr.write("check_urls: too many arguments\n")
@@ -70,7 +70,7 @@ def run():
       sys.stdout.flush()
 
    root_folder = storage.load()
-   from bkmk_objects import make_linear
+   from bkmk_objects import make_linear, break_tree
    make_linear(root_folder)
    objects = len(root_folder.linear)
 
@@ -118,9 +118,8 @@ def run():
                if hasattr(old_object, attr_name):
                   setattr(object, attr_name, getattr(old_object, attr_name))
          else:
-            url_type, url_rest = urllib.splittype(object.href)
-            log("Checking %s:%s" % (url_type, url_rest))
-            rcode = robot.check_url(object, url_type, url_rest)
+            log("Checking %s" % object.href)
+            rcode = robot.check_url(object)
 
             if rcode:
                checked[object.href] = object_no
@@ -143,6 +142,7 @@ def run():
       print urls_no, "URLs checked"
       print size, "bytes eaten"
 
+   break_tree(root_folder.linear)
    storage.store(root_folder)
 
    if rcode: