From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Fri, 3 Jun 2005 12:53:00 +0000 (+0000)
Subject: - gsoap-2.6 resistance
X-Git-Tag: gridsite-core_R_1_1_9~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c3b83fb7baabf797347a7f6ad3235ec95b506d9e;p=jra1mw.git

- gsoap-2.6 resistance
- database open on slave init
---

diff --git a/org.glite.jp.primary/src/bones_server.c b/org.glite.jp.primary/src/bones_server.c
index 8c90ba4..3296aa0 100644
--- a/org.glite.jp.primary/src/bones_server.c
+++ b/org.glite.jp.primary/src/bones_server.c
@@ -97,7 +97,11 @@ int main(int argc, char *argv[])
 
 	srand48(time(NULL)); /* feed id generation */
 
+#if GSOAP_VERSION <= 20602
+	for (i=0; jpps__namespaces[i].id && strcmp(jpps__namespaces[i].id,"ns1"); i++);
+#else
 	for (i=0; jpps__namespaces[i].id && strcmp(jpps__namespaces[i].id,"jpsrv"); i++);
+#endif
 	assert(jpps__namespaces[i].id);
 	glite_jp_default_namespace = jpps__namespaces[i].ns;
 
@@ -150,6 +154,7 @@ static int data_init(void **data)
 	*data = (void *) soap_new();
 
 	printf("[%d] slave started\n",getpid());
+	glite_jppsbe_init_slave(ctx);	/* XXX: global but slave's */
 
 	return 0;
 }