--- foxridge-archiver/harvestmeta.pl 2004/07/08 21:23:53 1.3 +++ foxridge-archiver/harvestmeta.pl 2004/07/13 18:32:49 1.4 @@ -17,7 +17,7 @@ $|=1; # # program version -my $version = "0.2 (08.07.2004)"; +my $version = "0.2.1 (13.07.2004)"; # read command line parameters my $args = MPIWGStor::parseargs; @@ -227,8 +227,8 @@ sub readURLIndex { foreach my $me (@indexdata) { $cnt++; my ($tag, $val, $attr) = @$me; - my $meta; - my $file; + my $meta = ""; + my $file = ""; if ($tag =~ /index\/resource$/) { if ($attr =~ /metaLink=\"([^\"]+)\"/) { $meta = $1; @@ -263,7 +263,7 @@ sub harvestURL { } my @data = $metaParserHandler->getData(); logger('DEBUG', "parsed $#data+1 elements"); - if ($data[0][0] eq "html") { + if (lc $data[0][0] eq "html") { # oops, wrong logger('WARNING', "invalid HTML content from $metaurl"); $warncnt++; @@ -384,14 +384,14 @@ sub initDB { logger("INFO", "harvestmeta $version"); initDB(); -my $fnum; +my $fnum = 0; if ($basedir) { # read and process all files under $basedir $fnum = readAllFiles($basedir, ""); # delete orphaned data (under $basedir) cleanUnmarkedFiles($basedir); -} elsif ($baseurl) { +} elsif ($indexurl) { # read and process XML index $fnum = readURLIndex($indexurl); if ($baseurl) {