Changeset 32 in text-formbuilder for trunk/lib/Text

Timestamp:

11/17/04 14:57:58 (20 years ago)

Author:

peter

Message:

fall through to CGI::FormBuilder builtin option lists if @LIST does not match a list directive

File:

• trunk/lib/Text/FormBuilder.pm (modified) (6 diffs)

trunk/lib/Text/FormBuilder.pm

@@ -57 +57 @@
     
     local $/ = undef;
-    open SRC, "< $filename";
+    open SRC, "< $filename" or croak "[Text::FormBuilder::parse_file] Can't open $filename: $!" and return;
     my $src = <SRC>;
     close SRC;
@@ -69 +69 @@
     # so it can be called as a class method
     $self = $self->new unless ref $self;
+    
+    # append a newline so that it can be called on a single field easily
+    $src .= "\n";
     
     $self->{form_spec} = $self->{parser}->form_spec($src);
@@ -105 +108 @@
     # expand groups
     my %groups = %{ $self->{form_spec}{groups} || {} };
-    
     for my $section (@{ $self->{form_spec}{sections} || [] }) {
-##         foreach (grep { $$_[0] eq 'group' } @{ $self->{form_spec}{lines} || [] }) {
         foreach (grep { $$_[0] eq 'group' } @{ $$section{lines} }) {
             $$_[1]{group} =~ s/^\%//;       # strip leading % from group var name
@@ -149 +150 @@
             $$_{options} = \@list;
         } else {
-##             #TODO: this is not working in CGI::FormBuilder
-##             # assume that the list name is a builtin 
-##             # and let it fall through to CGI::FormBuilder
-##             $$_{options} = $$_{list};
-##             warn "falling through to builtin $$_{options}";
+            # assume that the list name is a builtin 
+            # and let it fall through to CGI::FormBuilder
+            $$_{options} = $$_{list};
         }
     } continue {
@@ -168 +167 @@
     # TODO: configurable threshold for this
     foreach (@{ $self->{form_spec}{fields} }) {
-        $$_{ulist} = 1 if defined $$_{options} and @{ $$_{options} } >= 3;
+        $$_{ulist} = 1 if ref $$_{options} and @{ $$_{options} } >= 3;
     }
     
@@ -230 +229 @@
     my ($self, $package, $use_tidy) = @_;
 
-    croak 'Expecting a package name' unless $package;
+    croak '[Text::FormBuilder::write_module] Expecting a package name' unless $package;
     
     # automatically call build if needed to