--- loncom/imspackages/imsexport.pm	2012/01/29 19:51:01	1.8
+++ loncom/imspackages/imsexport.pm	2013/11/12 04:54:57	1.11
@@ -1,6 +1,6 @@
 # The LearningOnline Network
 #
-# $Id: imsexport.pm,v 1.8 2012/01/29 19:51:01 raeburn Exp $
+# $Id: imsexport.pm,v 1.11 2013/11/12 04:54:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,8 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonhtmlcommon;
 use Apache::lonnavmaps;
+use Apache::loncourserespicker;
+use Apache::londocs;
 use Apache::lonlocal;
 use Cwd;
 use LONCAPA qw(:DEFAULT :match);
@@ -39,40 +41,18 @@ use LONCAPA qw(:DEFAULT :match);
 sub exportcourse {
     my $r=shift;
     my $crstype = &Apache::loncommon::course_type();
-    my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                                               $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
-    my $numdisc = keys(%discussiontime);
-    my $numprobs = 0;
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
-                  '<h2>'.&mt('IMS Export Failed').'</h2>'.
-                  '<div class="LC_error">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Unable to retrieve information about community contents'));
-        } else {
-            $r->print(&mt('Unable to retrieve information about course contents'));
-        }
-        $r->print('</div><a href="/adm/coursedocs">');
-        if ($crstype eq 'Community') {
-            $r->print(&mt('Return to Community Editor'));
-        } else {
-            $r->print(&mt('Return to Course Editor'));
-        }
-        $r->print('</a>');
-        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
+    my ($navmap,$errormsg) = 
+        &Apache::loncourserespicker::get_navmap_object($crstype,'imsexport'); 
+    unless (ref($navmap)) {
+        $r->print($errormsg);
         return;
     }
-    my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
-    my $curRes;
-    my $outcome;
-
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['finishexport']);
     if ($env{'form.finishexport'}) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['archive','discussion']);
-
+        my $outcome; 
         my $format = $env{'form.format'};
         my @exportitems = &Apache::loncommon::get_env_multiple('form.archive');
         my @discussions = &Apache::loncommon::get_env_multiple('form.discussion');
@@ -135,184 +115,15 @@ sub exportcourse {
         }
         $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
+        $r->print(&Apache::londocs::startContentScreen('tools')); 
         $r->print($outcome);
