Item2301: add "$nop" for empty separator for $LISTJOIN; more unit tes…

…ts for $LISTJOIN

git-svn-id: http://svn.foswiki.org/trunk@5868 0b4bb1d4-4e5a-0410-9cc4-b2b747904278

SpreadSheetPlugin/data/System/SpreadSheetPlugin.txt

@@ -318,7 +318,7 @@ Conventions for Syntax:
 
 #FuncLISTJOIN
 ---+++ LISTJOIN( separator, list ) -- convert a list into a string
-   * By default, list items are separated by a comma and a space. Use this function to indicate a specific =separator= string, which may include =$comma= for comma, =$n= for newline, and =$sp= for space.
+   * By default, list items are separated by a comma and a space. Use this function to indicate a specific =separator= string, which may include =$comma= for comma, =$n= for newline, =$sp= for space, and =$nop= for no separator between list items.
    * Syntax: ==$LISTJOIN( separator, list )==
    * Example: ==%<nop>CALC{"$LISTJOIN($n, Apple, Orange, Apple, Kiwi)"}%== returns the four items separated by new lines
    * Related: =[[#FuncLIST][$LIST()]]=, =[[#FuncLISTSIZE][$LISTSIZE()]]=
@@ -771,6 +771,7 @@ Note that the =DONTSPACE= global preference overrides the =SPREADSHEETPLUGIN_DON
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- specify latest version first -->&nbsp; |
+|  29 Dec 2009: | Foswikitask:Item2301: added =$nop= to $LISTJOIN() for better empty parameter |
 |  10 Nov 2009: | Added unit tests |
 |  27 Oct 2009: | Foswikitask:Item2301: Fixed $LISTJOIN() to accept an empty separator |
 |  20 Sep 2009: | Minor documentation update. trunk and release branch code synced (mainly perltidy - all functional changes have been in sync). |

SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm

@@ -1026,13 +1026,15 @@ s/\$([A-Z]+)$escToken([0-9]+)\((.*?)$escToken\2\)/&doFunc($1,$3)/geo;
     elsif ( $theFunc eq "LISTJOIN" ) {
         my ( $sep, $str ) = _properSplit( $theAttr, 2 );
         $str    = "" unless ( defined($str) );
+	# SMELL: repairing standard delimiter ", " in the constructed string to our custom separator
         $result = _listToDelimitedString( getList($str) );
-        $sep    = ', ' unless defined $sep;
-        $sep    =~ s/\$comma/,/go;
-        $sep    =~ s/\$sp/ /go;
-        $sep    =~ s/\$n/\n/go;
-        $result =~ s/, /$sep/go;
-
+	if ( length $sep ) {
+	    $sep    =~ s/\$comma/,/go;
+	    $sep    =~ s/\$sp/ /go;
+	    $sep    =~ s/\$nop//go;	# make sure $nop appears before $n otherwise you end up with "\nop"
+	    $sep    =~ s/\$n/\n/go;
+	    $result =~ s/, /$sep/go;
+	}
     }
     elsif ( $theFunc eq "LISTSIZE" ) {
         my @arr = getList($theAttr);

SpreadSheetPlugin/test/unit/SpreadSheetPlugin/SpreadSheetPluginTests.pm

@@ -283,9 +283,16 @@ sub test_LISTITEM {
 
 sub test_LISTJOIN {
     my ($this) = @_;
+    $this->assert( $this->CALC( '$LISTJOIN(,1,2,3)' ) eq '1, 2, 3' );
     $this->assert( $this->CALC( '$LISTJOIN($comma,1,2,3)' ) eq '1,2,3' );
-    $this->assert( $this->CALC( '$LISTJOIN(,1,2,3)' ) eq '123' );
     $this->assert( $this->CALC( '$LISTJOIN($n,1,2,3)' ) eq "1\n2\n3" );
+    $this->assert( $this->CALC( '$LISTJOIN($sp,1,2,3)' ) eq "1 2 3" );
+    $this->assert( $this->CALC( '$LISTJOIN( ,1,2,3)' ) eq "1 2 3" );
+    $this->assert( $this->CALC( '$LISTJOIN(  ,1,2,3)' ) eq "1  2  3" );
+    $this->assert( $this->CALC( '$LISTJOIN(:,1,2,3)' ) eq "1:2:3" );
+    $this->assert( $this->CALC( '$LISTJOIN(::,1,2,3)' ) eq "1::2::3" );
+    $this->assert( $this->CALC( '$LISTJOIN(0,1,2,3)' ) eq "10203" );
+    $this->assert( $this->CALC( '$LISTJOIN($nop,1,2,3)' ) eq '123' );
 }
 
 sub test_LISTMAP {