--- loncom/interface/loncommon.pm	2012/04/06 01:23:11	1.1066
+++ loncom/interface/loncommon.pm	2012/04/08 22:34:57	1.1067
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1066 2012/04/06 01:23:11 raeburn Exp $
+# $Id: loncommon.pm,v 1.1067 2012/04/08 22:34:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9931,20 +9931,26 @@ sub decompress_form {
     my ($mimetype,$archiveurl,$action,$noextract,$hiddenelements,$dirlist) = @_;
     my %lt = &Apache::lonlocal::texthash (
         this => 'This file is an archive file.',
+        camt => 'This file is a Camtasia archive file.',
         itsc => 'Its contents are as follows:',
         youm => 'You may wish to extract its contents.',
-        camt => 'Extraction of contents is recommended for Camtasia zip files.',
         extr => 'Extract contents',
+        auto => 'LON-CAPA can process the files automatically, or you can decide how each should be handled.',
+        proa => 'Process automatically?',
         yes  => 'Yes',
         no   => 'No',
+        fold => 'Title for folder containing movie',
+        movi => 'Title for page containing embedded movie', 
     );
-    my $output = '<p>'.$lt{'this'};
     my $fileloc = &Apache::lonnet::filelocation(undef,$archiveurl);
-    my (%toplevel,@paths);
+    my ($is_camtasia,$topdir,%toplevel,@paths);
     my $info = &list_archive_contents($fileloc,\@paths);
     if (@paths) {
         foreach my $path (@paths) {
             $path =~ s{^/}{};
+            if ($path =~ m{^([^/]+)/$}) {
+                $topdir = $1;
+            }
             if ($path =~ m{^([^/]+)/}) {
                 $toplevel{$1} = $path;
             } else {
@@ -9952,12 +9958,53 @@ sub decompress_form {
             }
         }
     }
-    if ($info eq '') {
-        $output .= ' '.$lt{'youm'}.'</p>'."\n";
+    if ($mimetype =~ m{^application/(x\-)?(compressed|zip)}) {
+        my @camtasia = ("$topdir/","$topdir/index.html",
+                        "$topdir/media/",
+                        "$topdir/media/$topdir.mp4",
+                        "$topdir/media/FirstFrame.png",
+                        "$topdir/media/player.swf",
+                        "$topdir/media/swfobject.js",
+                        "$topdir/media/expressInstall.swf");
+        my @diffs = &compare_arrays(\@paths,\@camtasia);
+        if (@diffs == 0) {
+            $is_camtasia = 1;
+        }
+    }
+    my $output;
+    if ($is_camtasia) {
+        $output = <<"ENDCAM";
+<script type="text/javascript" language="Javascript">
+// <![CDATA[
+
+function camtasiaToggle() {
+    for (var i=0; i<document.uploaded_decompress.autoextract_camtasia.length; i++) {
+        if (document.uploaded_decompress.autoextract_camtasia[i].checked) {
+            if (document.uploaded_decompress.autoextract_camtasia[i].value == 1) {
+
+                document.getElementById('camtasia_titles').style.display='block';
+            } else {
+                document.getElementById('camtasia_titles').style.display='none';
+            }
+        }
+    }
+    return;
+}
+
+// ]]>
+</script>
+<p>$lt{'camt'}</p>
+ENDCAM
     } else {
-        $output .= ' '.$lt{'itsc'}.'</p>'."\n".
-                   '<div><pre>'.$info.'</pre></div>';
+        $output = '<p>'.$lt{'this'};
+        if ($info eq '') {
+            $output .= ' '.$lt{'youm'}.'</p>'."\n";
+        } else {
+            $output .= ' '.$lt{'itsc'}.'</p>'."\n".
+                       '<div><pre>'.$info.'</pre></div>';
+        }
     }
+    $output .= '<form name="uploaded_decompress" action="'.$action.'" method="post">'."\n";
     my $duplicates;
     my $num = 0;
     if (ref($dirlist) eq 'ARRAY') {
@@ -9993,9 +10040,28 @@ sub decompress_form {
     } else {
         $itemcount = 1;
     }
+    if ($is_camtasia) {
+        $output .= $lt{'auto'}.'<br />'.
+                   '<span class="LC_nobreak">'.$lt{'proa'}.'<label>'.
+                   '<input type="radio" name="autoextract_camtasia" value="1" onclick="javascript:camtasiaToggle();" checked="checked" />'.
+                   $lt{'yes'}.'</label>&nbsp;<label>'.
+                   '<input type="radio" name="autoextract_camtasia" value="0" onclick="javascript:camtasiaToggle();" />'.
+                   $lt{'no'}.'</label></span><br />'.
+                   '<div id="camtasia_titles" style="display:block">'.
+                   &Apache::lonhtmlcommon::start_pick_box().
+                   &Apache::lonhtmlcommon::row_title($lt{'fold'}).
+                   '<input type="textbox" name="camtasia_foldername" value="'.$env{'form.comment'}.'" />'."\n".
+                   &Apache::lonhtmlcommon::row_closure().
+                   &Apache::lonhtmlcommon::row_title($lt{'movi'}).
+                   '<input type="textbox" name="camtasia_moviename" value="" />'."\n".
+                   &Apache::lonhtmlcommon::row_closure(1).
+                   &Apache::lonhtmlcommon::end_pick_box().
+                   '</div>';
+    }
     $output .= 
         '<input type="hidden" name="archive_overwrite_total" value="'.$num.'" />'.
-        '<input type="hidden" name="archive_itemcount" value="'.$itemcount.'" />'."\n";
+        '<input type="hidden" name="archive_itemcount" value="'.$itemcount.'" />'.
+        "\n";
     if ($duplicates ne '') {
         $output .= '<p><span class="LC_warning">'.
                    &mt('Warning: decompression of the archive will overwrite the following items which already exist:').'</span><br />'.  
@@ -10011,24 +10077,17 @@ sub decompress_form {
                    &end_data_table().
                    '</p>';
     }
-    if ($mimetype =~ m{^application/(x\-)?(compressed|zip)}) {
-        $output .= '<p>'.$lt{'camt'}.'</p>';
-    }
-    $output .= <<"START";
-<div id="uploadfileresult">
-  <form name="uploaded_decompress" action="$action" method="post">
-  <input type="hidden" name="archiveurl" value="$archiveurl" />
-START
+    $output .= '<input type="hidden" name="archiveurl" value="'.$archiveurl.'" />'."\n";
     if (ref($hiddenelements) eq 'HASH') {
         foreach my $hidden (sort(keys(%{$hiddenelements}))) {
             $output .= '<input type="hidden" name="'.$hidden.'" value="'.$hiddenelements->{$hidden}.'" />'."\n";
         }
     }
     $output .= <<"END";
+<br />
 <input type="submit" name="decompress" value="$lt{'extr'}" />
 </form>
 $noextract
-</div>
 END
     return $output;
 }
@@ -10199,8 +10258,11 @@ sub process_decompression {
                         }
                     }
                     if (@contents > 0) {
+                        my $wantform;
+                        unless ($env{'form.autoextract_camtasia'}) {
+                            $wantform = 1;
+                        }
                         my (%children,%parent,%dirorder,%titles);
-                        my $wantform = 1;
                         my ($count,$datatable) = &get_extracted($docudom,$docuname,
                                                                 $currdir,\%is_dir,
                                                                 \%children,\%parent,
@@ -10213,6 +10275,50 @@ sub process_decompression {
                             $output .= &archive_javascript($startcount,$count,
                                                            \%titles,\%children);
                         }
+                        if ($env{'form.autoextract_camtasia'}) {
+                            my %displayed;
+                            my $total = 1;
+                            $env{'form.archive_directory'} = [];
+                            foreach my $i (sort { $a <=> $b } keys(%dirorder)) {
+                                my $path = join('/',map { $titles{$_}; } @{$dirorder{$i}});
+                                $path =~ s{/$}{};
+                                my $item;
+                                if ($path ne '') {
+                                    $item = "$path/$titles{$i}";
+                                } else {
+                                    $item = $titles{$i};
+                                }
+                                $env{'form.archive_content_'.$i} = "$dir_root/$destination/$item";
+                                if ($item eq $contents[0]) {
+                                    push(@{$env{'form.archive_directory'}},$i);
+                                    $env{'form.archive_'.$i} = 'display';
+                                    $env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'};
+                                    $displayed{'folder'} = $i;
+                                } elsif ($item eq "$contents[0]/index.html") {
+                                    $env{'form.archive_'.$i} = 'display';
+                                    $env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'};
+                                    $displayed{'web'} = $i;
+                                } else {
+                                    if ($item eq "$contents[0]/media") {
+                                        push(@{$env{'form.archive_directory'}},$i);
+                                    }
+                                    $env{'form.archive_'.$i} = 'dependency';
+                                }
+                                $total ++;
+                            }
+                            for (my $i=1; $i<$total; $i++) {
+                                next if ($i == $displayed{'web'});
+                                next if ($i == $displayed{'folder'});
+                                $env{'form.archive_dependent_on_'.$i} = $displayed{'web'};
+                            }
+                            $env{'form.phase'} = 'decompress_cleanup';
+                            $env{'form.archivedelete'} = 1;
+                            $env{'form.archive_count'} = $total-1;
+                            $output .=
+                                &process_extracted_files('coursedocs',$docudom,
+                                                         $docuname,$destination,
+                                                         $dir_root,$hiddenelem);
+                        }
                     } else {
                         $warning = &mt('No new items extracted from archive file.');
                     }
@@ -10611,12 +10717,12 @@ END
 }
 
 sub process_extracted_files {
-    my ($context,$docudom,$docuname,$url,$destination,$dir_root,$hiddenelem) = @_;
+    my ($context,$docudom,$docuname,$destination,$dir_root,$hiddenelem) = @_;
     my $numitems = $env{'form.archive_count'};
     return unless ($numitems);
     my @ids=&Apache::lonnet::current_machine_ids();
     my ($prefix,$pathtocheck,$dir,$ishome,$error,$warning,%toplevelitems,%is_dir,
-        %folders,%containers,%mapinner);
+        %folders,%containers,%mapinner,%prompttofetch);
     my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);
     if (grep(/^\Q$docuhome\E$/,@ids)) {
         $prefix = &LONCAPA::propath($docudom,$docuname);
@@ -10652,7 +10758,7 @@ sub process_extracted_files {
             }
         }
     }
