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.3 -r1.5.2.4
--- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl 5 Feb 2007 16:30:33 -0000 1.5.2.3
+++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.tcl 5 Feb 2007 16:44:29 -0000 1.5.2.4
@@ -248,6 +248,9 @@
foreach {discard ref} $ref_data {
lappend refs $ref
}
+ if {[llength $refs]} {
+ set refs [db_list confirm_object_ids {}]
+ }
return $refs
}
Index: openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql,v
diff -u -N -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql 10 Jan 2007 09:45:32 -0000 1.3.2.1
+++ openacs-4/packages/acs-tcl/tcl/application-data-link-procs.xql 5 Feb 2007 16:44:29 -0000 1.3.2.2
@@ -105,5 +105,10 @@
and object_id_two = :to_object_id
-
+
+
+
+ select object_id from acs_objects where object_id in ([template::util::tcl_to_sql_list $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.2.1 -r1.1.2.2
--- openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl 5 Feb 2007 16:30:33 -0000 1.1.2.1
+++ openacs-4/packages/acs-tcl/tcl/test/application-data-link-procs.tcl 5 Feb 2007 16:44:29 -0000 1.1.2.2
@@ -5,17 +5,17 @@
aa_register_case -cats api data_links_scan_links {
Test scanning content for object URLs
} {
- set text {Some random text
+ set text {Some random text
Some More Random Text /o/10 /file/11 /image/12
/o/[junk] /file/[junk] /image/[junk]
/o/" /file/" /image/"
/o/[ /file/[ /image/[
}
- append text " "
+ append text " "
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 7]
+ set correct_links [list 0]
aa_log "Links = '${links}'"
aa_true "Number of links found is correct" \
[expr {[llength $correct_links] eq [llength $links]}]