不要なコメント削除

diff --git a/lib/arcget.rb b/lib/arcget.rb
index cccc1a6..1e80662 100644 (file)
--- a/lib/arcget.rb
+++ b/lib/arcget.rb
@@ -47,7 +47,7 @@ class ArcGET
                        @sleepTime = 20.0\r
                        @commitCount = 16\r
                        @savePath = if param[:path] then param[:path] else "./save"    end\r
-                       @saveDB   = if param[:db] then param[:db] else "./url.db3" end\r
+                       @saveDB   = if param[:db]   then param[:db]   else "./url.db3" end\r
                        @pendingURI = param[:pendingURI]\r
                        @pendingURI = nil if @pendingURI.to_s == ""\r
                        @list = URLtable.new(param={:path => @savePath, :db => @saveDB})\r
@@ -177,10 +177,7 @@ class ArcGET
        end\r
        \r
        def check_root(add)\r
-               #p add.url.to_s\r
-               #p add.referrer.to_s\r
                @rootExp.each do |exp|\r
-               #       p exp\r
                        return true if exp.match(add.url.to_s)\r
                        return true if exp.match(add.referrer.to_s)\r
                end\r
@@ -201,15 +198,11 @@ class ArcGET
        def add_nextpage_sub(path, dat)\r
                return unless path\r
                \r
-               #p path\r
                path = CGI::unescapeHTML(path.to_s)\r
                return if /^(?:javascript|mailto|data|file|tel):/ni.match(path)\r
-               #p "##"\r
                uri = dat.uri\r
                begin\r
-               #       p path\r
                        path = URI.parse( path.gsub(/[\x00-\x1F\x80-\xFF]/n){|x| '%'+x.unpack('H2')[0] } )\r
-               #       p path\r
                rescue  URI::InvalidURIError, URI::InvalidComponentError\r
                #       p "INV #{path}"\r
                        return\r
@@ -224,15 +217,11 @@ class ArcGET
                if check_cgiroot(add) then\r
                        add.linkCountCGI = dat.linkCountCGI+1\r
                end\r
-               ##add.message = path    #for debug\r
                \r
-               #p "L #{newuri} #{add.linkCount}:#{add.linkCountCGI}"\r
                return if add.linkCountCGI > @cgiMAXlink\r
                \r
                isroot = check_root(add)\r
-               #p isroot\r
                if isroot and (add.linkCount <= @rootMAXlink) then\r
-               #       p "U"\r
                        if @rootExp[0].match(add.url) or (@cgirootExp[0] and @cgirootExp[0].match(add.url)) then\r
                                add.priority = add.priority | 0x40000000\r
                        end\r
@@ -244,31 +233,9 @@ class ArcGET
                                }\r
                        end\r
                end\r
-               #p path\r
        end\r
        \r
        def add_nextpage(dat,response)\r
-=begin\r
-               text = response.body\r
-               #p text\r
-               scriptmode = false\r
-               exp = /(<script|<\/script)\b|\b(?:href|src)(?:\s*=\s*"([^\x22]*)"|=([^\x22\x27> ]+))|\burl\(([^\x29]*)\)/ni\r
-               text.scan( exp ) do |t|\r
-                       curr=t.shift\r
-                       if curr=='<script'\r
-                               scriptmode = true\r
-                       end\r
-                       if curr=='</script'\r
-                               scriptmode = false\r
-                       end\r
-                       \r
-                       if !scriptmode then\r
-                               add_nextpage_sub(t[0], dat)\r
-                               add_nextpage_sub(t[1], dat)\r
-                               add_nextpage_sub(t[2], dat)\r
-                       end\r
-               end\r
-=end\r
                text = response.body\r
                scriptmode = false\r
                exp = /(<script|<\/script)\b|\b(href|src|value)(?:\s*=\s*"([^\x22]*)"|=([^\x22\x27> ]+))|\burl\(([^\x29]*)\)/ni\r

diff --git a/lib/downtable.rb b/lib/downtable.rb
index cd7d385..390cf57 100644 (file)
--- a/lib/downtable.rb
+++ b/lib/downtable.rb
@@ -5,9 +5,6 @@ require 'fileutils'
 require 'uri'\r
 require 'pathname'\r
 \r
-#TABLE_PATH = "./url.db3"\r
-\r
-\r
 \r
 class URLtable\r
        Waiting       =   0\r
@@ -345,10 +342,6 @@ SQL
                                read_sub(cond,data)\r
                        )\r
                end\r
-#              sql = SELECT_SQLBODY\r
-#              sql += ' order by priority desc limit 1;'\r
-#              result = @db.query( sql, [] )\r
-#              return notNil( toRow(result) )\r
        end\r
        \r
        def rest\r