Index: openacs-4/packages/robot-detection/robot-detection.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/robot-detection.info,v
diff -u -r1.3.4.1 -r1.3.4.2
--- openacs-4/packages/robot-detection/robot-detection.info	23 Mar 2003 02:17:33 -0000	1.3.4.1
+++ openacs-4/packages/robot-detection/robot-detection.info	22 May 2003 19:17:08 -0000	1.3.4.2
@@ -49,7 +49,7 @@
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="RefreshIntervalDays"  default="30" description="How frequently (in days) the robots table should be refreshed from the Web Robots DB"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="FilterPattern"  default="/member-only/*" description="a CSV string containing the URL paths to be filtered"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="WebRobotsDB"  default="http://info.webcrawler.com/mak/projects/robots/active/all.txt" description="the URL of the Web Robots DB text file"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="WebRobotsDB"  default="http://www.robotstxt.org/wc/active/all.txt" description="the URL of the Web Robots DB text file"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RedirectURL"  default="/robot-heaven/" description="the URL where robots should be sent"/>
         </parameters>
 
Index: openacs-4/packages/robot-detection/tcl/robot-detection-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/tcl/robot-detection-procs.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/robot-detection/tcl/robot-detection-procs.tcl	9 Mar 2002 02:00:02 -0000	1.2
+++ openacs-4/packages/robot-detection/tcl/robot-detection-procs.tcl	22 May 2003 19:17:25 -0000	1.2.4.1
@@ -4,7 +4,7 @@
     @author Michael Yoon (michael@yoon.org) 
     @author Roger Hsueh (rogerh@arsdigita.com) 
     @creation-date 1999-05-27
-    @cvs-id $Id$
+    @cvs-id robot-detection-procs.tcl,v 1.2 2002/03/09 02:00:02 donb Exp
 }
 ad_proc ad_replicate_web_robots_db {} {
 Replicates data from the Web Robots Database 
@@ -39,12 +39,17 @@
 	db_dml delete_old_robots_table {
 	    delete from robots
 	}
-        set robot_id [db_null]
-        set robot_name [db_null]
-        set robot_details_url [db_null]
-        set robot_useragent [db_null]
+        set robot_id ""
+        set robot_name ""
+        set robot_details_url ""
+        set robot_useragent ""
 	foreach line $page {
 	    if {![regexp {\w+} $line]} {
+
+                if { [string equal $robot_name ""] } {
+                    set robot_name $robot_id
+                }
+
                 #detected a blank line, that means we are should try to 
                 #insert a row into the robots table, if robot_id and robot_useragent are not null
                 if {[exists_and_not_null robot_id] && [exists_and_not_null robot_useragent]} {
@@ -55,16 +60,17 @@
                     }
                 }
                 # start clean for a new record
-                set robot_id [db_null]
-                set robot_name [db_null]
-                set robot_details_url [db_null]
-                set robot_useragent [db_null]
+                set robot_id ""
+                set robot_name ""
+                set robot_details_url ""
+                set robot_useragent ""
                 continue
             }
-	    if {[regexp {robot-id: *(.+)} $line match robot_id] ||
-            [regexp {robot-name: *(.+)} $line match robot_name] ||
-            [regexp {robot-details-url: *(.+)} $line match robot_details_url] ||
-            [regexp {robot-useragent: *(.+)} $line match robot_useragent] } {
+
+	    if {[regexp {robot-id:\s*([^\s]+)\s*} $line match robot_id] ||
+            [regexp {robot-name:\s*([^\s]+)\s*} $line match robot_name] ||
+            [regexp {robot-details-url:\s*([^\s]+)\s*} $line match robot_details_url] ||
+            [regexp {robot-useragent:\s*([\s]+)\s*} $line match robot_useragent] } {
                 continue
             }
 	}
Index: openacs-4/packages/robot-detection/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/www/admin/index.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/robot-detection/www/admin/index.adp	6 Sep 2002 15:36:39 -0000	1.2
+++ openacs-4/packages/robot-detection/www/admin/index.adp	22 May 2003 19:17:40 -0000	1.2.2.1
@@ -20,7 +20,7 @@
 
 <p>
 
-Courtesy of the <a href="http://info.webcrawler.com/mak/projects/robots/active.html">Web Robots Database</a>,
+Courtesy of the <a href="http://www.robotstxt.org/wc/active.html">Web Robots Database</a>,
 this installation of the ACS can recognize the following robots:
 
 <ul>