[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm londropadd.pm

albertel lon-capa-cvs@mail.lon-capa.org
Mon, 15 Apr 2002 23:37:37 -0000


This is a MIME encoded message

--albertel1018913857
Content-Type: text/plain

albertel		Mon Apr 15 19:37:37 2002 EDT

  Modified files:              
    /loncom/interface	londropadd.pm loncommon.pm 
  Log:
  - moved much of the CSV handling code into loncommon in preparation for grades.pm to accept uploads
  - addressed BUG#71 (both original and reverse mode now work)
  - did some cleanup and common code removal
  
  
--albertel1018913857
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20020415193737.txt"

Index: loncom/interface/londropadd.pm
diff -u loncom/interface/londropadd.pm:1.23 loncom/interface/londropadd.pm:1.24
--- loncom/interface/londropadd.pm:1.23	Thu Apr  4 15:41:17 2002
+++ loncom/interface/londropadd.pm	Mon Apr 15 19:37:37 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to drop and add students in courses 
 #
-# $Id: londropadd.pm,v 1.23 2002/04/04 20:41:17 albertel Exp $
+# $Id: londropadd.pm,v 1.24 2002/04/15 23:37:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,7 +52,8 @@
 package Apache::londropadd;
 
 use strict;
-use Apache::lonnet;
+use Apache::lonnet();
+use Apache::loncommon();
 use Apache::Constants qw(:common :http REDIRECT);
 
 # ================================================================ Print header
@@ -73,100 +74,6 @@
 ENDHEAD
 }
 
