--- loncom/publisher/lonpublisher.pm 2001/08/13 12:53:06 1.37
+++ loncom/publisher/lonpublisher.pm 2002/05/07 18:07:46 1.80
@@ -1,5 +1,30 @@
# The LearningOnline Network with CAPA
# Publication Handler
+#
+# $Id: lonpublisher.pm,v 1.80 2002/05/07 18:07:46 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
#
# (TeX Content Handler
#
@@ -11,24 +36,48 @@
# 04/16/2001 Scott Harrison
# 05/03,05/05,05/07 Gerd Kortemeyer
# 05/28/2001 Scott Harrison
-# 06/23,08/07,08/11,8/13 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
+# 12/04,12/05 Guy Albertelli
+# 12/05 Gerd Kortemeyer
+# 12/05 Guy Albertelli
+# 12/06,12/07 Gerd Kortemeyer
+# 12/15,12/16 Scott Harrison
+# 12/25 Gerd Kortemeyer
+# YEAR=2002
+# 1/16,1/17 Scott Harrison
+# 1/17 Gerd Kortemeyer
+#
+###
+
+###############################################################################
+## ##
+## ORGANIZATION OF THIS PERL MODULE ##
+## ##
+## 1. Modules used by this module ##
+## 2. Various subroutines ##
+## 3. Publication Step One ##
+## 4. Phase Two ##
+## 5. Main Handler ##
+## ##
+###############################################################################
package Apache::lonpublisher;
+# ------------------------------------------------- modules used by this module
use strict;
use Apache::File;
use File::Copy;
use Apache::Constants qw(:common :http :methods);
-use HTML::TokeParser;
+use HTML::LCParser;
use Apache::lonxml;
use Apache::lonhomework;
use Apache::loncacc;
use DBI;
+use Apache::lonnet();
+use Apache::loncommon();
my %addid;
my %nokey;
-my %language;
-my %cprtag;
my %metadatafields;
my %metadatakeys;
@@ -39,11 +88,10 @@ my $cuname;
my $cudom;
# ----------------------------------------------- Evaluate string with metadata
-
sub metaeval {
my $metastring=shift;
- my $parser=HTML::TokeParser->new(\$metastring);
+ my $parser=HTML::LCParser->new(\$metastring);
my $token;
while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {
@@ -61,17 +109,18 @@ sub metaeval {
if (defined($token->[2]->{'name'})) {
$unikey.='_'.$token->[2]->{'name'};
}
- map {
+ foreach (@{$token->[3]}) {
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
if ($metadatakeys{$unikey}) {
$metadatakeys{$unikey}.=','.$_;
} else {
$metadatakeys{$unikey}=$_;
}
- } @{$token->[3]};
+ }
if ($metadatafields{$unikey}) {
my $newentry=$parser->get_text('/'.$entry);
- unless ($metadatafields{$unikey}=~/$newentry/) {
+ unless (($metadatafields{$unikey}=~/$newentry/) ||
+ ($newentry eq '')) {
$metadatafields{$unikey}.=', '.$newentry;
}
} else {
@@ -82,7 +131,6 @@ sub metaeval {
}
# -------------------------------------------------------- Read a metadata file
-
sub metaread {
my ($logfile,$fn)=@_;
unless (-e $fn) {
@@ -101,8 +149,9 @@ sub metaread {
# ---------------------------- convert 'time' format into a datetime sql format
sub sqltime {
+ my $timef=shift @_;
my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
- localtime(@_[0]);
+ localtime($timef);
$mon++; $year+=1900;
return "$year-$mon-$mday $hour:$min:$sec";
}
@@ -121,13 +170,17 @@ sub hiddenfield {
}
sub selectbox {
- my ($title,$name,$value,%options)=@_;
- my $selout="\n