--- trunk2/lib/WebPAC.pm	2004/06/16 14:31:33	358
+++ trunk2/lib/WebPAC.pm	2004/06/16 20:05:19	363
@@ -3,6 +3,7 @@
 use Carp;
 use Text::Iconv;
 use Config::IniFiles;
+use XML::Simple;
 
 use Data::Dumper;
 
@@ -34,6 +35,15 @@
 
 =cut
 
+# mapping between data type and tag which specify
+# format in XML file
+my %type2tag = (
+	'isis' => 'isis',
+#	'excel' => 'column',
+#	'marc' => 'marc',
+#	'feed' => 'feed'
+);
+
 sub new {
 	my $class = shift;
         my $self = {@_};
@@ -67,18 +77,6 @@
 
 	$self->{indexer_config_file} = new Config::IniFiles( -file => $self->{config_file} ) || croak "can't open '$self->{config_file}'";
 
-	# read global config parametars
-	foreach my $var (qw(
-			dbi_dbd
-			dbi_dsn
-			dbi_user
-			dbi_passwd
-			show_progress
-			my_unac_filter
-		)) {
-		$self->{global_config}->{$var} = $self->{global_config_file}->val('global', $var);
-	}
-
 	return $self;
 }
 
@@ -127,12 +125,16 @@
 	# create Text::Iconv object
 	my $cp = Text::Iconv->new($code_page,$self->{'code_page'});
 
+	print STDERR "reading ISIS database '",$arg->{'filename'},"'\n" if ($self->{'debug'});
+
 	my $isis_db = OpenIsis::open($arg->{'filename'});
 
 	my $maxmfn = OpenIsis::maxRowid( $isis_db ) || 1;
 
 	$maxmfn = $self->{limit_mfn} if ($self->{limit_mfn});
 
+	print STDERR "processing $maxmfn records...\n" if ($self->{'debug'});
+
 	# read database
 	for (my $mfn = 1; $mfn <= $maxmfn; $mfn++) {
 
@@ -165,10 +167,67 @@
 
 	}
 
+	$self->{'current_mfn'} = 1;
+
 	# store max mfn and return it.
 	return $self->{'max_mfn'} = $maxmfn;
 }
 
+=head2 fetch_rec
+
+Fetch next record from database. It will also display progress bar (once
+it's implemented, that is).
+
+ my $rec = $webpac->fetch_rec;
+
+=cut
+
+sub fetch_rec {
+	my $self = shift;
+
+	my $mfn = $self->{'current_mfn'}++ || confess "it seems that you didn't load database!";
+
+	if ($mfn > $self->{'max_mfn'}) {
+		$self->{'current_mfn'} = $self->{'max_mfn'};
+		return;
+	}
+
+	return $self->{'data'}->{$mfn};
+}
+
+=head2 open_import_xml
+
+Read file from C<import_xml/> directory and parse it.
+
+ $webpac->open_import_xml(type => 'isis');
+
+=cut
+
+sub open_import_xml {
+	my $self = shift;
+
+	my $arg = {@_};
+	confess "need type to load file from import_xml/" if (! $arg->{'type'});
+
+	my $type = $arg->{'type'};
+
+	my $type_base = $type;
+	$type_base =~ s/_.*$//g;
+
+	my $f = "./import_xml/$type.xml";
+	confess "import_xml file '$f' doesn't exist!" if (! -e "$f");
+
+	print STDERR "reading '$f'\n" if ($self->{'debug'});
+
+	$self->{'import_xml'} = XMLin($f,
+		ForceArray => [ $type2tag{$type_base}, 'config', 'format' ],
+		ForceContent => 1
+	);
+
+	print Dumper($self->{'import_xml'});
+
+}
+
 =head2 create_lookup
 
 Create lookup from record using lookup definition.
@@ -268,10 +327,18 @@
 
 	my $found = 0;
 
+	my $eval_code;
+	# remove eval{...} from beginning
+	$eval_code = $1 if ($format =~ s/^eval{([^}]+)}//s);
+
 	# do actual replacement of placeholders
 	$format =~ s/v(\d+)(?:\^(\w))*/$self->get_data(\$rec,$1,$2,$i,\$found)/ges;
 
 	if ($found) {
+		if ($eval_code) {
+			my $eval = $self->fill_in($rec,$eval_code,$i);
+			return if (! eval $eval);
+		}
 		# do we have lookups?
 		if ($format =~ /\[[^\[\]]+\]/o) {
 			return $self->lookup($format);
@@ -355,12 +422,12 @@
 	my $prefix;
 	my $all_found=0;
 
-print "## $format\n";
+#print "## $format\n";
 	while ($format =~ s/^(.*?)v(\d+)(?:\^(\w))*//s) {
-print "## [ $1 | $2 | $3 ] $format\n";
+#print "## [ $1 | $2 | $3 ] $format\n";
 
 		my $del = $1 || '';
-		$prefix ||= $del;
+		$prefix ||= $del if ($all_found == 0);
 
 		my $found = 0;
 		my $tmp = $self->get_data(\$rec,$2,$3,$i,\$found);
@@ -374,13 +441,16 @@
 
 	return if (! $all_found);
 
-	print Dumper($prefix, \@out);
-
 	my $out = join('',@out) . $format;
 
 	# add prefix if not there
 	$out = $prefix . $out if ($out !~ m/^\Q$prefix\E/);
 	
+	if ($eval_code) {
+		my $eval = $self->fill_in($rec,$eval_code,$i);
+		return if (! eval $eval);
+	}
+
 	return $out;
 }