r33736 - in /branches/upstream/libspreadsheet-xlsx-perl/current: Changes MANIFEST META.yml lib/Spreadsheet/XLSX.pm lib/Spreadsheet/XLSX/Fmt2007.pm lib/Spreadsheet/XLSX/Utility2007.pm t/2_____with_chart.t t/2_____with_chart.xlsx

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Wed Apr 22 18:47:30 UTC 2009 

Author: gregoa
Date: Wed Apr 22 18:47:25 2009
New Revision: 33736

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33736
Log:
[svn-upgrade] Integrating new upstream version, libspreadsheet-xlsx-perl (0.1)

Added:
    branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t   (with props)
    branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx   (with props)
Modified:
    branches/upstream/libspreadsheet-xlsx-perl/current/Changes
    branches/upstream/libspreadsheet-xlsx-perl/current/MANIFEST
    branches/upstream/libspreadsheet-xlsx-perl/current/META.yml
    branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX.pm
    branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Fmt2007.pm
    branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Utility2007.pm

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/Changes?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/Changes (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/Changes Wed Apr 22 18:47:25 2009
@@ -1,4 +1,9 @@
-Revision history for Perl extension Spreadsheet::XLSC.
+Revision history for Perl extension Spreadsheet::XLSX.
+
+0.1   Wed Mar 25 18:19:46 MSK 2009
+
+	- bypassing empty sheets (thanks Lukasz Wilun for an example with diagrams);
+	- rich text within a cell (by Rob Polocz);
 
 0.09  Mon Jan 26 09:57:04 MSK 2009
 

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/MANIFEST?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/MANIFEST (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/MANIFEST Wed Apr 22 18:47:25 2009
@@ -8,4 +8,6 @@
 t/0____________use.t
 t/1_____loreyna126.t
 t/1_____loreyna126.xlsx
+t/2_____with_chart.t
+t/2_____with_chart.xlsx
 META.yml                                 Module meta-data (added by MakeMaker)

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/META.yml?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/META.yml (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/META.yml Wed Apr 22 18:47:25 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                Spreadsheet-XLSX
-version:             0.09
+version:             0.1
 abstract:            Perl extension for reading MS Excel 2007 files;
 license:             ~
 author:              

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX.pm?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX.pm (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX.pm Wed Apr 22 18:47:25 2009
@@ -6,7 +6,7 @@
 
 our @ISA = qw();
 
-our $VERSION = '0.09';
+our $VERSION = '0.1';
 
 use Archive::Zip;
 use Spreadsheet::XLSX::Fmt2007;
@@ -31,17 +31,15 @@
 	
 		my $mstr = $member_shared_strings->contents; 
 		$mstr =~ s/<t\/>/<t><\/t>/gsm;  # this handles an empty t tag in the xml <t/>
-
-		#foreach my $t ($member_shared_strings -> contents =~ /t\>([^\<]*)\<\/t/gsm) {
-		foreach my $t ($mstr =~ /<t.*?>(.*?)<\/t/gsm) {
-			$t = $converter -> convert ($t) if $converter;
-			
-			push @shared_strings, $t;
-		
-		}
-	
+		foreach my $si ($mstr =~ /<si.*?>(.*?)<\/si/gsm) {
+			my $str;
+			foreach my $t ($si =~ /<t.*?>(.*?)<\/t/gsm) {
+				$t = $converter -> convert ($t) if $converter;
+				$str .= $t;
+			}
+			push @shared_strings, $str;
+		}	
 	}
-
         my $member_styles = $self -> {zip} -> memberNamed ('xl/styles.xml');
 
         my @styles = ();
@@ -127,7 +125,7 @@
 	
 		my $member_name  = "xl/worksheets/sheet$sheet->{Id}.xml";
 	
-		my $member_sheet = $self -> {zip} -> memberNamed ($member_name) or die ("$member_name not found in this zip\n");
+		my $member_sheet = $self -> {zip} -> memberNamed ($member_name) or next;
 	
 		my ($row, $col);
 		
@@ -317,6 +315,10 @@
 	Rob Polocz
 	Gregor Herrmann
 	H.Merijn Brand
+	
+=head1 ACKNOWLEDGEMENTS	
+
+	Thanks to TrackVia Inc. (http://www.trackvia.com) for paying for Rob Polocz working time.
 
 =head1 COPYRIGHT AND LICENSE
 

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Fmt2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Fmt2007.pm?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Fmt2007.pm (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Fmt2007.pm Wed Apr 22 18:47:25 2009
@@ -8,7 +8,7 @@
 use warnings;
 
 use Spreadsheet::XLSX::Utility2007 qw(ExcelFmt);
-our $VERSION = '0.09'; # 
+our $VERSION = '0.1'; # 
 
 my %hFmtDefault = (
     0x00 => '@',

Modified: branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Utility2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Utility2007.pm?rev=33736&op=diff
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Utility2007.pm (original)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/lib/Spreadsheet/XLSX/Utility2007.pm Wed Apr 22 18:47:25 2009
@@ -12,12 +12,9 @@
 require Exporter;
 use vars qw(@ISA @EXPORT_OK);
 @ISA = qw(Exporter);
- at EXPORT_OK = qw(ExcelFmt LocaltimeExcel ExcelLocaltime 
-                col2int int2col sheetRef xls2csv);
-our $VERSION = '0.09';
-
-#my $sNUMEXP = '^[+-]?\d+(\.\d+)?$';
-#my $sNUMEXP = '(^[+-]?\d+(\.\d+)?$)|(^[+-]?\d\.*(\d+)[eE][+-](\d+))$';
+ at EXPORT_OK = qw(ExcelFmt LocaltimeExcel ExcelLocaltime col2int int2col sheetRef xls2csv);
+our $VERSION = '0.1';
+
 my $sNUMEXP = '(^[+-]?\d+(\.\d+)?$)|(^[+-]?\d+\.?(\d*)[eE][+-](\d+))$';
 
 #------------------------------------------------------------------------------

Added: branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t?rev=33736&op=file
==============================================================================
--- branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t (added)
+++ branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t Wed Apr 22 18:47:25 2009
@@ -1,0 +1,22 @@
+use Test::More tests => 6;
+
+BEGIN {
+
+	use Spreadsheet::XLSX;
+	use warnings;
+	
+	my $fn = __FILE__;
+	
+	$fn =~ s{t$}{xlsx};
+
+	my $excel = Spreadsheet::XLSX -> new ($fn);
+			
+	ok (@{$excel -> {Worksheet}} == 4);	
+	ok ($excel -> {Worksheet} -> [0] -> {Name} eq 'Tabelle1');
+	ok ($excel -> {Worksheet} -> [0] -> {Cells} [0] [0] -> {Val} == 1);
+	ok ($excel -> {Worksheet} -> [0] -> {Cells} [0] [1] -> {Val} == 10);
+	ok ($excel -> {Worksheet} -> [0] -> {Cells} [1] [0] -> {Val} == 2);
+	ok ($excel -> {Worksheet} -> [0] -> {Cells} [1] [1] -> {Val} == 20);
+
+};
+ 

Propchange: branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t
------------------------------------------------------------------------------
    svn:executable = *

Added: branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx?rev=33736&op=file
==============================================================================
Binary file - no diff available.

Propchange: branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx
------------------------------------------------------------------------------
    svn:executable = *

Propchange: branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

More information about the Pkg-perl-cvs-commits mailing list