-# ========================================================= Store uploaded file
-# needs $ENV{'form.upfile'}
-# return $datatoken to be put into hidden field
-
-sub upfile_store {
-    my $r=shift;
-    $ENV{'form.upfile'}=~s/\r/\n/gs;
-    $ENV{'form.upfile'}=~s/\f/\n/gs;
-    $ENV{'form.upfile'}=~s/\n+/\n/gs;
-    $ENV{'form.upfile'}=~s/\n+$//gs;
-	      
-    my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
-		  '_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
-    {
-       my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
-                                   '/tmp/'.$datatoken.'.tmp');
-       print $fh $ENV{'form.upfile'};
-    }
-    return $datatoken;
-}
-
-# ================================================= Load uploaded file from tmp
-# needs $ENV{'form.datatoken'}
-# sets $ENV{'form.upfile'}
-
-sub load_tmp_file {
-    my $r=shift;
-    my @studentdata=();
-    {
-      my $fh;
-      if ($fh=Apache::File->new($r->dir_config('lonDaemons').
-	  '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
-	     @studentdata=<$fh>;
-      }
-    }
-    $ENV{'form.upfile'}=join('',@studentdata);
-}
-
-# ========================================= Separate uploaded file into records
-# returns array of records
-
-sub upfile_record_sep {
-    if ($ENV{'form.upfiletype'} eq 'xml') {
-    } else {
-       return split(/\n/,$ENV{'form.upfile'});
-    }
-}
-
-# =============================================== Separate a record into fields
-
-sub record_sep {
-    my $record=shift;
-    my %components=();
-    if ($ENV{'form.upfiletype'} eq 'xml') {
-    } elsif ($ENV{'form.upfiletype'} eq 'space') {
-        my $i=0;
-        foreach (split(/\s+/,$record)) {
-            my $field=$_;
-            $field=~s/^(\"|\')//;
-            $field=~s/(\"|\')$//;
-            $components{$i}=$field;
-            $i++;
-        }
-    } elsif ($ENV{'form.upfiletype'} eq 'tab') {
-        my $i=0;
-        foreach (split(/\t+/,$record)) {
-            my $field=$_;
-            $field=~s/^(\"|\')//;
-            $field=~s/(\"|\')$//;
-            $components{$i}=$field;
-            $i++;
-        }
-    } else {
-        my @allfields=split(/\,/,$record);
-        my $i=0;
-        my $j;
-        for ($j=0;$j<=$#allfields;$j++) {
-            my $field=$allfields[$j];
-            if ($field=~/^\s*(\"|\')/) {
-		my $delimiter=$1;
-                while (($field!~/$delimiter$/) && ($j<$#allfields)) {
-		    $j++;
-		    $field.=','.$allfields[$j];
-		}
-                $field=~s/^\s*$delimiter//;
-                $field=~s/$delimiter\s*$//;
-            }
-            $components{$i}=$field;
-	    $i++;
-        }
-    }
-    return %components;
-}
-
 # =========== Drop student from all sections of a course, except optional $csec
 
 sub dropstudent {
@@ -206,17 +113,12 @@
 
 sub menu_phase_one {
     my $r=shift;
+    my $upfile_select=&Apache::loncommon::upfile_select_html();
     $r->print(<<ENDUPFORM);
 <input type=hidden name=phase value=two>
 <hr>
 <h3>Upload a courselist</h3>
-<input type=file name=upfile size=50>
-<br>Type: <select name=upfiletype>
-<option value=csv>CSV (comma separated values, spreadsheet)</option>
-<option value=space>Space separated</option>
-<option value=tab>Tabulator separated</option>
-<option value=xml>HTML/XML</option>
-</select>
+$upfile_select
 <p><input type=submit name=fileupload value="Upload Courselist">
 <hr>
 <h3>Enroll a single student</h3>
@@ -230,33 +132,40 @@
 
 sub phase_two_header {
     my ($r,$datatoken,$distotal,$krbdefdom)=@_;
+    my $javascript;
+    if ($ENV{'form.upfile_associate'} eq 'reverse') {
+	$javascript=&phase_two_javascript_reverse_associate();
+    } else {
+	$javascript=&phase_two_javascript_forward_associate();
+    }
+    my $javascript_validations=&javascript_validations($krbdefdom);
     $r->print(<<ENDPICK);
-<input type=hidden name=phase value=three>
-<input type=hidden name=datatoken value="$datatoken">
-<input type=hidden name=upfiletype value=$ENV{'form.upfiletype'}>
 <hr>
 <h3>Identify fields</h3>
 Total number of records found in file: $distotal <hr />
 Enter as many fields as you can. The system will inform you and bring you back
 to this page if the data selected is insufficient to run your class.<hr />
+<input type="submit" name="associate" value="Reverse Association" />
+<input type="hidden" name="phase" value="three" />
+<input type="hidden" name="datatoken" value="$datatoken" />
+<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
+<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+<input type="hidden" name="upfile_associate" value="$ENV{'form.upfile_associate'}" />
+<hr />
 <script>
-function verify(vf) {
-    var founduname=0;
-    var foundpwd=0;
-    var foundname=0;
-    var foundid=0;
-    var foundsec=0;
+$javascript
+
+$javascript_validations
+</script>
+ENDPICK
+}
+
+sub javascript_validations {
+    my ($krbdefdom)=@_;
+    return (<<ENDPICK);
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
     var foundatype=0;
-    var tw;
     var message='';
-    for (i=0;i<=vf.nfields.value;i++) {
-        tw=eval('vf.f'+i+'.selectedIndex');
-        if (tw==1) { founduname=1; }
-        if ((tw>=2) && (tw<=6)) { foundname=1; }
-        if (tw==7) { foundid=1; }
-        if (tw==8) { foundsec=1; } 
-        if (tw==9) { foundpwd=1; }
-    }
     if (founduname==0) {
 	alert('You need to specify at least the username field');
         return;
@@ -307,48 +216,7 @@
     } else {
       pclose();
       vf.submit();
-    }   
-}
-
-function flip(vf,tf) {
-   var nw=eval('vf.f'+tf+'.selectedIndex');
-   var i;
-   for (i=0;i<=vf.nfields.value;i++) {
-      if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
-          eval('vf.f'+i+'.selectedIndex=0;')      
-      } 
-   }
-   if (nw==2) {
-      for (i=0;i<=vf.nfields.value;i++) {
-         if ((eval('vf.f'+i+'.selectedIndex')>=3) &&
-             (eval('vf.f'+i+'.selectedIndex')<=6)) {
-             eval('vf.f'+i+'.selectedIndex=0;')
-         }
-      }      
-   }
-   if ((nw>=3) && (nw<=6)) {
-      for (i=0;i<=vf.nfields.value;i++) {
-         if (eval('vf.f'+i+'.selectedIndex')==2) {
-             eval('vf.f'+i+'.selectedIndex=0;')
-         }
-      }      
-   }
-   if (nw==9) {
-       vf.login[1].checked=true;
-       vf.intpwd.value='';
-       vf.krbdom.value='';
-       vf.locarg.value='';
-   }
-
-}
-
-function clearpwd(vf) {
-    var i;
-    for (i=0;i<=vf.nfields.value;i++) {
-        if (eval('vf.f'+i+'.selectedIndex')==9) {
-            eval('vf.f'+i+'.selectedIndex=0;')
-        }
-    }      
+    }
 }
 
 function setkrb(vf) {
@@ -357,6 +225,7 @@
        vf.login[0].checked=true;
        vf.krbdom.value=vf.krbdom.value.toUpperCase();
        vf.intpwd.value='';
+       vf.locarg.value='';
    }
 }
 
@@ -365,6 +234,15 @@
        clearpwd(vf);
        vf.login[1].checked=true;
        vf.krbdom.value='';
+       vf.locarg.value='';
+   }
+}
+
+function setloc(vf) {
+    if (vf.locarg.value!='') {
+       vf.login[2].checked=true;
+       vf.krbdom.value='';
+       vf.intpwd.value='';
    }
 }
 
@@ -372,10 +250,17 @@
     vf.krbdom.value='$krbdefdom';
     clearpwd(vf);
     vf.intpwd.value='';
+    vf.locarg.value='';
 }
 
 function clickint(vf) {
     vf.krbdom.value='';
+    vf.locarg.value='';
+}
+
+function clickloc(vf) {
+    vf.krbdom.value='';
+    vf.intpwd.value='';
 }
 
     function pclose() {
@@ -405,8 +290,127 @@
         pclose();
     }
 
-</script>
-<table border=2><tr><th>Field</th><th>Samples</th></tr>
+ENDPICK
+}
+
+sub phase_two_javascript_forward_associate {
+    return(<<ENDPICK);
+function verify(vf) {
+    var founduname=0;
+    var foundpwd=0;
+    var foundname=0;
+    var foundid=0;
+    var foundsec=0;
+    var tw;
+    for (i=0;i<=vf.nfields.value;i++) {
+        tw=eval('vf.f'+i+'.selectedIndex');
+        if (tw==1) { founduname=1; }
+        if ((tw>=2) && (tw<=6)) { foundname=1; }
+        if (tw==7) { foundid=1; }
+        if (tw==8) { foundsec=1; }
+        if (tw==9) { foundpwd=1; }
+    }
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
+}
+
+
+function flip(vf,tf) {
+   var nw=eval('vf.f'+tf+'.selectedIndex');
+   var i;
+   for (i=0;i<=vf.nfields.value;i++) {
+      if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) {
+          eval('vf.f'+i+'.selectedIndex=0;')
+      }
+   }
+   if (tf==1 && nw!=0) {
+      for (i=2;i<=5;i++) {
+         eval('vf.f'+i+'.selectedIndex=0;')
+      }
+   }
+   if (nw==2) {
+      for (i=0;i<=vf.nfields.value;i++) {
+         if ((eval('vf.f'+i+'.selectedIndex')>=3) &&
+             (eval('vf.f'+i+'.selectedIndex')<=6)) {
+             eval('vf.f'+i+'.selectedIndex=0;')
+         }
+      }
+   }
+   if ((nw>=3) && (nw<=6)) {
+      for (i=0;i<=vf.nfields.value;i++) {
+         if (eval('vf.f'+i+'.selectedIndex')==2) {
+             eval('vf.f'+i+'.selectedIndex=0;')
+         }
+      }
+   }
+   if (nw==9) {
+       vf.login[1].checked=true;
+       vf.intpwd.value='';
+       vf.krbdom.value='';
+       vf.locarg.value='';
+   }
+}
+
+function clearpwd(vf) {
+    var i;
+    for (i=0;i<=vf.nfields.value;i++) {
+        if (eval('vf.f'+i+'.selectedIndex')==9) {
+            eval('vf.f'+i+'.selectedIndex=0;')
+        }
+    }
+}
+
+ENDPICK
+}
+
+sub phase_two_javascript_reverse_associate {
+    return(<<ENDPICK);
+function verify(vf) {
+    var founduname=0;
+    var foundpwd=0;
+    var foundname=0;
+    var foundid=0;
+    var foundsec=0;
+    var tw;
+    for (i=0;i<=vf.nfields.value;i++) {
+        tw=eval('vf.f'+i+'.selectedIndex');
+        if (i==0 && tw!=0) { founduname=1; }
+        if (((i>=1) && (i<=5)) && tw!=0 ) { foundname=1; }
+        if (i==6 && tw!=0) { foundid=1; }
+        if (i==7 && tw!=0) { foundsec=1; }
+        if (i==8 && tw!=0) { foundpwd=1; }
+    }
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
+}
+
+function flip(vf,tf) {
+   var nw=eval('vf.f'+tf+'.selectedIndex');
+   var i;
+   // picked the all one one name field, reset the other name ones to blank
+   if (tf==1 && nw!=0) {
+      for (i=2;i<=5;i++) {
+         eval('vf.f'+i+'.selectedIndex=0;')
+      }
+   }
+   //picked one of the piecewise name fields, reset the all in
+   //one field to blank
+   if ((tf>=2) && (tf<=5) && (nw!=0)) {
+      eval('vf.f1.selectedIndex=0;')
+   }
+   // intial password specified, pick internal authentication
+   if (tf==8 && nw!=0) {
+       vf.login[1].checked=true;
+       vf.intpwd.value='';
+       vf.krbdom.value='';
+       vf.locarg.value='';
+   }
+}
+
+function clearpwd(vf) {
+    var i;
+    if (eval('vf.f8.selectedIndex')!=0) {
+        eval('vf.f8.selectedIndex=0;')
+    }
+}
 ENDPICK
 }
 
@@ -459,14 +463,20 @@
 Note: for large courses, this operation might be time consuming.
 ENDPICK
 }
+
 # ======================================================= Menu Phase Two Upload
 
 sub menu_phase_two_upload {
     my $r=shift;
 
-    my $datatoken=&upfile_store($r);
-
-    my @records=&upfile_record_sep();
+    my $datatoken;
+    if (!$ENV{'form.datatoken'}) {
+      $datatoken=&Apache::loncommon::upfile_store($r);
+    } else {
+      $datatoken=$ENV{'form.datatoken'};
+      &Apache::loncommon::load_tmp_file($r);
+    }
+    my @records=&Apache::loncommon::upfile_record_sep();
     my $total=$#records;
     my $distotal=$total+1;
 
@@ -481,46 +491,27 @@
 
     &phase_two_header($r,$datatoken,$distotal,$krbdefdom);
 
-    my %sone; my %stwo; my %sthree;
-    my $i=0;
-
+    my $i;
+    my $keyfields;
     if ($total>=0) {
-	%sone=&record_sep($records[0]);
-	if ($total>=1) {
-	    %stwo=&record_sep($records[1]);
-	}
-	if ($total>=2) {
-	    %sthree=&record_sep($records[2]);
-	}
-	foreach (sort keys %sone) {
-	    $r->print('<tr><td><select name=f'.$i.
-		      ' onChange="flip(this.form,'.$i.');">');
-	    foreach ('none: ','username:Username',
-		     'names:Last Name, First Names',
-		     'fname:First Name','mname:Middle Names/Initials',
-		     'lname:Last Name','gen:Generation',
-		     'id:ID/Student Number','sec:Group/Section',
-		     'ipwd:Initial Password') {
-		my ($value,$display)=split(/\:/,$_);
-		$r->print('<option value='.$value.'>'.$display.
-			  '</option>');
-	    }
-	    $r->print('</select></td><td>');
-	    if (defined($sone{$_})) { 
-		$r->print($sone{$_}."</br>\n"); 
-	    }
-	    if (defined($stwo{$_})) { 
-		$r->print($stwo{$_}."</br>\n"); 
-	    }
-	    if (defined($sthree{$_})) { 
-		$r->print($sthree{$_}."</br>\n"); 
-	    }
-	    $r->print('</td></tr>');
-	    $i++;
+	my @d=(['username','Username'],['names','Last Name, First Names'],
+	       ['fname','First Name'],['mname','Middle Names/Initials'],
+	       ['lname','Last Name'],['gen','Generation'],
+	       ['id','ID/Student Number'],['sec','Group/Section'],
+	       ['ipwd','Initial Password']);
+	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
+	    &Apache::loncommon::csv_print_samples($r,\@records);
+	    $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d);
+	    foreach (@d) { $keyfields.=$_->[0].','; }
+	    chop($keyfields);
+	} else {
+	    unshift(@d,['none','']);
+	    $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d);
+	    my %sone=&Apache::loncommon::record_sep($records[0]);
+	    $keyfields=join(',',sort(keys(%sone)));
 	}
-	$i--;
     }
