Index: openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl,v
diff -u -N -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl	10 Jan 2007 09:45:32 -0000	1.5.2.2
+++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl	5 Feb 2007 16:30:33 -0000	1.5.2.3
@@ -241,9 +241,12 @@
 
 } {
     set refs [list]
-    set ref_data [regexp -inline -all {/(?:o|image|file)/(\d{1,8})} $text]
+    set http_url [string trimright [ad_url] /]/
+    set https_url [string map {http https} $http_url]
+    set re "(?:\")(?:$http_url|$https_url|/)(?:o|image|file)/(\\d{1,8})"
+    set ref_data [regexp -inline -all $re $text]
     foreach {discard ref} $ref_data {
-	lappend refs $ref
+            lappend refs $ref
     } 
     return $refs
 }
Index: openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl	1 Sep 2006 20:01:23 -0000	1.1
+++ openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl	5 Feb 2007 16:30:33 -0000	1.1.2.1
@@ -5,15 +5,17 @@
 aa_register_case -cats api data_links_scan_links {
     Test scanning content for object URLs
 } {
-    set text {Some random text /o/1 /file/2 /image/3 /image/4/ /image/5/thumbnail /image/6/info
-              Some More Random Text /o/junk /file/junk /image/junk
+    set text {Some random text <img src="/o/1"> <a href="/file/2"> <img src="/image/3"> <img src="/image/4/"> <img src="/image/5/thumbnail"> <img src="/image/6/info"> <a href="http://example.com/o/9">
+              Some More Random Text <a href="/o/junk"> <a href="/file/junk"> <a href="/image/junk"> /o/10 /file/11 /image/12
 	/o/[junk] /file/[junk] /image/[junk]
         /o/" /file/" /image/"
         /o/[ /file/[ /image/[
+       
     }
-    
+    append text "<a href=\"[ad_url]/o/7\"> "
+    aa_log "ad_url = '[ad_url]'"
     set links [application_data_link::scan_for_links -text $text]
-    set correct_links [list 1 2 3 4 5 6]
+    set correct_links [list 1 2 3 4 5 6 7]
     aa_log "Links = '${links}'"
     aa_true "Number of links found is correct" \
         [expr {[llength $correct_links] eq [llength $links]}]