X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=e7edc7e1189c5ecbac1d64a84b154b68b7fb5a0c;hb=cf4f872e4a4d739408bd2f0d71887d27ebe598c9;hp=a48c2230a02cb7b62744b57b329eeb396a60f1c5;hpb=716344659847fd869a89e31168c600ae432b7c0c;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index a48c223..e7edc7e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -29,19 +29,20 @@ Options g_options; // options passed to program through command line arguments
  */
 void ParseArguments(int argc, char ** argv)
 {
-
-
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
+	// Set the main directory
+	//if (getcwd(g_options.root_dir, sizeof(g_options.root_dir)) == NULL)
+	//	Fatal("Couldn't get current working directory - %s", strerror(errno));
+
 	gettimeofday(&(g_options.start_time), NULL); // Start time
 
 
 	g_options.auth_method = AUTH_NONE;  // Don't use authentication
 	g_options.auth_uri = ""; // 
 	g_options.ldap_base_dn = "";
+	g_options.experiment_dir = ".";
 	
-
-
 	for (int i = 1; i < argc; ++i)
 	{
 		if (argv[i][0] != '-')
@@ -72,6 +73,10 @@ void ParseArguments(int argc, char ** argv)
 			case 'd':
 				g_options.ldap_base_dn = argv[++i];
 				break;
+			case 'e':
+			// Experiments directory
+				g_options.experiment_dir = argv[++i];
+				break;
 			default:
 				Fatal("Unrecognised switch %s", argv[i]);
 				break;
@@ -85,6 +90,13 @@ void ParseArguments(int argc, char ** argv)
 	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
 	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
 	Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
+	//Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
+	Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir);
+
+	if (!DirExists(g_options.experiment_dir))
+	{
+		Fatal("Experiment directory '%s' does not exist.", g_options.experiment_dir);
+	}
 
 	if (g_options.auth_uri[0] != '\0')
 	{
@@ -128,19 +140,19 @@ int main(int argc, char ** argv)
 	Pin_Init();
 	
 	// Try and start things
-	
+	/*
 	const char *ret;
 	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);
-	
+	*/
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
 
-	
+	/*
 	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);
-	
+	*/
 	//Sensor_StopAll();
 	//Actuator_StopAll();