--- loncom/publisher/lonpublisher.pm 2003/03/07 17:52:37 1.113
+++ loncom/publisher/lonpublisher.pm 2003/03/14 16:12:14 1.118
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.113 2003/03/07 17:52:37 albertel Exp $
+# $Id: lonpublisher.pm,v 1.118 2003/03/14 16:12:14 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -436,7 +436,7 @@ sub get_subscribed_hosts {
my $srcf=$2;
opendir(DIR,$1);
while ($filename=readdir(DIR)) {
- if ($filename=~/$srcf\.(\w+)$/) {
+ if ($filename=~/\Q$srcf\E\.(\w+)$/) {
my $subhost=$1;
if (($subhost ne 'meta' && $subhost ne 'subscription') &&
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
@@ -809,7 +809,7 @@ sub publish {
my %allow=();
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
- return ('No write permission to user directory, FAIL',1);
+ return ('No write permission to user directory, FAIL',1);
}
print $logfile
"\n\n================= Publish ".localtime()." Phase One ================\n";
@@ -823,7 +823,7 @@ sub publish {
print $logfile "Copied original file to ".$copyfile."\n";
} else {
print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
- return ("Failed to write backup copy, $!,FAIL",1);
+ return ("Failed to write backup copy, $!,FAIL",1);
}
# ------------------------------------------------------------- IDs and indices
@@ -957,90 +957,87 @@ sub publish {
}
# ---------------- Find and document discrepancies in the parameters and stores
- my $chparms='';
- foreach (sort keys %metadatafields) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless ($_=~/\.\w+$/) {
- unless ($oldparmstores{$_}) {
- print $logfile 'New: '.$_."\n";
- $chparms.=$_.' ';
- }
- }
- }
- }
- if ($chparms) {
- $scrout.='New parameters or stored values: '.
- $chparms;
- }
+ my $chparms='';
+ foreach (sort keys %metadatafields) {
+ if (($_=~/^parameter/) || ($_=~/^stores/)) {
+ unless ($_=~/\.\w+$/) {
+ unless ($oldparmstores{$_}) {
+ print $logfile 'New: '.$_."\n";
+ $chparms.=$_.' ';
+ }
+ }
+ }
+ }
+ if ($chparms) {
+ $scrout.='
New parameters or stored values: '.$chparms;
+ }
- $chparms='';
- foreach (sort keys %oldparmstores) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless (($metadatafields{$_.'.name'}) ||
- ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
- print $logfile 'Obsolete: '.$_."\n";
- $chparms.=$_.' ';
- }
- }
- }
- if ($chparms) {
- $scrout.='
Obsolete parameters or stored values: '.
- $chparms;
- }
+ $chparms='';
+ foreach (sort keys %oldparmstores) {
+ if (($_=~/^parameter/) || ($_=~/^stores/)) {
+ unless (($metadatafields{$_.'.name'}) ||
+ ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
+ print $logfile 'Obsolete: '.$_."\n";
+ $chparms.=$_.' ';
+ }
+ }
+ }
+ if ($chparms) {
+ $scrout.='
Obsolete parameters or stored values: '.
+ $chparms;
+ }
# ------------------------------------------------------- Now have all metadata
- my %keywords=();
+ my %keywords=();
- if (length($content)<500000) {
- my $textonly=$content;
- $textonly=~s/\//g;
- $textonly=~s/\[^\<]+\<\/m\>//g;
- $textonly=~s/\<[^\>]*\>//g;
- $textonly=~tr/A-Z/a-z/;
- $textonly=~s/[\$\&][a-z]\w*//g;
- $textonly=~s/[^a-z\s]//g;
-
- foreach ($textonly=~m/(\w+)/g) {
- unless ($nokey{$_}) {
- $keywords{$_}=1;
- }
- }
- }
+ if (length($content)<500000) {
+ my $textonly=$content;
+ $textonly=~s/\//g;
+ $textonly=~s/\[^\<]+\<\/m\>//g;
+ $textonly=~s/\<[^\>]*\>//g;
+ $textonly=~tr/A-Z/a-z/;
+ $textonly=~s/[\$\&][a-z]\w*//g;
+ $textonly=~s/[^a-z\s]//g;
+
+ foreach ($textonly=~m/(\w+)/g) {
+ unless ($nokey{$_}) {
+ $keywords{$_}=1;
+ }
+ }
+ }
- foreach (split(/\W+/,$metadatafields{'keywords'})) {
- $keywords{$_}=1;
- }
+ foreach (split(/\W+/,$metadatafields{'keywords'})) {
+ $keywords{$_}=1;
+ }
# --------------------------------------------------- Now we also have keywords
# =============================================================================
# INTERACTIVE MODE
#
- unless ($batch) {
+ unless ($batch) {
$scrout.=
- '