--- rat/client/parameter.html	2022/07/08 16:38:03	1.64.2.5.2.3
+++ rat/client/parameter.html	2020/12/23 21:20:36	1.85
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.64.2.5.2.3 2022/07/08 16:38:03 raeburn Exp $
+// $Id: parameter.html,v 1.85 2020/12/23 21:20:36 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -45,9 +45,14 @@ var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
+var psmap='';
 var pmarker='';
 var pmodal='';
 var pname='';
+var precursive='';
+var pnonreccol='';
+var pmarkerst='';
+var pparm='';
 var pextra='';
 
 var defhour=0;
@@ -189,7 +194,7 @@ function second() {
         choicewrite('>'+i+'</option>');
     }
     choicewrite('</select>');
-} 
+}
 
 
 function date() {
@@ -240,8 +245,8 @@ function month() {
     }
     choicewrite('</select>');
 }
-    
-    
+
+
 function intminute() {
    var thisminutes=cmins;
     var i;
@@ -288,7 +293,7 @@ function intsecond() {
     }
     result += '</select>';
     return result;
-}
+} 
 
 
 function intday() {
@@ -324,7 +329,7 @@ function intcalc() {
                         newpmodval = sform.donebutton[i].value;
                         newpextravaltwo = sform.donebutton_text.value;
                     } else {
-                        if (sform.donebutton[i].value == '_done_proctor') {
+                        if (sform.donebutton[i].value == '_done_proctor') { 
                             newpmodval = sform.donebutton[i].value;
                             newpextraval = sform.donebutton_proctorkey.value;
                             newpextravaltwo = sform.donebutton_text.value;
@@ -345,7 +350,7 @@ function intcalc() {
                 svalue += donevals[1];
             }
             if (newpextravaltwo) {
-                if (newpextravaltwo != 'Done') {
+                if (newpextravaltwo != 'Done') { 
                     svalue += ':'+newpextravaltwo+':';
                 }
             }
@@ -396,9 +401,9 @@ function validateInterval() {
         for (var i=0; i<sform.donebutton.length; i++) {
             if (sform.donebutton[i].checked) {
                 if (sform.donebutton[i].value == '_done_proctor') {
-                    var keyval = sform.donebutton_proctorkey.value;
-                    if ((keyval == '') || (typeof(keyval) == 'undefined')) {  
-                        alert('Please provide a key for a proctor to enter when a student uses the "Done" button.');
+                    if ((sform.donebutton_proctorkey.value == '') || 
+                        (sform.donebutton_proctorkey.value == null)) {
+                        alert('Please enter a key for a proctor to enter when a student uses the "Done" button.');
                         return;
                     }
                 }
@@ -411,18 +416,15 @@ function validateInterval() {
 
 function validateDeepLink() {
     var sform=choices.document.forms.sch;
-    svalue = sform.deeplinkstate.options[sform.deeplinkstate.selectedIndex].value+',';
-    svalue += sform.deeplinkothers.options[sform.deeplinkothers.selectedIndex].value+',';
-    svalue += sform.deeplinklisted.options[sform.deeplinklisted.selectedIndex].value+',';
+    svalue = sform.deeplinklisted.options[sform.deeplinklisted.selectedIndex].value+',';
     svalue += sform.deeplinkacc.options[sform.deeplinkacc.selectedIndex].value+',';
     var keyRegExp = /^[a-zA-Z\d_.!@#$%^&*()+=-]+$/;
     var numRegExp = /^\d+$/;
-    var exitTextRegExp = /^[^'":;,]+$/;
-    if (sform.deeplinkprotect.length) {
-        for (var i=0; i<sform.deeplinkprotect.length; i++) {
-            if (sform.deeplinkprotect[i].checked) {
-                svalue += sform.deeplinkprotect[i].value;
-                if (sform.deeplinkprotect[i].value == 'key') {
+    if (sform.deeplinktypes.length) {
+        for (var i=0; i<sform.deeplinktypes.length; i++) {
+            if (sform.deeplinktypes[i].checked) {
+                svalue += sform.deeplinktypes[i].value;
+                if (sform.deeplinktypes[i].value == 'key') {
                     var posskey = sform.deeplinkkey.value;
                     posskey = posskey.replace(/^\s+|\s+$/g,'');
                     if (keyRegExp.test(posskey)) {
@@ -430,20 +432,12 @@ function validateDeepLink() {
                     } else {
                         alert('Please enter a value for the key containing one or more of: a-zA-Z0-9_.!@#$%^&*()+=-\n'+
                               'or choose a different supported link type.');
-                        return;
+                        return; 
                     }
-                } else if (sform.deeplinkprotect[i].value == 'ltic') {
-                    var possltic = sform.linkpossltic.options[sform.linkpossltic.selectedIndex].value;
-                    if ((numRegExp.test(possltic)) && (possltic > 0)) {
-                        svalue += ':'+possltic;
-                    } else {
-                        alert('Please select an LTI launcher, or choose a different supported link type.');
-                        return;
-                    }
-                } else if (sform.deeplinkprotect[i].value == 'ltid') {
-                    var possltid = sform.linkpossltid.options[sform.linkpossltid.selectedIndex].value;
-                    if ((numRegExp.test(possltid)) && (possltid > 0)) {
-                        svalue += ':'+possltid;
+                } else if (sform.deeplinktypes[i].value == 'lti') {
+                    var posslti = sform.linkposslti.options[sform.linkposslti.selectedIndex].value;
+                    if ((numRegExp.test(posslti)) && (posslti > 0)) {
+                        svalue += ':'+posslti;
                     } else {
                         alert('Please select an LTI launcher, or choose a different supported link type.');
                         return;
@@ -461,7 +455,7 @@ function validateDeepLink() {
                     svalue += '0';
                 } else if (sform.deeplinkmenus[i].value == 'collnum') {
                     var posscoll = sform.linkpossmenu.options[sform.linkpossmenu.selectedIndex].value;
-                    if ((numRegExp.test(posscoll)) && (posscoll > 0)) {
+                    if ((numRegExp.test(posscoll)) && (posscoll > 0)) { 
                         svalue += posscoll;
                     } else {
                         alert("Please select either a numbered collection or check 'Standard (all menus)'.");
@@ -472,60 +466,32 @@ function validateDeepLink() {
             }
         }
     }
-    svalue += ',';
-    svalue += sform.deeplinktarget.options[sform.deeplinktarget.selectedIndex].value;
-    svalue += ',';
-    if (sform.deeplinkexit.length) {
-        for (var i=0; i<sform.deeplinkexit.length; i++) {
-            if (sform.deeplinkexit[i].checked) {
-                if (sform.deeplinkexit[i].value == 'no') {
-                    svalue += sform.deeplinkexit[i].value;
-                } else {
-                    var exittext = sform.deeplinkexittext.value;
-                    exittext = exittext.replace(/^\s+|\s+$/g,'');
-                    if ((exittext.length) && (exitTextRegExp.test(exittext))) {
-                        svalue += sform.deeplinkexit[i].value;
-                        if (exittext !== 'Exit Tool') {
-                            svalue += ':'+exittext;
-                        }
-                    } else {
-                        alert('Please enter the button text. Disallowed characters are ;,":\'\n'+
-                              'or check "not in use" option for "Exit Tool Link"');
-                        return;
-                    }
-                }
-                break;
-            }
-        }
-    }
     assemble();
 }
 
 function toggleDeepLink(caller) {
     var sform=choices.document.forms.sch;
-    if ((caller == 'protect') && (sform.deeplinkprotect.length)) {
+    if ((caller == 'types') && (sform.deeplinktypes.length)) {
         var frame = window.frames["choices"];
-        for (var i=0; i<sform.deeplinkprotect.length; i++) {
-            if (sform.deeplinkprotect[i].checked) {
-                if (frame.document.getElementById('deeplinkkey')) {
-                    if (sform.deeplinkprotect[i].value == 'key') {
+        for (var i=0; i<sform.deeplinktypes.length; i++) {
+            if (sform.deeplinktypes[i].checked) {
+                if (sform.deeplinktypes[i].value == 'key') {
+                    if (frame.document.getElementById('deeplinkkey')) {
                         frame.document.getElementById('deeplinkkey').type='text';
-                    } else {
-                        frame.document.getElementById('deeplinkkey').type='hidden';
                     }
-                }
-                if (frame.document.getElementById('deeplinklticdiv')) {
-                    if (sform.deeplinkprotect[i].value == 'ltic') {
-                        frame.document.getElementById('deeplinklticdiv').style.display='block';
-                    } else {
-                        frame.document.getElementById('deeplinklticdiv').style.display='none';
+                    if (frame.document.getElementById('deeplinkltidiv')) {
+                        frame.document.getElementById('deeplinkltidiv').style.display='none';
                     }
-                }
-                if (frame.document.getElementById('deeplinkltiddiv')) {
-                    if (sform.deeplinkprotect[i].value == 'ltid') {
-                        frame.document.getElementById('deeplinkltiddiv').style.display='block';
-                    } else {
-                        frame.document.getElementById('deeplinkltiddiv').style.display='none';
+                } else {
+                    if (frame.document.getElementById('deeplinkkey')) {
+                        frame.document.getElementById('deeplinkkey').type='hidden';
+                    }
+                    if (frame.document.getElementById('deeplinkltidiv')) {
+                        if (sform.deeplinktypes[i].value == 'lti') {
+                            frame.document.getElementById('deeplinkltidiv').style.display='block';
+                        } else {
+                            frame.document.getElementById('deeplinkltidiv').style.display='none';
+                        }
                     }
                 }
                 break;
@@ -547,26 +513,6 @@ function toggleDeepLink(caller) {
             }
         }
     }
-    if ((caller == 'exit') && (sform.deeplinkexit.length)) {
-        var frame = window.frames["choices"];
-        for (var i=0; i<sform.deeplinkexit.length; i++) {
-            if (sform.deeplinkexit[i].checked) {
-                if (frame.document.getElementById('deeplinkexitdiv')) {
-                    if (sform.deeplinkexit[i].value == 'no') {
-                        frame.document.getElementById('deeplinkexitdiv').style.display='none';
-                        sform.deeplinkexittext.value = '';
-                    } else {
-                        frame.document.getElementById('deeplinkexitdiv').style.display='inline-block';
-                        if (sform.deeplinkexittext.value == '') {
-                            sform.deeplinkexittext.value = 'Exit Tool';
-                        }
-                        frame.document.getElementById('deeplinkexitdiv').scrollIntoView();
-                    }
-                }
-                break;
-            }
-        }
-    }
 }
 
 function calldeeplink(caller) {
@@ -612,7 +558,7 @@ function ipstringeval() {
     svalue = '';
     for (var i=0; i<acctypes.length; i++) {
         var items = choices.document.getElementsByName('setip'+acctypes[i]);
-        if (items.length > 0) {
+        if (items.length > 0) { 
             for (var j=0; j<items.length; j++) {
                 if (items[j].type == "text") {
                     var possip = items[j].value;
@@ -637,7 +583,7 @@ function addIpRule(iptype) {
     var frame = window.frames["choices"];
     if (frame.document.getElementById('LC_string_ipacc_inner_'+iptype)) {
         var innerDiv = frame.document.getElementById('LC_string_ipacc_inner_'+iptype);
-        var count = innerDiv.childNodes.length
+        var count = innerDiv.childNodes.length 
         var ipDiv = frame.document.createElement('div');
         ipDiv.innerHTML = '<input type="text" size="10" name="setip'+iptype+'" onblur="parent.ipstringeval();" />'+
                           '<a href="#" onclick="parent.removeIpRule(\''+iptype+'\',\''+count+'\')">Remove</a>';
@@ -669,6 +615,45 @@ function callradiostringeval(newval) {
     return 'onclick="parent.radiostringeval(\''+newval+'\')"';
 }
 
+function lenienteval(newval) {
+    if (newval == 'weighted') {
+        if (document.getElementById('lenientweighteddiv')) {
+            document.getElementById('lenientweighteddiv').style.display='block';
+        }
+        var patternRelWeight = /^\-?[\d.]+$/;
+        var sform=choices.document.forms.sch;
+        if ((sform.lenientrelwt.length != 'undefined')  && (sform.lenientrelwt.length) != 'null') {
+            for (var i=0; i<sform.lenientrelwt.length; i++) {
+                var relweight = sform.lenientrelwt[i].value;
+                relweight = relweight.replace(/^\s+|\s+$/g,'');
+                if (!patternRelWeight.test(relweight)) {
+                    if (i<2) {
+                        relweight = '1.0';
+                    } else {
+                        relweight = '0.0';
+                    }
+                }
+                sform.lenientrelwt[i].value = relweight;
+                if (i==0) {
+                    svalue = relweight;
+                } else {
+                    svalue += ','+relweight;
+                }
+            }
+        }
+    } else {
+        if (document.getElementById('lenientweighteddiv')) {
+            document.getElementById('lenientweighteddiv').style.display='none';
+        }
+        svalue=newval;
+    }
+    draw();
+}
+
+function calllenientradioeval(newval) {
+    return 'onclick="parent.lenienteval(\''+newval+'\')"';
+}
+
 function callintervalpmodval() {
     return 'onclick="parent.intcalc();parent.toggleSecret()"';
 }
@@ -697,8 +682,7 @@ function colorfield(ir,ig,ib) {
    if (color==svalue) { selection="<font color='#"+col[10-ir]+col[10-ig]+col[10-ib]+"'>X</font>"; }
    choicewrite('<td bgcolor="'+color+'"><a href="javascript:parent.pickcolor('+"'"+
                color+"'"+')">'+selection+'</a></td>');
-               
-}    
+}
 
 function draw() {
    choicestart();
@@ -801,7 +785,7 @@ function draw() {
          tablestart('Date and time');
       }
       if (pscat=='interval') {
-         var proctorkeytype = 'hidden';
+         var proctorkeytype = 'hidden'; 
          var donebuttontext = 'none';
          if (pmodval == '_done_proctor') {
              proctorkeytype = 'text';
@@ -910,7 +894,7 @@ function draw() {
    if (ptype=='float') {
       if (pscat=='default') {
          tablestart('Default value or none');
-         choicewrite('</table>');         
+         choicewrite('</table>');
       } else {
         if (pscat=='pos') {
            tablestart('Positive floating point number or zero');
@@ -929,7 +913,7 @@ function draw() {
    }
 
    if (ptype=='string') {
-        if ((pscat=='any') || (pscat=='') || (pscat=='default') ||
+        if ((pscat=='any') || (pscat=='') || (pscat=='default') || 
             (typeof(pscat)=='undefined')) {
            tablestart('Text');
            choicewrite('<tr><td>Value:</td><td colspan="2">');
@@ -998,7 +982,7 @@ function draw() {
            choicewrite('<label><input name="stringval" value="exam"'+
                   ' type="radio" '+callradiostringeval('exam'));
            if (svalue=='exam') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> Exam</label><br />');
+           choicewrite(' /> Bubblesheet Exam</label><br />');
 //         choicewrite('<label><input name="stringval" value="assess"'+
 //              ' type="radio" '+callradiostringeval('assess'));
 //         if (svalue=='assess') { choicewrite(' checked="checked"'); }
@@ -1033,20 +1017,50 @@ function draw() {
            choicewrite(' /> Library</label><br />');
         }
         if (pscat=='lenient') {
+           var patternLenientStd = /^(yes|no|default)$/;
+           var patternLenientRel = /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/;
+           var lenientweighted = 'none';
+           var relatives = new Array;
            tablestart('Lenient Grading (Partial Credit)');
            choicewrite('<tr><td>Value:</td><td colspan="2">');
            choicewrite('<label><input name="stringval" value="yes"'+
-                  ' type="radio" '+callradiostringeval('yes'));
+                  ' type="radio" '+calllenientradioeval('yes'));
            if (svalue=='yes') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Yes</label><br />');
            choicewrite('<label><input name="stringval" value="no"'+
-                  ' type="radio" '+callradiostringeval('no'));
+                  ' type="radio" '+calllenientradioeval('no'));
            if (svalue=='no') { choicewrite(' checked="checked"'); }
            choicewrite(' /> No</label><br />');
            choicewrite('<label><input name="stringval" value="default"'+
-               ' type="radio" '+callradiostringeval('default'));
+               ' type="radio" '+calllenientradioeval('default'));
            if (svalue=='default') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Default (only bubblesheet grading is lenient)</label><br />');
+           choicewrite('<label><input name="stringval" value="weighted"'+
+               ' type="radio" '+calllenientradioeval('weighted'));
+           if (!patternLenientStd.test(svalue) && svalue != '') {
+              choicewrite(' checked="checked"');
+              lenientweighted='block';
+              var relatives = svalue.match(patternLenientRel);
+           }
+           choicewrite(' />Yes, weighted (optionresponse in checkbox mode)</label><br /><br />'+
+                       '<div id="lenientweighteddiv" style="display:'+lenientweighted+'">'+
+                       '<table class="LC_parmsel_table"><tr bgcolor="#C5DB99">'+
+                       '<th colspan="2">Foil submission status</th><th>Points</th></tr>');
+           var lenienttypes = ['Correct (checked)','Correct (unchecked)','Incorrect (checked)','Incorrect (unchecked)'];
+           for (var i=0; i<lenienttypes.length; i++) {
+               var j = i+1;
+               if (relatives[j] == '') {
+                   if (i < 2) {
+                       relatives[j] = '1.0';
+                   } else {
+                       relatives[j] = '0.0';
+                   }
+               }
+               choicewrite('<tr><td colspan="2">'+lenienttypes[i]+'</td>'+
+                           '<td><input type="text" name="lenientrelwt" value="'+relatives[j]+'"'+
+                           ' size="3" onblur="parent.lenienteval(\'weighted\')" /></td></tr>');
+           }
+           choicewrite('</table></div>');
         }
         if (pscat=='discussvote') {
            tablestart('Discussion Voting');
@@ -1067,7 +1081,7 @@ function draw() {
         if (pscat=='ip') {
             var currallow = new Array;
             var currdeny = new Array;
-            if ((svalue != '') && (typeof(svalue) != 'undefined')) {
+            if ((svalue != '') && (svalue != null)) {
                 var patternComma = /,/;
                 var patternAllow = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
                 var patternDeny = /^\!([\[\]a-zA-Z\.\d\*\-]+)$/;
@@ -1149,61 +1163,34 @@ function draw() {
                   ' type="radio" '+callradiostringeval('map_map'));
            if (svalue=='map_map') { choicewrite(' checked="checked"'); }
            choicewrite(' /> Yes, and the scope of the slot is the enclosing map/folder. When checking in, all resources in the map/folder are checked in.</label><br />');
-        choicewrite('</td></tr></table>');
-      }
+           choicewrite('</td></tr></table>');
+       }
        if (pscat=='deeplink') {
            var deeplinkvals = new Array();
-           var linkprotectparts = new Array();
-           var ltikeyRegExp = /^(ltic:\d+|ltid:\d+|key:[a-zA-Z\d_.!@#$%^&*()+=-]+)$/;
-           var linkexitparts = new Array();
-           var dlinkexitRegExp = /^(yes|url|no)(|:[^:,;'"]+)$/;
+           var linktypeparts = new Array();
+           var ltikeyRegExp = /^(lti|key):(\w+)$/;
            var dlinkkeysty = 'hidden';
            var dlinkkeyval = '';
-           var dlinklticdivsty = 'none';
-           var dlinkltiddivsty = 'none';
+           var dlinkltidivsty = 'none';
            var dlinkmenusdivsty = 'none';
-           var dlinkexitdivsty = 'none';
-           var dlinkexittextval = '';
-           if ((svalue != '') && (typeof(svalue) != 'undefined')) {    
+           if ((svalue != '') && (svalue != null)) {
                deeplinkvals = svalue.split(',');
-               if (ltikeyRegExp.test(deeplinkvals[4])) {
-                   linkprotectparts = deeplinkvals[4].split(':');
-                   deeplinkvals[4] = linkprotectparts[0];
-                   if (linkprotectparts[0] == 'key') {
+               if (ltikeyRegExp.test(deeplinkvals[2])) {
+                   linktypeparts = deeplinkvals[2].split(':');
+                   deeplinkvals[2] = linktypeparts[0];
+                   if (linktypeparts[0] == 'key') {
                        dlinkkeysty = 'text';
-                       dlinkkeyval = linkprotectparts[1];
-                   } else if (linkprotectparts[0] == 'ltic') {
-                       dlinklticdivsty = 'block';
-                   } else if (linkprotectparts[0] == 'ltid') {
-                       dlinkltiddivsty = 'block';
+                       dlinkkeyval = linktypeparts[1];
+                   } else if (linktypeparts[0] == 'lti') {
+                       dlinkltidivsty = 'block';
                    }
                }
-               if (deeplinkvals[5] >= 1) {
+               if (deeplinkvals[3] >= 1) {
                    dlinkmenusdivsty = 'inline-block';
                }
-               if (dlinkexitRegExp.test(deeplinkvals[7])) {
-                   linkexitparts = deeplinkvals[7].split(':');
-                   deeplinkvals[7] = linkexitparts[0];
-                   if (deeplinkvals[7] != 'no') {
-                       dlinkexitdivsty = 'inline-block';
-                       if (!linkexitparts[1]) {
-                           dlinkexittextval = 'Exit Tool';
-                       } else {
-                           dlinkexittextval = linkexitparts[1];
-                       }
-                   }
-               }
            } else {
-               deeplinkvals = ['off','unhide','full','res','','0','_self','no'];
+               deeplinkvals = ['full','res','any','0'];
            }
-           var deeplinkstate = new Array();
-           deeplinkstate = ['only','off','both'];
-           var deeplinkstatetxt = new Array();
-           deeplinkstatetxt = ['deep only','deeplink off','regular + deep'];
-           var deeplinkothers = new Array();
-           deeplinkothers = ['hide','unhide'];
-           var deeplinkotherstxt = new Array();
-           deeplinkotherstxt = ['Hidden','Unhidden'];
            var deeplinklisting = new Array();
            deeplinklisting = ['full','absent','grades','details','datestatus'];
            var deeplinklisttxt = new Array();
@@ -1212,155 +1199,94 @@ function draw() {
            deeplinkscopes = ['res','map','rec'];
            var deeplinkscopetxt = new Array();
            deeplinkscopetxt = ['resource only','enclosing map/folder','recursive map/folder'];
-           var deeplinkprotect = new Array();
-           deeplinkprotect = ['none','key','ltic','ltid'];
-           var deeplinktarget = new Array();
-           deeplinktarget = ['_self','_top'];
-           var deeplinktargettxt = new Array();
-           deeplinktargettxt = ['Embedded','Not embedded'];
-           var deeplinkexit = ['yes','url','no'];
+           var deeplinkurls = new Array();
+           deeplinkurls = ['any','only','key','lti'];
            tablestart('Deep-linked items');
-           choicewrite('<tr><td>Access status?</td><td>');
-           choicewrite('<select name="deeplinkstate">');
-           for (var i=0; i<deeplinkstate.length; i++) {
-               choicewrite('<option value="'+deeplinkstate[i]+'"');
-               if (deeplinkvals[0] == deeplinkstate[i]) {
-                   choicewrite(' selected="selected"');
-               }
-               choicewrite('>'+deeplinkstatetxt[i]+'</option>');
-           }
-           choicewrite('</select></td></tr>');
-           choicewrite('<tr><td>Hide other resources?</td><td>');
-           choicewrite('<select name="deeplinkothers">');
-           for (var i=0; i<deeplinkothers.length; i++) {
-               choicewrite('<option value="'+deeplinkothers[i]+'"');
-               if (deeplinkvals[1] == deeplinkothers[i]) {
-                   choicewrite(' selected="selected"');
-               }
-               choicewrite('>'+deeplinkotherstxt[i]+'</option>');
-           }
-           choicewrite('</select></td></tr>');
            choicewrite('<tr><td>In Contents + Gradebook?</td><td>');
            choicewrite('<select name="deeplinklisted">');
            for (var i=0; i<deeplinklisting.length; i++) {
                choicewrite('<option value="'+deeplinklisting[i]+'"');
-               if (deeplinkvals[2] == deeplinklisting[i]) {
+               if (deeplinkvals[0] == deeplinklisting[i]) {
                    choicewrite(' selected="selected"');
                }
                choicewrite('>'+deeplinklisttxt[i]+'</option>');
            }
            choicewrite('</select></td></tr>');
-           choicewrite('<tr><td>Access scope for link</td><td>');
+           choicewrite('<tr><td>Access scope via deep-link</td><td>');
            choicewrite('<select name="deeplinkacc">');
            for (var i=0; i<deeplinkscopes.length; i++) {
                choicewrite('<option value="'+deeplinkscopes[i]+'"');
-               if (deeplinkvals[3] == deeplinkscopes[i]) {
+               if (deeplinkvals[1] == deeplinkscopes[i]) {
                    choicewrite(' selected="selected"');
                }
                choicewrite('>'+deeplinkscopetxt[i]+'</option>');
            }
            choicewrite('</select></td></tr>');
-           choicewrite('<tr><td>Link protection</td><td>');
+           choicewrite('<tr><td>Supported Link Types</td><td>');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinktypes" value="any"'+
+                  ' type="radio" '+calldeeplink('types'));
+           if (deeplinkvals[2]=='any') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> regular + deep</label></span><br />');
            choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinkprotect" value="none"'+
-                  ' type="radio" '+calldeeplink('protect'));
-           if (deeplinkvals[4]=='none') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> not in use</label>');
-           choicewrite('<input name="deeplinkprotect" value="key"'+
-                  ' type="radio" '+calldeeplink('protect'));
-           if (deeplinkvals[4]=='key') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> key access</label>');
+           choicewrite('<input name="deeplinktypes" value="only"'+
+                  ' type="radio" '+calldeeplink('types'));
+           if (deeplinkvals[2]=='only') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> deep only</label></span><br />');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinktypes" value="key"'+
+                  ' type="radio" '+calldeeplink('types'));
+           if (deeplinkvals[2]=='key') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> deep with key</label>');
            choicewrite('<input type="'+dlinkkeysty+'" name="deeplinkkey" id="deeplinkkey" value="'+dlinkkeyval+'" size="10" />');
            choicewrite('</span><br />');
 
            var possmenus = new Array();
-           if ((pextra != '') && (typeof(pextra) != 'undefined')) {
-               var lticRegExp = /^ltic_/;
-               var ltidRegExp = /^ltid_/;
+           if ((pextra != '') && (pextra != null)) {
+               var ltiRegExp = /^lti_/;
                var menusRegExp = /^menus_/;
                var extras = pextra.split('&');
                for (var i=0; i<extras.length; i++) {
-                   if (lticRegExp.test(extras[i])) {
-                       extras[i] = extras[i].replace(lticRegExp,'');
-                       var possltic = extras[i].split(',');
-                       if (possltic.length >= 1) {
-                           var lticnums = new Array();
-                           var ltictitles = new Array();
-                           for (var j=0; j<possltic.length; j++) {
-                               var entries = possltic[j].split(':');
-                               lticnums[j] = entries[0];
-                               ltictitles[j] = decodeURIComponent(entries[1]);
+                   if (ltiRegExp.test(extras[i])) {
+                       extras[i] = extras[i].replace(ltiRegExp,'');
+                       var posslti = extras[i].split(',');
+                       if (posslti.length >= 1) {
+                           var ltinums = new Array();
+                           var ltititles = new Array();
+                           for (var j=0; j<posslti.length; j++) {
+                               var entries = posslti[j].split(':');
+                               ltinums[j] = entries[0];
+                               ltititles[j] = decodeURIComponent(entries[1]);
                            }
-                           if (lticnums.length) {
+                           if (ltinums.length) {
                                choicewrite('<span style="white-space: nowrap;"><label>');
-                               choicewrite('<input name="deeplinkprotect" value="ltic"'+
-                                           ' type="radio" '+calldeeplink('protect'));
-                               if (deeplinkvals[4]=='ltic') { choicewrite(' checked="checked"'); }
-                               choicewrite(' /> course LTI launch</label>');
-                               choicewrite('<div id="deeplinklticdiv" style="display:'+dlinklticdivsty+'">');
-                               choicewrite('<select name="linkpossltic">');
+                               choicewrite('<input name="deeplinktypes" value="lti"'+
+                                           ' type="radio" '+calldeeplink('types'));
+                               if (deeplinkvals[2]=='lti') { choicewrite(' checked="checked"'); }
+                               choicewrite(' /> deep with LTI launch</label>');
+                               choicewrite('<div id="deeplinkltidiv" style="display:'+dlinkltidivsty+'">');
+                               choicewrite('<select name="linkposslti">');
                                var sel='';
-                               if (deeplinkvals[4]!='ltic') {
+                               if (deeplinkvals[2]!='lti') {
                                    sel = ' selected="selected"';
                                }
-                               if (lticnums.length > 1) {
+                               if (ltinums.length > 1) {
                                    choicewrite('<option value=""'+sel+'>Select</option>');
                                }
-                               for (var j=0; j<lticnums.length; j++) {
+                               for (var j=0; j<ltinums.length; j++) {
                                    sel = '';
-                                   if (deeplinkvals[4]=='ltic') {
-                                       if (linkprotectparts.length) {
-                                           if (lticnums[j] == linkprotectparts[1]) {
+                                   if (deeplinkvals[2]=='lti') {
+                                       if (linktypeparts.length) {
+                                           if (ltinums[j] == linktypeparts[1]) {
                                                sel = ' selected="selected"';
                                            }
                                        }
                                    }
-                                   choicewrite('<option value="'+lticnums[j]+'"'+sel+'>'+ltictitles[j]+'</option>');
+                                   choicewrite('<option value="'+ltinums[j]+'"'+sel+'>'+ltititles[j]+'</option>');
                                }
                                choicewrite('</select></div></span><br />');
                            }
                        }
-                   } else if (ltidRegExp.test(extras[i])) {
-                       extras[i] = extras[i].replace(ltidRegExp,'');
-                       var possltid = extras[i].split(',');
-                       if (possltid.length >= 1) {
-                           var ltidnums = new Array();
-                           var ltidtitles = new Array();
-                           for (var j=0; j<possltid.length; j++) {
-                               var entries = possltid[j].split(':');
-                               ltidnums[j] = entries[0];
-                               ltidtitles[j] = decodeURIComponent(entries[1]);
-                           }
-                           if (ltidnums.length) {
-                               choicewrite('<span style="white-space: nowrap;"><label>');
-                               choicewrite('<input name="deeplinkprotect" value="ltid"'+
-                                           ' type="radio" '+calldeeplink('protect'));
-                               if (deeplinkvals[4]=='ltid') { choicewrite(' checked="checked"'); }
-                               choicewrite(' />domain LTI launch</label>');
-                               choicewrite('<div id="deeplinkltiddiv" style="display:'+dlinkltiddivsty+'">');
-                               choicewrite('<select name="linkpossltid">');
-                               var sel='';
-                               if (deeplinkvals[4]!='ltid') {
-                                   sel = ' selected="selected"';
-                               }
-                               if (ltidnums.length > 1) {
-                                   choicewrite('<option value=""'+sel+'>Select</option>');
-                               }
-                               for (var j=0; j<ltidnums.length; j++) {
-                                   sel = '';
-                                   if (deeplinkvals[4]=='ltid') {
-                                       if (linkprotectparts.length) {
-                                           if (ltidnums[j] == linkprotectparts[1]) {
-                                               sel = ' selected="selected"';
-                                           }
-                                       }
-                                   }
-                                   choicewrite('<option value="'+ltidnums[j]+'"'+sel+'>'+ltidtitles[j]+'</option>');
-                               }
-                               choicewrite('</select></div></span><br />');
-                           }
-                       }
-
                    } else if (menusRegExp.test(extras[i])) {
                        extras[i] = extras[i].replace(menusRegExp,'');
                        possmenus = extras[i].split(',');
@@ -1371,20 +1297,20 @@ function draw() {
            choicewrite('<span style="white-space: nowrap;"><label>');
            choicewrite('<input name="deeplinkmenus" value="std"'+
                        ' type="radio" '+calldeeplink('menus'));
-           if (deeplinkvals[5] == 0) {
+           if (deeplinkvals[3] == 0) {
                choicewrite(' checked="checked"');
            }
            choicewrite(' /> Standard (all menus)</label></span><br />');
-           if (possmenus.length >= 1) {
+           if (possmenus.length >= 1) {  
                choicewrite('<span style="white-space: nowrap;"><label>');
                choicewrite('<input name="deeplinkmenus" value="collnum"'+
                            ' type="radio" '+calldeeplink('menus'));
-               if (deeplinkvals[5] > 0) { choicewrite(' checked="checked"'); }
+               if (deeplinkvals[3] > 0) { choicewrite(' checked="checked"'); }
                choicewrite(' /> Numbered collection</label>');
                choicewrite('<div id="deeplinkmenusdiv" style="display:'+dlinkmenusdivsty+'">');
                choicewrite('<select name="linkpossmenu">');
                var sel='';
-               if (deeplinkvals[5] == 0) {
+               if (deeplinkvals[3] == 0) {
                    sel = ' selected="selected"';
                }
                if (possmenus.length > 1) {
@@ -1392,49 +1318,17 @@ function draw() {
                }
                for (var i=0; i<possmenus.length; i++) {
                    sel = '';
-                   if (deeplinkvals[5] == possmenus[i]) {
+                   if (deeplinkvals[3] == possmenus[i]) {
                        sel = ' selected="selected"';
                    }
                    choicewrite('<option value="'+possmenus[i]+'"'+sel+'>'+possmenus[i]+'</option>');
                }
                choicewrite('</select></div></span><br />');
            }
-           choicewrite('</td></tr>');
-           choicewrite('<tr><td>Embedded?</td><td>');
-           choicewrite('<select name="deeplinktarget">');
-           for (var i=0; i<deeplinktarget.length; i++) {
-               choicewrite('<option value="'+deeplinktarget[i]+'"');
-               if (deeplinkvals[6] == deeplinktarget[i]) {
-                   choicewrite(' selected="selected"');
-               }
-               choicewrite('>'+deeplinktargettxt[i]+'</option>');
-           }
-           choicewrite('</select>');
-           choicewrite('</td></tr>');
-           choicewrite('<tr><td>Exit Button?</td><td>');
-           choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinkexit" value="no"'+
-                  ' type="radio" '+calldeeplink('exit'));
-           if (deeplinkvals[7]=='no') { choicewrite(' checked="checked"'); }
-           choicewrite(' />not in use</label></span><br />');
-           choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinkexit" value="yes"'+
-                  ' type="radio" '+calldeeplink('exit'));
-           if (deeplinkvals[7]=='yes') { choicewrite(' checked="checked"'); }
-           choicewrite(' />in use, no redirect</label></span> ');
-           choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinkexit" value="url"'+
-                  ' type="radio" '+calldeeplink('exit'));
-           if (deeplinkvals[7]=='url') { choicewrite(' checked="checked"'); }
-           choicewrite(' />in use, redirect to URL</label></span><br />');
-           choicewrite('<div id="deeplinkexitdiv" style="display:'+dlinkexitdivsty+'">');
-           choicewrite('<br /><span style="white-space: nowrap;">Button text:&nbsp;');
-           choicewrite('<input type="text" name="deeplinkexittext" id="deeplinkexittext" value="'+dlinkexittextval+'" size="10" />');
-           choicewrite('</span></div>');
            choicewrite('</td></tr></table>');
        }
    }
-   
+
    if (ptype=='color') {
       tablestart('Choose a Color');
       choicewrite('<table>');
@@ -1449,7 +1343,7 @@ function draw() {
                   colorfield(ir,ig,ib);
 	      }
               choicewrite('</tr>');
-	  }	      
+	  }
       }
       choicewrite('</table></td></table>');
    }
@@ -1472,6 +1366,22 @@ function catchange() {
    draw();
 }
 
+function recursechange() {
+   var rform=selector.document.forms.frec;
+   var count = rform.recurse.length;
+   if (count > 0) {
+       for (var i=0; i<count; i++) {
+           if (rform.recurse[i].checked) {
+               var colnum = pnonreccol;
+               if (rform.recurse[i].value == 1) {
+                   colnum++;
+               }
+               pmarker = pmarkerst+'_'+pparm+'&'+colnum;
+           }
+       }
+   }
+}
+
 function assemble() {
     if ((ptype=='date') && (pscat!='interval')) {
         svalue=Math.floor(cdate.getTime()/1000);
@@ -1526,6 +1436,7 @@ function init() {
   var doneproctorRegExp = /_done(|\:[^\:]+\:)_proctor/;
   var proctorkeyRegExp = /^(\d+)_(.+)$/;
   var donetextRegExp = /\:([^\:]+)\:/;
+  var markerRegExp = /^(.+)_([A-Za-z0-9]+)\&(\d+)$/;
   var namevalue=this.window.location.search.split('&');
   namevalue[0]=namevalue[0].substr(1,namevalue[0].length-1);
 
@@ -1536,10 +1447,10 @@ function init() {
      if (pair[0]=='type') { subs=pair[1].split('_');
                             ptype=subs[0];
                             pscat=subs[1];
-                            if (typeof(subs[2])!="undefined") { 
-                               pscat+='_'+subs[2]; 
+                            if (typeof(subs[2])!="undefined") {
+                               pscat+='_'+subs[2];
                             }
-                            if ((pscat=='') || (typeof(pscat)=="undefined")) { 
+                            if ((pscat=='') || (typeof(pscat)=="undefined")) {
                                pscat='default';
                             }
                            }
@@ -1556,6 +1467,44 @@ function init() {
      if (pair[0]=='extra') { pextra=pair[1]; }
   }
 
+  var tablecol = '';
+  var ismap = '';
+  if (markerRegExp.test(pmarker)) {
+      var markerinfo = pmarker.match(markerRegExp);
+      if (markerinfo.length == 4) {
+          pmarkerst = markerinfo[1];
+          pparm = markerinfo[2];
+          tablecol = markerinfo[3];
+          if (tablecol == 17 || tablecol == 16) {
+              ismap = 1;
+              if (tablecol == 17) {
+                  precursive = 1;
+              }
+              pnonreccol = 16;
+          } else if (tablecol == 11 || tablecol == 10) {
+              ismap = 1;
+              if (tablecol == 11) {
+                  precursive = 1;
+              }
+              pnonreccol = 10;
+          } else if (tablecol == 7 || tablecol == 6) {
+              ismap = 1;
+              if (tablecol == 7) {
+                  precursive = 1;
+              }
+              pnonreccol = 6;
+          } else if (tablecol == 3 || tablecol == 2) {
+              ismap = 1;
+              if (tablecol == 3) {
+                  precursive = 1;
+              }
+              pnonreccol = 2;
+          }
+      }
+  }
+  psmap = ismap;
+
+
   if (ptype=='date' && pscat == 'interval') {
       if (doneproctorRegExp.test(pvalue)) {
           var current = pvalue.match(doneproctorRegExp);
@@ -1599,8 +1548,8 @@ function init() {
   }
   svalue=pvalue;
   if (((ptype=='float') || (ptype=='string') || (ptype=='int')) &&
-      (pscat=='default') && 
-      (typeof(svalue)!="undefined") && 
+      (pscat=='default') &&
+      (typeof(svalue)!="undefined") &&
       (svalue!=0) && (svalue!='')) { pscat='any'; }
 
   if (ptype=='tolerance') {
@@ -1676,7 +1625,7 @@ function init() {
      months[10]='November';
      months[11]='December';
   }
-   
+
   if (ptype=='int') {
      sopt('default','Default');
      sopt('pos','Positive Integer, Not Zero');
@@ -1716,6 +1665,22 @@ function init() {
   }
 
   selwrite('</select></form>');
+  if (ismap == 1) {
+      if ((pparm != 'hiddenresource') && (pparm != 'encrypturl')) {
+          selwrite('<form name="frec" action="">');
+          selwrite('Recursive: <label><input type="radio" name="recurse" value="1" ');
+          if (precursive == 1) {
+              selwrite('checked="checked" ');
+          }
+          selwrite('onclick="parent.recursechange();" />Yes</label>&nbsp;&nbsp;');
+          selwrite('<label><input type="radio" name="recurse" value="0" ');
+          if (precursive != 1) {
+              selwrite('checked="checked" ');
+          }
+          selwrite('onclick="parent.recursechange();" />No</label>');
+          selwrite('</form><br />');
+      }
+  }
   var targ='parent.opener';
   if (pmodal==1) {
      targ='parent.parent';
@@ -1753,10 +1718,14 @@ function init() {
   selwrite('</body></html>');
   this.window.selector.document.close();
   if (pscat == 'deeplink') {
-      document.getElementById("LCparampopup").rows="60,*";
+      if (psmap==1) {
+          document.getElementById("LCparampopup").rows="100,*";
+      } else {  
+          document.getElementById("LCparampopup").rows="60,*";
+      }
   }
   draw();
-
+ 
 }
 
 // ]]>