From d6e5dcbdf13cd88b90c7ac518fb110a191630878 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 13 Mar 2017 19:54:22 -0600 Subject: [PATCH 1/2] Optutil not working #110 --- core/oputil/oputil_file_base.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js index bc1d6381..09b07548 100644 --- a/core/oputil/oputil_file_base.js +++ b/core/oputil/oputil_file_base.js @@ -9,7 +9,6 @@ const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDataba const getHelpFor = require('./oputil_help.js').getHelpFor; const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage; const Errors = require('../../core/enig_error.js').Errors; -const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName; const async = require('async'); const fs = require('fs'); @@ -43,6 +42,8 @@ function finalizeEntryAndPersist(fileEntry, cb) { return callback(null); } + const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName; + const questions = [ { name : 'desc', From f510fca65623850ea87b5dee70111036f3f6b034 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 13 Mar 2017 20:11:43 -0600 Subject: [PATCH 2/2] Tic File Processor didn't work on nodelist file #111 --- core/scanner_tossers/ftn_bso.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js index d1435c90..0239176c 100644 --- a/core/scanner_tossers/ftn_bso.js +++ b/core/scanner_tossers/ftn_bso.js @@ -1360,11 +1360,15 @@ function FTNMessageScanTossModule() { short_file_name : ticFileInfo.getAsString('File').toUpperCase(), // upper to ensure no case issues later; this should be a DOS 8.3 name tic_origin : ticFileInfo.getAsString('Origin'), tic_desc : ticFileInfo.getAsString('Desc'), - tic_ldesc : ticFileInfo.getAsString('Ldesc', '\n'), upload_by_username : _.get(Config.scannerTossers.ftn_bso.nodes, [ localInfo.node, 'tic', 'uploadBy' ]) || Config.scannerTossers.ftn_bso.tic.uploadBy, } }; + const ldesc = ticFileInfo.getAsString('Ldesc', '\n'); + if(ldesc) { + scanOpts.meta.tic_ldesc = ldesc; + } + // // We may have TIC auto-tagging for this node and/or specific (remote) area //