--- isis2stream.pl	2002/06/24 15:36:52	1.11
+++ isis2stream.pl	2002/06/25 13:42:54	1.17
@@ -325,7 +325,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);
@@ -346,11 +346,20 @@
 		$headline =~ s/\s+$//g;
 
 		# author
-		$bib .= isis_to_bib($row,'700','%700+','*',2,'<');
-		$bib .= isis_to_bib($row,'701','%700+','*',2,'<');
-		$bib .= isis_to_bib($row,'710','%700+','*',2,'<');
-		$bib .= isis_to_bib($row,'711','%700+','*',2,'<');
-		$bib .= isis_to_bib($row,'503','%700+','*',2,'<');
+		$bib .= isis_to_bib($row,'700','%700+','ab',undef,'>',', ');
+		$bib .= isis_to_bib($row,'701','%700+','ab',undef,'>',', ');
+		$bib .= isis_to_bib($row,'701','%700+','cd',undef,'>',', ');
+
+		my $tmp;
+		$tmp = isis_sf($row,'710','abc', '', '', (' : ',', '));
+		$tmp .= isis_sf($row,'710','dfe', ' (', ')', ('', ' ; ',' ; '));
+		$bib .= "%700+ $tmp\n" if ($tmp);
+
+		$tmp = isis_sf($row,'711','abc', '', '', (' : ',', '));
+		$tmp .= isis_sf($row,'711','dfe', ' (', ')', ('', ' ; ',' ; '));
+		$bib .= "%700+ $tmp\n" if ($tmp);
+
+		$bib .= isis_to_bib($row,'503','%700+','ab',undef,'>',', ');
 
 		$mps .= isis_to_mps($row,'700',1);
 		$mps .= isis_to_mps($row,'701',1);
@@ -386,7 +395,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,'. - ').
@@ -472,9 +480,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');
@@ -483,6 +491,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;
@@ -514,15 +528,13 @@
 
 		$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!
 			$headline =~ s/&/&and;/g;
 			$headline =~ s/</&lt;/g;
 			$headline =~ s/>/&gt;/g;
-			$headline =~ s/&lt;(\/?[bi])&gt;/<$1>/g;
 			$mps .= "H ".c_852_iso($headline)."\n";
 		} else {
 			$mps .= "H nepoznato\n";