--- isis2stream.pl	2002/06/16 16:06:55	1.6
+++ isis2stream.pl	2002/06/16 18:11:14	1.7
@@ -3,7 +3,7 @@
 use strict;
 use OpenIsis;
 use Getopt::Std;
-#use Data::Dumper;
+use Data::Dumper;
 use common;
 
 my %opts;
@@ -307,7 +307,7 @@
 sub isis_sf {
 	my $row = shift @_;
 	my $isis_id = shift @_;
-	my $subfield = shift @_ || 'a';
+	my $subfield = shift @_;
 	my $prefix = shift @_ || '';
 	my $postfix = shift @_ || '';
 
@@ -315,7 +315,10 @@
 
 	if ($row->{$isis_id}->[0]) {
 		my $sf = OpenIsis::subfields($row->{$isis_id}->[0]);
-		if (length($subfield) == 1) {
+		if (! defined $subfield || length($subfield) == 0) {
+			# subfield list undef, empty or no defined subfields for this record
+			return $prefix . $row->{$isis_id}->[0] . $postfix;
+		} elsif (length($subfield) == 1) {
 			if ($sf->{$subfield}) {
 				return $prefix . $sf->{$subfield} . $postfix;
 			} else {
@@ -376,7 +379,7 @@
 	if (my $tmp = $row->{'200'}->[0]) {
 
 		my $bib = "%MFN $row->{mfn}\n";
-		my $mps;
+		my $mps = "W $row->{mfn} 14\n";
 
 		my $pcnt = int($row->{mfn} * 100 / $max_rowid);
 		if ($pcnt != $last_pcnt) {
@@ -401,6 +404,7 @@
 		$mps .= isis_to_mps($row,'711',1);
 		$mps .= isis_to_mps($row,'503',1);
 		$mps .= isis_to_mps($row,'702',1);
+		$mps .= isis_to_mps($row,'200',1,"fg");
 
 		$bib .= isis_to_bib($row,'205','%205');
 
@@ -422,11 +426,51 @@
 		$mps .= isis_to_mps($row,'532',2);
 		$mps .= isis_to_mps($row,'424',2);
 
+		$mps .= isis_to_mps($row,'230',2,"ae");
+		$mps .= isis_to_mps($row,'231',2,"ae");
+		$mps .= isis_to_mps($row,'232',2,"ae");
+		$mps .= isis_to_mps($row,'233',2,"ae");
+
+
+		$bib .= "%sv ".isis_sf($row,'230','v').
+			isis_sf($row,'230','a',' : ').
+			isis_sf($row,'250',undef,'. - ').
+			isis_sf($row,'260',undef,'. - ').
+			isis_sf($row,'290',undef,'<br>ISBN ').
+			"\n";
+		$bib .= "%sv ".isis_sf($row,'231','v','<br>').
+			isis_sf($row,'231','a',' : ').
+			isis_sf($row,'251',undef,'. - ').
+			isis_sf($row,'261',undef,'. - ').
+			isis_sf($row,'291',undef,'<br>ISBN ').
+			"\n";
+		$bib .= "%sv ".isis_sf($row,'232','v','<br>').
+			isis_sf($row,'232','a',' : ').
+			isis_sf($row,'252',undef,'. - ').
+			isis_sf($row,'262',undef,'. - ').
+			isis_sf($row,'292',undef,'<br>ISBN ').
+			"\n";
+		$bib .= "%sv ".isis_sf($row,'233','v','<br>').
+			isis_sf($row,'233','a',' : ').
+			isis_sf($row,'253',undef,'. - ').
+			isis_sf($row,'263',undef,'. - ').
+			isis_sf($row,'293',undef,'<br>ISBN ').
+			"\n";
+
+		$mps .= isis_to_mps($row,'270',2);
+		$mps .= isis_to_mps($row,'271',2);
+		$mps .= isis_to_mps($row,'272',2);
+		$mps .= isis_to_mps($row,'273',2);
+
 		$headline .= isis_sf($row,'700','b'," ");
 		$headline .= isis_sf($row,'700','a'," ");
 
 		# izdavac
 		$mps .= isis_to_mps($row,'210',3);
+		$mps .= isis_to_mps($row,'250',3);
+		$mps .= isis_to_mps($row,'251',3);
+		$mps .= isis_to_mps($row,'252',3);
+		$mps .= isis_to_mps($row,'253',3);
 #		if (my $sf = OpenIsis::subfields($row->{'210'}->[0])) {
 #			my $tmp;
 #			$tmp .= $sf->{a} if ($sf->{a});
@@ -434,7 +478,7 @@
 #			$tmp .= ", ".$sf->{d} if ($sf->{d});
 #			$bib .= "%210 $tmp\n" if ($tmp);
 #		}
-		$bib .= "%210 ".isis_sf($row,'210','acd', '','', ('',' : ',', ') )."\n";
+		$bib .= "%210+ ".isis_sf($row,'210','acd', '','', ('',' : ',', ') )."\n";
 
 		if (my $year = isis_sf($row,'210','d')) {
 			$year =~ s/^\s*cop\.*\s*//i;
@@ -443,7 +487,12 @@
 			$headline .= " ($year)";
 		}
 
-		$bib .= isis_to_bib($row,'215','%215', '*', undef, undef, ', ');
+		$mps .= isis_to_mps($row,'215',15);
+		$mps .= isis_to_mps($row,'260',15);
+		$mps .= isis_to_mps($row,'261',15);
+		$mps .= isis_to_mps($row,'262',15);
+		$mps .= isis_to_mps($row,'263',15);
+		$bib .= isis_to_bib($row,'215','%215+', '*', undef, undef, ', ');
 
 #		$bib .= isis_to_bib($row,'225','%225', 'aehivw');
 		$bib .= "%225 ".isis_sf($row,'225','aevhiw', '(',')', ('',' : ',' ; ','. ',', ',' ; '))."\n";
@@ -455,6 +504,10 @@
 		$mps .= isis_to_mps($row,'300',5);
 		$mps .= isis_to_mps($row,'320',5);
 		$mps .= isis_to_mps($row,'327',5);
+		$mps .= isis_to_mps($row,'280',5);
+		$mps .= isis_to_mps($row,'281',5);
+		$mps .= isis_to_mps($row,'282',5);
+		$mps .= isis_to_mps($row,'283',5);
 
 		$bib .= isis_to_bib($row,'330','%330');
 		$mps .= isis_to_mps($row,'330',6);
@@ -476,15 +529,28 @@
         	$bib .= isis_to_bib($row,'991','%991');
 	        $mps .= isis_to_mps($row,'991',12);
 
-		# ISBN
-		if (my $isbn = $row->{10}->[0]) {
-			$isbn =~ s/ +//g;	# remove spaces
-			$mps .= "W $isbn 13\n";
-			$bib .= "%ISBN $isbn\n";
-			$isbn =~ s/-//g;
-			$mps .= "W $isbn 13\n";
+		sub store_isn {
+			if (my $isn = shift @_) {
+				my $nr = shift @_;
+				my $tag = shift @_;
+				$isn =~ s/ +//g;	# remove spaces
+				$mps .= "W $isn $nr\n";
+				$bib .= "$tag $isn\n";
+				if ($isn =~ s/-//g) {
+					$mps .= "W $isn $nr\n";
+				}
+			}
 		}
-		$mps .= isis_to_mps($row,'10',12);
+
+		# ISBN
+		store_isn($row->{10}->[0],13,'%ISBN');
+		$mps .= isis_to_mps($row,'290',13);
+		$mps .= isis_to_mps($row,'291',13);
+		$mps .= isis_to_mps($row,'292',13);
+		$mps .= isis_to_mps($row,'293',13);
+
+		# ISSN
+		#store_isn($row->{11}->[0],14,'%ISSN');
 
 		$mps .= isis_to_mps($row,'532',1);
 
@@ -507,6 +573,7 @@
 #}
 
 		print R c_852_iso($bib);
+		print R "%perl ".Dumper($row)."\n";
 
 		$mps .= "T document text/plain ".(tell(R) - $last_tell)." $dir/bib $last_tell ".tell(R)."\n";
 		$last_tell=tell(R);