--- foxridge-archiver/HarvestmetaHandler.pm 2004/07/08 21:23:53 1.3 +++ foxridge-archiver/HarvestmetaHandler.pm 2004/07/13 18:32:49 1.4 @@ -45,14 +45,12 @@ sub start_element { push @elements, [$elem, "", $currAttrib]; } # element name is either LocalName or Name - my $name = $$el{'LocalName'}; - $name = $$el{'Name'} unless ($name); + my $name = $$el{'LocalName'} or $$el{'Name'}; #logger('DEBUG', " name: $name"); # assemble attributes string - $currAttrib =""; + $currAttrib = ""; foreach my $attr (values %{$$el{'Attributes'}}) { - my $key = $$attr{'LocalName'}; - $key = $$attr{'Name'} unless ($key); + my $key = $$attr{'LocalName'} or $$attr{'Name'}; my $val = $$attr{'Value'}; $currAttrib .= "$key=\"$val\" "; } @@ -68,8 +66,7 @@ sub end_element { # process element end event logger('DEBUG', "endelem: $self, $$el{'LocalName'}") if ($debugElem); # check element name - my $name = $$el{'LocalName'}; - $name = $$el{'Name'} unless ($name); + my $name = $$el{'LocalName'} or $$el{'Name'}; my $lastag = $currElemPath[$#currElemPath]; if ($lastag ne $name) { logger('ERROR', "closing tag '$lastag' doesn't match '$name'!"); @@ -94,10 +91,10 @@ sub end_element { sub characters { my ($self, $char) = @_; # process character data event - logger('DEBUG', "characters: $self, $char") if ($debugElem); + logger('DEBUG', "characters: $self, $char") if ($debugElem > 1); # add to current content $currText .= $$char{'Data'}; - logger('DEBUG', " Text: $currText") if ($debugCont); + logger('DEBUG', " Text: $currText") if ($debugCont > 1); }