ASAP::O: Remove filesystem path

This is only really needed for offline processing.  It's an added
complication for now.  Maybe we'll revisit it later and re-expose this,
though.

5 files changed, 4 insertions, 25 deletions

diff --git a/src/im-asapo.c b/src/im-asapo.c
index 9d8fb171..c44f05a7 100644
--- a/src/im-asapo.c
+++ b/src/im-asapo.c
@@ -91,12 +91,10 @@ char *im_asapo_make_unique_group_id(const char *endpoint,
 struct im_asapo *im_asapo_connect(const char *endpoint,
                                   const char *token,
                                   const char *beamtime,
-                                  const char *path,
                                   const char *group_id,
                                   const char *data_source)
 {
 	struct im_asapo *a;
-	int has_filesystem;
 	AsapoSourceCredentialsHandle cred;
 	AsapoErrorHandle err = asapo_new_handle();
 
@@ -105,14 +103,7 @@ struct im_asapo *im_asapo_connect(const char *endpoint,
 
 	cred = asapo_create_source_credentials(kProcessed, beamtime, "",
 	                                       data_source, token);
-	if ( path == NULL ) {
-		path = "";
-		has_filesystem = 0;
-	} else {
-		has_filesystem = 1;
-	}
-	a->consumer = asapo_create_consumer(endpoint, path, has_filesystem,
-	                                    cred, &err);
+	a->consumer = asapo_create_consumer(endpoint, "", 0, cred, &err);
 	asapo_free_handle(&cred);
 	if ( asapo_is_error(err) ) {
 		show_asapo_error("Cannot create ASAP::O consumer", err);
diff --git a/src/im-asapo.h b/src/im-asapo.h
index 3160c69d..04856511 100644
--- a/src/im-asapo.h
+++ b/src/im-asapo.h
@@ -39,7 +39,6 @@
 extern struct im_asapo *im_asapo_connect(const char *endpoint,
                                          const char *token,
                                          const char *beamtime,
-                                         const char *path,
                                          const char *group_id,
                                          const char *data_source);
 
@@ -55,7 +54,6 @@ extern char *im_asapo_make_unique_group_id(const char *endpoint,
 static UNUSED struct im_asapo *im_asapo_connect(const char *endpoint,
                                                 const char *token,
                                                 const char *beamtime,
-                                                const char *path,
                                                 const char *group_id,
                                                 const char *data_source)
 {
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index f1c0474f..0933ab31 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -110,7 +110,6 @@ struct sandbox
 	const char *asapo_endpoint;
 	const char *asapo_token;
 	const char *asapo_beamtime;
-	const char *asapo_path;
 	const char *asapo_group_id;
 	const char *asapo_source;
 
@@ -362,7 +361,6 @@ static int run_work(const struct index_args *iargs, Stream *st,
 		asapostuff = im_asapo_connect(sb->asapo_endpoint,
 		                              sb->asapo_token,
 		                              sb->asapo_beamtime,
-		                              sb->asapo_path,
 		                              sb->asapo_group_id,
 		                              sb->asapo_source);
 		if ( asapostuff == NULL ) {
@@ -1099,7 +1097,7 @@ int create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
                    const char *zmq_address, char **zmq_subscriptions,
                    int n_zmq_subscriptions, const char *zmq_request,
                    const char *asapo_endpoint, const char *asapo_token,
-                   const char *asapo_beamtime, const char *asapo_path,
+                   const char *asapo_beamtime,
                    const char *asapo_group_id, const char *asapo_source,
                    int timeout, int profile)
 {
@@ -1146,7 +1144,6 @@ int create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
 		sb->asapo_endpoint = asapo_endpoint;
 		sb->asapo_token = asapo_token;
 		sb->asapo_beamtime = asapo_beamtime;
-		sb->asapo_path = asapo_path;
 		sb->asapo_source = asapo_source;
 	} else {
 		sb->asapo = 0;
diff --git a/src/im-sandbox.h b/src/im-sandbox.h
index 8d76b376..a1b9ed36 100644
--- a/src/im-sandbox.h
+++ b/src/im-sandbox.h
@@ -88,7 +88,7 @@ extern int create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
                           const char *zmq_address, char **zmq_subscriptions,
                           int n_zmq_subscriptions, const char *zmq_request,
                           const char *asapo_endpoint, const char *asapo_token,
-                          const char *asapo_beamtime, const char *asapo_path,
+                          const char *asapo_beamtime,
                           const char *asapo_group_id, const char *asapo_source,
                           int timeout, int profile);
 
diff --git a/src/indexamajig.c b/src/indexamajig.c
index 7fbb3f8f..8d383d8e 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -87,7 +87,6 @@ struct indexamajig_arguments
 	char *asapo_endpoint;
 	char *asapo_token;
 	char *asapo_beamtime;
-	char *asapo_path;
 	char *asapo_group_id;
 	char *asapo_source;
 	int serial_start;
@@ -420,10 +419,6 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
 		args->asapo_beamtime = strdup(arg);
 		break;
 
-		case 216 :
-		args->asapo_path = strdup(arg);
-		break;
-
 		case 217 :
 		args->asapo_group_id = strdup(arg);
 		break;
@@ -859,7 +854,6 @@ int main(int argc, char *argv[])
 	args.asapo_endpoint = NULL;
 	args.asapo_token = NULL;
 	args.asapo_beamtime = NULL;
-	args.asapo_path = NULL;
 	args.asapo_group_id = NULL;
 	args.asapo_source = NULL;
 	args.n_zmq_subscriptions = 0;
@@ -973,7 +967,6 @@ int main(int argc, char *argv[])
 		{"asapo-endpoint", 213, "str", OPTION_NO_USAGE, "ASAP::O endpoint"},
 		{"asapo-token", 214, "str", OPTION_NO_USAGE, "ASAP::O token"},
 		{"asapo-beamtime", 215, "str", OPTION_NO_USAGE, "ASAP::O beamtime ID"},
-		{"asapo-path", 216, "str", OPTION_NO_USAGE, "ASAP::O path to files"},
 		{"asapo-group", 217, "str", OPTION_NO_USAGE, "ASAP::O group ID"},
 		{"asapo-source", 218, "str", OPTION_NO_USAGE, "ASAP::O data source"},
 		{"data-format", 219, "str", OPTION_NO_USAGE, "Streamed data format"},
@@ -1338,7 +1331,7 @@ int main(int argc, char *argv[])
 	                   args.zmq_addr, args.zmq_subscriptions,
 	                   args.n_zmq_subscriptions, args.zmq_request,
 	                   args.asapo_endpoint, args.asapo_token,
-	                   args.asapo_beamtime, args.asapo_path,
+	                   args.asapo_beamtime,
 	                   args.asapo_group_id, args.asapo_source,
 	                   timeout, args.profile);