From 975b229918744816b12263fae523eaad4f8e2d87 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 8 Dec 2000 08:55:35 +0000 Subject: [PATCH] DCdot doesn't rely on htmlSwitch no more. --- dcdot.tcl | 51 ++++++++++++++++----------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/dcdot.tcl b/dcdot.tcl index aeb4f91..af0bef7 100755 --- a/dcdot.tcl +++ b/dcdot.tcl @@ -1,5 +1,5 @@ #!/usr/bin/tclsh -# $Id: dcdot.tcl,v 1.1 2000/12/07 20:16:11 adam Exp $ +# $Id: dcdot.tcl,v 1.2 2000/12/08 08:55:35 adam Exp $ # proc RobotRestart {} { @@ -11,28 +11,14 @@ proc RobotRestart {} { proc RobotTextHtml {url} { global URL - set head 0 - htmlSwitch $URL($url,buf) \ - title { - set URL($url,title) $body - } -nonest meta { - set scheme {} - if {[info exist parm(scheme)]} { - set scheme $parm(scheme) - unset parm(scheme) - } - if {[info exist parm(name)]} { - if {[info exist parm(content)]} { - set URL($url,meta,$parm(name),$scheme) $parm(content) - unset parm(content) - } - unset parm(name) - } - } a { - if {[info exists parm(href)]} { - lappend URL($url,links) $parm(href) - } - } + set b $URL($url,buf) + set e {<[mM][eE][tT][aA][^>]*>} + catch {unset $URL($url,meta)} + while {[regexp -indices $e $b i]} { + set meta [string range $b [lindex $i 0] [lindex $i 1]] + lappend URL($url,meta) $meta + set b [string range $b [lindex $i 1] end] + } } proc Robot200 {url} { @@ -157,14 +143,7 @@ proc RobotGetUrl {url phost} { return 0 } -if {![llength [info commands htmlSwitch]]} { - set e [info sharedlibextension] - if {[catch {load ./tclrobot$e}]} { - load tclrobot$e - } -} - -set agent "zmbot/0.0" +set agent "dcdot.tcl/0.0" if {![catch {set os [exec uname -s -r]}]} { set agent "$agent ($os)" } @@ -185,8 +164,10 @@ proc RobotGetDCDOT {url} { if {$argc == 1} { set url [lindex $argv 0] RobotGetDCDOT $url - set mask {,meta,[Dd][Cc]\.*} - foreach a [array names URL $url$mask] { - puts "URL($a) = $URL($a)" + set mask {,meta} + if {[info exist URL($url,meta)]} { + foreach m $URL($url,meta) { + puts $m + } } -} \ No newline at end of file +} -- 1.7.10.4