--- loncom/homework/functionplotresponse.pm	2010/11/13 03:22:58	1.37
+++ loncom/homework/functionplotresponse.pm	2010/11/19 15:41:28	1.39
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: functionplotresponse.pm,v 1.37 2010/11/13 03:22:58 www Exp $
+# $Id: functionplotresponse.pm,v 1.39 2010/11/19 15:41:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,9 +74,9 @@ sub geogebra_default_parameters {
         <param name="image" value="/adm/lonIcons/lonanim.gif"  />
         <param name="boxborder" value="false"  />
         <param name="centerimage" value="true"  />
-        <param name="java_arguments" value="-Xmx512m" />
-        <param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_export.jar, geogebra_properties.jar" />
-        <param name="cache_version" value="3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0, 3.2.44.0" />
+        <param name="java_arguments" value="-Xmx512m -Djnlp.packEnabled=true" />
+	<param name="cache_archive" value="geogebra.jar, geogebra_main.jar, geogebra_gui.jar, geogebra_cas.jar, geogebra_algos.jar, geogebra_export.jar, geogebra_javascript.jar, jlatexmath.jar, jlm_greek.jar, jlm_cyrillic.jar, geogebra_properties.jar" />
+	<param name="cache_version" value="3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0, 3.9.115.0" />
         <param name="framePossible" value="false" />
 
         <param name="showResetIcon" value="false" />
@@ -417,7 +417,7 @@ sub start_functionplotrule {
                                      $token,'8').
              &Apache::edit::text_arg('Optional maximum length for range:','maximumlength',
                                      $token,'8').'<br />'.
-             &Apache::edit::select_arg(&mt('Relationship:'),'relationship',
+             &Apache::edit::select_or_text_arg(&mt('Relationship:'),'relationship',
                                   [['eq','equal'],
                                    ['ne','not equal'],
                                    ['ge','greater than or equal'],
@@ -595,7 +595,11 @@ sub d2dt2_cubic_hermite {
 #
 sub array_index {
    my ($xmin,$xmax,$x)=@_;
-   return int(($x-$xmin)/($xmax-$xmin)*400.+0.5);
+   if ($x ne '') {
+      return int(($x-$xmin)/($xmax-$xmin)*400.+0.5);
+   } else {
+      return undef;
+   }
 }
 
 #
@@ -886,7 +890,7 @@ sub functionplotrulecheck {
 # Basic sanity checks
    if ($li<0) { $li=0; }
    if ($lh>400) { $lh=400; }
-   if ($li>$lh) {
+   if (($li>$lh) || (!defined($lh))) {
        $lh=$li;
    }