From: Jiří Filipovič <fila@ics.muni.cz>
Date: Tue, 27 May 2008 11:03:47 +0000 (+0000)
Subject: - longer sql command
X-Git-Tag: glite-yaim-lb_R_4_0_2_1~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=cfb5bde75c47e4f1a239cd214a4a115207297eed;p=jra1mw.git

- longer sql command
- fixed indexed value type
---

diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c
index a9879b9..549e573 100644
--- a/org.glite.jp.index/src/db_ops.c
+++ b/org.glite.jp.index/src/db_ops.c
@@ -307,7 +307,7 @@ int glite_jpis_initDatabase(glite_jpis_context_t ctx) {
 	size_t i;
 	int indexed, state, locked, nattrs;
 	size_t conds_len;
-	char sql[512];
+	char sql[2048];
 	glite_jp_is_feed **feeds;
 	void *conds;
 	glite_jp_context_t jpctx = ctx->jpctx;
@@ -405,12 +405,12 @@ int glite_jpis_initDatabase(glite_jpis_context_t ctx) {
 	// create jobs table
 	snprintf(sql, sizeof(sql) - 1, SQLCMD_CREATE_JOBS_TABLE_BEGIN);
 	if (ctx->conf->singleval_attrs) for (i = 0; ctx->conf->singleval_attrs[i]; i++)
-		snprintf(sql + strlen(sql), sizeof(sql) - 1, 
+		snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), 
 			"	`%s`	%s	NOT NULL,\n	index (%s),\n",
 			get_simple_name(ctx->conf->singleval_attrs[i]),
-			glite_jp_attrval_db_type_full(jpctx, ctx->conf->singleval_attrs[i]),
+			glite_jp_attrval_db_type_index(jpctx, ctx->conf->singleval_attrs[i], INDEX_LENGTH),
 			get_simple_name(ctx->conf->singleval_attrs[i]));
-	snprintf(sql + strlen(sql), sizeof(sql) - 1, SQLCMD_CREATE_JOBS_TABLE_END);
+	snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), SQLCMD_CREATE_JOBS_TABLE_END);
 	llprintf(LOG_SQL, "sql=%s\n", sql);
 	if ((glite_jp_db_ExecSQL(jpctx, sql, NULL)) == -1) {
                         glite_jpis_stack_error(ctx->jpctx, EAGAIN, "Cannot create table 'jobs'!");