--- isis2stream.pl	2002/06/24 15:36:52	1.11
+++ isis2stream.pl	2002/07/17 18:37:37	1.19
@@ -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);
@@ -309,6 +311,12 @@
 	if (-e "$common::isis_data/$db_dir/$_/PERI") {
 		push @isis_dbs,"$common::isis_data/$db_dir/$_/PERI/PERI";
 	}
+	if (-e "$common::isis_data/$db_dir/$_/AMS") {
+		push @isis_dbs,"$common::isis_data/$db_dir/$_/AMS/AMS";
+	}
+	if (-e "$common::isis_data/$db_dir/$_/ARTI") {
+		push @isis_dbs,"$common::isis_data/$db_dir/$_/ARTI/ARTI";
+	}
 }
 
 foreach my $isis_db (@isis_dbs) {
@@ -317,6 +325,20 @@
 
   my $db = OpenIsis::open( "$isis_db" );
 
+  if (! defined $db) {
+  	die "can't open '$isis_db'";
+  }
+
+  my $tip = $isis_db; $tip =~ s/^.+?\/([^\/]+)$/$1/;
+  if (defined $default::tip{$tip}) {
+  	$tip=$default::tip{$tip};
+  } elsif ($tip eq "AMS") {
+  	$tip=$default::tip{'LIBRI'};
+  } else {
+  	die "can't find tip for database '$isis_db'";
+  }
+  $tip = c_iso_852($tip);
+
   my $max_rowid = OpenIsis::maxRowid( $db );
 
   my $last_pcnt = 0;
@@ -325,9 +347,13 @@
 	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";
 
+		# tip gradje
+		$mps .= "W ".c_852_czs($tip)." 17\n";
+		$bib .= "%tip $tip\n";
+
 		my $pcnt = int($row->{mfn} * 100 / $max_rowid);
 		if ($pcnt != $last_pcnt) {
 			printf MPS ("M %5d / %5d -- %-2d %%\n",$row->{mfn},$max_rowid,$pcnt) if (! $opts{q});
@@ -346,11 +372,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 +421,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 +506,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 +517,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;
@@ -510,19 +550,29 @@
 		$mps .= isis_isn_to_mps($row,'293',13);
 
 		# ISSN
-		#store_isn($row->{11}->[0],14,'%ISSN');
+		$bib .= isis_to_bib($row,'11','%ISSN');
+		$mps .= isis_isn_to_mps($row,'11',13);
 
 		$mps .= isis_to_mps($row,'532',1);
 
-		$bib .= isis_to_bib($row,'994','%994a','a');
+		# Casopisi
+		$tmp = isis_to_bib($row,'326','%326');
+		$tmp =~ s/g1/godišnjak/;
+		$tmp =~ s/g6/dvomjesečnik/;
+		$tmp =~ s/10/godišnje 10 brojeva/;
+		$tmp =~ s/m1/mjesečnik/;
+		$tmp =~ s/m2/polumjesečnik/;
+		$tmp =~ s/nr/neredovito/;
+		$bib .= c_iso_852($tmp);
+		$bib .= isis_to_bib($row,'992','%992');
 
+		$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";