--- loncom/interface/londocs.pm	2013/01/10 17:12:22	1.484.2.24
+++ loncom/interface/londocs.pm	2013/01/14 23:14:59	1.484.2.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.24 2013/01/10 17:12:22 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.25 2013/01/14 23:14:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1282,13 +1282,13 @@ sub url_paste_fixups {
             my $title = $token->[2]->{'title'};
             if ($checktitle) {
                 if ($title =~ m{\d+\Q___&&&___\E$match_username\Q___&&&___\E$match_domain\Q___&&&___\E(.+)$}) {
-                    $retitles->{$oldurl}{$ressrc} = $id;
+                    $retitles->{$oldurl}{$id} = $ressrc;
                 }
             }
             next if ($token->[2]->{'type'} eq 'external');
             if ($token->[2]->{'type'} eq 'zombie') {
                 next if ($skip);  
-                $zombies->{$oldurl}{$ressrc} = $id;
+                $zombies->{$oldurl}{$id} = $ressrc;
                 $changed = 1;
             } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
                 my $srcdom = $1;
@@ -1321,7 +1321,7 @@ sub url_paste_fixups {
                     ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
                    
                     if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
-                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $rewrites->{$oldurl}{$id} = $ressrc;
                         $mapchanges->{$ressrc} = 1;
                         unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
                                                   $rewrites,$retitles,$copies,$dbcopies,$zombies,
@@ -1331,7 +1331,7 @@ sub url_paste_fixups {
                         }
                         $changed = 1;
                     } else {
-                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $rewrites->{$oldurl}{$id} = $ressrc;
                         $copies->{$oldurl}{$ressrc} = $id;
                         $changed = 1;
                     }
@@ -1341,7 +1341,7 @@ sub url_paste_fixups {
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $rewrites->{$oldurl}{$id} = $ressrc;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
                     $changed = 1;
                 }
@@ -1350,7 +1350,7 @@ sub url_paste_fixups {
                 my $srcdom = $1;
                 my $srcnum = $2;
                 if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
-                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $rewrites->{$oldurl}{$id} = $ressrc;
                     $dbcopies->{$oldurl}{$ressrc} = $id;
                     $changed = 1;
                 }
@@ -1436,7 +1436,7 @@ sub apply_fixups {
         }
         if ($key eq $oldurl) {
             if ((exists($docmoves{$key}))) {
-                unless (grep(/^\Q$oldurl\E/,@allcopies)) {
+                unless (grep(/^\Q$oldurl\E$/,@allcopies)) {
                     push(@allcopies,$oldurl);
                 }
             }
@@ -1458,7 +1458,7 @@ sub apply_fixups {
                                 $storefn =~ s/^\Q$before{'doc'}\E/$after{'doc'}/;
                             }
                             if ($newsubdir{$key}) {
-                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}#;
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir{$key}/#;
                             }
                         }
                         &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
@@ -1545,7 +1545,7 @@ sub apply_fixups {
             for (my $i=0; $i<@LONCAPA::map::zombies; $i++) {
                 if (defined($LONCAPA::map::zombies[$i])) {
                     my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]);
-                    if ($zombie{$src} eq $i) {
+                    if ($zombie{$i} eq $src) {
                         undef($LONCAPA::map::zombies[$i]);
                     }
                 }
@@ -1565,12 +1565,12 @@ sub apply_fixups {
                         next;
                     }
                     my $origsrc = $src;
-                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $idx)) {
+                    if ((exists($toretitle{$idx})) && ($toretitle{$idx} eq $src)) {
                         if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
                             $changed = 1;
                         }
                     }
-                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $idx)) {
+                    if ((exists($torewrite{$idx})) && ($torewrite{$idx} eq $src)) {
                         $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
                         if ($origsrc =~ m{^/uploaded/}) {
                             if ($prefixchg && $before{'map'} && $after{'map'}) {
@@ -1580,12 +1580,12 @@ sub apply_fixups {
                                     $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before{'doc'}\E#$1$after{'doc'}#;
                                 }
                             }
-                            if ($newsubdir{$origsrc}) {
-                                if ($src =~ /\.(page|sequence)$/) {
+                            if ($origsrc =~ /\.(page|sequence)$/) {
+                                if ($newsubdir{$origsrc}) {
                                     $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir{$origsrc}#;
-                                } else {
-                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$origsrc}#;
                                 }
+                            } elsif ($newsubdir{$key}) {
+                                $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir{$key}#;
                             }
                         }
                         $changed = 1;