give render module to pull usemap from

[Biblio-Z3950.git] / server.pl

diff --git a/server.pl b/server.pl
index 33708da..7cc545f 100755 (executable)
--- a/server.pl
+++ b/server.pl
@@ -36,6 +36,7 @@ diag "SearchHandle ",Dumper($this);
     my $query;
 
     eval { $query = $rpn->{query}->render(); };
+       warn "ERROR: $@" if $@;
     if ( $@ && ref($@) ) {    ## Did someone/something report any errors?
         $this->{ERR_CODE} = $@->{errcode};
         $this->{ERR_STR}  = $@->{errstr};
@@ -164,10 +165,14 @@ use Data::Dump qw(dump);
 use COBISS;
 
 sub render {
-    my $this       = shift;
+    my ($this,$from) = @_;
 
 print "render ", dump($this);
 
+my $usemap = eval '$' . $from . '::usemap';
+die $@ if $@;
+warn "# $from usermap ",dump($usemap);
+
     my $attributes = {};
     my $prefix     = "";
     foreach my $attr ( @{ $this->{attributes} } ) {
@@ -176,7 +181,7 @@ print "render ", dump($this);
         $attributes->{$type} = $value;
     }
     if ( defined( my $use = $attributes->{1} ) ) {
-        if ( defined( my $field = COBISS::usemap($use) ) ) {
+        if ( defined( my $field = $usemap->{$use} ) ) {
             $prefix = $field;
         }
         else {