--- trunk/lib/WebPAC/Parser.pm	2006/09/25 13:24:09	703
+++ trunk/lib/WebPAC/Parser.pm	2006/09/25 13:46:36	705
@@ -66,18 +66,6 @@
 	$self ? return $self : return undef;
 }
 
-=head2 lookup_create_rules
-
-  my $source = $parser->lookup_create_rules($database, $input);
-
-=cut
-
-sub lookup_create_rules {
-	my $self = shift;
-	my ($database,$input) = @_;
-	return $self->{_lookup_create}->{ _q($database) }->{ _q($input) };
-}
-
 =head2 valid_database
 
   my $ok = $parse->valid_database('key');
@@ -100,8 +88,8 @@
 
 sub valid_database_input {
 	my $self = shift;
-
 	my ($database,$input) = @_;
+	$input = _input_name($input);
 	return defined($self->{valid_inputs}->{ _q($database) }->{ _q($input) });
 }
 
@@ -116,6 +104,7 @@
 sub depends {
 	my $self = shift;
 	my ($database,$input) = @_;
+	$input = _input_name($input);
 	$self->_get_logger->debug("depends($database,$input)");
 	return unless (
 		defined( $self->{depends}->{ _q($database) } ) &&
@@ -124,6 +113,23 @@
 	return $self->{depends}->{ _q($database) }->{ _q($input) };
 }
 
+=head2 lookup_create_rules
+
+  my $source = $parser->lookup_create_rules($database, $input);
+
+=cut
+
+sub lookup_create_rules {
+	my $self = shift;
+	my ($database,$input) = @_;
+	$input = _input_name($input);
+	return unless (
+		defined( $self->{_lookup_create}->{ _q($database) } ) &&
+		defined( $self->{_lookup_create}->{ _q($database) }->{ _q($input) } )
+	);
+	return $self->{_lookup_create}->{ _q($database) }->{ _q($input) };
+}
+
 =head1 PRIVATE
 
 =head2 _read_sources
@@ -286,7 +292,7 @@
 			return $self->_lookup_error("invalid input $e[5] of database $e[3] in $path", ) unless $self->valid_database_input( $e[3], $e[5] );
 
 			# save code to create this lookup
-			$self->{_lookup_create}->{ _q($e[3]) }->{ _q($e[5]) }->{ _q($key) } .= $create;
+			$self->{_lookup_create}->{ _q($e[3]) }->{ _q($e[5]) }->{ _q($key) } .= "# lookup for $e[3]/$e[5]/$key\n\n$create";
 
 
 			if (defined( $self->{depends}->{ $database }->{ $input }->{ _q($e[3]) }->{ _q($e[5]) }->{ $key } )) {