[LON-CAPA-cvs] cvs: loncom /homework insertlist.tab /xml lonxml.pm doc/loncapafiles loncapafiles.lpml
albertel
lon-capa-cvs-allow@mail.lon-capa.org
Sat, 07 Apr 2007 01:22:23 -0000
albertel Fri Apr 6 21:22:23 2007 EDT
Removed files:
/loncom/homework insertlist.tab
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/xml lonxml.pm
Log:
- elminating insertlist.tab
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.528 doc/loncapafiles/loncapafiles.lpml:1.529
--- doc/loncapafiles/loncapafiles.lpml:1.528 Tue Apr 3 18:13:40 2007
+++ doc/loncapafiles/loncapafiles.lpml Fri Apr 6 21:21:49 2007
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.528 2007/04/03 22:13:40 albertel Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.529 2007/04/07 01:21:49 albertel Exp $ -->
<!--
@@ -1441,14 +1441,6 @@
</fileglob>
<file>
- <source>loncom/homework/insertlist.tab</source>
- <target dist='default'>home/httpd/lonTabs/insertlist.tab</target>
- <categoryname>static conf</categoryname>
- <description>
-Describes what tags are allowed inside other tags.
- </description>
-</file>
-<file>
<source>loncom/homework/insertlist.xml</source>
<target dist='default'>home/httpd/lonTabs/insertlist.xml</target>
<categoryname>static conf</categoryname>
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.442 loncom/xml/lonxml.pm:1.443
--- loncom/xml/lonxml.pm:1.442 Fri Apr 6 20:04:40 2007
+++ loncom/xml/lonxml.pm Fri Apr 6 21:21:59 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.442 2007/04/07 00:04:40 albertel Exp $
+# $Id: lonxml.pm,v 1.443 2007/04/07 01:21:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1698,46 +1698,6 @@
}
}
-sub register_insert_tab {
- my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
- my $i;
- my $tagnum=0;
- my @order;
- for ($i=0;$i < $#data; $i++) {
- my $line = $data[$i];
- if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
- if ( $line =~ /TABLE/ ) { last; }
- my ($tag,$descrip,$color,$function,$show,$helpfile,$helpdesc) = split(/,/, $line);
- if ($tag) {
- $insertlist{"$tagnum.tag"} = $tag;
- $insertlist{"$tag.description"} = $descrip;
- $insertlist{"$tag.color"} = $color;
- $insertlist{"$tag.function"} = $function;
- if (!defined($show)) { $show='yes'; }
- $insertlist{"$tag.show"}= $show;
- $insertlist{"$tag.helpfile"} = $helpfile;
- $insertlist{"$tag.helpdesc"} = $helpdesc;
- $insertlist{"$tag.num"}=$tagnum;
- $tagnum++;
- }
- }
- $i++; #skipping TABLE line
- $tagnum = 0;
- for (;$i < $#data;$i++) {
- my $line = $data[$i];
- my ($mnemonic,@which) = split(/ +/,$line);
- my $tag = $insertlist{"$tagnum.tag"};
- for (my $j=0;$j <=$#which;$j++) {
- if ( $which[$j] eq 'Y' ) {
- if ($insertlist{"$j.show"} ne 'no') {
- push(@{ $insertlist{"$tag.which"} },$insertlist{"$j.tag"});
- }
- }
- }
- $tagnum++;
- }
-}
-
sub register_insert_xml {
my $parser = HTML::LCParser->new($Apache::lonnet::perlvar{'lonTabDir'}
.'/insertlist.xml');
@@ -1794,9 +1754,6 @@
}
sub register_insert {
-# ®ister_insert_tab(@_);
-# &dump_insertlist('1');
-# undef(%insertlist);
return ®ister_insert_xml(@_);
# &dump_insertlist('2');
}