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/v4/db_import.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sisu/v4/db_import.rb') diff --git a/lib/sisu/v4/db_import.rb b/lib/sisu/v4/db_import.rb index 199d4efa..a4251a98 100644 --- a/lib/sisu/v4/db_import.rb +++ b/lib/sisu/v4/db_import.rb @@ -129,9 +129,9 @@ module SiSU_DbImport select_first_match=%{ 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 file_exist=@sql_type=~/sqlite/ \ ? @conn.get_first_value(select_first_match) : @conn.select_one(select_first_match) -- cgit v1.2.3