--- loncom/interface/Attic/londropadd.pm	2000/12/27 17:58:45	1.3
+++ loncom/interface/Attic/londropadd.pm	2000/12/27 21:57:10	1.4
@@ -79,9 +79,13 @@ ENDUPFORM
 # ------------------------------------------------------------------- Phase two
       if ($ENV{'form.phase'} eq 'two') {
 	  if ($ENV{'form.fileupload'}) {
-             my $datatoken=Apache::lonnet::reply(
-                'tmpput:'.Apache::lonnet::escape($ENV{'form.upfile'}),
-                $r->dir_config('lonHostID'));
+	      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'};
+	    }
              my $separator='';
              my $remove='';
              if ($ENV{'form.upfiletype'} eq 'csv') {
@@ -94,17 +98,20 @@ ENDUPFORM
              } elsif ($ENV{'form.upfiletype'} eq 'xml') {
              }
              my @lines=split(/\n/,$ENV{'form.upfile'});
-             my $total=$#lines+1;
+             my $total=$#lines;
              $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
 	     my $krbdefdom=$1;
              $krbdefdom=~tr/a-z/A-Z/;
+             my $today=time;
+             my $halfyear=$today+15552000;
+             my $defdom=$r->dir_config('lonDefDomain');
 	     $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 students: $total
+Total number of records found in file: $total
 <script>
 function verify(vf) {
     var founduname=0;
@@ -148,10 +155,28 @@ function verify(vf) {
     if (foundname==0) { message='No name fields specified. '; }
     if (foundid==0) { message+='No ID or student number field specified. '; }
     if (foundsec==0) { message+='No section or group field specified. '; }
-    message+='Complete enrollment?';
-    if (confirm(message)) {
-	vf.submit();
+    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 (vf.enddate.value<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();
+    }   
 }
 
 function flip(vf,tf) {
@@ -221,8 +246,33 @@ function clickint(vf) {
     vf.krbdom.value='';
 }
 
+    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>
 <table border=2><tr><th>Field</th><th>Samples</th></tr>
 ENDPICK
@@ -281,6 +331,21 @@ Kerberos authenticated with domain
 <input type=radio name=login value=int onClick="clickint(this.form);"> 
 Internally authenticated (with initial password 
 <input type=text size=10 name=intpwd onChange="setint(this.form);">)<p>
+LON-CAPA domain: <input type=text size=10 value=$defdom name=lcdomain><p>
+
+<input type="hidden" value='' name="pres_value">
+<input type="hidden" value='' name="pres_type">
+<input type="hidden" value='' name="pres_marker">
+<input type="hidden" value='$today' name=startdate>
+<input type="hidden" value='$halfyear' name=enddate>
+<a 
+ href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
+>Set Starting Date</a><p>
+
+<a 
+ href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
+>Set Ending Date</a><p>
+
 <input type=button onClick="verify(this.form)" value="Submit Selection">
 ENDPICK
          } elsif ($ENV{'form.enroll'}) {
@@ -301,17 +366,58 @@ ENDPICK
                  $separator='\t+';
              } elsif ($ENV{'form.upfiletype'} eq 'xml') {
              }
+             my %fields=();
+             for (my $i=0;$i<=$ENV{'form.nfields'};$i++) {
+                 $fields{$ENV{'form.f'.$i}}=$i;
+             }
+             my $startdate=$ENV{'form.startdate'};
+             my $enddate=$ENV{'form.enddate'};
+             if ($startdate=~/\D/) { $startdate=''; }
+             if ($enddate=~/\D/) { $enddate=''; }
+             my $count=1;
+             my @studentdata=();
+             {
+                my $fh;
+                if ($fh=Apache::File->new($r->dir_config('lonDaemons').
+		              '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) {
+		    @studentdata=<$fh>;
+                }
+	     }
 	      map {
-                  my $line=$_;
-                  $line=~s/^$remove//;
-                  $line=~s/$remove$//;
-		  my @entries=split(/$separator/,$line);
-                  $r->print($entries[8].'<br>');
-              } split(/\n/,
-                 &Apache::lonnet::unescape(Apache::lonnet::reply(
-                 'tmpget:'.$ENV{'form.datatoken'},$r->dir_config('lonHostID')))
-                 );
-             
+                my $line=$_;
+                chomp($line);
+                $line=~s/^$remove//;
+                $line=~s/$remove$//;
+	        my @entries=split(/$separator/,$line);
+                unless (($entries[$fields{'username'}] eq '') ||
+                        (!defined($entries[$fields{'username'}]))) {
+                  my $fname=''; my $mname=''; my $lname=''; my $gen='';
+                  if (defined($fields{'names'})) {
+		      ($lname,$fname,$mname)=
+	            ($entries[$fields{'names'}]=~/([^\,]+)\,\s*(\w+)\s*(.*)$/);
+                  } else {
+                      if (defined($fields{'fname'})) {
+		         $fname=$entries[$fields{'fname'}];
+		      }
+                      if (defined($fields{'mname'})) {
+		         $mname=$entries[$fields{'mname'}];
+		      }
+                      if (defined($fields{'lname'})) {
+		         $lname=$entries[$fields{'lname'}];
+		      }
+                      if (defined($fields{'gen'})) {
+		         $gen=$entries[$fields{'gen'}];
+		      }
+                  }
+                  if ($entries[$fields{'username'}]=~/\W/) {
+                     $r->print('<p><b>Unacceptable username: '.
+                              $entries[$fields{'username'}].' for user '.
+                              $fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
+		  } else {   
+$r->print($count.': '.$fname.' - '.$mname.' - '.$lname.' - '.$gen.'<br>'); $count++;
+                  }
+                 }                 
+              } @studentdata;
           }
       }
 # ------------------------------------------------------------------------- End