--- loncom/xml/scripttag.pm 2001/07/06 19:50:02 1.42
+++ loncom/xml/scripttag.pm 2001/07/12 14:29:17 1.46
@@ -123,7 +123,6 @@ sub start_parserlib {
my $bodytext;
my $result ="";
my $error='';
-
if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
@@ -197,83 +196,50 @@ sub start_import {
my $result ="";
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
- my $file=&Apache::lonnet::getfile($location);
- if ($file == -1) {
- &Apache::lonxml::error(" Unable to find $bodytext $location for import");
- return "";
- }
- my $dir=$location;
- $dir=~s:/[^/]*$::;
-# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
- &Apache::lonxml::newparser($parser,\$file,$dir);
+ if ($target eq 'web' || $target eq 'grade') {
+ # FIXME this probably needs to be smart about construction vs.
+ # non construction space.
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ my $file=&Apache::lonnet::getfile($location);
+ if ($file == -1) {
+ &Apache::lonxml::error(" Unable to find $bodytext as $location for import");
+ return "";
+ }
+ my $dir=$location;
+ $dir=~s:/[^/]*$::;
+ # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
+ &Apache::lonxml::newparser($parser,\$file,$dir);
+ }
if ($target eq "edit" ) {
+ $result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
- $result.="Clickhere to edit
"
+ #FIXME this need to convert $bodytext to be a contruction space reference
+ #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ #$result.="Clickhere to edit
"
}
- return '';
+ if ($target eq 'modified') {
+ $bodytext=$$parser[$#$parser]->get_text("/import");
+ $result=&Apache::edit::modifiedfield($token);
+ &Apache::lonxml::debug($result);
+ }
+ return $result;
}
sub end_import {
+ return '';
}
-sub start_meta {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result = '';
- if ($target ne 'meta') {
- $result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
- $result = '';
- return $result;
- } else {
- return $result;
- }
-}
-
-sub end_meta {
-}
-
-sub editfield {
- my ($tag,$data)=@_;
-
- my $count=0;
- my $maxlength=-1;
- map { $count++;
- if (length($_) > $maxlength) { $maxlength = length ($_); }
- } split ("\n", $data);
-
- return "
\n<$tag>
\n
\n</$tag>
\n";
-}
-
-sub getfilenothere {
- my ($filename) = @_;
- my $a="";
-
- $filename=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
- $filename="/home/httpd/html/res".$filename;
- if (! -e $filename ) {
- &Apache::lonnet::subscribe($filename);
- &Apache::lonnet::repcopy($filename);
- }
- if (! -e $filename ) { return -1; };
- my $fh=Apache::File->new($filename);
- while (<$fh>) {
- $a .=$_;
- }
- return $a
-}
-
-
sub start_storetc {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
&Apache::lonxml::startredirection;
return $result;
}
sub end_storetc {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
my $output=&Apache::lonxml::endredirection;
$output =~ s/\"/\"\;/g;
@@ -283,15 +249,21 @@ sub end_storetc {
sub start_physnet {
-
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
- my $cbistylefile = &Apache::lonnet::getfile('/home/httpd/res/msu/physnet/cbi.sty');
- %$style = (%$style,&Apache::style::styleparser($target,$cbistylefile));
- &Apache::lonxml::newparser($parser$$style{'physnet'});
-
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $bodytext = '/msu/physnet/cbi.sty';
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ my $cbistyletext=&Apache::lonnet::getfile($location);
+
+ %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
+ if ( defined($$style{'physnet'}) ) {
+ &Apache::lonxml::newparser($parser,\$$style{'physnet'});
+ }
return "";
}
+sub end_physnet {
+}
+
1;
__END__