[interchange-cvs] interchange - heins modified code/UI_Tag/auto_wizard.coretag

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2005-03-11 05:38:34 GMT
Modified:  code/UI_Tag auto_wizard.coretag
Log:
* Make output_repeated option work.

Revision  Changes    Path
1.18      +19 -3     interchange/code/UI_Tag/auto_wizard.coretag


rev 1.18, prev_rev 1.17
Index: auto_wizard.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/auto_wizard.coretag,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- auto_wizard.coretag	14 Feb 2005 00:42:52 -0000	1.17
+++ auto_wizard.coretag	11 Mar 2005 05:38:33 -0000	1.18
@@ -1,11 +1,11 @@
 # Copyright 2002 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: auto_wizard.coretag,v 1.17 2005/02/14 00:42:52 docelic Exp $
+# $Id: auto_wizard.coretag,v 1.18 2005/03/11 05:38:33 mheins Exp $
 
 UserTag  auto-wizard  Order     name
 UserTag  auto-wizard  AddAttr
 UserTag  auto-wizard  HasEndTag
-UserTag  auto-wizard  Version   $Revision: 1.17 $
+UserTag  auto-wizard  Version   $Revision: 1.18 $
 UserTag  auto-wizard  Routine   <<EOR
 
 use vars qw/$Session $Tag $CGI $Tmp $Scratch $Values $ready_safe/;
@@ -282,7 +282,7 @@
 
 	::logData($fn, @o);
 	email_output($wizname, $ref, $opt, $fnames);
-	already($wizname => 1);
+	already($wizname => 1) unless $opt->{output_repeated};
 	return template_attr($wizname, $ref, $opt, $fnames);
 }
 
@@ -585,6 +585,15 @@
 				}
 				next;
 			}
+			elsif(/^opt:\s*(.*)$/s) {
+				my $option = $1;
+				$option =~ s/\s+$//;
+				my ($n, $v) = split /=/, $option, 2;
+				my $o = $ref->{_options} ||= [];
+				push @$o, $n, $v;
+				next;
+			}
+
 			s/^\s+//;
 			unless (/^([A-Za-z]\w+)(?:=([^:]+))?\s*:\s*(.*)/s) {
 				$Tag->warnings(qq{Unrecognized "$_" in middle of script.});
@@ -869,6 +878,13 @@
 		$opts{ui_break_before} = join " ", @{$optref->{_breaks}};
 		$opts{ui_break_before_label} = join ",", @{$optref->{_break_labels}};
 	}
+
+	if(my $o = $optref->{_options}) {
+		for (my $i = 0; $i < @$o; $i += 2) {
+			$opts{$o->[$i]} = $o->[$i + 1];
+		}
+	}
+
 	$opts{form_name} ||= 'wizard';
 	$opts{all_errors} = '1';
 	$opts{hidden} = {