Changeset 28836 for main/trunk/greenstone2
- Timestamp:
- 2014-02-12T18:03:06+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugins
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm
r28267 r28836 224 224 225 225 226 my $metadata_name = decode("utf-8",$self->{'metadata_name'}); 227 my $metadata_value = decode("utf-8",$self->{'metadata_value'}); 226 my $metadata_name = $self->{'metadata_name'}; 227 my $metadata_value = $self->{'metadata_value'}; 228 #my $metadata_name = decode("utf-8",$self->{'metadata_name'}); 229 #my $metadata_value = decode("utf-8",$self->{'metadata_value'}); 228 230 229 231 $self->{'doc_obj'}->add_utf8_metadata($self->{'section'}, … … 271 273 # text read in by XML::Parser is in Perl's binary byte value 272 274 # form ... need to explicitly make it UTF-8 273 my $content = decode("utf-8",$self->{'content'}); 275 #my $content = decode("utf-8",$self->{'content'}); 276 my $content = $self->{'content'}; 274 277 275 278 $self->{'doc_obj'}->add_utf8_text($self->{'section'}, $content); -
main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm
r28489 r28836 364 364 # form ... need to explicitly make it UTF-8 365 365 366 my $metadata_name = decode("utf-8",$self->{'metadata_name'}); 367 my $metadata_value = decode("utf-8",$self->{'metadata_value'}); 366 my $metadata_name = $self->{'metadata_name'}; 367 my $metadata_value = $self->{'metadata_value'}; 368 #my $metadata_name = decode("utf-8",$self->{'metadata_name'}); 369 #my $metadata_value = decode("utf-8",$self->{'metadata_value'}); 368 370 369 371 &metadatautil::store_saved_metadata($self, … … 392 394 # things down significantly in some cases. 393 395 sub Char { 394 use bytes; # Necessary to prevent encoding issues with XML::Parser 2.31+396 # use bytes; # Necessary to prevent encoding issues with XML::Parser 2.31+ 395 397 396 398 # if ($]<5.008) { -
main/trunk/greenstone2/perllib/plugins/ReadXMLFile.pm
r24348 r28836 291 291 # things down significantly in some cases. 292 292 sub Char { 293 use bytes; # Necessary to prevent encoding issues with XML::Parser 2.31+293 # use bytes; # Necessary to prevent encoding issues with XML::Parser 2.31+ 294 294 $_[0]->{'Text'} .= $_[1]; 295 295 return undef;
Note:
See TracChangeset
for help on using the changeset viewer.