Changeset 30058 for main/trunk/greenstone2
- Timestamp:
- 2015-07-26T18:19:32+12:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm
r29099 r30058 1706 1706 if ((!defined $opt_doc_secnum) || ($opt_doc_secnum eq $curr_secnum)) 1707 1707 { 1708 my $name_attr = $attrHash->{'name'}; 1708 my $name_attr = $attrHash->{'name'}; 1709 # print STDOUT "*** testing: $name_attr eq $metaname ? and $metamode eq override ?\n"; 1709 1710 if (($name_attr eq $metaname) && ($metamode eq "override")) 1710 1711 { … … 1718 1719 } 1719 1720 1720 if(defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}) 1721 if ((defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == $parser->{'parameters'}->{'metapos'}) 1722 || (!defined $parser->{'parameters'}->{'metapos'} && $parser->{'parameters'}->{'poscount'} == 0)) 1723 1721 1724 { 1722 1725 ##print STDERR "#### got match!!\n"; … … 1728 1731 $parser->{'parameters'}->{'metamode'} = "done"; 1729 1732 } 1730 elsif (defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'})1733 elsif (defined $parser->{'parameters'}->{'prevmetavalue'} && $parser->{'parameters'}->{'prevmetavalue'} eq $attrHash->{'_content'}) 1731 1734 { 1732 1735 my $metavalue = $parser->{'parameters'}->{'metavalue'}; … … 1804 1807 && ($metamode eq "accumulate" || $metamode eq "override")) { 1805 1808 if ($metamode eq "override") { 1806 print " No metadata value to override. Switching 'metamode' to accumulate\n";1809 print "Got to end of <Description> block. No metadata value to override. Switching 'metamode' to accumulate\n"; 1807 1810 } 1808 1811
Note:
See TracChangeset
for help on using the changeset viewer.