From de28cef1445034907860029a47a5e2918fdccee4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 12 Jun 2008 12:48:10 +0000 Subject: [PATCH] Update docs. Fix warnings. define cleanup. --- org.glite.jp.index/doc/glite-jp-indexd.sgml | 12 ++++++++++++ org.glite.jp.index/src/common.h | 2 ++ org.glite.jp.index/src/db_ops.c | 7 +++---- org.glite.jp.index/src/db_ops.h | 2 ++ org.glite.jp.index/src/soap_ops.c | 4 ++-- org.glite.jp.index/src/type_plugin.c | 1 + 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/org.glite.jp.index/doc/glite-jp-indexd.sgml b/org.glite.jp.index/doc/glite-jp-indexd.sgml index 45e626d..4b9ad37 100644 --- a/org.glite.jp.index/doc/glite-jp-indexd.sgml +++ b/org.glite.jp.index/doc/glite-jp-indexd.sgml @@ -98,6 +98,11 @@ --feeding FILE + + -F + --force-feed + + @@ -236,6 +241,13 @@ Feed the index server from the local file. Format of the file is job per line wi + + | + +By default old feeds in the database are untouched when JP index server is restarted, and further used and refreshed. This option forces dropping and reloading feeds from the configuration file. + + + diff --git a/org.glite.jp.index/src/common.h b/org.glite.jp.index/src/common.h index c0756c2..19cebaa 100644 --- a/org.glite.jp.index/src/common.h +++ b/org.glite.jp.index/src/common.h @@ -12,4 +12,6 @@ int glite_jpis_stack_error_source(glite_jp_context_t ctx, int code, const char * #define glite_jpis_stack_error(CTX, CODE, DESCFMT...) glite_jpis_stack_error_source((CTX), (CODE), __FUNCTION__, __LINE__, ##DESCFMT); +int glite_jp_typeplugin_load(glite_jp_context_t ctx,const char *so); + #endif diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c index 90f9573..08b4345 100644 --- a/org.glite.jp.index/src/db_ops.c +++ b/org.glite.jp.index/src/db_ops.c @@ -65,7 +65,6 @@ #define SQL_CMD_INSERT_SINGLEATTRVAL "UPDATE jobs \n\ SET attr_%s='%s' \n\ WHERE dg_jobid='%s'" -#define INDEX_LENGTH 255 #define WORD_SWAP(X) ((((X) >> 8) & 0xFF) | (((X) & 0xFF) << 8)) #define LONG_SWAP(X) (WORD_SWAP(((X) >> 16) & 0xFFFF) | ((WORD_SWAP(X) & 0xFFFF) << 16)) @@ -334,7 +333,7 @@ int glite_jpis_initDatabase(glite_jpis_context_t ctx) { i = 0; if (attrs) while (attrs[i]) { type_full = glite_jp_attrval_db_type_full(jpctx, attrs[i]); - type_index = glite_jp_attrval_db_type_index(jpctx, attrs[i], INDEX_LENGTH); + type_index = glite_jp_attrval_db_type_index(jpctx, attrs[i], GLITE_JPIS_INDEX_LENGTH); attrid = glite_jp_indexdb_attr2id(attrs[i]); indexed = is_indexed(ctx->conf, attrs[i]); @@ -376,7 +375,7 @@ int glite_jpis_initDatabase(glite_jpis_context_t ctx) { snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " `attr_%s` %s NOT NULL,\n", glite_jp_indexdb_attr2id(ctx->conf->attrs[i]), - glite_jp_attrval_db_type_index(jpctx, ctx->conf->attrs[i], INDEX_LENGTH)); + glite_jp_attrval_db_type_index(jpctx, ctx->conf->attrs[i], GLITE_JPIS_INDEX_LENGTH)); if (is_indexed(ctx->conf, ctx->conf->attrs[i])) snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), @@ -705,7 +704,7 @@ int glite_jpis_insertAttrVal(glite_jpis_context_t ctx, const char *jobid, glite_ err.source = __FUNCTION__; table = glite_jp_indexdb_attr2id(av->name); - value = glite_jp_attrval_to_db_index(ctx->jpctx, av, INDEX_LENGTH); + value = glite_jp_attrval_to_db_index(ctx->jpctx, av, GLITE_JPIS_INDEX_LENGTH); full_value = glite_jp_attrval_to_db_full(ctx->jpctx, av); md5_jobid = str2md5(jobid); origin = av->origin; diff --git a/org.glite.jp.index/src/db_ops.h b/org.glite.jp.index/src/db_ops.h index 8078a5b..ec79901 100644 --- a/org.glite.jp.index/src/db_ops.h +++ b/org.glite.jp.index/src/db_ops.h @@ -17,6 +17,8 @@ #define GLITE_JP_IS_STATE_ERROR 8 #define GLITE_JP_IS_STATE_ERROR_STR "8" +#define GLITE_JPIS_INDEX_LENGTH 255 + #define GLITE_JPIS_PARAM(DEST, DEST_LEN, SRC) do { \ (DEST)[sizeof((DEST)) - 1] = '\0'; \ strncpy((DEST), (SRC), sizeof((DEST)) - 1); \ diff --git a/org.glite.jp.index/src/soap_ops.c b/org.glite.jp.index/src/soap_ops.c index 85f935b..2ebfef6 100644 --- a/org.glite.jp.index/src/soap_ops.c +++ b/org.glite.jp.index/src/soap_ops.c @@ -215,7 +215,7 @@ static void add_attr_table(char *new, char ***attr_tables) (*attr_tables)[i+1] = NULL; } -/* transform soap enum queryOp to mysql quivalent */ +/* transform soap enum queryOp to mysql equivalent */ static int get_op(const enum jptype__queryOp in, char **out) { char *qop; @@ -273,7 +273,7 @@ static int get_sql_indexvalue(char **sql, glite_jpis_context_t ctx, struct jptyp } else return 0; glite_jpis_SoapToAttrOrig(condition->origin, &(attr.origin)); - *sql = glite_jp_attrval_to_db_index(ctx->jpctx, &attr, 255); + *sql = glite_jp_attrval_to_db_index(ctx->jpctx, &attr, GLITE_JPIS_INDEX_LENGTH); return 0; } diff --git a/org.glite.jp.index/src/type_plugin.c b/org.glite.jp.index/src/type_plugin.c index 3310a87..34f838e 100644 --- a/org.glite.jp.index/src/type_plugin.c +++ b/org.glite.jp.index/src/type_plugin.c @@ -5,6 +5,7 @@ #include #include +#include #include "glite/jp/type_plugin.h" int glite_jp_typeplugin_load(glite_jp_context_t ctx,const char *so){ -- 1.8.2.3