+        $r->print(&Apache::londocs::endContentScreen());
         $r->print(&Apache::loncommon::end_page());
     } else {
-        my $display='<form name="exportdoc" action="" method="post">'."\n".
-                    '<p>'.
-                    &mt('Choose which items you wish to export from your '.$crstype.'.').
-                    '</p>'.
-                    '<div class="LC_columnSection"><fieldset>'.
-                    '<legend>'.&mt('Content items').'</legend>'.
-                    '<input type="button" value="'.&mt('check all').'" '.
-                    'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
-                    '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>';
-        if ($numdisc > 0) {
-            $display .= '<fieldset>'.
-                        '<legend>'.&mt('Discussion posts').'</legend>'.
-                        '<input type="button" value="'.&mt('check all').'"'.
-                        ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                        '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                        ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
-                        '</fieldset>';
-        }
-        $display .= '</div>';
-        my $curRes;
-        my $depth = 0;
-        my $count = 0;
-        my $boards = 0;
-        my $startcount = 5;
-        my %parent = ();
-        my %children = ();
-        my $lastcontainer = $startcount;
-        $display .= &Apache::loncommon::start_data_table()
-                   .&Apache::loncommon::start_data_table_header_row()
-                   .'<th>'.&mt('Export content item?').'</th>';
-        if ($numdisc > 0) {
-            $display .= '<th>'.&mt('Export discussion posts?').'</th>';
-        }
-        $display .= &Apache::loncommon::end_data_table_header_row();
-        while ($curRes = $it->next()) {
-            if (ref($curRes)) {
-                $count ++;
-            }
-            if ($curRes == $it->BEGIN_MAP()) {
-                $depth++;
-                $parent{$depth} = $lastcontainer;
-            }
-            if ($curRes == $it->END_MAP()) {
-                $depth--;
-                $lastcontainer = $parent{$depth};
-            }
-            if (ref($curRes)) {
-                my $symb = $curRes->symb();
-                my $ressymb = $symb;
-                if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
-                    unless ($ressymb =~ m|adm/wrapper/adm|) {
-                        $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
-                    }
-                }
-                my $currelem = $count+$boards+$startcount;
-                $display .= &Apache::loncommon::start_data_table_row()
-                           .'<td>'."\n"
-                           .'<input type="checkbox" name="archive" value="'.$count.'" ';
-                if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    $lastcontainer = $currelem;
-                    $display .= 'onclick="javascript:propagateCheck(this.form,'."'$currelem'".')"';
-                } elsif ($curRes->is_problem()) {
-                    $numprobs ++;
-                }
-                $display .= ' />'."\n";
-                for (my $i=0; $i<$depth; $i++) {
-                    $display .= ('<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />' x2)."\n";
-                }
-                if ($curRes->is_sequence()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
-                } elsif ($curRes->is_page()) {
-                    $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
-                }
-                $children{$parent{$depth}} .= $currelem.':';
-                $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
-
-                # Existing discussion posts?
-                if ($discussiontime{$ressymb} > 0) {
-                    $boards ++;
-                    $display .= '<td align="right">'
-                               .'<input type="checkbox" name="discussion" value="'.$count.'" />'
-                               .'</td>'."\n";
-                } elsif ($numdisc > 0) {
-                    $display .= '<td>&nbsp;</td>'."\n";
-                }
-                $display .= &Apache::loncommon::end_data_table_row();
-            }
-        }
-        $display .= &Apache::loncommon::end_data_table();
-        my $numcount = $count + $boards + $startcount;
-        my $scripttag = &export_javascript($startcount,$numcount,%children);
-        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
-                                                 $scripttag));
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
-        if ($numprobs > 0) {
-            $display .= '<p><span class="LC_nobreak">'.
-                        &mt('Export format for LON-CAPA problems:').
-                        '<label><input type="radio" name="format" value="xml" checked="checked" />'.
-                        '&nbsp;'.&mt('XML').'</label>'.('&nbsp;' x3).
-                        '<label><input type="radio" name="format" value="html" />'.
-                        '&nbsp;'.&mt('HTML').'</label>'.('&nbsp;' x3).
-                        '<label><input type="radio" name="format" value="plaintext" />'.
-                        '&nbsp;'.&mt('Text').'</label></span></p>';
-        }
-        $r->print($display.
-                  '<p><input type="hidden" name="finishexport" value="1" />'.
-                  '<input type="submit" name="exportcourse" value="'.
-                  &mt('Export').'" /></p></form>');
-    }
-}
-
-sub export_javascript {
-    my ($startcount,$numitems,%children) = @_;
-    my $scripttag = <<"START";
-<script type="text/javascript">
-// <![CDATA[
-function checkAll(field) {
-    if (field.length > 0) {
-        for (i = 0; i < field.length; i++) {
-            field[i].checked = true ;
-        }
-    } else {
-        field.checked = true
-    }
-}
-
-function uncheckAll(field) {
-    if (field.length > 0) {
-        for (i = 0; i < field.length; i++) {
-            field[i].checked = false ;
-        }
-    } else {
-        field.checked = false ;
+        $r->print(&Apache::loncourserespicker::create_picker($navmap,'imsexport',
+                                                             'exportdoc',$crstype));
     }
-}
-
-function propagateCheck(form,item) {
-    if (form.elements[item].checked == true) {
-        containerCheck(form,item)
-    }
-}
-
-numitems = $numitems
-var parents = new Array(numitems)
-for (var i=$startcount; i<numitems; i++) {
-    parents[i] = new Array
-}
-
-START
-
-    foreach my $container (sort { $a <=> $b } (keys(%children))) {
-        my @contents = split(/:/,$children{$container});
-        for (my $i=0; $i<@contents; $i ++) {
-            $scripttag .= 'parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
-        }
-    }
-
-    $scripttag .= <<"END";
-
-function containerCheck(form,item) {
-    form.elements[item].checked = true;
-    if(Object.prototype.toString.call(parents[item]) === '[object Array]') {
-        if (parents[item].length > 0) {
-            for (var j=0; j<parents[item].length; j++) {
-                containerCheck(form,parents[item][j])
-            }
-        }
-    }
-}
-// ]]>
-</script>
-
-END
-    return $scripttag;
+    return;
 }
 
 sub create_ims_store {
@@ -862,6 +673,7 @@ sub simpleproblem  {
                 %values = &evaloptionhash($options);
                 $output .= qq|
 <problem>
+  <startouttext />$qtext<endouttext />
   <optionresponse max="$maxfoils" randomize="$randomize">
     <foilgroup options="$options">
 |;
@@ -890,8 +702,9 @@ sub simpleproblem  {
             } else {
                 $output .= qq|
 <problem>
+  <startouttext />$qtext<endouttext />
   <radiobuttonresponse max="$maxfoils" randomize="$randomize">
-   <foilgroup>
+  <foilgroup>
 |;
                 for (my $k=0; $k<10; $k++) {
                     my $iter = $k+1;
@@ -916,14 +729,14 @@ sub simpleproblem  {
 </problem>
 |;
             }
-        } elsif ($qtype eq 'stringanswer') {
+        } elsif ($qtype eq 'string') {
             my $stringanswer = $qparms{$prefix.'stringanswer'};
             my $stringtype=$qparms{$prefix.'stringtype'};
             $output .= qq|
 <problem>
   <stringresponse answer="$stringanswer" type="$stringtype">
-    <textline>
-    </textline>
+  <startouttext />$qtext<endouttext />
+    <textline />
             |;
             if ($hint) {
                 $output .= '
@@ -937,6 +750,55 @@ sub simpleproblem  {
   </stringresponse>
 </problem>
 |;
+        } elsif ($qtype eq 'numerical') {
+            my $sigfigs = $qparms{$prefix.'numericalsigfigs'};
+            my $unit = $qparms{$prefix.'numericalunit'};
+            my $answer = $qparms{$prefix.'numericalanswer'};
+            my $tolerance = $qparms{$prefix.'numericaltolerance'};
+            my $format = $qparms{$prefix.'numericalformat'};
+            my $scriptblock = $qparms{$prefix.'numericalscript'};
+            $output .= qq|
+<problem>
+|;
+            if ($scriptblock) {
+                $output .= qq|
+<script type="loncapa/perl">
+$scriptblock
+</script>|;
+             }
+             $output .= qq|
+<startouttext />$qtext<endouttext />
+<numericalresponse answer="$answer" |;
+             if ($unit ne '') {
+                 $output .= qq|unit="$unit" |;
+             }
+             if ($format ne '') {
+                 $output .= qq|format="$format" |;
+             }
+             $output =~ s{ $}{};
+             $output .= '>';
+             if ($tolerance ne '') {
+                 $output .= qq|
+  <responseparam name="tol" type="tolerance" default="$tolerance" description="Numerical Tolerance" />|;
+             }
+             if ($sigfigs) {
+                 $output .= qq|
+  <responseparam name="sig" type="int_range" default="$sigfigs" description="Significant Digits" />|;
+             }
+             $output .= qq|
+  <textline />|;
+            if ($hint) {
+                $output .= qq|
+  <hintgroup>
+    <hintpart on="default">
+      <startouttext />'.$hint.'<endouttext/>
+    </hintpart>
+  </hintgroup>|;
+            }
+            $output .= qq|
+</numericalresponse>
+</problem>
+|;
         } else {
             $output .= qq|
 <problem>
@@ -1075,8 +937,6 @@ described at http://www.lon-capa.org.
 
 =item exportcourse()
 
-=item export_javascript()
-
 =item create_ims_store()
 
 =item build_package()