--- modules/gci/londocsgci.pm	2010/11/29 04:33:35	1.16
+++ modules/gci/londocsgci.pm	2010/12/05 17:48:54	1.17
@@ -2,7 +2,7 @@
 # Custom Edit Course Routines for Assembly of Valid Concept Tests from
 # Geoscience Concept Inventory. 
 #
-# $Id: londocsgci.pm,v 1.16 2010/11/29 04:33:35 gci Exp $
+# $Id: londocsgci.pm,v 1.17 2010/12/05 17:48:54 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,65 +60,69 @@ my %mandatory;
 my @development;
 
 sub setdefaults {
-   $path='/res/gci/gci';
-   $version='GCIv2-1-1';
-   $reqnum=15;
-   @allprobs=('01','02','37','2004_73','03','04','05','06','07',
-              '08','10',
-              '09',
-              '11','12','13','14','15','16','17',
-              '18','69',
-              '19','20',
-              '21','22','23','24','25','26','27','28','29','30',
-              '31','32','33','34','35','36','38',
-              '39A','39B',
-              '40',
-              '41','42','43','44','45','46','47','48','49','50',
-              '51',
-              '52','57',
-              '53','54','55','56','58',
-              '60',
-              '61','62','63','64','65','66','67','68','70',
-              '71');
-    @bins = ( ['03','04','06'],
-              ['07','08','09'],
-              ['10','12','13','14','15','16','17'],
-              ['18','19','20','21','22','23','24','25'],
-              ['26','27','28','30'],
-              ['32','33','34','35','36'],
-              ['38','39A','39B','40','41','42','43','44','45','46'],
-              ['47','48','49','50','51','52','53'],
-              ['54','55','56','57','58','60','61','62'],
-              ['63','64','65'],
-              ['66','67','68','69','70','71']);
-    @optional = ('05','11','29','31');
-    @mandcats = ('M1','M2','M3','M4');
-    @bincats = ('A','B','C','D','E','F','G','H','I','J','K');
-    @categories=(@mandcats,@bincats);
-    %probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,
-              '03' => 'A' ,'04' => 'A','05' => ''  ,'06' => 'A' ,'07' => 'B' ,
-              '08' => 'B' ,'09' => 'B' ,'10' => 'C' ,'11' => ''  ,'12' => 'C' ,
-              '13' => 'C' ,'14' => 'C' ,'15' => 'C' ,'16' => 'C' ,'17' => 'C' ,'18' => 'D' ,'19' => 'D' ,'20' => 'D' ,
-              '21' => 'D' ,'22' => 'D' ,'23' => 'D' ,'24' => 'D' ,'25' => 'D' ,'26' => 'E' ,'27' => 'E' ,'28' => 'E' ,'29' => ''  ,'30' => 'E' ,
-              '31' => ''  ,'32' => 'F' ,'33' => 'F' ,'34' => 'F' ,'35' => 'F' ,'36' => 'F' ,'38' => 'G' ,
-              '39A'=> 'G' ,'39B'=> 'G' ,
-              '40' => 'G' ,
-              '41' => 'G' ,'42' => 'G' ,'43' => 'G' ,'44' => 'G' ,'45' => 'G' ,'46' => 'G' ,'47' => 'H' ,'48' => 'H' ,'49' => 'H' ,'50' => 'H' ,
-              '51' => 'H' ,'52' => 'H' ,'53' => 'H' ,'54' => 'I' ,'55' => 'I' ,'56' => 'I' ,'57' => 'I' ,'58' => 'I' ,
-              '60' => 'I' ,
-              '61' => 'I' ,'62' => 'I' ,'63' => 'J' ,'64' => 'J' ,'65' => 'J' ,'66' => 'K' ,'67' => 'K' ,'68' => 'K' ,'69' => 'K' ,'70' => 'K' ,
-              '71' => 'K');
-    %mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);
-    @mandprobs = ('01','02','37','2004_73');
-    %prereqs=('10' => '08', '57' => '52', '69' => '18');
-    foreach my $item (keys(%prereqs)) {
-        $revreqs{$prereqs{$item}} = $item;
+    my ($cdom) = @_;
+    if ($cdom eq 'gcitest') {
+        $path='/res/gci/gci';
+        $version='GCIv2-1-1';
+        $reqnum=15;
+        @allprobs=('01','02','37','2004_73','03','04','05','06','07',
+                   '08','10',
+                   '09',
+                   '11','12','13','14','15','16','17',
+                   '18','69',
+                   '19','20',
+                   '21','22','23','24','25','26','27','28','29','30',
+                   '31','32','33','34','35','36','38',
+                   '39A','39B',
+                   '40',
+                   '41','42','43','44','45','46','47','48','49','50',
+                   '51',
+                   '52','57',
+                   '53','54','55','56','58',
+                   '60',
+                   '61','62','63','64','65','66','67','68','70',
+                   '71');
+         @bins = ( ['03','04','06'],
+                   ['07','08','09'],
+                   ['10','12','13','14','15','16','17'],
+                   ['18','19','20','21','22','23','24','25'],
+                   ['26','27','28','30'],
+                   ['32','33','34','35','36'],
+                   ['38','39A','39B','40','41','42','43','44','45','46'],
+                   ['47','48','49','50','51','52','53'],
+                   ['54','55','56','57','58','60','61','62'],
+                   ['63','64','65'],
+                   ['66','67','68','69','70','71']);
+         @optional = ('05','11','29','31');
+         @mandcats = ('M1','M2','M3','M4');
+         @bincats = ('A','B','C','D','E','F','G','H','I','J','K');
+         @categories=(@mandcats,@bincats);
+         %probcat =('01' => 'M1' ,'02' => 'M2' ,'37' => 'M3' ,'2004_73' => 'M4' ,
+                    '03' => 'A' ,'04' => 'A','05' => ''  ,'06' => 'A' ,'07' => 'B' ,
+                    '08' => 'B' ,'09' => 'B' ,'10' => 'C' ,'11' => ''  ,'12' => 'C' ,
+                    '13' => 'C' ,'14' => 'C' ,'15' => 'C' ,'16' => 'C' ,'17' => 'C' ,'18' => 'D' ,'19' => 'D' ,'20' => 'D' ,
+                    '21' => 'D' ,'22' => 'D' ,'23' => 'D' ,'24' => 'D' ,'25' => 'D' ,'26' => 'E' ,'27' => 'E' ,'28' => 'E' ,'29' => ''  ,'30' => 'E' ,
+                    '31' => ''  ,'32' => 'F' ,'33' => 'F' ,'34' => 'F' ,'35' => 'F' ,'36' => 'F' ,'38' => 'G' ,
+                    '39A'=> 'G' ,'39B'=> 'G' ,
+                    '40' => 'G' ,
+                    '41' => 'G' ,'42' => 'G' ,'43' => 'G' ,'44' => 'G' ,'45' => 'G' ,'46' => 'G' ,'47' => 'H' ,'48' => 'H' ,'49' => 'H' ,'50' => 'H' ,
+                    '51' => 'H' ,'52' => 'H' ,'53' => 'H' ,'54' => 'I' ,'55' => 'I' ,'56' => 'I' ,'57' => 'I' ,'58' => 'I' ,
+                    '60' => 'I' ,
+                    '61' => 'I' ,'62' => 'I' ,'63' => 'J' ,'64' => 'J' ,'65' => 'J' ,'66' => 'K' ,'67' => 'K' ,'68' => 'K' ,'69' => 'K' ,'70' => 'K' ,
+                    '71' => 'K');
+        %mandatory=('01' => 1 ,'02' => 1,'37' => 1, '2004_73' => 1);
+        @mandprobs = ('01','02','37','2004_73');
+        %prereqs=('10' => '08', '57' => '52', '69' => '18');
+        foreach my $item (keys(%prereqs)) {
+            $revreqs{$prereqs{$item}} = $item;
+        }
+        @defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');
+        @development = ('001','002','003','004','005','006','007','008','009','010','011','012','013','014','015','016','017','018','019','020','021','022','023','024','025','026','027');
     }
-    @defchosen=('01','02','03','07','12','18','26','32','37','38','47','54','63','66','2004_73');
-    @development = ('001','002','003','004','005','006','007','008','009','010','011','012','013','014','015','016','017','018','019','020','021','022','023','024','025','026','027');
 }
 
 sub checkvalid {
+   my ($cdom) = @_;
    my %covered=();
    my %chosenproblems=();
    my @errors=();
@@ -138,9 +142,9 @@ sub checkvalid {
    foreach my $item (@chosen) {
        if ($prereqs{$item}) {
           unless ($chosenproblems{$prereqs{$item}}) {
-              my $url = &fullurl($item);
+              my $url = &fullurl($item,$cdom);
               my $title = &Apache::lonnet::metadata($url,'title');
-              my $prerequrl = &fullurl($prereqs{$item});
+              my $prerequrl = &fullurl($prereqs{$item},$cdom);
               my $prereqtitle = &Apache::lonnet::metadata($prerequrl,'title');
               push(@errors,&mt('[_1] requires [_2].',"'$title'","'$prereqtitle'"));
           }
@@ -150,12 +154,14 @@ sub checkvalid {
 }
 
 sub fullurl {
-   my ($item,$catname)=@_;
-   unless ($item=~/\_/) { $item='_'.$item; }
-   if ($catname eq 'development') {
-       return $path.'/pilot/pilot'.$item.'.problem';
-   }
-   return $path.'/'.$version.'/GCI'.$item.'.problem';
+    my ($item,$cdom,$catname)=@_;
+    if ($cdom eq 'gcitest') {
+        unless ($item=~/\_/) { $item='_'.$item; }
+        if ($catname eq 'development') {
+            return $path.'/pilot/pilot'.$item.'.problem';
+        }
+        return $path.'/'.$version.'/GCI'.$item.'.problem';
+    }
 }
 
 sub item_from_url {
@@ -166,8 +172,8 @@ sub item_from_url {
 }
 
 sub validcheck {
-   my ($r)=@_;
-   my @errors=&checkvalid();
+   my ($r,$cdom)=@_;
+   my @errors=&checkvalid($cdom);
    if ($#errors>-1) {
       $r->print('<span class="LC_error">'.&mt('Your test is not yet valid.').'</span><p>'.&mt('The following issues must be addressed before you can use the test:').'<ul>');
       foreach my $message (@errors) {
@@ -207,7 +213,7 @@ sub listresources {
                 '<input type="submit" name="choosetest" value="'.&mt('Next').'"></p>');
        return;
    }
-   if ((!&validcheck($r)) || ($env{'form.concepttest'} eq 'editmyown')) {
+   if ((!&validcheck($r,$cdom)) || ($env{'form.concepttest'} eq 'editmyown')) {
       &editor($r,$context,$cdom,$cnum);
    } else {
       my $numsub = &get_submissions_count($cdom,$cnum);
@@ -273,23 +279,25 @@ sub editor {
     $r->print('<form name="selecteditems" method="post" action="/adm/coursedocs"
               onsubmit="return validTestCheck()">');
     $r->print(&mt('Select test items from the numbered bins below and then press [_1]"Store Problem Selection"[_2] at the bottom of the page.','<i>','</i>').'<br />');
-    $r->print('<ul>'.
-              '<li>'.&mt('Tests will contain a minimum of [_1] questions from the GCI 2 Inventory.',"<b>$reqnum</b>").'</li>'.
-              '<li>'.&mt('Tests must contain [_1]four[_2] mandatory questions and at least one item from each of [_1]eleven[_2] other bins.','<b>','</b>').'</li>'.
-              '<li>'.&mt('All tests conclude with [_1]two[_2] questions selected by the system (at random) from a pool of development questions being piloted by the GCI team.','<b>','</b>').'</li>'.
-              '</ul>');
+    if ($cdom eq 'gcitest') {
+        $r->print('<ul>'.
+                  '<li>'.&mt('Tests will contain a minimum of [_1] questions from the GCI 2 Inventory.',"<b>$reqnum</b>").'</li>'.
+                  '<li>'.&mt('Tests must contain [_1]four[_2] mandatory questions and at least one item from each of [_1]eleven[_2] other bins.','<b>','</b>').'</li>'.
+                  '<li>'.&mt('All tests conclude with [_1]two[_2] questions selected by the system (at random) from a pool of development questions being piloted by the GCI team.','<b>','</b>').'</li>'.
+                  '</ul>');
+    }
     my $mandleg = &mt('Mandatory Questions');
-    $r->print(&display_questions(\@mandprobs,'mandatory',$mandleg,\%chosenitems));
+    $r->print(&display_questions(\@mandprobs,'mandatory',$mandleg,\%chosenitems,$cdom));
     for (my $i=0; $i<@bins; $i++) {
         my $num = $i+1;
         my $legend = &mt('Bin [_1]',$num);
         my $catname = 'bin'.$i;
-        $r->print(&display_questions($bins[$i],$catname,$legend,\%chosenitems));
+        $r->print(&display_questions($bins[$i],$catname,$legend,\%chosenitems,$cdom));
     }
     my $optleg = &mt('Optional Questions');
-    $r->print(&display_questions(\@optional,'optional',$optleg,\%chosenitems));
+    $r->print(&display_questions(\@optional,'optional',$optleg,\%chosenitems,$cdom));
     my $devleg = &mt('Development Questions');
-    $r->print(&display_questions(\@devitems,'development',$devleg,\%chosenitems));
+    $r->print(&display_questions(\@devitems,'development',$devleg,\%chosenitems,$cdom));
     $r->print('<input type="hidden" name="phase" value="storemap" />'.
               '<input type="hidden" name="context" value="'.$context.'" />'.
               '<input type="hidden" name="concepttest" value="'.$env{'form.concepttest'}.'" />'.
@@ -299,7 +307,7 @@ sub editor {
 }
 
 sub display_questions {
-    my ($questions,$catname,$catlegend,$chosenitems) = @_;
+    my ($questions,$catname,$catlegend,$chosenitems,$cdom) = @_;
     return unless((ref($questions) eq 'ARRAY') && (ref($chosenitems) eq 'HASH'));
     my $total = 0;
     foreach my $item (@{$questions}) {
@@ -337,7 +345,7 @@ sub display_questions {
                '</th><th>'.&mt('Preview').'</th>'.
                &Apache::loncommon::end_data_table_header_row();
     foreach my $item (@{$questions}) {
-        my $url = &fullurl($item,$catname);
+        my $url = &fullurl($item,$cdom,$catname);
         my $title = &Apache::lonnet::metadata($url,'title');
         $output .= &Apache::loncommon::start_data_table_row().'<td>';
         if ($catname eq 'mandatory') {
@@ -410,8 +418,9 @@ sub evaluate {
 sub mapread_gci {
     my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
     my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sequence = &Apache::loncommon::get_citest_map($coursedom);
     return
-      &LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/default_1261144274.sequence');
+      &LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.$sequence);
 }
 
 sub storemap_gci {
@@ -422,13 +431,18 @@ sub storemap_gci {
     }
     return ('unauthorized',2) if (($coursedom eq '') || ($coursedom eq '') ||
                    (!&Apache::lonnet::allowed('mdc',$coursedom.'_'.$coursenum)));
-    my ($outtext,$errtext)=
-        &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/default_1261144274.sequence',1);
+    my $sequence = &Apache::loncommon::get_citest_map($coursedom);
+    my ($outtext,$errtext);
+    if ($sequence) {   
+        ($outtext,$errtext)=
+            &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.$sequence,1);
+    }
     if ($errtext) { return ($errtext,2); }
     return ($errtext,0);
 }
 
 sub chosen_to_map {
+   my ($cdom) = @_;
    my %chosenproblems=();
    foreach my $item (@chosen) {
       $chosenproblems{$item}=1;
@@ -440,11 +454,11 @@ sub chosen_to_map {
    for (my $idx=0;$idx<=$#allprobs;$idx++) {
        $residx=$idx+1;
        if ($chosenproblems{$allprobs[$idx]}) {
-          my $url  = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx]));
+          my $url  = &LONCAPA::map::qtunescape(&fullurl($allprobs[$idx],$cdom));
           if (($revreqs{$allprobs[$idx]}) && 
               ($chosenproblems{$revreqs{$allprobs[$idx]}})) {
               my $probnum = '_'.$allprobs[$idx].'_'.$revreqs{$allprobs[$idx]};
-              $url = &LONCAPA::map::qtunescape(&fullurl($probnum));
+              $url = &LONCAPA::map::qtunescape(&fullurl($probnum,$cdom));
           } elsif ($prereqs{$allprobs[$idx]}) {
               next;
           }
@@ -456,7 +470,7 @@ sub chosen_to_map {
     }
     foreach my $devitem (@development) {
         if ($env{'form.pilot'.$devitem}) {
-            my $url = &LONCAPA::map::qtunescape(&fullurl($devitem,'development'));
+            my $url = &LONCAPA::map::qtunescape(&fullurl($devitem,$cdom,'development'));
             $residx ++;
             push(@LONCAPA::map::order,$residx);
             $counter ++;
@@ -491,7 +505,7 @@ sub store {
    if ($env{'form.concepttest'} eq 'defchosen') {
        @chosen = @defchosen;
    }
-   my @errors=&checkvalid();
+   my @errors=&checkvalid($cdom);
    if (@errors > 0) {
        if (($caller eq 'requestcrs') && ($env{'form.concepttest'} eq 'defchosen')) {
            return &mt('Invalid concept test.');
@@ -529,10 +543,11 @@ sub store {
 }
 
 sub load {
+   my ($cdom) = @_;
    &mapread_gci();
    &map_to_chosen();
    if (@chosen > 0) {
-       my @errors=&checkvalid();
+       my @errors=&checkvalid($cdom);
        if ($#errors>1) { @chosen=@defchosen; }
    }
 }
@@ -605,10 +620,11 @@ sub get_submissions_count {
         my $itemserror = '<span class="LC_warning">'.&mt('An error occurred retrieving information about the course.').'<br />'.&mt('It is recommended that you [_1]re-select the course[_2].','<a href="/adm/roles">','</a>').'</span>';
         return $itemserror;
     }
-    my @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/default_1261144274.sequence',sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
-    my (%resourcetracker,$submissioncount);
-    my %resourcetracker =  &Apache::lonnet::dump('nohist_resourcetracker',
-                                                 $cdom,$cnum);
+    my (%resourcetracker,$submissioncount,@allres);
+    my $sequence = &Apache::loncommon::get_citest_map($cdom);
+    @allres=$navmap->retrieveResources('/uploaded/'.$cdom.'/'.$cnum.'/'.$sequence,sub {if ($_[0]->is_problem) { $_[0]->parts();} return 1;});
+    %resourcetracker =  &Apache::lonnet::dump('nohist_resourcetracker',
+                                              $cdom,$cnum);
     foreach my $resource (@allres) {
         my $symb = $resource->symb();
         my @parts = @{$resource->parts()};
@@ -628,6 +644,7 @@ sub get_submissions_count {
 }
 
 sub builder_javascript {
+    my ($cdom) = @_;
     my %lt = &Apache::lonlocal::texthash(
                                           show => 'Show',
                                           hide => 'Hide',
@@ -652,9 +669,9 @@ function checkPrereqs(caller,item,prereq
     foreach my $item (sort(keys(%prereqs))) {
         $hasdep .= "'$item',";
         $prereq .= "'$prereqs{$item}',";
-        my $url = &fullurl($item);
+        my $url = &fullurl($item,$cdom);
         $hasdeptitle .= "'".&Apache::lonnet::metadata($url,'title')."',";
-        my $purl = &fullurl($prereqs{$item});
+        my $purl = &fullurl($prereqs{$item},$cdom);
         $prereqtitle .= "'".&Apache::lonnet::metadata($purl,'title')."',";
     }
     $hasdep =~ s/,$//;