[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kmplayer
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2011-06-21 20:58:53
Message-ID: 20110621205853.73101AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1237903 by vriezen:

Correct expression's subsequence length parameter

Defaults to be all elements from start position and latter should start
minimal at 1

 M  +3 -1      src/expression.cpp  
 M  +1 -1      tests/arte.smil  
 M  +1 -1      tests/state.smil  


--- trunk/extragear/multimedia/kmplayer/src/expression.cpp #1237902:1237903
@@ -1057,7 +1057,9 @@
         n = n->next_sibling;
         if (n) {
             int p = n->toInt ();
-            int len = 1;
+            if (p < 1)
+                p = 1;
+            int len = -1;
             if (n->next_sibling)
                 len = n->next_sibling->toInt ();
             NodeValueItem *itm = src->first ();
--- trunk/extragear/multimedia/kmplayer/tests/arte.smil #1237902:1237903
@@ -148,7 +148,7 @@
                 <setvalue ref="/data/tmp"
                           value="substring-before(/data/tmp, ';')"/-->
                 <setvalue ref="/data/tmp"
-                          value="subsequence(tokenize(/data/page/html, \
'vars_player.videorefFileUrl *= *&quot;[^&quot;]+&quot;'),1)"/> +                     \
value="subsequence(tokenize(/data/page/html, 'vars_player.videorefFileUrl *= \
*&quot;[^&quot;]+&quot;'),1,1)"/>  <setvalue ref="/data/tmp"
                           value="substring-after(/data/tmp, '&quot;')"/>
                 <setvalue ref="/data/vref/uri"
--- trunk/extragear/multimedia/kmplayer/tests/state.smil #1237902:1237903
@@ -58,7 +58,7 @@
             left="10" top="10" width="300" height="20"/>
       <text src="data:,Has%20{tokenize(/data/books/book[2]/title,&quot;\S+&quot;)}%20words"
  left="10" top="40" width="300" height="20"/>
-      <text src="data:,First \
word%20is%20&quot;{subsequence(tokenize(/data/books/book[2]/title,&quot;\S+&quot;),1)}&quot;"
 +      <text src="data:,First \
word%20is%20&quot;{subsequence(tokenize(/data/books/book[2]/title,&quot;\S+&quot;),1,1)}&quot;"
  left="10" top="70" width="300" height="20"/>
       <text src="data:,First two \
words%20are%20&quot;{string-join(subsequence(tokenize(/data/books/book[2]/title,&quot;\S+&quot;),1,2), \
' ')}&quot;"  left="10" top="100" width="300" height="20"/>


[prev in list] [next in list] [prev in thread] [next in thread]