--- loncom/homework/functionplotresponse.pm	2010/11/06 14:37:24	1.23
+++ loncom/homework/functionplotresponse.pm	2010/11/06 16:12:39	1.24
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.23 2010/11/06 14:37:24 www Exp $
+# $Id: functionplotresponse.pm,v 1.24 2010/11/06 16:12:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -344,10 +344,56 @@ sub end_backgroundplot {
 sub start_splinerule {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $result='';
-   my $internalid = $Apache::inputtags::part.'_'.$Apache::inputtags::response[-1];
-   if ($target eq 'edit') {
-        $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
-                &Apache::edit::end_row();
+   my $label=&Apache::lonxml::get_param('index',$parstack,$safeeval);
+   $Apache::functionplotresponse::counter++;
+   if ($label=~/\W/) {
+      &Apache::lonxml::warning(&mt('Spline Rule indices should only contain alphanumeric characters.'));
+   }
+   $label=~s/\W//gs;
+   unless ($label) {
+      $label='R'.$Apache::functionplotresponse::counter;
+   } else {
+      $label='R'.$label;
+   }
+   if ($Apache::functionplotresponse::splineorder{$label}) {
+       &Apache::lonxml::error(&mt('Spline Rule indices must be unique.'));
+   }
+
+
+   if ($target eq 'grade') {
+# Simply remember - in order - for later
+      my $beginninglabel=&Apache::lonxml::get_param('beginninglabel',$parstack,$safeeval);
+      my $endinglabel=&Apache::lonxml::get_param('endinglabel',$parstack,$safeeval);
+      if (($beginninglabel=~/\W/) || ($endinglabel=~/W/)) {
+          &Apache::lonxml::warning(&mt('Spline Rule labels must be alphanumeric.'));
+      }
+      $beginninglabel=~s/\W//gs;
+      $endinglabel=~s/\W//gs;
+      my $relationship=&Apache::lonxml::get_param('relationship',$parstack,$safeeval);
+      $relationship=~s/\W//gs;
+      $relationship=lc($relationship);
+      unless ($relationship=~/^(eq|ge|gt|le|lt|ne)$/) {
+          &Apache::lonxml::warning(&mt('Spline Rule relationship not defined.'));
+          $relationship='eq';
+      }
+      my $derivative=&Apache::lonxml::get_param('derivative',$parstack,$safeeval);
+      unless (($derivative==0) || ($derivative==1) || ($derivative==2)) {
+         &Apache::lonxml::warning(&mt('Spline Rule derivative not defined.'));
+         $derivative=0;
+      }
+      push(@Apache::functionplotresponse::splinerules,join(':',(
+           $label,
+           $derivative,
+           &Apache::lonxml::get_param('beginningvalue',$parstack,$safeeval),
+           $beginninglabel,
+           &Apache::lonxml::get_param('endingvalue',$parstack,$safeeval),
+           $endinglabel,
+           $relationship,
+           &Apache::lonxml::get_param('value',$parstack,$safeeval)
+          )));
+   } elsif ($target eq 'edit') {
+      $result=&Apache::edit::tag_start($target,$token,'Spline Evaluation Rule').
+              &Apache::edit::end_row();
    }
    return $result;
 }
@@ -657,6 +703,8 @@ sub start_functionplotresponse {
   undef %Apache::functionplotresponse::previous;
   $Apache::functionplotresponse::inputfields='';
   $Apache::functionplotresponse::counter=0;
+# Remember rules
+  undef @Apache::functionplotresponse::splinerules;
 # Part and ID
   my $partid=$Apache::inputtags::part;
   my $id=&Apache::response::start_response($parstack,$safeeval);
@@ -729,6 +777,12 @@ sub start_functionplotresponse {
   return $result;
 }
 
+sub splinerulecheck {
+   my ($rule)=@_;
+   return 0;
+}
+
+
 sub end_functionplotresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
@@ -758,11 +812,20 @@ sub end_functionplotresponse {
         $xmin=(defined($xmin)?$xmin:-10);
         my $xmax=&Apache::lonxml::get_param('xmax',$parstack,$safeeval);
         $xmax=(defined($xmax)?$xmax:10);
-        my $ad;
+        my $ad='';
         if (&populate_arrays($internalid,$xmin,$xmax) eq 'no_func') {
            $ad='NOT_FUNCTION';
         } else {
-           $ad='INCORRECT';
+# We have a function that we can actually grade, go through the spline rules.
+           undef  %Apache::functionplotresponse::splinerulelabels;
+           foreach my $rule (@Apache::functionplotresponse::splinerules) {
+              unless (&splinerulecheck($rule)) {
+                 $ad='INCORRECT';
+                 last;
+              }
+           }
+# If it's not wrong, it's correct 
+           unless ($ad) { $ad='EXACT_ANS' };
         }
 
 #