From e9cdcaa5fdf343207f22f211ce97b87726c5dae0 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 18 Aug 2010 11:30:08 +0000
Subject: [PATCH] add new resource strings for blixem file format.
---
src/include/ZMap/zmapConfigStrings.h | 10 +++++++---
src/zmapConfig/zmapConfigLoader.c | 7 ++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/include/ZMap/zmapConfigStrings.h b/src/include/ZMap/zmapConfigStrings.h
index 9c85f0e69..44b8f4179 100755
--- a/src/include/ZMap/zmapConfigStrings.h
+++ b/src/include/ZMap/zmapConfigStrings.h
@@ -38,9 +38,9 @@
* defines !
*
* HISTORY:
- * Last edited: Mar 2 14:19 2010 (edgrif)
+ * Last edited: Aug 18 12:04 2010 (edgrif)
* Created: Tue Apr 25 14:36:16 2006 (edgrif)
- * CVS info: $Id: zmapConfigStrings.h,v 1.34 2010-07-15 10:48:53 mh17 Exp $
+ * CVS info: $Id: zmapConfigStrings.h,v 1.35 2010-08-18 11:30:08 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_CONFIG_STRINGS_H
@@ -870,11 +870,15 @@
#define ZMAPSTANZA_BLIXEM_CONF_FILE "config-file"
#define ZMAPSTANZA_BLIXEM_SCOPE "scope"
#define ZMAPSTANZA_BLIXEM_MAX "homol-max"
+#define ZMAPSTANZA_BLIXEM_FILE_FORMAT "file-format"
#define ZMAPSTANZA_BLIXEM_KEEP_TEMP "keep-tempfiles"
#define ZMAPSTANZA_BLIXEM_KILL_EXIT "kill-on-exit"
#define ZMAPSTANZA_BLIXEM_DNA_FS "dna-featuresets"
#define ZMAPSTANZA_BLIXEM_PROT_FS "protein-featuresets"
-#define ZMAPSTANZA_BLIXEM_TRANS_FS "transcript-featuresets"
+#define ZMAPSTANZA_BLIXEM_FS "transcript-featuresets"
+
+#define ZMAPSTANZA_BLIXEM_FILE_OPT_GFF "gffv3"
+#define ZMAPSTANZA_BLIXEM_FILE_OPT_EXBLX "exblx"
diff --git a/src/zmapConfig/zmapConfigLoader.c b/src/zmapConfig/zmapConfigLoader.c
index a44ae0307..a0c4dc328 100644
--- a/src/zmapConfig/zmapConfigLoader.c
+++ b/src/zmapConfig/zmapConfigLoader.c
@@ -30,9 +30,9 @@
* Exported functions: See ZMap/zmapConfigLoader.h
*
* HISTORY:
- * Last edited: Mar 2 14:47 2010 (edgrif)
+ * Last edited: Aug 18 11:54 2010 (edgrif)
* Created: Thu Sep 25 14:12:05 2008 (rds)
- * CVS info: $Id: zmapConfigLoader.c,v 1.26 2010-07-15 10:48:55 mh17 Exp $
+ * CVS info: $Id: zmapConfigLoader.c,v 1.27 2010-08-18 11:30:08 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -1559,12 +1559,13 @@ static ZMapConfigIniContextKeyEntry get_blixem_group_data(char **stanza_name, ch
{ ZMAPSTANZA_BLIXEM_SCRIPT, G_TYPE_STRING, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_CONF_FILE, G_TYPE_STRING, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_SCOPE, G_TYPE_INT, NULL, FALSE },
+ { ZMAPSTANZA_BLIXEM_FILE_FORMAT, G_TYPE_STRING, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_MAX, G_TYPE_INT, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_KEEP_TEMP, G_TYPE_BOOLEAN, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_KILL_EXIT, G_TYPE_BOOLEAN, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_DNA_FS, G_TYPE_STRING, NULL, FALSE },
{ ZMAPSTANZA_BLIXEM_PROT_FS, G_TYPE_STRING, NULL, FALSE },
- { ZMAPSTANZA_BLIXEM_TRANS_FS, G_TYPE_STRING, NULL, FALSE },
+ { ZMAPSTANZA_BLIXEM_FS, G_TYPE_STRING, NULL, FALSE },
{ NULL }
};
static char *name = ZMAPSTANZA_BLIXEM_CONFIG;
--
GitLab