--- loncom/xml/lonxml.pm	2015/04/06 17:02:33	1.531.2.19
+++ loncom/xml/lonxml.pm	2015/02/22 18:40:18	1.552
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.19 2015/04/06 17:02:33 raeburn Exp $
+# $Id: lonxml.pm,v 1.552 2015/02/22 18:40:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -228,103 +228,8 @@ 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) {
+    foreach my $temp (sort(keys(%Apache::lonxml::alltags))) {
         &Apache::lonxml::debug("$temp -- ".
                                join(',',@{ $Apache::lonxml::alltags{$temp} }));
     }
@@ -463,8 +368,6 @@ sub inner_xmlparse {
   my $result;
   my $token;
   my $dontpop=0;
-  my $lastdontpop;
-  my $lastendtag;
   my $startredirection = $Apache::lonxml::redirection;
   while ( $#$pars > -1 ) {
     while ($token = $$pars['-1']->get_token) {
@@ -560,29 +463,17 @@ sub inner_xmlparse {
       }
       $result = '';
 
-      if ($token->[0] eq 'E') {
-          if ($dontpop) {
-              $lastdontpop = $token;
-          } else {
-              $lastendtag = $token->[1];
-              &end_tag($stack,$parstack,$token);
-          }
+      if ($token->[0] eq 'E' && !$dontpop) {
+	&end_tag($stack,$parstack,$token);
       }
       $dontpop=0;
-    }
+    }	
     if ($#$pars > -1) {
 	pop @$pars;
 	pop @Apache::lonxml::pwd;
     }
   }
 
-  if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') &&
-      ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) {
-       if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) {
-           &end_tag($stack,$parstack,$lastdontpop);
-       }
-   }
-
   # if ($target eq 'meta') {
   #   $finaloutput.=&endredirection;
   # }
@@ -1569,15 +1460,13 @@ SIMPLECONTENT
 
 sub verify_html {
     my ($filecontents)=@_;
-    my ($is_html,$is_xml,$is_physnet);
+    my ($is_html,$is_xml);
     if ($filecontents =~/(?:\<|\&lt\;)\?xml[^\<]*\?(?:\>|\&gt\;)/is) {
         $is_xml = 1;
     } elsif ($filecontents =~/(?:\<|\&lt\;)html(?:\s+[^\<]+|\s*)(?:\>|\&gt\;)/is) {
         $is_html = 1;
-    } elsif ($filecontents =~/(?:\<|\&lt\;)physnet[^\<]*(?:\>|\&gt\;)/is) {
-        $is_physnet = 1;
     }
-    unless ($is_xml || $is_html || $is_physnet) {
+    unless ($is_xml || $is_html) {
         return &mt('File does not have [_1] or [_2] starting tag','&lt;html&gt;','&lt;?xml ?&gt;');
     }
     if ($is_html) {
@@ -1682,7 +1571,7 @@ FULLPAGE
               }
           } elsif ($symb || $folderpath) {
               $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
-              $initialize .=
+              $initialize .= 
                   &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
                                                              undef,$folderpath,$uri)."\n";
           }
@@ -2239,6 +2128,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]; }
@@ -2246,13 +2136,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 {
@@ -2260,6 +2153,7 @@ sub get_param {
 	}
     } else {
 	if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+	    
 	    return &Apache::run::run("{$args;".'return $'.$param.'}',
                                      $safeeval); #'
 	} else {