--- isis2stream.pl	2002/06/24 17:08:20	1.14
+++ isis2stream.pl	2002/07/17 16:55:24	1.18
@@ -49,7 +49,9 @@
 	if (/^database-name:([^=]+)=(.*)$/) {
 		my ($db_name,$db_desc) = ($1,$2);
 		$db_desc=~s/^##\w+##//g;
-		$DatabaseDescriptions{$db_name}=$db_desc;
+		# c_iso_852 is a cludge so that output format would be
+		# correct 8859-2 again...
+		$DatabaseDescriptions{$db_name}=c_iso_852($db_desc);
 	}
 }
 close(CF);
@@ -325,7 +327,7 @@
 	my $row = OpenIsis::read( $db, $row_id );
 	if (my $tmp = $row->{'200'}->[0]) {
 
-		my $bib = "%MFN $row->{mfn}\n";
+		my $bib;
 		my $mps = "W $row->{mfn} 14\n";
 
 		my $pcnt = int($row->{mfn} * 100 / $max_rowid);
@@ -350,11 +352,12 @@
 		$bib .= isis_to_bib($row,'701','%700+','ab',undef,'>',', ');
 		$bib .= isis_to_bib($row,'701','%700+','cd',undef,'>',', ');
 
-		my $tmp = isis_sf($row,'710','abc', '', '', (' : ',', '));
+		my $tmp;
+		$tmp = isis_sf($row,'710','abc', '', '', (' : ',', '));
 		$tmp .= isis_sf($row,'710','dfe', ' (', ')', ('', ' ; ',' ; '));
 		$bib .= "%700+ $tmp\n" if ($tmp);
 
-		my $tmp = isis_sf($row,'711','abc', '', '', (' : ',', '));
+		$tmp = isis_sf($row,'711','abc', '', '', (' : ',', '));
 		$tmp .= isis_sf($row,'711','dfe', ' (', ')', ('', ' ; ',' ; '));
 		$bib .= "%700+ $tmp\n" if ($tmp);
 
@@ -394,7 +397,6 @@
 		$mps .= isis_to_mps($row,'233',2,"ae");
 
 
-		my $tmp;
 		$tmp =	isis_sf($row,'230','v').
 			isis_sf($row,'230','a',' : ').
 			isis_sf($row,'250',undef,'. - ').
@@ -480,9 +482,9 @@
 		$bib .= isis_to_bib($row,'610','%610');
 		$mps .= isis_to_mps($row,'610',8);
 
-		$bib .= isis_to_bib($row,'675','%675+');
+		$bib .= isis_to_bib($row,'675','%675+','a');
 		$mps .= isis_to_mps($row,'675',9);
-		$bib .= isis_to_bib($row,'686','%675+');
+		$bib .= isis_to_bib($row,'686','%675+','a');
 		$mps .= isis_to_mps($row,'686',10);
 
 		$bib .= isis_to_bib($row,'990','%990');
@@ -491,6 +493,12 @@
         	$bib .= isis_to_bib($row,'991','%991');
 	        $mps .= isis_to_mps($row,'991',12);
 
+		# Jezik
+        	$bib .= isis_to_bib($row,'101','%101');
+	        $mps .= isis_to_mps($row,'101',16);
+		# Pismo
+        	$bib .= isis_to_bib($row,'998','%101', 'a');
+
 		sub isis_isn_to_mps {
 			my $row = shift @_ || die;
 			my $isis_id = shift @_ || die;
@@ -522,8 +530,7 @@
 
 		$mps .= isis_to_mps($row,'532',1);
 
-		$bib .= isis_to_bib($row,'994','%994a','a');
-
+		$bib .= '%knjiz '.$DatabaseDescriptions{$db_dir}.", ".$row->{mfn}."\n";
 		# headline
 		if ($headline) {
 			$headline .= " <i>(".$DatabaseDescriptions{$db_dir}.", ".$row->{mfn}.")</i>";	## debug MFN!