Index: openacs.org-dev/www/bboard-migr/links-migr.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/bboard-migr/links-migr.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/bboard-migr/links-migr.tcl	10 Jul 2002 19:29:04 -0000	1.1
+++ openacs.org-dev/www/bboard-migr/links-migr.tcl	1 Aug 2002 16:15:35 -0000	1.2
@@ -53,18 +53,22 @@
 
 "
 
-set ids [db_list ids "select message_id from bboard_forum_message_map"]
+#set ids [db_list ids "select message_id from bboard_forum_message_map"]
 #set ids [list 4590]
 set test_counter 0
 
-foreach id $ids {
+#foreach id $ids {
 
     # loop through possibly several revisions of one message
+    #db_foreach get_message {
+    #    select r.revision_id, r.content from cr_revisions r
+    #    where item_id=:id 
+    #} {
+    # loop through all the messages
     db_foreach get_message {
-        select r.revision_id, r.content from cr_revisions r
-        where item_id=:id 
+        select message_id, content from forums_messages
     } {
-        ns_write "-- checking $id\n"
+        ns_write "-- checking $message_id\n"
 
         # split content into a list where each element is either a
         # matching link or a text blurb in between.
@@ -77,7 +81,7 @@
         }
             
         if { [llength $content_list] == 0 } {
-            # nothing to replace in this revision
+            # nothing to replace in this message
             continue
         }
 
@@ -92,21 +96,31 @@
             if { [regexp $old_link_regex $element match old_id] } {
                 # this is a link
 
-                if { [db_0or1row get_ids_for_new_link { select m.new_message_id, f.forum_id
-                    from migr_message_map m
-                    join bboard_forum_message_map f
-                    on m.new_message_id=f.message_id
+                #if { [db_0or1row get_ids_for_new_link { select m.new_message_id, f.forum_id
+                #    from migr_message_map m
+                #    join bboard_forum_message_map f
+                #    on m.new_message_id=f.message_id
+                #    where old_message_id=:old_id
+                #}] } {
+                if { [db_0or1row get_ids_for_new_link { select new_message_id
+                    from migr_message_map
                     where old_message_id=:old_id
                 }] } {
                     # we found a mapping
-                    set new_link "$new_bboard_url/message?message_id=$new_message_id&forum_id=$forum_id"
+                    #set new_link "$new_bboard_url/message?message_id=$new_message_id&forum_id=$forum_id"
+		    set new_link "$new_bboard_url/message-view?message_id=$new_message_id"
 
                     set content_list [lreplace $content_list $idx $idx $new_link]
 
-                    ns_write "new message_id: $id
-revision_id: $revision_id
+#                    ns_write "new message_id: $id
+#revision_id: $revision_id
+#old_id: $old_id
+#new forum_id: $forum_id
+#new link: $new_link
+#"
+                    ns_write "test_counter: $test_counter
+new message_id: $message_id
 old_id: $old_id
-new forum_id: $forum_id
 new link: $new_link
 "
                     set replaced_p 1
@@ -126,11 +140,12 @@
 
             if { $replaced_p } {
                 set new_content [join $content_list ""]
-                db_dml update_content "update cr_revisions set content=:new_content where revision_id=:revision_id"
+                #db_dml update_content "update cr_revisions set content=:new_content where revision_id=:revision_id"
+		db_dml update_content "update forums_messages set content=:new_content where message_id=:new_message_id"
             }
         }
     }
-}
+#}
 
 ns_write "