Index: /trunk/DataStoreServer/scripts/dsfsindex
===================================================================
--- /trunk/DataStoreServer/scripts/dsfsindex	(revision 16953)
+++ /trunk/DataStoreServer/scripts/dsfsindex	(revision 16954)
@@ -41,5 +41,6 @@
 my $prod_id = $prod->{prod_id};
 
-my $stmt = $dbh->prepare("SELECT fileset_id FROM dsFileset WHERE fileset_name = \'$fileset\'");
+my $stmt = $dbh->prepare("SELECT fileset_id FROM dsFileset WHERE fileset_name = \'$fileset\'" .
+                    " AND prod_id = $prod_id");
 $stmt->execute();
 my $fs = $stmt->fetchrow_hashref();