implemented index_delimiter which enables to to format index entries in format

(values to be inserted in index);;(values to be displayed) if there is
definition of index_delimiter=";;". This will allow you to index (and
search) through values from original database and still have ability to
display lookup fields.

git-svn-id: file:///home/dpavlin/private/svn/webpac/trunk@188 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/all2xml.pl b/all2xml.pl
index ee276f6..b125adb 100755 (executable)
--- a/all2xml.pl
+++ b/all2xml.pl
@@ -117,6 +117,7 @@ sub data2xml {
        delete $cache->{swish_data};
        delete $cache->{swish_exact_data};
        delete $cache->{index_data};
+       delete $cache->{index_delimiter};
        my @page_fields;        # names of fields
 
 
@@ -164,6 +165,7 @@ sub data2xml {
                my %page_max = ();
                # default line_delimiter if using
                my $page_line_delimiter = $config->{indexer}->{$field}->{page_line_delimiter} || '<br/>';
+               $cache->{index_delimiter}->{$field} = $config->{indexer}->{$field}->{index_delimiter};
 
                foreach my $x (@{$config->{indexer}->{$field}->{$tag}}) {
 
@@ -177,7 +179,7 @@ sub data2xml {
                        my ($s,$se,$d,$i,$il) = (1,0,1,0,0);
                        $s = 0 if (lc($x->{type}) eq "display");
                        $d = 0 if (lc($x->{type}) eq "swish");
-                       ($s,$se,$d,$i) = (0,0,0,1) if (lc($x->{type}) eq "index");
+                       ($s,$se,$d,$i) = (0,1,0,1) if (lc($x->{type}) eq "index");
                        ($s,$se,$d,$i) = (0,1,0,0) if (lc($x->{type}) eq "swish_exact");
                        ($s,$se,$d,$i,$il) = (0,1,0,0,1) if (lc($x->{type}) =~ /^lookup/);
 
@@ -371,9 +373,14 @@ sub data2xml {
                        }
 
                        if (! $iterate_by_page) {
+                               my $idel = $x->{index_delimiter};
                                # fill data in index
-                               foreach my $d (@index_data) {
-                                       $index->insert($field, $d, $path);
+                               foreach my $tmp (@index_data) {
+                                       my $i = $d = $tmp;
+                                       if ($idel && $tmp =~ m/$idel/) {
+                                               ($i,$d) = split(/$idel/,$tmp);
+                                       }
+                                       $index->insert($field, $i, $d, $path);
                                }
                                @index_data = ();
                        }
@@ -455,9 +462,15 @@ sub data2xml {
                                        $xml .= xmlify($field."_swish_exact", unac_string($codepage,'xxbxx '.$swish_exact_data.' xxexx'));
                                }
                                
-                               foreach my $d (@{$cache->{index_data}->{$field}->[$page]}) {
-                                       $index->insert($field, $d, $path);
-#print STDERR "index $field: $d [$path]\n";
+                               my $idel = $cache->{index_delimiter}->{$field};
+                               foreach my $tmp (@{$cache->{index_data}->{$field}->[$page]}) {
+                                       my $i = $tmp;
+                                       my $d = $tmp;
+                                       if ($idel && $tmp =~ m/$idel/) {
+                                               ($i,$d) = split(/$idel/,$tmp);
+                                       }
+                                       $index->insert($field, $i, $d, $path);
+#print STDERR "index [$idel] $field: $i --> $d [$path]\n";
                                }
                        }
        

diff --git a/index_DBI_cache.pm b/index_DBI_cache.pm
index c544fbf..a798ce4 100644 (file)
--- a/index_DBI_cache.pm
+++ b/index_DBI_cache.pm
@@ -10,6 +10,7 @@ package index_DBI;
 use strict qw(vars);
 use vars qw($Count);
 use HTML::Entities;
+use URI::Escape;
 
 use DBI;
 
@@ -66,6 +67,7 @@ sub delete_and_create {
        }
        $sql = "create table $field (
                        item varchar(255),
+                       display text,
                        count int,
                        ord int,
                        primary key (item)
@@ -79,7 +81,7 @@ sub insert {
 
        my $field = shift;
        my $index_data = shift || print STDERR "\$index->insert($field,NULL,...)";
-       my $ident = shift || '';        # e.g. library id
+       my $display = shift || $index_data;
 
        if (! $index_data) {
                print STDERR "\$index->insert() -- no value to insert\n";
@@ -101,6 +103,7 @@ sub insert {
        if (! $c_table->{$field}->{$uc}) {
 #print stderr "in index: $index_data\n";
                $c_table->{$field}->{$uc} = $index_data;
+               $c_table->{$field}->{$uc}->{display} = $display;
                $c_count->{$field}->{$uc} = 1;
        } else {
                $c_count->{$field}->{$uc}++;
@@ -145,7 +148,7 @@ sub fetch {
 
        my @sql_args;
 
-       my $sql = "select item,ord from $field";
+       my $sql = "select item,display,ord from $field";
 
        if ($where) {
                my $sql2 = "select ord from $field where upper(item) like upper(?)||'%'";
@@ -171,7 +174,8 @@ sub fetch {
        $sth->execute() || die "execute: $sql; ".$self->{dbh}->errstr();
        my @arr;
        while (my $row = $sth->fetchrow_hashref) {
-               $row->{item} = HTML::Entities::encode($row->{item},'<>&"');
+               $row->{item} = HTML::Entities::encode($row->{item},' <>&"');
+               $row->{display} = HTML::Entities::encode($row->{display},'<>&"');
                push @arr,$row;
        }
        return @arr;
@@ -192,13 +196,14 @@ sub close {
                my @keys = sort keys %{$c_table->{$table}};
 
                $self->bench("Dumping data into $table");
-               my $sql = "insert into $table (ord,item,count) values (?,?,?)";
+               my $sql = "insert into $table (ord,item,display,count) values (?,?,?,?)";
                my $sth = $self->{dbh}->prepare($sql) || die "sql: $sql; ".$self->{dbh}->errstr();
 
                my $ord = 0;
                foreach my $key (@keys) {
                        $sth->execute(++$ord,
                                $c_table->{$table}->{$key},
+                               $c_table->{$table}->{$key}->{display},
                                $c_count->{$table}->{$key}
                        );
                }