r33739 - in /trunk/libspreadsheet-xlsx-perl: Changes MANIFEST META.yml debian/changelog 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:50:15 UTC 2009 

Author: gregoa
Date: Wed Apr 22 18:50:09 2009
New Revision: 33739

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33739
Log:
New upstream release.

Added:
    trunk/libspreadsheet-xlsx-perl/t/2_____with_chart.t
      - copied unchanged from r33737, branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.t
    trunk/libspreadsheet-xlsx-perl/t/2_____with_chart.xlsx
      - copied unchanged from r33737, branches/upstream/libspreadsheet-xlsx-perl/current/t/2_____with_chart.xlsx
Modified:
    trunk/libspreadsheet-xlsx-perl/Changes
    trunk/libspreadsheet-xlsx-perl/MANIFEST
    trunk/libspreadsheet-xlsx-perl/META.yml
    trunk/libspreadsheet-xlsx-perl/debian/changelog
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm
    trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm

Modified: trunk/libspreadsheet-xlsx-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/Changes?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/Changes (original)
+++ trunk/libspreadsheet-xlsx-perl/Changes Wed Apr 22 18:50:09 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: trunk/libspreadsheet-xlsx-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/MANIFEST?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/MANIFEST (original)
+++ trunk/libspreadsheet-xlsx-perl/MANIFEST Wed Apr 22 18:50:09 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: trunk/libspreadsheet-xlsx-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/META.yml?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/META.yml (original)
+++ trunk/libspreadsheet-xlsx-perl/META.yml Wed Apr 22 18:50:09 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: trunk/libspreadsheet-xlsx-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/debian/changelog?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/debian/changelog (original)
+++ trunk/libspreadsheet-xlsx-perl/debian/changelog Wed Apr 22 18:50:09 2009
@@ -1,7 +1,8 @@
-libspreadsheet-xlsx-perl (0.09-2) UNRELEASED; urgency=low
+libspreadsheet-xlsx-perl (0.10-1) UNRELEASED; urgency=low
 
   * debian/watch: add uversionmangle to deal with single-digit upstream
     versions.
+  * New upstream release.
 
  -- gregor herrmann <gregoa at debian.org>  Wed, 08 Apr 2009 16:55:45 +0200
 

Modified: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX.pm Wed Apr 22 18:50:09 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: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Fmt2007.pm Wed Apr 22 18:50:09 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: trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm?rev=33739&op=diff
==============================================================================
--- trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm (original)
+++ trunk/libspreadsheet-xlsx-perl/lib/Spreadsheet/XLSX/Utility2007.pm Wed Apr 22 18:50:09 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+))$';
 
 #------------------------------------------------------------------------------

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