-    my $keyfields=join(',',sort keys %sone);
+
 
     &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear);
 }
@@ -576,7 +567,7 @@
     my $halfyear=$today+15552000;
 
     my $defdom=$r->dir_config('lonDefDomain');
-
+    my $javascript_validations=&javascript_validations($krbdefdom);
     $r->print(<<ENDSENROLL);
 <script>
 function verify(vf) {
@@ -585,9 +576,7 @@
     var foundname=0;
     var foundid=0;
     var foundsec=0;
-    var foundatype=0;
     var tw;
-    var message='';
     if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') && 
 	(typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) {
         founduname=1;
@@ -606,123 +595,15 @@
 	alert('You need to specify at least the username and domain fields');
         return;
     }
-    if (vf.login[0].checked) {
-	foundatype=1;
-        if (vf.krbdom.value=='') {
-	    alert('You need to specify the Kerberos domain');
-            return;
-        }
-    }
-    if (vf.login[1].checked) {
-	foundatype=1;
-        if ((vf.intpwd.value=='') && (foundpwd==0)) {
-	    alert('You need to specify the initial password');
-            return;
-        }
-    }
-    if (vf.login[2].checked) {
-	foundatype=1;
-	//An argument is not required
-    }
-    if (foundatype==0) {
-	alert('You need to set the login type');
-        return;
-    }
-    if (foundname==0) { message='No first and last name specified. '; }
-    if (foundid==0) { message+='No ID or student number field specified. '; }
-    if (foundsec==0) { message+='No section or group field specified. '; }
-    if (vf.startdate.value=='') {
-	message+='No starting date set. ';
-    }
-    if (vf.enddate.value=='') {
-        message+='No ending date set. ';
-    }
-    if ((vf.enddate.value!='') && (vf.startdate.value!='')) {
-       if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) {
-          alert('Ending date is before starting date');
-          return;
-       }
-    }
-    if (message!='') {
-       message+='Continue enrollment?';
-       if (confirm(message)) {
-	  pclose();
-	  vf.submit();
-       }
-    } else {
-      pclose();
-      vf.submit();
-    }   
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
 }
 
