--- isis2stream.pl	2002/06/16 15:45:44	1.5
+++ isis2stream.pl	2002/06/16 16:06:55	1.6
@@ -344,17 +344,28 @@
 
 my $last_tell=0;
 
-my @isis_dbs = ( '.' );	# use dirname as database name
+my @isis_dirs = ( '.' );	# use dirname as database name
 
 if ($opts{m}) {
-	@isis_dbs = split(/,/,$opts{m});
+	@isis_dirs = split(/,/,$opts{m});
 }
 
-foreach my $db_name (@isis_dbs) {
+my @isis_dbs;
 
-  print MPS "M reading ISIS from $db_dir/$db_name/LIBRI...\n";
+foreach (@isis_dirs) {
+	if (-e "$common::isis_data/$db_dir/$_/LIBRI") {
+		push @isis_dbs,"$common::isis_data/$db_dir/$_/LIBRI/LIBRI";
+	}
+	if (-e "$common::isis_data/$db_dir/$_/PERI") {
+		push @isis_dbs,"$common::isis_data/$db_dir/$_/PERI/PERI";
+	}
+}
+
+foreach my $isis_db (@isis_dbs) {
+
+  print MPS "M reading ISIS from '$isis_db'...\n";
 
-  my $db = OpenIsis::open( "$common::isis_data/$db_dir/$db_name/LIBRI/LIBRI" );
+  my $db = OpenIsis::open( "$isis_db" );
 
   my $max_rowid = OpenIsis::maxRowid( $db );