From 5331c088fb00a71bc397a0bd7eac78bae62f4ed5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 6 Jun 2013 21:15:34 -0400 Subject: v4 v5: db, population of database (--update), import of master files (.ssm), fix * (Note: for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns, affects construction of unique identifier) --- lib/sisu/v5/db_remove.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sisu/v5/db_remove.rb') diff --git a/lib/sisu/v5/db_remove.rb b/lib/sisu/v5/db_remove.rb index 1fb40e30..2e65d51a 100644 --- a/lib/sisu/v5/db_remove.rb +++ b/lib/sisu/v5/db_remove.rb @@ -78,17 +78,17 @@ module SiSU_DbRemove remove_selected=%{ SELECT tid FROM metadata_and_text - WHERE src_filename = '#{@opt.fns}' + WHERE src_filename = '#{@md.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}' - ;} + ;} # note, for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns @conn.get_first_value(remove_selected).to_i else remove_selected=%{ SELECT metadata_and_text.tid FROM metadata_and_text - WHERE metadata_and_text.src_filename = '#{@opt.fns}' + WHERE metadata_and_text.src_filename = '#{@md.fns}' AND metadata_and_text.language_document_char = '#{@opt.lng}' - ;} + ;} # note, for .ssm: @md.fns (is set during runtime & is) != @opt.fns @md.opt.fns x=@conn.select_one(remove_selected) x ? (x.join.to_i) : nil end -- cgit v1.2.3