--- loncom/xml/lonxml.pm	2013/12/14 01:22:15	1.531.2.13
+++ loncom/xml/lonxml.pm	2013/10/29 21:01:21	1.544
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.13 2013/12/14 01:22:15 raeburn Exp $
+# $Id: lonxml.pm,v 1.544 2013/10/29 21:01:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -144,7 +144,7 @@ $metamode = 0;
 # turns on and of run::evaluate actually derefencing var refs
 $evaluate = 1;
 
-# data structure for edit mode, determines what tags can go into what other tags
+# data structure for eidt mode, determines what tags can go into what other tags
 %insertlist=();
 
 # stores the list of active tag namespaces
@@ -228,100 +228,6 @@ sub xmlend {
     return $discussion;
 }
 
-sub tokeninputfield {
-    my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
-    $defhost=~tr/a-z/A-Z/;
-    return (<<ENDINPUTFIELD)
-<script type="text/javascript">
-    function updatetoken() {
-        var comp=new Array;
-        var barcode=unescape(document.tokeninput.barcode.value);
-        comp=barcode.split('*');
-        if (typeof(comp[0])!="undefined") {
-            document.tokeninput.codeone.value=comp[0];
-        }
-        if (typeof(comp[1])!="undefined") {
-            document.tokeninput.codetwo.value=comp[1];
-        }
-        if (typeof(comp[2])!="undefined") {
-            comp[2]=comp[2].toUpperCase();
-            document.tokeninput.codethree.value=comp[2];
-        }
-        document.tokeninput.barcode.value='';
-    }
-</script>
-<form method="post" name="tokeninput" action="">
-<table border="2" bgcolor="#FFFFBB">
-<tr><th>DocID Checkin</th></tr>
-<tr><td>
-<table>
-<tr>
-<td>Scan in Barcode</td>
-<td><input type="text" size="22" name="barcode"
-onchange="updatetoken()"/></td>
-</tr>
-<tr><td><i>or</i> Type in DocID</td>
-<td>
-<input type="text" size="5" name="codeone" />
-<b><font size="+2">*</font></b>
-<input type="text" size="5" name="codetwo" />
-<b><font size="+2">*</font></b>
-<input type="text" size="10" name="codethree" value="$defhost"
-onchange="this.value=this.value.toUpperCase()" />
-</td></tr>
-</table>
-</td></tr>
-<tr><td><input type="submit" value="Check in DocID" /></td></tr>
-</table>
-</form>
-ENDINPUTFIELD
-}
-
-sub maketoken {
-    my ($symb,$tuname,$tudom,$tcrsid)=@_;
-    unless ($symb) {
-        $symb=&Apache::lonnet::symbread();
-    }
-    unless ($tuname) {
-        $tuname=$env{'user.name'};
-        $tudom=$env{'user.domain'};
-        $tcrsid=$env{'request.course.id'};
-    }
-    return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
-}
-
-sub printtokenheader {
-    my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
-    unless ($token) { return ''; }
-
-    my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
-    unless ($tsymb) {
-        $tsymb=$symb;
-    }
-    unless ($tuname) {
-        $tuname=$name;
-        $tudom=$domain;
-        $tcrsid=$courseid;
-    }
-
-    my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
-
-    if ($target eq 'web') {
-        my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
-        return
- '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
-               &mt('Checked out for').' '.$plainname.
-               '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
-               '<br />'.&mt('ID').': '.$idhash{$tuname}.
-               '<br />'.&mt('CourseID').': '.$tcrsid.
-               '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
-               '<br />'.&mt('DocID').': '.$token.
-               '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
-    } else {
-        return $token;
-    }
-}
-
 sub printalltags {
   my $temp;
   foreach $temp (sort keys %Apache::lonxml::alltags) {
@@ -1651,7 +1557,7 @@ FULLPAGE
           unless ($context eq 'syllabus') {
               if ($symb || $folderpath) {
                   $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
-                  $initialize .=
+                  $initialize .= 
                       &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
                                                                  undef,$folderpath,$uri)."\n";
               }
@@ -2194,6 +2100,7 @@ sub add_messages {
 
 sub get_param {
     my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_;
+
     if ( ! $context ) { $context = -1; }
     my $args ='';
     if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
@@ -2201,13 +2108,16 @@ sub get_param {
 	$args=$Apache::lonxml::style_values.$args;
     }
 
+
     if ($noelide) {
-        $args =~ s/'\$/'\\\$/g;
+#	$args =~ s/\\'/'/g;
+	$args =~ s/'\$/'\\\$/g;
     }
 
     if ( ! $args ) { return undef; }
     if ( $case_insensitive ) {
 	if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {
+
 	    return &Apache::run::run("{$args;".'return $'.$param.'}',
                                      $safeeval); #'
 	} else {
@@ -2215,6 +2125,7 @@ sub get_param {
 	}
     } else {
 	if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+	    
 	    return &Apache::run::run("{$args;".'return $'.$param.'}',
                                      $safeeval); #'
 	} else {
@@ -2376,7 +2287,7 @@ sub description {
 sub helpinfo {
     my ($token)=@_;
     my $tag = &get_tag($token);
-    return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
+    return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});
 }
 
 sub get_tag {