--- loncom/xml/lonxml.pm 2002/12/06 17:56:53 1.218
+++ loncom/xml/lonxml.pm 2003/02/07 21:55:57 1.228
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.218 2002/12/06 17:56:53 matthew Exp $
+# $Id: lonxml.pm,v 1.228 2003/02/07 21:55:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,7 +41,6 @@
# 6/1/1 Gerd Kortemeyer
# 2/21,3/13 Guy
# 3/29,5/4 Gerd Kortemeyer
-# 5/10 Scott Harrison
# 5/26 Gerd Kortemeyer
# 5/27 H. K. Ng
# 6/2,6/3,6/8,6/9 Gerd Kortemeyer
@@ -192,7 +191,8 @@ sub xmlend {
my $idx;
for ($idx=1;$idx<=$contrib{'version'};$idx++) {
my $hidden=($contrib{'hidden'}=~/\.$idx\./);
- unless (($hidden) && (!$seeid)) {
+ my $deleted=($contrib{'deleted'}=~/\.$idx\./);
+ unless ((($hidden) && (!$seeid)) || ($deleted)) {
my $message=$contrib{$idx.':message'};
$message=~s/\n/\<br \/\>/g;
$message=&Apache::lontexconvert::msgtexconverted($message);
@@ -226,8 +226,10 @@ sub xmlend {
} else {
$sender.=' <a href="/adm/feedback?hide='.
$symb.':::'.$idx.'">Hide</a>';
- }
- }
+ }
+ $sender.=' <a href="/adm/feedback?deldisc='.
+ $symb.':::'.$idx.'">Delete</a>';
+ }
} else {
if ($screenname) {
$sender='<i>'.$screenname.'</i>';
@@ -268,7 +270,7 @@ sub tokeninputfield {
my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
$defhost=~tr/a-z/A-Z/;
return (<<ENDINPUTFIELD)
-<script>
+<script type="text/javascript">
function updatetoken() {
var comp=new Array;
var barcode=unescape(document.tokeninput.barcode.value);
@@ -352,7 +354,7 @@ sub printtokenheader {
if ($target eq 'web') {
my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
return
- '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
+ '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
'Checked out for '.$plainname.
'<br />User: '.$tuname.' at '.$tudom.
'<br />ID: '.$idhash{$tuname}.
@@ -392,7 +394,7 @@ sub registerurl {
my $result = '';
if ($target eq 'edit') {
- $result .="<script>\n".
+ $result .="<script type=\"text/javascrtipt\">\n".
"if (typeof menu != 'undefined') {menu.currentURL=null;}\n".
&Apache::loncommon::browser_and_searcher_javascript().
"\n</script>\n";
@@ -401,12 +403,11 @@ sub registerurl {
(!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
(!$forcereg)) {
return $result.
- '<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
+ '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
}
if ($Apache::lonxml::registered && !$forcereg) { return ''; }
$Apache::lonxml::registered=1;
- my $nothing='';
- if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
+ my $reopen=&Apache::lonmenu::reopenmenu();
my $newmail='';
if (&Apache::lonmsg::newmail()) {
$newmail='menu.setstatus("you have","messages");';
@@ -496,7 +497,7 @@ ENDPARM
// BEGIN LON-CAPA Internal
function LONCAPAreg() {
- menu=window.open("$nothing","LONCAPAmenu","",false);
+ menu=$reopen;
menu.clearTimeout(menu.menucltim);
$timesync
$newmail
@@ -507,7 +508,7 @@ ENDPARM
menu.currentStale=0;
menu.clearbut(3,1);
menu.switchbutton
- (6,3,'catalog.gif','catalog','info','catalog_info()');
+ (6,3,'catalog.gif','catalog','info','catalog_info()','Show catalog information');
menu.switchbutton
(8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
menu.switchbutton
@@ -529,7 +530,7 @@ ENDPARM
}
function LONCAPAstale() {
- menu=window.open("$nothing","LONCAPAmenu","",false);
+ menu=$reopen
menu.currentStale=1;
if (menu.reloadURL!='' && menu.reloadURL!= null) {
menu.switchbutton
@@ -540,7 +541,7 @@ ENDPARM
menu.clearbut(7,3);
menu.menucltim=menu.setTimeout(
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
2000);
}
@@ -556,7 +557,7 @@ ENDREGTHIS
// BEGIN LON-CAPA Internal
function LONCAPAreg() {
- menu=window.open("$nothing","LONCAPAmenu","",false);
+ menu=$reopen
$timesync
menu.currentStale=1;
menu.clearbut(2,1);
@@ -771,7 +772,7 @@ sub inner_xmlparse {
if ($token->[0] eq 'E') {
&end_tag($stack,$parstack,$token);
}
- }
+ }
if ($#$pars > -1) {
pop @$pars;
pop @Apache::lonxml::pwd;
@@ -813,13 +814,13 @@ sub callsub {
}
if (!$deleted) {
if ($space) {
- &Apache::lonxml::debug("Calling sub $sub in $space $metamode");
+ #&Apache::lonxml::debug("Calling sub $sub in $space $metamode");
$sub1="$space\:\:$sub";
($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
$parstack,$parser,$safeeval,
$style);
} else {
- &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode");
+ #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode");
if ($metamode <1) {
if (defined($token->[4]) && ($metamode < 1)) {
$currentstring = $token->[4];
@@ -831,7 +832,7 @@ sub callsub {
# &Apache::lonxml::debug("nodefalt:$nodefault:");
if ($currentstring eq '' && $nodefault eq '') {
if ($target eq 'edit') {
- &Apache::lonxml::debug("doing default edit for $token->[1]");
+ #&Apache::lonxml::debug("doing default edit for $token->[1]");
if ($token->[0] eq 'S') {
$currentstring = &Apache::edit::tag_start($target,$token);
} elsif ($token->[0] eq 'E') {
@@ -1113,7 +1114,9 @@ sub store_counter {
sub get_all_text {
my($tag,$pars)= @_;
&Apache::lonxml::debug("Got a ".ref($pars));
+ my $gotfullstack=1;
if (ref($pars) ne 'ARRAY') {
+ $gotfullstack=0;
$pars=[$pars];
}
my $depth=0;
@@ -1122,7 +1125,8 @@ sub get_all_text {
if ( $tag =~ m:^/: ) {
my $tag=substr($tag,1);
#&Apache::lonxml::debug("have:$tag:");
- while (($depth >=0) && ($#$pars > -1)) {
+ my $top_empty=0;
+ while (($depth >=0) && ($#$pars > -1) && (!$top_empty)) {
while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
@@ -1140,11 +1144,21 @@ sub get_all_text {
}
}
}
+ if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; }
if (($depth >=0) && ($#$pars > 0) ) {
pop(@$pars);
pop(@Apache::lonxml::pwd);
}
}
+ if ($top_empty && $depth >= 0) {
+ #never found the end tag ran out of text, throw error send back blank
+ &error('Never found end tag for <'.$tag.'>');
+ if ($gotfullstack) {
+ my $newstring='</'.$tag.'>'.$result;
+ &Apache::lonxml::newparser($pars,\$newstring);
+ }
+ $result='';
+ }
} else {
while ($#$pars > -1) {
while ($token = $$pars[-1]->get_token) {
@@ -1250,7 +1264,7 @@ sub afterburn {
$matchthis=~s/\_+/\\s\+/g;
$result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
$result.=(<<"ENDSCRIPT");
-<script>
+<script type="text/javascript">
document.location.hash='$anchorname';
</script>
ENDSCRIPT