-function setkrb(vf) {
-    if (vf.krbdom.value!='') {
-       vf.login[0].checked=true;
-       vf.krbdom.value=vf.krbdom.value.toUpperCase();
-       vf.intpwd.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setint(vf) {
-    if (vf.intpwd.value!='') {
-       vf.login[1].checked=true;
-       vf.krbdom.value='';
-       vf.locarg.value='';
-   }
-}
+$javascript_validations
 
-function setloc(vf) {
-    if (vf.locarg.value!='') {
-       vf.login[2].checked=true;
-       vf.krbdom.value='';
-       vf.intpwd.value='';
-   }
-}
-
-function clickkrb(vf) {
-    vf.krbdom.value='$krbdefdom';
-    vf.intpwd.value='';
-    vf.locarg.value='';
-}
-
-function clickint(vf) {
-    vf.krbdom.value='';
-    vf.locarg.value='';
-}
-
-function clickloc(vf) {
-    vf.krbdom.value='';
-    vf.intpwd.value='';
+function clearpwd(vf) {
+    //nothing else needs clearing
 }
 
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
-    function pjump(type,dis,value,marker,ret,call) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
-                 +"&value="+escape(value)+"&marker="+escape(marker)
-                 +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-
-    }
-
-    function dateset() {
-        if (document.studentform.pres_marker.value=='end') {
-           document.studentform.enddate.value=
-	       document.studentform.pres_value.value;
-        }
-        if (document.studentform.pres_marker.value=='start') {
-           document.studentform.startdate.value=
-	       document.studentform.pres_value.value;
-        }
-        pclose();
-    }
-
 </script>
 <h3>Personal Data</h3>
 First Name: <input type=text name=cfirst size=15><br>
@@ -839,15 +720,20 @@
 sub upfile_drop_add {
     my $r=shift;
 
-    &load_tmp_file($r);
-    my @studentdata=&upfile_record_sep();
+    &Apache::loncommon::load_tmp_file($r);
+    my @studentdata=&Apache::loncommon::upfile_record_sep();
 
     my @keyfields=split(/\,/,$ENV{'form.keyfields'});
     my $cid=$ENV{'request.course.id'};
-
              my %fields=();
              for (my $i=0;$i<=$ENV{'form.nfields'};$i++) {
-                 $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+		 if ($ENV{'form.upfile_associate'} eq 'reverse') {
+		     if ($ENV{'form.f'.$i} ne 'none') {
+			 $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+		     }
+		 } else {
+		     $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+		 }
              }
              my $startdate=$ENV{'form.startdate'};
              my $enddate=$ENV{'form.enddate'};
@@ -878,7 +764,7 @@
 # ----------------------------------------------------------- Get new classlist
 # --------------------------------------------------------- Enroll new students
 	      foreach (@studentdata) {
-		  my %entries=&record_sep($_);
+		  my %entries=&Apache::loncommon::record_sep($_);
 
                 unless (($entries{$fields{'username'}} eq '') ||
                         (!defined($entries{$fields{'username'}}))) {
@@ -978,7 +864,7 @@
                      }
 # ------------------------------------------------ Now got up-to-date classlist
                      foreach (@studentdata) {
- 	                my %entries=&record_sep($_);
+ 	                my %entries=&Apache::loncommon::record_sep($_);
                         unless (($entries{$fields{'username'}} eq '') ||
                           (!defined($entries{$fields{'username'}}))) {
 			   delete($currentlist{
@@ -1020,7 +906,7 @@
 
 sub handler {
    my $r=shift;
-
+   $Apache::lonxml::debug=1;
    if ($r->header_only) {
       $r->content_type('text/html');
       $r->send_http_header;
@@ -1042,6 +928,15 @@
 	  &menu_phase_one($r);
       }
 # ------------------------------------------------------------------- Phase two
+
+      if ($ENV{'form.associate'} eq 'Reverse Association') {
+	$ENV{'form.phase'} = 'two';
+	if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
+	  $ENV{'form.upfile_associate'} = 'reverse';
+	} else {
+	  $ENV{'form.upfile_associate'} = 'forward';
+	}
+      }
       if ($ENV{'form.phase'} eq 'two') {
 	 if ($ENV{'form.fileupload'}) {
 	     &menu_phase_two_upload($r);
@@ -1065,7 +960,7 @@
       if ($ENV{'form.phase'} eq 'four') {
 	  &drop_student_list($r);
       }
-# ------------------------------------------------------------------ Phase four
+# ------------------------------------------------------------------ Phase five
       if ($ENV{'form.phase'} eq 'five') {
 	  &enroll_single_student($r);
       }
@@ -1082,7 +977,4 @@
 
 1;
 __END__
-
-
-
 
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.30 loncom/interface/loncommon.pm:1.31
--- loncom/interface/loncommon.pm:1.30	Thu Mar 28 17:15:56 2002
+++ loncom/interface/loncommon.pm	Mon Apr 15 19:37:37 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.30 2002/03/28 22:15:56 albertel Exp $
+# $Id: loncommon.pm,v 1.31 2002/04/15 23:37:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -273,7 +273,14 @@
       }
       $prevattempts='<table border=2></tr><th>History</th>';
       foreach (sort(keys %lasthash)) {
-        $prevattempts.='<th>'.$_.'</th>';
+	my ($ign,@parts) = split(/\./,$_);
+	if (@parts) {
+	  my $data=$parts[-1];
+	  pop(@parts);
+	  $prevattempts.='<th>Part '.join('.',@parts).'<br />'.$data.'</th>';
+	} else {
+	  $prevattempts.='<th>'.$ign.'</th>';
+	}
       }
       for ($version=1;$version<=$returnhash{'version'};$version++) {
         $prevattempts.='</tr><tr><th>Attempt '.$version.'</th>';
@@ -405,6 +412,203 @@
   } else {
     $ENV{$name}=$value;
   }
+}
+
+#---CSV Upload/Handling functions
+
+# ========================================================= Store uploaded file
+# needs $ENV{'form.upfile'}
+# return $datatoken to be put into hidden field
+
+sub upfile_store {
+    my $r=shift;
+    $ENV{'form.upfile'}=~s/\r/\n/gs;
+    $ENV{'form.upfile'}=~s/\f/\n/gs;
+    $ENV{'form.upfile'}=~s/\n+/\n/gs;
+    $ENV{'form.upfile'}=~s/\n+$//gs;
+
+    my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+	'_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$;
+    {
+	my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
+				 '/tmp/'.$datatoken.'.tmp');
+	print $fh $ENV{'form.upfile'};
+    }
+    return $datatoken;
+}
+
+# ================================================= Load uploaded file from tmp
+# needs $ENV{'form.datatoken'}
+# sets $ENV{'form.upfile'} to the contents of the file
+
+sub load_tmp_file {
+    my $r=shift;
+    my @studentdata=();
+    {
+	my $fh;
+	if ($fh=Apache::File->new($r->dir_config('lonDaemons').
+				  '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
+	    @studentdata=<$fh>;
+	}
+    }
+    $ENV{'form.upfile'}=join('',@studentdata);
+}
+
+# ========================================= Separate uploaded file into records
+# returns array of records
+# needs $ENV{'form.upfile'}
+# needs $ENV{'form.upfiletype'}
+
+sub upfile_record_sep {
+    if ($ENV{'form.upfiletype'} eq 'xml') {
+    } else {
+	return split(/\n/,$ENV{'form.upfile'});
+    }
+}
+
+# =============================================== Separate a record into fields
+# needs $ENV{'form.upfiletype'}
+# takes $record as arg
+sub record_sep {
+    my $record=shift;
+    my %components=();
+    if ($ENV{'form.upfiletype'} eq 'xml') {
+    } elsif ($ENV{'form.upfiletype'} eq 'space') {
+        my $i=0;
+        foreach (split(/\s+/,$record)) {
+            my $field=$_;
+            $field=~s/^(\"|\')//;
+            $field=~s/(\"|\')$//;
+            $components{$i}=$field;
+            $i++;
+        }
+    } elsif ($ENV{'form.upfiletype'} eq 'tab') {
+        my $i=0;
+        foreach (split(/\t+/,$record)) {
+            my $field=$_;
+            $field=~s/^(\"|\')//;
+            $field=~s/(\"|\')$//;
+            $components{$i}=$field;
+            $i++;
+        }
+    } else {
+        my @allfields=split(/\,/,$record);
+        my $i=0;
+        my $j;
+        for ($j=0;$j<=$#allfields;$j++) {
+            my $field=$allfields[$j];
+            if ($field=~/^\s*(\"|\')/) {
+		my $delimiter=$1;
+                while (($field!~/$delimiter$/) && ($j<$#allfields)) {
+		    $j++;
+		    $field.=','.$allfields[$j];
+		}
+                $field=~s/^\s*$delimiter//;
+                $field=~s/$delimiter\s*$//;
+            }
+            $components{$i}=$field;
+	    $i++;
+        }
+    }
+    return %components;
+}
+
+# =============================== HTML code to select file and specify its type
+sub upfile_select_html {
+    return (<<'ENDUPFORM');
+<input type="file" name="upfile" size="50">
+<br />Type: <select name="upfiletype">
+<option value="csv">CSV (comma separated values, spreadsheet)</option>
+<option value="space">Space separated</option>
+<option value="tab">Tabulator separated</option>
+<option value="xml">HTML/XML</option>
+</select>
+ENDUPFORM
+}
+
+# ===================Prints a table of sample values from each column uploaded
+# $r is an Apache Request ref
+# $records is an arrayref from &Apache::loncommon::upfile_record_sep
+sub csv_print_samples {
+    my ($r,$records) = @_;
+    my (%sone,%stwo,%sthree);
+    %sone=&record_sep($$records[0]);
+    if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
+    if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
+
+    $r->print('Samples<br /><table border="2"><tr>');
+    foreach (sort({$a <=> $b} keys(%sone))) { $r->print('<th>Column&nbsp;'.($_+1).'</th>'); }
+    $r->print('</tr>');
+    foreach my $hash (\%sone,\%stwo,\%sthree) {
+	$r->print('<tr>');
+	foreach (sort({$a <=> $b} keys(%sone))) {
+	    $r->print('<td>');
+	    if (defined($$hash{$_})) { $r->print($$hash{$_}); }
+	    $r->print('</td>');
+	}
+	$r->print('</tr>');
+    }
+    $r->print('</tr></table><br />'."\n");
+}
+
+# ======Prints a table to create associations between values and table columns
+# $r is an Apache Request ref
+# $records is an arrayref from &Apache::loncommon::upfile_record_sep
+# $d is an array of 2 element arrays (internal name, displayed name)
+sub csv_print_select_table {
+    my ($r,$records,$d) = @_;
+    my $i=0;my %sone;
+    %sone=&record_sep($$records[0]);
+    $r->print('Associate columns with student attributes.'."\n".
+	     '<table border="2"><tr><th>Attribute</th><th>Column</th></tr>'."\n");
+    foreach (@$d) {
+	my ($value,$display)=@{ $_ };
+	$r->print('<tr><td>'.$display.'</td>');
+
+	$r->print('<td><select name=f'.$i.
+		  ' onChange="flip(this.form,'.$i.');">');
+	$r->print('<option value="none"></option>');
+	foreach (sort({$a <=> $b} keys(%sone))) {
+	    $r->print('<option value="'.$_.'">Column '.($_+1).'</option>');
+	}
+	$r->print('</select></td></tr>'."\n");
+	$i++;
+    }
+    $i--;
+    return $i;
+}
+
+# ===================Prints a table of sample values from the upload and
+#                      can make associate samples to internal names
+# $r is an Apache Request ref
+# $records is an arrayref from &Apache::loncommon::upfile_record_sep
+# $d is an array of 2 element arrays (internal name, displayed name)
+sub csv_samples_select_table {
+    my ($r,$records,$d) = @_;
+    my %sone; my %stwo; my %sthree;
+    my $i=0;
+
+    $r->print('<table border=2><tr><th>Field</th><th>Samples</th></tr>');
+    %sone=&record_sep($$records[0]);
+    if (defined($$records[1])) {%stwo=&record_sep($$records[1]);}
+    if (defined($$records[2])) {%sthree=&record_sep($$records[2]);}
+
+    foreach (sort keys %sone) {
+	$r->print('<tr><td><select name=f'.$i.
+		  ' onChange="flip(this.form,'.$i.');">');
+	foreach (@$d) {
+	    my ($value,$display)=@{ $_ };
+	    $r->print('<option value='.$value.'>'.$display.'</option>');
+	}
+	$r->print('</select></td><td>');
+	if (defined($sone{$_})) { $r->print($sone{$_}."</br>\n"); }
+	if (defined($stwo{$_})) { $r->print($stwo{$_}."</br>\n"); }
+	if (defined($sthree{$_})) { $r->print($sthree{$_}."</br>\n"); }
+	$r->print('</td></tr>');
+	$i++;
+    }
+    $i--;
+    return($i);
 }
 1;
 __END__;

--albertel1018913857--