1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Mon, 06 Jun 2016 11:24:46 +0200
Description: In Debian */*.vschema is installed to /usr/lib/ncbi-vdb/
--- a/test/fastq-loader/test-fastq-loader.cpp
+++ b/test/fastq-loader/test-fastq-loader.cpp
@@ -146,7 +146,7 @@ public:
string dbName;
};
const string TempFileFixture::TempDir = "./tmp";
-const string TempFileFixture::SchemaPath = "align/align.vschema";
+const string TempFileFixture::SchemaPath = "/usr/lib/ncbi-vdb/align/align.vschema";
const string TempFileFixture::DbType = "NCBI:align:db:alignment_unsorted";
///////////////////////////////////////////////// FASTQ-based tests for CommonWriter
--- a/tools/fastq-loader/fastq-loader.c
+++ b/tools/fastq-loader/fastq-loader.c
@@ -253,7 +253,7 @@ rc_t CC Usage (const Args * args)
/* MARK: Definitions and Globals */
-#define SCHEMAFILE "align/align.vschema"
+#define SCHEMAFILE "/usr/lib/ncbi-vdb/align/align.vschema"
CommonWriterSettings G;
--- a/tools/bam-loader/bam-loader.c
+++ b/tools/bam-loader/bam-loader.c
@@ -553,7 +553,7 @@ rc_t CC Usage (const Args * args)
/* MARK: Definitions and Globals */
-#define SCHEMAFILE "align/align.vschema"
+#define SCHEMAFILE "/usr/lib/ncbi-vdb/align/align.vschema"
Globals G;
--- a/tools/sra-sort/run.c
+++ b/tools/sra-sort/run.c
@@ -78,7 +78,7 @@ bool map_typename_builtin ( const ctx_t
#define ALIGN_EVIDENCE_MAP "NCBI:align:db:alignment_evidence_sorted"
#define ALIGN_UNSORTED_MAP "NCBI:align:db:alignment_sorted"
-#define ALIGN_SRC "align/align.vschema"
+#define ALIGN_SRC "/usr/lib/ncbi-vdb/align/align.vschema"
if ( strcmp ( out, "NCBI/align/db/alignment_evidence" ) == 0 )
copied = string_copy ( out, size, ALIGN_EVIDENCE_MAP, sizeof ALIGN_EVIDENCE_MAP - 1 );
--- a/tools/cg-load/cg-load.c
+++ b/tools/cg-load/cg-load.c
@@ -1073,7 +1073,7 @@ rc_t CC KMain( int argc, char* argv[] )
const XMLLogger* xml_logger = NULL;
SParam params;
memset(¶ms, 0, sizeof(params));
- params.schema = "align/align.vschema";
+ params.schema = "/usr/lib/ncbi-vdb/align/align.vschema";
params.argv0 = argv[0];
--- a/tools/util/sortreadtest.c
+++ b/tools/util/sortreadtest.c
@@ -21,11 +21,11 @@
/*
- default file is "ncbi/seq.vschema"
+ default file is "/usr/lib/ncbi-vdb/ncbi/seq.vschema"
default table-spec "NCBI:tbl:base_space#2"
*/
-#define SCHEMASPEC "ncbi/seq.vschema"
+#define SCHEMASPEC "/usr/lib/ncbi-vdb/ncbi/seq.vschema"
#define TYPESPEC "NCBI:tbl:base_space#2"
const char UsageDefaultName[] = "sortreadtest";
--- a/tools/vdb-copy/vdb-copy.kfg
+++ b/tools/vdb-copy/vdb-copy.kfg
@@ -25,11 +25,11 @@
# matching legacy-tables with schema's to write to for vdb-copy
# ILLUMINA
-/VDBCOPY/NCBI_SRA_Illumina_tbl_v0a_1/schema = "sra/illumina.vschema"
+/VDBCOPY/NCBI_SRA_Illumina_tbl_v0a_1/schema = "/usr/lib/ncbi-vdb/sra/illumina.vschema"
#/VDBCOPY/NCBI_SRA_Illumina_tbl_v0a_1/tab = "NCBI:SRA:Illumina:tbl:q4:v2"
#/VDBCOPY/NCBI_SRA_Illumina_tbl_v0a_1/tab = "NCBI:SRA:Illumina:tbl:q1:v2"
/VDBCOPY/NCBI_SRA_Illumina_tbl_v0a_1/tab = "NCBI:SRA:Illumina:tbl:phred:v2"
-/VDBCOPY/_ILLUMINA_/schema = "sra/illumina.vschema"
+/VDBCOPY/_ILLUMINA_/schema = "/usr/lib/ncbi-vdb/sra/illumina.vschema"
/VDBCOPY/_ILLUMINA_/tab = "NCBI:SRA:Illumina:tbl:phred:v2"
@@ -41,9 +41,9 @@
# ABSOLID
-/VDBCOPY/NCBI_SRA_ABI_tbl_v1_1/schema = "sra/abi.vschema"
+/VDBCOPY/NCBI_SRA_ABI_tbl_v1_1/schema = "/usr/lib/ncbi-vdb/sra/abi.vschema"
/VDBCOPY/NCBI_SRA_ABI_tbl_v1_1/tab = "NCBI:SRA:ABI:tbl:v2"
-/VDBCOPY/_ABSOLID_/schema = "sra/abi.vschema"
+/VDBCOPY/_ABSOLID_/schema = "/usr/lib/ncbi-vdb/sra/abi.vschema"
/VDBCOPY/_ABSOLID_/tab = "NCBI:SRA:ABI:tbl:v2"
--- a/tools/pacbio-load/pl-context.h
+++ b/tools/pacbio-load/pl-context.h
@@ -52,7 +52,7 @@ extern "C" {
#define ALIAS_WITH_PROGRESS "p"
#define ALIAS_OUTPUT "o"
-#define DFLT_SCHEMA "sra/pacbio.vschema"
+#define DFLT_SCHEMA "/usr/lib/ncbi-vdb/sra/pacbio.vschema"
#define PACBIO_SCHEMA_DB "NCBI:SRA:PacBio:smrt:db"
|
