r-gregmisc-users

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1265] trunk/gdata/inst/perl/Spreadsheet/ParseExcel /Utility.pm

[<wa...@us...>]

Revision: 1265
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1265&view=rev
Author:   warnes
Date:     2008-05-11 17:00:56 -0700 (Sun, 11 May 2008)

Log Message:
-----------
Patch to correct issue with OpenOffice-created XLS files.  Thanks to
Robert Burns for pointing out the patch at 
http://rt.cpan.org/Public/Bug/Display.html?id=7206

Modified Paths:
--------------
    trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm

Modified: trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm
===================================================================
--- trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm	2008-05-07 18:59:21 UTC (rev 1264)
+++ trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm	2008-05-12 00:00:56 UTC (rev 1265)
@@ -27,7 +27,16 @@
     my $sCond;
     my $sWkF ='';
     my $sRes='';
+
+# OpenOffice peculiarity?
+$sFmt = '@' if ($sFmt eq "GENERAL");
+
 #1. Get Condition
+if($sFmt=~/^\[([<>=][^\]]+)\](.*)$/) {
+$sCond = $1;
+
+
+#1. Get Condition
     if($sFmt=~/^\[([<>=][^\]]+)\](.*)$/) {
         $sCond = $1;
         $sFmt = $2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[R-gregmisc-users] SF.net SVN: r-gregmisc: [1267] trunk/gdata/inst/perl/Spreadsheet/ParseExcel /Utility.pm

[<wa...@us...>]

Revision: 1267
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1267&view=rev
Author:   warnes
Date:     2008-05-12 19:47:18 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Correct broken patch for open-office support

Modified Paths:
--------------
    trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm

Modified: trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm
===================================================================
--- trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm	2008-05-13 02:40:12 UTC (rev 1266)
+++ trunk/gdata/inst/perl/Spreadsheet/ParseExcel/Utility.pm	2008-05-13 02:47:18 UTC (rev 1267)
@@ -32,11 +32,6 @@
 $sFmt = '@' if ($sFmt eq "GENERAL");
 
 #1. Get Condition
-if($sFmt=~/^\[([<>=][^\]]+)\](.*)$/) {
-$sCond = $1;
-
-
-#1. Get Condition
     if($sFmt=~/^\[([<>=][^\]]+)\](.*)$/) {
         $sCond = $1;
         $sFmt = $2;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.