--- isis2stream.pl	2002/09/23 18:46:21	1.21
+++ isis2stream.pl	2002/10/24 16:32:00	1.22
@@ -14,19 +14,7 @@
 
 my $db_dir = $opts{d};
 
-mkdir "$common::install_dir/$db_dir" if (!-e "$common::install_dir/$db_dir");
-mkdir "$common::install_dir/$db_dir/data" if (!-e "$common::install_dir/$db_dir/data");
-
-my $dir="$common::install_dir/$db_dir/data";
-
-
-open(S,"> $dir/stream") || die "can't open output $dir/stream: $!";
-open(R,"> $dir/bib") || die "can't open output $dir/bib: $!";
-open(MPS,"| $common::mpsindex -d $common::install_dir/$db_dir -autokey") || die "can't start MPS indexer $common::mpsindex: $!";
-#open(MPS,"> /tmp/mpsindex") || die "mps: $!";
-
-print S $common::mps_header;
-print MPS $common::mps_header;
+my $dir = open_data_files($db_dir);
 
 #--------------------------------------------------------------------
 # init array in_mps_header for config checks later
@@ -138,7 +126,7 @@
 	my @sf_arr = subfields_str_2_arr($subfields,$sf_hash);
 
 	foreach (@sf_arr) {
-		$out.=mps_expand($mps_id,$sf_hash->{$_});
+		$out.=mps_expand($mps_id,c_852_iso($sf_hash->{$_}));
 	}
 	return $out;
 }
@@ -164,15 +152,15 @@
 		if (scalar keys %{$sf_hash} > 0) {
 			if ($subfields) {
 				foreach (split(//,$subfields)) {
-					$out.=mps_expand($mps_id,$sf_hash->{$_});
+					$out.=mps_expand($mps_id,c_852_iso($sf_hash->{$_}));
 				}
 			} else {
 				foreach (keys %{$sf_hash}) {
-					$out.=mps_expand($mps_id,$sf_hash->{$_});
+					$out.=mps_expand($mps_id,c_852_iso($sf_hash->{$_}));
 				}
 			}
 		} else {
-			$out.=mps_expand($mps_id,$row->{$isis_id}->[$i]);
+			$out.=mps_expand($mps_id,c_852_iso($row->{$isis_id}->[$i]));
 		}
 		$i++;
 	}
@@ -605,7 +593,6 @@
 
 		$mps .= "E\n";
 
-
 		print S $mps;
 		print MPS $mps;
 	}