--- rat/client/parameter.html	2001/08/08 13:31:43	1.11
+++ rat/client/parameter.html	2001/08/08 15:40:52	1.12
@@ -5,6 +5,7 @@ Parameter Input Window
 06/16/00,06/17,11/17,11/18,11/23,11/27,11/28,12/15,12/16,
 03/21/01,03/24,06/26 Gerd Kortemeyer
 07/24/01 Scott Harrison
+08/08 Gerd Kortemeyer
 -->
 <head>
 <title>LON-CAPA</title>
@@ -248,10 +249,10 @@ function integereval() {
    if ((pscat=='pos') && (svalue==0)) {
       svalue='';
    }
-   if (pscat.indexOf('range')!=-1) {
+   if (pscat.indexOf('inrange')!=-1) {
       var rangeparts=new Array;
       rangeparts=split('_',pscat);
-      rangeparts=split('...',rangeparts[1]);
+      rangeparts=split(',',rangeparts[1]);
       if (svalue<rangeparts[0]) { svalue=rangeparts[0]; }
       if (svalue>rangeparts[1]) { svalue=rangeparts[1]; }
    }
@@ -285,13 +286,6 @@ function intervaldis() {
                +cmins+' mins '+csecs+' secs');
 }
     
-    
-    
-function afterproc() {
-  choicewrite('<tr bgcolor="#AAFFAA"><td colspan=3>Error after rounding: '
-             +'<input type=checkbox name=val1></td></tr>');
-}
-
 function draw() {
    choicestart();
    choicewrite('<form name=sch');
@@ -313,14 +307,12 @@ function draw() {
       }
       if (pscat=='exact') {
          tablestart('Accept only exact value, zero tolerance');
-         afterproc();
       }
       if (pscat=='relative_sym') {
 // 2: percentage
 // 3: open
          tablestart('Percentage error, symmetric around value');
          valline('Percentage',2,3);
-         afterproc();
       }
       if (pscat=='relative') {
 // 2: left
@@ -330,18 +322,15 @@ function draw() {
          tablestart('Percentage error, asymmetric around value');
          valline('Upper percentage',2,3);
          valline('Lower percentage',4,5);
-         afterproc();
       }
       if (pscat=='absolute_sym') {
          tablestart('Absolute error, symmetric around value');
          valline('Value',2,3);
-         afterproc();
       }
       if (pscat=='absolute') {
          tablestart('Absolute error, asymmetric around value');
          valline('Upper value',2,3);
          valline('Lower value',4,5);
-         afterproc();
       }
       if (pscat=='sigdigits') {
          tablestart('Agreement on significant digits');
@@ -399,11 +388,14 @@ choicewrite('<tr bgcolor="#AAFFAA"><td c
         if (pscat=='zeropos') {
            tablestart('Positive integer or zero');
         }
-        if (pscat.indexOf('range')!=-1) {
+        if (pscat.indexOf('inrange')!=-1) {
            var rangeparts=new Array;
-           rangeparts=split('_',pscat);
+           rangeparts=split(',',pscat);
            tablestart('Integer in the range ['+rangeparts[1]+']');
         }
+        if (pscat=='range') {
+           tablestart('Integer range');      
+        }
         if (pscat=='any') {
            tablestart('Integer');
         }
@@ -472,8 +464,43 @@ function assemble() {
     if ((ptype=='date') && (pscat!='interval')) {
         svalue=Math.round(cdate.getTime()/1000);
     }
+    if (ptype=='tolerance') {
+       if (pscat=='relative_sym') {
+          svalue=choices.document.forms.sch.val2.value+'%';
+          if (choices.document.forms.sch.val3.checked) {
+             svalue+='+';
+          }
+       }
+       if (pscat=='absolute_sym') {
+          svalue=choices.document.forms.sch.val2.value;
+          if (choices.document.forms.sch.val3.checked) {
+             svalue+='+';
+          }
+       }
+       if (pscat=='absolute') {
+          svalue=choices.document.forms.sch.val2.value;
+          if (choices.document.forms.sch.val3.checked) {
+             svalue+='+';
+          }
+          svalue+=','+choices.document.forms.sch.val4.value;
+          if (choices.document.forms.sch.val5.checked) {
+             svalue+='+';
+          }
+       }
+       if (pscat=='relative') {
+          svalue=choices.document.forms.sch.val2.value+'%';
+          if (choices.document.forms.sch.val3.checked) {
+             svalue+='+';
+          }
+          svalue+=','+choices.document.forms.sch.val4.value+'%';
+          if (choices.document.forms.sch.val5.checked) {
+             svalue+='+';
+          }
+       }
+    }
     if (pscat=='default') { svalue=''; }
     stype=ptype+'_'+pscat;
+//    prompt(stype+' - '+svalue);
 }
 
 
@@ -514,6 +541,7 @@ function init() {
 
   selwrite('<form name="fsel"><b>'+pname+'</b><br>');
   selwrite('<select name="fcat" onChange="parent.catchange();">');
+
   if (ptype=='tolerance') {
      sopt('default','Default');
      sopt('exact','Exact Value (no tolerance)');