-    my ($output,%children,%parent,%titles,%dirorder);
+    my ($output,%children,%parent,%titles,%dirorder,$result);
     if (keys(%toplevelitems) > 0) {
         my @contents = sort(keys(%toplevelitems));
         (my $count,undef) = &get_extracted($docudom,$docuname,$currdir,\%is_dir,\%children,
@@ -10713,6 +10819,9 @@ sub process_extracted_files {
                                                         $docuname.'/'.$folders{$outer}.
                                                         '.'.$containers{$outer},1);
                             $newseqid{$i} = $newidx;
+                            unless ($errtext) {
+                                $result .=  '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n";
+                            }
                         }
                     } else {
                         if ($context eq 'coursedocs') {
@@ -10729,6 +10838,11 @@ sub process_extracted_files {
                             if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") {
                                 system("mv $prefix$path $prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title");
                                 $newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx";
+                                unless ($ishome) {
+                                    my $fetch = "$newdest{$i}/$title";
+                                    $fetch =~ s/^\Q$prefix$dir\E//;
+                                    $prompttofetch{$fetch} = 1;
+                                }
                             }
                             $LONCAPA::map::resources[$newidx]=
                                 $docstitle.':'.$url.':false:normal:res';
@@ -10737,6 +10851,11 @@ sub process_extracted_files {
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
                                                         $docuname.'/'.$folders{$outer}.
                                                         '.'.$containers{$outer},1);
+                            unless ($errtext) {
+                                if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
+                                    $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n";
+                                }
+                            }
                         }
                     }
                 } elsif ($env{'form.archive_'.$i} eq 'dependency') {
@@ -10744,7 +10863,7 @@ sub process_extracted_files {
                     $referrer{$i} = $env{'form.archive_dependent_on_'.$i};
                     if ($env{'form.archive_'.$referrer{$i}} eq 'display') {
                         if (ref($dirorder{$i}) eq 'ARRAY') {
-                            my ($itemidx,$fullpath);
+                            my ($itemidx,$fullpath,$relpath);
                             for (my $j=0; $j<@{$dirorder{$i}}; $j++) {
                                 if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') {
                                     my $container = $dirorder{$referrer{$i}}->[-1];
@@ -10763,6 +10882,7 @@ sub process_extracted_files {
                                             if (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
                                                 unless (defined($newseqid{$dirorder{$i}->[$j]})) {
                                                     $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                    $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
                                                     if (!-e $fullpath) {
                                                         mkdir($fullpath,0755);
                                                     }
@@ -10781,6 +10901,7 @@ sub process_extracted_files {
                                         } elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/,@archdirs)) {
                                             unless (defined($newseqid{$dirorder{$i}->[$j]})) {
                                                 $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                                $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
                                                 if (!-e $fullpath) {
                                                     mkdir($fullpath,0755);
                                                 }
@@ -10791,7 +10912,23 @@ sub process_extracted_files {
                                     }
                                 }
                                 if ($fullpath ne '') {
-                                    system("mv $prefix$path $fullpath/$title");
+                                    if (-e "$prefix$path") {
+                                        system("mv $prefix$path $fullpath/$title");
+                                    }
+                                    if (-e "$fullpath/$title") {
+                                        my $showpath;
+                                        if ($relpath ne '') {
+                                            $showpath = "$relpath/$title";
+                                        } else {
+                                            $showpath = "/$title";
+                                        } 
+                                        $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
+                                    } 
+                                    unless ($ishome) {
+                                        my $fetch = "$fullpath/$title";
+                                        $fetch =~ s/^\Q$prefix$dir\E//; 
+                                        $prompttofetch{$fetch} = 1;
+                                    }
                                 }
                             }
                         }
@@ -10819,6 +10956,26 @@ sub process_extracted_files {
                 &cleanup_empty_dirs($prefix."$pathtocheck/$dir");
             }
         }
+        if ($result ne '') {
+            $output .= '<ul>'."\n".
+                       $result."\n".
+                       '</ul>';
+        }
+        unless ($ishome) {
+            my $replicationfail;
+            foreach my $item (keys(%prompttofetch)) {
+                my $fetchresult= &Apache::lonnet::reply('fetchuserfile:'.$item,$docuhome);
+                unless ($fetchresult eq 'ok') {
+                    $replicationfail .= '<li>'.$item.'</li>'."\n";
+                }
+            }
+            if ($replicationfail) {
+                $output .= '<p class="LC_error">'.
+                           &mt('Course home server failed to retrieve:').'<ul>'.
+                           $replicationfail.
+                           '</ul></p>';
+            }
+        }
     } else {
         $warning = &mt('No items found in archive.');
     }