--- trunk/all2xml.pl	2002/12/01 22:51:29	4
+++ trunk/all2xml.pl	2003/01/11 19:55:30	9
@@ -5,14 +5,27 @@
 use Getopt::Std;
 use Data::Dumper;
 use XML::Simple;
-use Text::Unaccent;
+use Text::Unaccent 1.02;	# 1.01 won't compile on my platform,
 require Unicode::Map8;
+use DBI;
 
 my $config=XMLin(undef, forcearray => [ 'isis' ], forcecontent => 1);
+my $dbh = DBI->connect("DBI:Pg:dbname=webpac","","") || die $DBI::errstr; # FIX
+# FIX; select relname from pg_class where relname like 'index_%' ;
+$dbh->begin_work || die $dbh->errstr();
+
+$dbh->do("delete from index_author") || die $dbh->errstr();
+$dbh->do("delete from index_title") || die $dbh->errstr();
 
 my %opts;
 
-getopts('d:m:q', \%opts);
+# usage:
+# 	-d directory name
+# 	-m multiple directories
+# 	-q quiet
+# 	-s run swish
+
+getopts('d:m:qs', \%opts);
 
 my $db_dir = $opts{d} || "ps";	# FIX
 
@@ -29,6 +42,7 @@
 	my $row = shift @_;
 
 	my $xml;
+	$xml->{db_dir} = [ $db_dir ];	# FIX remove?
 
 	sub isis_sf {
 		my $row = shift @_;
@@ -50,19 +64,23 @@
 	foreach my $field (keys %{$config->{indexer}}) {
 
 		my $display_data = "";
+		my $swish_data = "";
 		my $index_data = "";
 
 		foreach my $x (@{$config->{indexer}->{$field}->{isis}}) {
 
 			my $display_tmp = "";
+			my $swish_tmp = "";
 			my $index_tmp = "";
 
 			my $format = $x->{content};
-			my $i = 1;	# index only
+			my $s = 1;	# swish only
 			my $d = 1;	# display only
-			$i = 0 if (lc($x->{type}) eq "display");
-			$d = 0 if (lc($x->{type}) eq "index");
-#print "## i: $i d: $d ## $format ##";	
+			my $i = 0;	# index only
+			$s = 0 if (lc($x->{type}) eq "display");
+			$d = 0 if (lc($x->{type}) eq "swish");
+			($s,$d,$i) = (0,0,1) if (lc($x->{type}) eq "index");
+#print STDERR "## s: $s d: $d i: $i ## $format ##\n";	
 			# parse format
 			my $prefix = "";
 			if ($format =~ s/^([^\d]+)//) {
@@ -74,8 +92,9 @@
 					if ($isis_tmp) {
 #						$display_tmp .= $prefix . "/$1/$2/".$isis_tmp if ($d);
 						$display_tmp .= $prefix . $isis_tmp if ($d);
-						$index_tmp .= $isis_tmp." " if ($i);
-#print " $isis_tmp <--\n";
+						$swish_tmp .= $isis_tmp." " if ($s);
+						$index_tmp .= $prefix . $isis_tmp if ($i);
+#print STDERR " $isis_tmp <--\n";
 					}
 					$prefix = "";
 				} elsif ($format =~ s/^([^\d]+)//) {
@@ -87,20 +106,38 @@
 			}
 			# add suffix
 			$display_tmp .= $prefix if ($display_tmp);
+			$index_tmp .= $prefix if ($index_tmp);
 
 #			$display_data .= $display_tmp if ($display_tmp ne "");
-#			$index_data .= $index_tmp if ($index_tmp ne "");
+#			$swish_data .= $swish_tmp if ($swish_tmp ne "");
 			$display_data .= $display_tmp;
+			$swish_data .= $swish_tmp;
 			$index_data .= $index_tmp;
 
 		}
-#print "--display:$display_data\n--index:$index_data\n";
-		$xml->{$field}->{display} .= $isis_map->tou($display_data)->utf8 if ($display_data);
-		$xml->{$field}->{index} .= unac_string($config->{isis_codepage},$index_data) if ($index_data);
-	
+#print "--display:$display_data\n--swish:$swish_data\n";
+		#$xml->{$field."_display"} = $isis_map->tou($display_data)->utf8 if ($display_data);
+		#$xml->{$field."_swish"} = unac_string($config->{isis_codepage},$swish_data) if ($swish_data);
+		$xml->{$field."_display" } = [ $isis_map->tou($display_data)->utf8 ] if ($display_data);
+		$xml->{$field."_swish"} = [ unac_string($config->{isis_codepage},$swish_data) ] if ($swish_data);
+
+		# index
+		if ($index_data && $index_data ne "") {
+			my $sql = "select $field from index_$field where upper($field)=upper(?)";
+			my $sth = $dbh->prepare($sql) || die $dbh->errstr();
+			$sth->execute($index_data) || die "SQL: $sql; ".$dbh->errstr();
+#print STDERR "--->$index_data<---\n";
+			if (! $sth->fetchrow_hashref) {
+				my $sql = "insert into index_$field values (?)";
+				my $sth = $dbh->prepare($sql) || die $dbh->errstr();
+#print STDERR "$sql: $index_data<!----\n";
+				$sth->execute($index_data) || die "SQL: $sql; ".$dbh->errstr();
+			}
+		}
+
 	}
 	if ($xml) {
-		return XMLout($xml, rootname => 'xml', noattr => 1 );
+		return XMLout($xml, rootname => 'xml', keeproot => 0, noattr => 0 );
 	} else {
 		return;
 	}
@@ -168,15 +205,19 @@
 			}
 
 			if (my $xml = isis2xml($row)) {
-				print "Path-Name: $isis_db#".$row->{mfn}."\n";
-				print "Content-Length: ".(length($xml)+1)."\n";
-				print "Document-Type: XML\n\n$xml\n";
+				my $path = $isis_db;
+				$path =~ s#$config->{isis_data}/*##g;
+				my $out = "Path-Name: $path#".$row->{mfn}."\n";
+				$out .= "Content-Length: ".(length($xml)+1)."\n";
+				$out .= "Document-Type: XML\n\n$xml\n";
+				print $out;
 			}
 		}
 	}
 	print STDERR "\n";
 }
 
+$dbh->commit || die $dbh->errstr();
 
 1;
 __END__