r51697 - in /branches/upstream/libopenoffice-oodoc-perl/current: ./ OODoc/ examples/ t/
franck at users.alioth.debian.org
franck at users.alioth.debian.org
Thu Jan 28 20:31:04 UTC 2010
Author: franck
Date: Thu Jan 28 20:30:56 2010
New Revision: 51697
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51697
Log:
[svn-upgrade] Integrating new upstream version, libopenoffice-oodoc-perl (2.112)
Modified:
branches/upstream/libopenoffice-oodoc-perl/current/Changes
branches/upstream/libopenoffice-oodoc-perl/current/META.yml
branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm
branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml
branches/upstream/libopenoffice-oodoc-perl/current/README
branches/upstream/libopenoffice-oodoc-perl/current/build_date
branches/upstream/libopenoffice-oodoc-perl/current/examples/odf2pod
branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_fields
branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_title
branches/upstream/libopenoffice-oodoc-perl/current/examples/odfhighlight
branches/upstream/libopenoffice-oodoc-perl/current/examples/odfsearch
branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t
branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t
Modified: branches/upstream/libopenoffice-oodoc-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/Changes?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/Changes (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/Changes Thu Jan 28 20:30:56 2010
@@ -1,3 +1,8 @@
+2.112 2010-01-27
+ Meta.pm: Added increment_editing_cycles().
+ Text.pm: Bug fix in userFieldValue() #54004.
+ Cosmetic change in odf_set_fields example.
+ Bug fix and cosmetic change in odf_set_title example.
2.111 2010-01-10
File.pod, XPath.pod: doc update.
File.pm: target file no longer require at creation time.
Modified: branches/upstream/libopenoffice-oodoc-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/META.yml?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/META.yml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/META.yml Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: OpenOffice-OODoc
-version: 2.111
+version: 2.112
abstract: The Perl Open OpenDocument Connector
author:
- Jean-Marie Gouarne <jmgdoc at cpan.org>
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc.pm Thu Jan 28 20:30:56 2010
@@ -1,14 +1,14 @@
#-----------------------------------------------------------------------------
#
-# $Id : OODoc.pm 2.111 2010-01-10 JMG$
+# $Id : OODoc.pm 2.112 2010-01-27 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2008 by Genicorp, S.A. (www.genicorp.com)
#
#-----------------------------------------------------------------------------
-use OpenOffice::OODoc::File 2.201;
-use OpenOffice::OODoc::Meta 2.014;
+use OpenOffice::OODoc::File 2.202;
+use OpenOffice::OODoc::Meta 2.015;
use OpenOffice::OODoc::Document 2.023;
use OpenOffice::OODoc::Manifest 2.005;
@@ -16,7 +16,7 @@
package OpenOffice::OODoc;
use 5.008_000;
-our $VERSION = 2.111;
+our $VERSION = 2.112;
require Exporter;
our @ISA = qw(Exporter);
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pm Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#-----------------------------------------------------------------------------
#
-# $Id : Meta.pm 2.014 2010-01-05 JMG$
+# $Id : Meta.pm 2.015 2010-01-27 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -9,8 +9,8 @@
package OpenOffice::OODoc::Meta;
use 5.008_000;
-our $VERSION = 2.014;
-use OpenOffice::OODoc::XPath 2.229;
+our $VERSION = 2.015;
+use OpenOffice::OODoc::XPath 2.232;
our @ISA = qw ( OpenOffice::OODoc::XPath );
#-----------------------------------------------------------------------------
@@ -171,6 +171,16 @@
my $self = shift;
return $self->accessor('//meta:editing-cycles', @_);
}
+
+#-----------------------------------------------------------------------------
+# increment the 'editing-cycles' field
+
+sub increment_editing_cycles
+ {
+ my $self = shift;
+ my $v = $self->editing_cycles;
+ return $self->editing_cycles($v + 1);
+ }
#-----------------------------------------------------------------------------
# get/set the 'editing-duration' field (i.e. the total elapsed time for all
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Meta.pod Thu Jan 28 20:30:56 2010
@@ -95,6 +95,8 @@
of versions.
With argument, modifies this number without checking.
+
+ See also increment_editing_cycles().
=head3 editing_duration()
@@ -160,6 +162,14 @@
=head3 getUserPropertyElements()
Returns the list of all the existing user-defined property elements.
+
+=head3 increment_editing_cycles()
+
+ Adds 1 to the editing cycle count that is stored in the document, and
+ returns the new count. This count should be incremented each time
+ the document is edited through an ODF-compliant application.
+
+ See also editing_cycles().
=head3 initial_creator()
@@ -232,12 +242,12 @@
$meta->setUserProperty
(
"Release date",
- type => 'date', value => "2010-01-01'
+ type => 'date', value => '2010-01-01'
);
$meta->setUserProperty
(
"Release number",
- type => 'float', value => "5.4'
+ type => 'float', value => 5.4
);
The 'type' option allows to change the data type of an existing user-
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/Text.pm Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#----------------------------------------------------------------------------
#
-# $Id : Text.pm 2.237 2010-01-05 JMG$
+# $Id : Text.pm 2.238 2010-01-27 JMG$
#
# Created and maintained by Jean-Marie Gouarne
# Copyright 2009 by Genicorp, S.A. (www.genicorp.com)
@@ -9,9 +9,9 @@
package OpenOffice::OODoc::Text;
use 5.008_000;
-use OpenOffice::OODoc::XPath 2.229;
+use OpenOffice::OODoc::XPath 2.232;
our @ISA = qw ( OpenOffice::OODoc::XPath );
-our $VERSION = 2.237;
+our $VERSION = 2.238;
#-----------------------------------------------------------------------------
# synonyms
@@ -138,7 +138,11 @@
my $self = shift;
my $field = shift or return undef;
my $newtype = shift;
- my $prefix = $self->{'opendocument'} ? 'office' : 'table';
+ my $prefix = 'office';
+ unless ($self->{'opendocument'})
+ {
+ $prefix = $field->isTableCell() ? 'table' : 'text';
+ }
my $attribute = $prefix . ':value-type';
my $oldtype = $field->att($attribute);
unless (defined $newtype)
@@ -169,7 +173,13 @@
$self->fieldType($field) :
$field;
my $attribute = "";
- my $prefix = $self->{'opendocument'} ? 'office' : 'table';
+
+ my $prefix = 'office';
+ unless ($self->{'opendocument'})
+ {
+ $prefix = $field->isTableCell() ? 'table' : 'text';
+ }
+
if (
($value_type eq 'string') ||
($value_type eq 'date') ||
Modified: branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/OODoc/config.xml Thu Jan 28 20:30:56 2010
@@ -6,7 +6,7 @@
<XPath-LOCAL_CHARSET>utf8</XPath-LOCAL_CHARSET>
<File-WORKING_DIRECTORY>.</File-WORKING_DIRECTORY>
<Styles-COLORMAP></Styles-COLORMAP>
- <BUILD_DATE>2010-01-10T22:23:27</BUILD_DATE>
+ <BUILD_DATE>2010-01-27T11:07:22</BUILD_DATE>
<INSTALLATION_DATE>N/A</INSTALLATION_DATE>
</OpenOffice-OODoc>
</config>
Modified: branches/upstream/libopenoffice-oodoc-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/README?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/README (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/README Thu Jan 28 20:30:56 2010
@@ -19,13 +19,15 @@
See INSTALL for system requirements and installation instructions for
the CPAN original distribution.
-The present version supports both the OpenOffice.org 1.0 document format
-and the OASIS OpenDocument Format (ODF) 1.0. It works with ODF 1.1 and
-1.2 as well, knowing that its present features are not directly impacted
-by the changes between the successive versions of the ODF specification.
-In addition, advanced users can rely on OpenOffice::OODoc to process any
-kind of flat or zipped XML files, in order to combine ODF documents with
-non-ODF XML data through a single application programming interface.
+The present version supports the OASIS OpenDocument Format (ODF). It works
+with ODF 1.0 to 1.2, knowing that its present features are not directly
+impacted by the changes between the successive versions of the ODF standard.
+The legacy OpenOffice.org 1.0 format is still supported, too; however, the
+use of this deprecated format is not recommended for new documents.
+In addition, advanced users can rely on OpenOffice::OODoc to process
+any kind of flat or zipped XML files that don't comply with the ODF
+standard, so they can combine ODF documents with non-ODF XML data through
+a single application programming interface.
-------------------------------------------------------------------------
Modified: branches/upstream/libopenoffice-oodoc-perl/current/build_date
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/build_date?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/build_date (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/build_date Thu Jan 28 20:30:56 2010
@@ -1,1 +1,1 @@
-2010-01-10T22:23:27
+2010-01-27T11:07:22
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/odf2pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/odf2pod?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/odf2pod (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/odf2pod Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# $Id : odf2pod 0.3 2008-05-04 JMG$
+# $Id : odf2pod 0.4 2010-01-11 JMG$
#-----------------------------------------------------------------------------
=head1 NAME
@@ -74,7 +74,7 @@
# output the content according to the type of text object
sub content_output
{
- my $element = shift; # it's an OOo text object (not a flat string)
+ my $element = shift; # it's an ODF text object (not a flat string)
my $text = $doc->getText($element);
# choose an output format according to the type
@@ -95,9 +95,9 @@
#-----------------------------------------------------------------------------
-# initialise the OOo file object
+# initialise the ODF file object
my $ooarchive = odfContainer($ARGV[0])
- or die "No regular OpenOffice.org file\n";
+ or die "No regular ODF file\n";
# extract the metadata
$meta = odfMeta(container => $ooarchive)
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_fields
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_fields?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_fields (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_fields Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# $Id : odf_set_fields 0.2 2008-05-04 JMG$
+# $Id : odf_set_fields 0.4 2010-01-27 JMG$
#-----------------------------------------------------------------------------
=head1 NAME
@@ -13,9 +13,10 @@
=head1 SYNOPSIS
-Sample script updating or creating the 4 first user-defined fields of an ODF
+Sample script updating or creating 4 user-defined fields of an ODF
file and adding new keywords. Existing keywords are preserved. Old user-defined
-fields names and values are deleted and replaced.
+fields names and values are deleted and replaced. The revision number of the
+document is incremented by 1.
The keywords must be passed as a comma-separated list through the -keywords
option.
@@ -53,11 +54,11 @@
# get the command line argument as filename
my $filename = $ARGV[0]
- or die "usage : oo_set_fields filename [-options]\n";
+ or die "usage : odf_set_fields filename [-options]\n";
# create a meta-data object linked to the file
my $doc = OpenOffice::OODoc::Meta->new(file => $filename)
- or die "I can't open $filename as an OpenOffice.org document\n";
+ or die "I can't open $filename as an ODF document\n";
# set the user-defined fields using a list of name/value pairs
# (the names are hard-coded in my example but they could be
@@ -84,14 +85,13 @@
# the OpenOffice.org software); useful to allow any other program to know
# if this version comes directly from the StarOffice/OpenOffice suite or
# has been generated by my program
-$doc->generator('My document management application Version 1.0');
+$doc->generator('odf_set_fields Version 0.4');
# with the same kind of idea, I want to
# increment the editing cycles count (just to mimic the OpenOffice.org
# software each time the file is edited, and maybe
# to help some other workflow/versioning management program)
-my $editing_cycles = $doc->editing_cycles;
-$doc->editing_cycles($editing_cycles + 1);
+$doc->increment_editing_cycles;
# commit all and leave
$doc->save;
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_title
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_title?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_title (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/odf_set_title Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# $Id : odfbuild 0.2 2008-05-04 JMG$
+# $Id : odf_set_title 0.3 2010-01-27 JMG$
#-----------------------------------------------------------------------------
=head1 NAME
@@ -21,13 +21,15 @@
=cut
-use OpenOffice::OODoc 2.101;
+use OpenOffice::OODoc 2.112;
- # create an OpenOffice.org file object
+my $new_title = undef;
+
+ # create an ODF file object
# using the 1st command line argument as filename
my $oofile = odfContainer($ARGV[0]);
# exit if $filename isn't available or can't be open
- # as a regular OpenOffice.org file
+ # as a regular ODF file
die "Unavailable file $ARGV[0]\n" unless $oofile;
# create a metadata-aware object, linked to the File object
@@ -38,53 +40,50 @@
my $title = $doc_meta->title;
# if the title is defined, display it and exit
-if ($title)
+if (defined $title)
{
print "The existing title is \"$title\"\n";
}
-
- # if there is no title...
-else
+
+if (defined $ARGV[1])
+ {
+ $new_title = $ARGV[1];
+ }
+elsif (! defined $title)
{
- my $new_title = undef;
- # use the 2nd command line arg, if any, as the new title
- if ($ARGV[1])
+ # use the 1st heading of the content
+ # create a content-aware object linked to the same container
+ my $doc_text = odfDocument
+ (
+ container => $oofile,
+ read_only => 'true'
+ );
+ # get the text of the first heading element
+ my $text = $doc_text->getHeadingText(0);
+ if ($text)
{
- $new_title = $ARGV[1];
+ # use this text, if defined, as the title
+ $new_title = $text;
}
- # use the 1st heading of the content otherwise
else
{
- # create a content-aware object linked to the same file object
- my $doc_text = odfDocument
- (
- container => $oofile,
- read_only => 'true'
- );
- # get the text of the first heading element
- my $text = $doc_text->getHeadingText(0);
- if ($text)
- {
- # use this text, if defined, as the title
- $new_title = $text;
- }
- else
- {
- # alas, there was no heading in the document,
- # so we put an arbitrary provisional title
- warn "No heading text in the document.\n" .
- "Nothing is changed.\n";
- }
+ # there was no heading in the document,
+ # so nothing is done
+ warn "No heading text in the document.\n" .
+ "Nothing is changed.\n";
}
+ }
- if ($new_title)
- {
- # set the new title
- print "The new title is \"$new_title\"\n";
- $doc_meta->title($new_title);
- # commit the update
- $oofile->save;
- }
+ # the new title (if any) is saved
+if (defined $new_title)
+ {
+ # set the new title
+ print "The new title is \"$new_title\"\n";
+ $doc_meta->title($new_title);
+ # update the revision number
+ $doc_meta->increment_editing_cycles;
+ # commit the update
+ $oofile->save;
}
exit;
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/odfhighlight
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/odfhighlight?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/odfhighlight (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/odfhighlight Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# $Id : odfhighlight 0.2 2008-05-04 JMG$
+# $Id : odfhighlight 0.3 2010-01-11 JMG$
#-----------------------------------------------------------------------------
=head1 NAME
@@ -106,7 +106,7 @@
my $filename = $ARGV[0];
my $search = $ARGV[1];
-die "usage: oohighlight <file> <search_string> [-options]\n"
+die "usage: odfhighlight <file> <search_string> [-options]\n"
unless ($filename && $search);
#-----------------------------------------------------------------------------
Modified: branches/upstream/libopenoffice-oodoc-perl/current/examples/odfsearch
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/examples/odfsearch?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/examples/odfsearch (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/examples/odfsearch Thu Jan 28 20:30:56 2010
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#-----------------------------------------------------------------------------
-# $Id : odfsearch 0.2 2008-05-04 JMG$
+# $Id : odfsearch 0.3 2010-01-11 JMG$
#-----------------------------------------------------------------------------
=head1 NAME
@@ -52,7 +52,7 @@
my $search_string = $ARGV[2];
my $stylename = $ARGV[3] || 'Text body';
-die "Usage : oosearch target_file source_file search_string\n"
+die "Usage : odfsearch target_file source_file search_string\n"
unless ($target_file && $source_file && $search_string);
# create the 2 Document instances
Modified: branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/01write.t Thu Jan 28 20:30:56 2010
@@ -1,12 +1,12 @@
#-----------------------------------------------------------------------------
-# 01write.t OpenOffice::OODoc Installation test 2010-01-05
+# 01write.t OpenOffice::OODoc Installation test 2010-01-11
#-----------------------------------------------------------------------------
use Test;
BEGIN { plan tests => 19 }
-use OpenOffice::OODoc 2.109;
-ok($OpenOffice::OODoc::VERSION >= 2.109);
+use OpenOffice::OODoc 2.112;
+ok($OpenOffice::OODoc::VERSION >= 2.112);
#-----------------------------------------------------------------------------
Modified: branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t?rev=51697&op=diff
==============================================================================
--- branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t (original)
+++ branches/upstream/libopenoffice-oodoc-perl/current/t/02read.t Thu Jan 28 20:30:56 2010
@@ -1,12 +1,12 @@
#-----------------------------------------------------------------------------
-# 02read.t OpenOffice::OODoc Installation test 2009-12-23
+# 02read.t OpenOffice::OODoc Installation test 2010-01-11
#-----------------------------------------------------------------------------
use Test;
BEGIN { plan tests => 12 }
-use OpenOffice::OODoc 2.109;
-ok($OpenOffice::OODoc::VERSION >= 2.109);
+use OpenOffice::OODoc 2.112;
+ok($OpenOffice::OODoc::VERSION >= 2.112);
#-----------------------------------------------------------------------------
More information about the Pkg-perl-cvs-commits
mailing list