changeset 9573:7f71b792671b octave-forge

Search for trigger in the two first fields, if any
author cdemills
date Wed, 07 Mar 2012 08:05:08 +0000
parents c7dda416161e
children 7f4260938517
files extra/dataframe/inst/@dataframe/dataframe.m
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/extra/dataframe/inst/@dataframe/dataframe.m	Wed Mar 07 08:04:20 2012 +0000
+++ b/extra/dataframe/inst/@dataframe/dataframe.m	Wed Mar 07 08:05:08 2012 +0000
@@ -233,7 +233,13 @@
               if (all (cellfun ('size', dummy, 2) == 0))
                 continue;
               endif
-              if (strcmp (dummy{1}, trigger))
+              if (size (dummy, 2) >= 1 && ...
+                  ~isempty (regexp (dummy{1}, trigger, 'match')))
+                break;
+              endif
+              if (size (dummy, 2) >= 2 && ...
+                  ~isempty (regexp (dummy{2}, trigger, 'match')))
+                %#was  (strcmp (dummy{1}, trigger))
                 break;
               endif
             endwhile