--- loncom/imspackages/imsimportdocs.pm	2004/03/02 15:45:06	1.1
+++ loncom/imspackages/imsimportdocs.pm	2004/08/05 23:21:49	1.7
@@ -1,10 +1,36 @@
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 package Apache::imsimportdocs;
 
+use Apache::Constants qw(:common :http :methods);
 use Apache::lonnet;
+use Apache::londocs;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::imsprocessor;
 use LONCAPA::Configuration;
+use strict;
 
 sub jscript_one {
     my $javascript = shift;
@@ -41,8 +67,8 @@ function setOptions(caller,itemnum) {
     if (caller == "board") {
       opForm.elements[menu].options[0] = new Option("Select","-1",true,true)
       opForm.elements[menu].options[1] = new Option("Import topics only","topics",true,true)
-      opForm.elements[menu].options[2] = new Option("Import topics & posts (with author)","allpost",true,true)
-      opForm.elements[menu].options[3] = new Option("Import topics & posts (no author)","allanon",true,true)
+      opForm.elements[menu].options[2] = new Option("Import topics + posts (with author)","allpost",true,true)
+      opForm.elements[menu].options[3] = new Option("Import topics + posts (no author)","allanon",true,true)
     }
     else { 
       if (caller == "users") {
@@ -94,6 +120,16 @@ function nextPage(caller) {
 #;
 }
 
+sub jscript_three {
+    my $javascript = shift;
+    $$javascript = qq|
+function init(tf) {
+    setTimeout("self.close()",3000)
+    tf.submit();   
+}
+    |;
+}
+
 sub handler {
     my $r = shift;
     my $javascript = '';
@@ -101,29 +137,10 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my @areas = ("doc","extlink","announce","staff","board","quiz","survey","pool","users");
+    my @areas = ();
     my %cmsmap = ();
-    %{$cmsmap{bb5}} = (
-                announce => 'resource/x-bb-announcement',
-                board => 'resource/x-bb-discussionboard',
-                doc => 'resource/x-bb-document',
-                extlink => 'resource/x-bb-externallink',
-                pool => 'assessment/x-bb-pool',
-                quiz => 'assessment/x-bb-quiz',
-                staff => 'resource/x-bb-staffinfo',
-                survey => 'assessment/x-bb-survey',
-                users => 'course/x-bb-user',
-                );
- 
-    %{$cmsmap{angel}} =  (
-                board => 'BOARD',
-                extlink => 'LINK',
-                msg => 'MESSAGE',
-                quiz => 'QUIZ',
-                survey => 'FORM',
-                );
-
-    @{$cmsmap{angel}{doc}} = ('FILE','PAGE');
+    my %areaname = ();
+    &Apache::imsprocessor::ims_config(\@areas,\%cmsmap,\%areaname);
 
 # get course data
     my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
@@ -153,6 +170,8 @@ sub handler {
         &jscript_one(\$javascript);
     } elsif ($ENV{'form.phase'} eq 'two') {
         &jscript_two(\$javascript);
+    } elsif ($ENV{'form.phase'} eq 'three') {
+        &jscript_three(\$javascript);
     }
 
 # print screen
@@ -172,38 +191,17 @@ ENDHEAD
     if ($ENV{'form.phase'} eq 'one') {
         &display_one($r);       
     } elsif ($ENV{'form.phase'} eq 'two') {
-        &display_two($r,$coursenum,\@areas,%cmsmap);
+        &display_two($r,$coursenum,\@areas,\%areaname,%cmsmap);
     } elsif ($ENV{'form.phase'} eq 'three') {
-        &display_three($r,$coursenum,$coursedom,$coursehome,\@areas,%cmsmap);
+        &display_three($r,$coursenum,$coursedom,$coursehome,$uname,$udom,\@areas,%cmsmap);
     }   
     $r->print("</body><html>");
+    return OK;
 } 
 
-sub uploadzip {
-    my $tempdir = shift;
-    my $fname=$ENV{'form.uploadname.filename'};
-# Replace Windows backslashes by forward slashes
-    $fname=~s/\\/\//g;
-# Get rid of everything but the actual filename
-    $fname=~s/^.*\/([^\/]+)$/$1/;
-# Replace spaces by underscores
-    $fname=~s/\s+/\_/g;
-# Replace all other weird characters by nothing
-    $fname=~s/[^\w\.\-]//g;
-# See if there is anything left
-    unless ($fname) { return 'error: no uploaded file'; }
-
-# Save the file
-    chomp($ENV{'form.uploadname'});
-    open(my $fh,'>'.$tempdir.'/'.$fname);
-    print $fh $ENV{'form.uploadname'};
-    close($fh);
-    return $fname;   
-}
 
 sub display_one {
-    my $r = shift;
-    my $timestamp = time;
+    my ($r) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
 
     $r->print(<<ENDBLOCK);
@@ -235,6 +233,7 @@ Please choose the CMS used to create you
         <select name="source">
          <option value='-1' selected="true">Please select
          <option value='bb5'>Blackboard 5
+         <option value='bb6'>Blackboard 6
          <option value='angel'>ANGEL
         </select>
         </font>
@@ -298,11 +297,12 @@ ENDBLOCK
 
 
 sub display_two {
-    my ($r,$crs,$areasref,%cmsmap) = @_;
+    my ($r,$crs,$areasref,$areaname,%cmsmap) = @_;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder','source']);
     my $cms = $ENV{'form.source'};
-    my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs);
-    my $fname = &uploadzip($tempdir);
+    my $timenow = time;
+    my $tempdir = &Apache::imsprocessor::create_tempdir('DOCS',$crs,$timenow);
+    my $fname = &Apache::imsprocessor::uploadzip('DOCS',$tempdir);
     my $unzip_result = '';
     my $manifest_result = '';
     unless ($tempdir eq '') {
@@ -311,6 +311,7 @@ sub display_two {
     my %resources = ();
     my %items = ();
     my %hrefs = ();
+    my %resinfo = ();
     my %count = ();
     my @bgcolors = ("#eeeeee","#dddddd");
 
@@ -329,23 +330,11 @@ sub display_two {
                 users => 0,
                 );
 
-    my %areaname = (
-                announce => 'Announcements',
-                board => 'Discussion Boards',
-                doc => 'Documents, pages &amp; folders',
-                extlink => 'Links to external sites',
-                pool => 'Question pools',
-                quiz => 'Quizzes',
-                staff => 'Staff information',
-                survey => 'Surveys',
-                users => 'Enrollment',
-                );
-         
     if ($unzip_result eq 'ok') {
-        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs);
+        $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo);
         if ($manifest_result eq 'ok') {
             foreach my $res (sort keys %resources) {
-                if ($cms eq 'bb5') {
+                if ($cms eq 'bb5' || $cms eq 'bb6') {
                     foreach my $area (keys %{$cmsmap{$cms}}) {
                         if ($resources{$res}{type} eq $cmsmap{$cms}{$area}) {
                             $count{$area} ++;
@@ -408,10 +397,10 @@ ENDBLOCK
                         $r->print(qq|onClick='javascript:setOptions("$area","$counter")'|);
                     }
                     $r->print("/></font></td>
-                <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;$areaname{$area}&nbsp;&nbsp; - $count{$area} item(s)</font></td>");
+                <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;$$areaname{$area}&nbsp;&nbsp; - $count{$area} item(s)</font></td>");
                     if ($area eq 'board') {
                         $r->print("            <td align='left'><font face='arial,helvetica,sans-serif'>&nbsp;&nbsp;
-                 <select name='bb_handling'>
+                 <select name='db_handling'>
                   <option value='-2'>&lt;-- Check Import first
                  </select></font>
                 </td>");
@@ -443,9 +432,35 @@ ENDBLOCK
       <tr>
        <td colspan='2'>&nbsp;<br /><br /></td>
       </tr>
+      <tr bgcolor='#CCCCFF'>
+       <td valign='middle'><img src='/res/adm/pages/bl_step4.gif'>
+       </td>
+       <td width='100%' align='left'>&nbsp;&nbsp;
+        <font face='arial,helvetica,sans-serif'><b>Choose display options for listing of contents of top level of package.</b></font>
+       </td>
+      </tr>
+      <tr>
+       <td colspan='2'>&nbsp;</td>
+      </tr>
       <tr>
        <td>&nbsp;</td>
-       <td><font face='arial,helvetica,sans-serif'>Once you have checked the checkboxes for all areas you wish to import from the IMS package, and selected options (if available) you should click the 'Complete Import' button.</font></td>
+       <td>
+        <table border='0'>
+         <tr>
+          <td><font face='arial,helvetica,sans-serif'><input type="radio" name="toplevel" value="newfolder" />Display listing of contents in a new folder, with folder name:&nbsp;&nbsp;&nbsp;<input type="text" name="foldername" size="15" value="Type Name Here" /></font></td>
+         </tr>
+         <tr>
+          <td><font face='arial,helvetica,sans-serif'><input type="radio" name="toplevel" value="oldfolder" />Append listing of contents of top level of package to contents list for the current folder.</font></td>
+         </tr>
+        </table>
+       </td>
+      </tr>
+      <tr>
+       <td colspan='2'>&nbsp;</td>
+      </tr>
+      <tr>
+       <td>&nbsp;</td>
+       <td><font face='arial,helvetica,sans-serif'>Once you have checked the checkboxes for all areas you wish to import from the IMS package, selected options (if available), and selected a display option for the package contents you should click the 'Complete Import' button.</font></td>
       </tr>
       <tr>
        <td colspan='2'>&nbsp;
@@ -484,38 +499,186 @@ ENDDOCUMENT
 
 
 sub display_three {
-   my ($r,$crs,$cdom,$chome,$areas,%cmsmap) = @_;
-   $r->print("You reached phase three");
-   my $cms = $ENV{'form.source'};
-   my $tempdir = $ENV{'form.tempdir'};
-   my $longcrs = '';
-   if ($crs =~ m/^(\d)(\d)(\d)/) {
-       $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
-   }
-   my $destdir = '';
-   my %imports = ();
-   my @targets = ();
-   my %resources = ();
-   my %items = ();
-   my %hrefs = ();
-   my %urls = ();
-   foreach my $area (@{$areas}) {
-       if (defined($ENV{"form.$area"}) ) {          
-           if ($cms eq 'angel' && $area eq 'doc') {
-               foreach (@{$cmsmap{$cms}{$area}}) {
-                   $imports{$_} = 1;
-               }
-           } else {
-               $imports{$cmsmap{$cms}{$area}} = 1;
-           }
-       }
-   }
+    my ($r,$crs,$cdom,$chome,$uname,$udom,$areas,%cmsmap) = @_;
+    my $folder = $ENV{'form.folder'};
+    my $cms = $ENV{'form.source'};
+    my $tempdir = $ENV{'form.tempdir'};
+    my $longcrs = '';
+    if ($crs =~ m/^(\d)(\d)(\d)/) {
+        $longcrs = $1.'/'.$2.'/'.$3.'/'.$crs;
+    }
+    my %imports = ();
+    my @targets = ();
+    my %resources = ();
+    my %items = ();
+    my %hrefs = ();
+    my %urls = ();
+    my %resinfo = ();
+    my %total = (
+                 page => 0,
+                 prob => 0,
+                 seq => 0,
+                 board => 0,         
+                 quiz => 0,
+                 surv => 0,
+                );
+    my @pages = ();
+    my @sequences = ();
+    my @resrcfiles = ();
+
+    my $timenow = time;
+
+    my $destdir = $Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.$cdom.'/'.$crs.'/'.$timenow;
+    my $seqstem = "/uploaded/$cdom/$crs/$timenow";
+    my $db_handling = '';
+    my $user_handling = '';
+
+    my $toplevel = '';
+    my $foldername = '';
+    my %topitems = ();
+    if (defined($ENV{'form.toplevel'}) ) {
+        $toplevel = $ENV{'form.toplevel'};     
+    }
+    if (defined($ENV{'form.foldername'}) ) {
+        $foldername = $ENV{'form.foldername'}; 
+    }
+ 
+    foreach my $area (@{$areas}) {
+        if (defined($ENV{"form.$area"}) ) {          
+            if ($cms eq 'angel' && $area eq 'doc') {
+                foreach (@{$cmsmap{$cms}{$area}}) {
+                    $imports{$_} = 1;
+                }
+            } else {
+                $imports{$cmsmap{$cms}{$area}} = 1;
+            }
+            if ($area eq 'board') {
+                $db_handling = $ENV{'form.db_handling'};
+            } elsif ($area eq 'users') {
+                $user_handling = $ENV{'form.user_handling'};
+            }
+        }
+    }
    
-   my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs);
-   if ($manifest_result eq 'ok') {
-       &Apache::imsprocessor::target_resources(\%resources,\%imports,\@targets);
-       $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$chome,$destdir); 
-   }
+    my $manifest_result = &Apache::imsprocessor::process_manifest($cms,$tempdir,\%resources,\%items,\%hrefs,\%resinfo);
+    if ($manifest_result eq 'ok') {
+        my @path = ($cdom,$crs,$timenow);
+        my $fullpath = $Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles';
+        foreach my $item (@path) {
+            $fullpath .= '/'.$item;
+            if (!-e "$fullpath") {
+                mkdir("$fullpath",0770);
+            }
+        }
+        my @namedirs = ("resfiles","sequences","pages","problems");
+        foreach my $name (@namedirs) {
+            if (!-e "$fullpath/$name") {
+                mkdir("$fullpath/$name",0770);
+            }
+        }
+        &Apache::imsprocessor::target_resources(\%resources,\%imports,\@targets);
+
+        my @boards = ();
+        my @announcements = ();
+        my @quizzes = ();
+        my @surveys = ();
+        my @groups = ();
+        my %messages = ();
+        my @timestamp = ();
+        my %boardnum = ();
+        my @topurls = ();
+        my @topnames = ();
+        my @packages = ();
+
+        &Apache::imsprocessor::process_resinfo($cms,'DOCS',$tempdir,$destdir,\%items,\%resources,\@boards,\@announcements,\@quizzes,\@surveys,\@groups,\%messages,\@timestamp,\%boardnum,\%resinfo,$udom,$uname,$cdom,$crs,$db_handling,$user_handling,\%total,$seqstem,$seqstem,\@resrcfiles,\@packages,\%hrefs);
+
+        my $copy_result = &Apache::imsprocessor::copy_resources('DOCS',$cms,\%hrefs,$tempdir,\@targets,\%urls,$crs,$cdom,$chome,$destdir,$timenow);
+
+        &Apache::imsprocessor::build_structure($cms,'DOCS',$destdir,\%items,\%resinfo,\%resources,\%hrefs,$udom,$uname,'',$timenow,$cdom,$crs,\@timestamp,\%total,\@boards,\@announcements,\@quizzes,\@surveys,\%boardnum,\@pages,\@sequences,\@topurls,\@topnames,\@packages);
+ 
+        foreach my $item (@pages) {
+            my $filename = $timenow.'/pages/'.$item;
+            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+        }
+        foreach my $item (@sequences) {
+            unless ($item eq 'Top.sequence' && $toplevel eq 'oldfolder') {
+                my $filename = $timenow.'/sequences/'.$item;
+                my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+            }
+        }
+        foreach my $item (@resrcfiles) {
+            my $filename = $timenow.'/resfiles/'.$item;
+            my $fetchresult= &Apache::lonnet::process_coursefile('propagate',$crs,$cdom,$chome,$filename,'');
+        }
+
+        my @imports = ();
+        if ($toplevel eq 'oldfolder') {
+            for (my $i=0; $i<@topurls; $i++) {
+                my $url = &Apache::lonnet::unescape($topurls[$i]);
+                my $name = &Apache::lonnet::unescape($topnames[$i]);
+                push @imports, $name, $url;
+            }
+        } elsif ($toplevel eq 'newfolder') {
+            my $url = &Apache::lonnet::unescape("/uploaded/$cdom/$crs/$timenow/sequences/Top.sequence");
+            my $name = &Apache::lonnet::unescape("$ENV{'form.foldername'}");
+            push @imports, $name, $url;
+        }
+        my $errtext='';
+        my $fatal=0;
+        ($errtext,$fatal)=  &Apache::londocs::mapread($crs,$cdom,$folder.'.sequence');
+        if ($#Apache::lonratedt::order<1) {
+            $Apache::lonratedt::order[0]=1;
+            $Apache::lonratedt::resources[1]='';
+        }
+        my ($errtext,$fatal)=&Apache::londocs::group_import($crs, $cdom, $folder,@imports);
+        if ($fatal) {
+            print STDERR "Fatal error during group_import\n";
+        }
+    }
+    if ($tempdir =~ m/^\/home\/httpd\/perl\/tmp\/$crs\/\d{10}/) {
+        system("rm -r -f $tempdir");
+    }
+    $r->print(<<ENDBLOCK);
+  <table border='0' bgcolor='#F6F6F6'' cellspacing='0' cellpadding ='0' width='100%'>
+   <tr>
+    <td colspan='2'>
+     <table border='0' cellspacing='0' cellpadding='0'>
+      <tr>
+       <td colspan='2'  align='left'>&nbsp;
+       </td>
+      </tr>
+      <tr bgcolor='#CCCCFF'>
+       <td valign='middle'><img src='/res/adm/pages/bl_step5.gif'>
+       </td>
+       <td width='100%' align='left'>&nbsp;&nbsp;
+        <font face='arial,helvetica,sans-serif'><b>Your import is complete</b></font>
+       </td>
+      </tr>
+      <tr>
+       <td colspan='2'>&nbsp;</td>
+      </tr>
+      <tr>
+       <td>&nbsp;</td>
+       <td>
+ENDBLOCK
+    my $initblock = qq|  
+         <form method="post" action="/adm/roles" target="loncapaclient" name="importDone">
+           <input type="hidden" name="orgurl" value="/adm/coursedocs" />
+           <input type="hidden" name="selectrole" value="1" />
+           <h3><font color="red">Changes will become active for your current session after
+           <input type="hidden" name="$ENV{'request.role'}" value="1" />
+           <input type="button" value="|;
+    $initblock .= &mt('re-initializing course');
+    $initblock .= qq|" onClick="javascript:init(this.form)"/>|;
+    $initblock .= &mt('or the next time you log in.');
+    $initblock .= qq|</font></h3></form>|;  
+    $r->print($initblock);
+    $r->print(<<ENDBLOCKTWO);
+     </table>
+    </td>
+   </tr>
+  </table>
+ENDBLOCKTWO
 }
 
 1;