Index: openacs-4/packages/imsld/tcl/imsld-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-callback-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/imsld/tcl/imsld-callback-procs.tcl	13 Nov 2008 23:39:32 -0000	1.6
+++ openacs-4/packages/imsld/tcl/imsld-callback-procs.tcl	13 Nov 2008 23:50:16 -0000	1.7
@@ -11,6 +11,7 @@
     -res_href
     -tmp_dir
     -community_id
+    -prop
 } {
     <p>Returns the acs_object_id for the resource.</p>
 
Index: openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	4 Nov 2008 13:42:04 -0000	1.6
+++ openacs-4/packages/imsld/tcl/imsld-monitor-procs.tcl	13 Nov 2008 23:50:16 -0000	1.7
@@ -5,7 +5,11 @@
     
     @creation-date Nov 2006
     @author jopez@inv.it.uc3m.es
+<<<<<<< imsld-monitor-procs.tcl
     @cvs-id $Id$
+=======
+    @cvs-id $Id$
+>>>>>>> 1.6
 }
 
 namespace eval imsld::monitor {}
Index: openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl,v
diff -u -N -r1.69 -r1.70
--- openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	23 Oct 2008 17:31:57 -0000	1.69
+++ openacs-4/packages/imsld/tcl/imsld-parse-procs.tcl	13 Nov 2008 23:50:16 -0000	1.70
@@ -5,7 +5,11 @@
     
     @creation-date Jul 2005
     @author jopez@inv.it.uc3m.es
+<<<<<<< imsld-parse-procs.tcl
     @cvs-id $Id$
+=======
+    @cvs-id $Id$
+>>>>>>> 1.69
 }
 
 namespace eval imsld {}
Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -N -r1.104 -r1.105
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	22 Oct 2008 10:47:58 -0000	1.104
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	13 Nov 2008 23:50:16 -0000	1.105
@@ -5,7 +5,11 @@
     
     @creation-date Aug 2005
     @author jopez@inv.it.uc3m.es
+<<<<<<< imsld-procs.tcl
     @cvs-id $Id$
+=======
+    @cvs-id $Id$
+>>>>>>> 1.104
 }
 
 namespace eval imsld {}
@@ -2624,6 +2628,7 @@
     } else {
         # is webcontent, let's get the associated files
         foreach file_list [db_list_of_lists associated_files { *SQL* }] {
+    ns_log notice "resource_item_id $resource_item_id"
             set imsld_file_id [lindex $file_list 0]
             set file_name [lindex $file_list 1]
             set item_id [lindex $file_list 2]
@@ -2670,16 +2675,32 @@
             }
         }
         # get associated urls
+<<<<<<< imsld-procs.tcl
+	ns_log notice "**************** ids: $resource_id $resource_item_id"
         db_foreach associated_urls_wiki {
             select ar.object_id_two as page_id
             from acs_rels ar,
             imsld_res_files_rels map
             where ar.object_id_one = :resource_item_id
             and ar.rel_id = map.rel_id
 	} {
+=======
+        db_foreach associated_urls_wiki {
+            select ar.object_id_two as page_id
+            from acs_rels ar,
+            imsld_res_files_rels map
+            where ar.object_id_one = :resource_item_id
+            and ar.rel_id = map.rel_id
+	} {
+>>>>>>> 1.104
             set a_node [$dom_doc createElement a]
+<<<<<<< imsld-procs.tcl
 	    # set url [imsld::xowiki::page_url -item_id $page_id]
+	    set url "xowiki-view?item_id=$page_id"
+=======
+	    # set url [imsld::xowiki::page_url -item_id $page_id]
 	    set url "xowiki-view/$page_id"
+>>>>>>> 1.104
             $a_node setAttribute href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" { {file_url "[export_vars -base $url]"} resource_item_id run_id}]"
 	    ns_log notice "resource item: $resource_item_id"
 	    $a_node setAttribute onclick "return loadContent(this.href)"