Properties order modified (bd3efbe1) · Commits · IA2 / data_importer

src/DataImporter.cpp

+88 −89

Original line number	Diff line number	Diff line
		@@ -196,6 +196,13 @@ void DataImporter::get_device_property()
		Tango::DbData dev_prop;
		dev_prop.push_back(Tango::DbDatum("CertificateFile"));
		dev_prop.push_back(Tango::DbDatum("StoragePath"));
		dev_prop.push_back(Tango::DbDatum("DIDBHost"));
		dev_prop.push_back(Tango::DbDatum("DIDBPort"));
		dev_prop.push_back(Tango::DbDatum("DIDBUser"));
		dev_prop.push_back(Tango::DbDatum("DIDBPassword"));
		dev_prop.push_back(Tango::DbDatum("DIDBSchema"));
		dev_prop.push_back(Tango::DbDatum("DIDBIndexTable"));
		dev_prop.push_back(Tango::DbDatum("DIDBRejectedTable"));
		dev_prop.push_back(Tango::DbDatum("RemoteHost"));
		dev_prop.push_back(Tango::DbDatum("RemotePort"));
		dev_prop.push_back(Tango::DbDatum("RemoteUsername"));
		@@ -209,13 +216,6 @@ void DataImporter::get_device_property()
		dev_prop.push_back(Tango::DbDatum("DatabaseTable"));
		dev_prop.push_back(Tango::DbDatum("RefreshTime"));
		dev_prop.push_back(Tango::DbDatum("Timeout"));
		dev_prop.push_back(Tango::DbDatum("DIDBHost"));
		dev_prop.push_back(Tango::DbDatum("DIDBPort"));
		dev_prop.push_back(Tango::DbDatum("DIDBUser"));
		dev_prop.push_back(Tango::DbDatum("DIDBPassword"));
		dev_prop.push_back(Tango::DbDatum("DIDBSchema"));
		dev_prop.push_back(Tango::DbDatum("DIDBIndexTable"));
		dev_prop.push_back(Tango::DbDatum("DIDBRejectedTable"));

		// is there at least one property to be read ?
		if (dev_prop.size()>0)
		@@ -252,6 +252,83 @@ void DataImporter::get_device_property()
		// And try to extract StoragePath value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> storagePath;

		// Try to initialize DIDBHost from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBHost;
		else {
		// Try to initialize DIDBHost from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBHost;
		}
		// And try to extract DIDBHost value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBHost;

		// Try to initialize DIDBPort from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBPort;
		else {
		// Try to initialize DIDBPort from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBPort;
		}
		// And try to extract DIDBPort value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBPort;

		// Try to initialize DIDBUser from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBUser;
		else {
		// Try to initialize DIDBUser from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBUser;
		}
		// And try to extract DIDBUser value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBUser;

		// Try to initialize DIDBPassword from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBPassword;
		else {
		// Try to initialize DIDBPassword from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBPassword;
		}
		// And try to extract DIDBPassword value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBPassword;

		// Try to initialize DIDBSchema from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBSchema;
		else {
		// Try to initialize DIDBSchema from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBSchema;
		}
		// And try to extract DIDBSchema value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBSchema;

		// Try to initialize DIDBIndexTable from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBIndexTable;
		else {
		// Try to initialize DIDBIndexTable from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBIndexTable;
		}
		// And try to extract DIDBIndexTable value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBIndexTable;

		// Try to initialize DIDBRejectedTable from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBRejectedTable;
		else {
		// Try to initialize DIDBRejectedTable from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBRejectedTable;
		}
		// And try to extract DIDBRejectedTable value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBRejectedTable;

		// Try to initialize RemoteHost from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> remoteHost;
		@@ -394,84 +471,6 @@ void DataImporter::get_device_property()
		}
		// And try to extract Timeout value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> timeout;

		// Try to initialize DIDBHost from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBHost;
		else {
		// Try to initialize DIDBHost from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBHost;
		}
		// And try to extract DIDBHost value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBHost;

		// Try to initialize DIDBPort from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBPort;
		else {
		// Try to initialize DIDBPort from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBPort;
		}
		// And try to extract DIDBPort value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBPort;

		// Try to initialize DIDBUser from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBUser;
		else {
		// Try to initialize DIDBUser from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBUser;
		}
		// And try to extract DIDBUser value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBUser;

		// Try to initialize DIDBPassword from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBPassword;
		else {
		// Try to initialize DIDBPassword from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBPassword;
		}
		// And try to extract DIDBPassword value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBPassword;

		// Try to initialize DIDBSchema from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBSchema;
		else {
		// Try to initialize DIDBSchema from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBSchema;
		}
		// And try to extract DIDBSchema value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBSchema;

		// Try to initialize DIDBIndexTable from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBIndexTable;
		else {
		// Try to initialize DIDBIndexTable from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBIndexTable;
		}
		// And try to extract DIDBIndexTable value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBIndexTable;

		// Try to initialize DIDBRejectedTable from class property
		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
		if (cl_prop.is_empty()==false) cl_prop >> dIDBRejectedTable;
		else {
		// Try to initialize DIDBRejectedTable from default device value
		def_prop = ds_class->get_default_device_property(dev_prop[i].name);
		if (def_prop.is_empty()==false) def_prop >> dIDBRejectedTable;
		}
		// And try to extract DIDBRejectedTable value from database
		if (dev_prop[i].is_empty()==false) dev_prop[i] >> dIDBRejectedTable;

		}

		/----- PROTECTED REGION ID(DataImporter::get_device_property_after) ENABLED START -----/

src/DataImporter.h

+16 −16

Original line number	Diff line number	Diff line
		@@ -94,6 +94,20 @@ public:
		string certificateFile;
		// StoragePath: Absolute path to storage
		string storagePath;
		// DIDBHost: Hostname where data import database is running
		string dIDBHost;
		// DIDBPort: Port where data import database is listening
		Tango::DevULong dIDBPort;
		// DIDBUser: User to login in data import database
		string dIDBUser;
		// DIDBPassword: Password to login in data import database
		string dIDBPassword;
		// DIDBSchema: Schema where data import tables are located
		string dIDBSchema;
		// DIDBIndexTable: Index table name
		string dIDBIndexTable;
		// DIDBRejectedTable: Rejected table name
		string dIDBRejectedTable;
		// RemoteHost: Metadata exporter remote host
		string remoteHost;
		// RemotePort: Metadata exporter remote port
		@@ -120,20 +134,6 @@ public:
		Tango::DevULong refreshTime;
		// Timeout: Connection timeout (seconds)
		Tango::DevULong timeout;
		// DIDBHost: Hostname where data import database is running
		string dIDBHost;
		// DIDBPort: Port where data import database is listening
		Tango::DevULong dIDBPort;
		// DIDBUser: User to login in data import database
		string dIDBUser;
		// DIDBPassword: Password to login in data import database
		string dIDBPassword;
		// DIDBSchema: Schema where data import tables are located
		string dIDBSchema;
		// DIDBIndexTable: Index table name
		string dIDBIndexTable;
		// DIDBRejectedTable: Rejected table name
		string dIDBRejectedTable;


		// Constructors and destructors

src/DataImporter.xmi

+28 −28

Original line number	Diff line number	Diff line
		@@ -49,6 +49,34 @@
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBHost" description="Hostname where data import database is running">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBPort" description="Port where data import database is listening">
		<type xsi:type="pogoDsl:UIntType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBUser" description="User to login in data import database">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBPassword" description="Password to login in data import database">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBSchema" description="Schema where data import tables are located">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBIndexTable" description="Index table name">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBRejectedTable" description="Rejected table name">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="RemoteHost" description="Metadata exporter remote host">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		@@ -103,34 +131,6 @@
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		<DefaultPropValue>60</DefaultPropValue>
		</deviceProperties>
		<deviceProperties name="DIDBHost" description="Hostname where data import database is running">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBPort" description="Port where data import database is listening">
		<type xsi:type="pogoDsl:UIntType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBUser" description="User to login in data import database">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBPassword" description="Password to login in data import database">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBSchema" description="Schema where data import tables are located">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBIndexTable" description="Index table name">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<deviceProperties name="DIDBRejectedTable" description="Rejected table name">
		<type xsi:type="pogoDsl:StringType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</deviceProperties>
		<commands name="State" description="This command gets the device state (stored in its device_state data member) and returns it to the caller." execMethod="dev_state" displayLevel="OPERATOR" polledPeriod="0">
		<argin description="none">
		<type xsi:type="pogoDsl:VoidType"/>

src/DataImporterClass.cpp

+84 −84

Original line number	Diff line number	Diff line
		@@ -551,8 +551,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "RemoteHost";
		prop_desc = "Metadata exporter remote host";
		prop_name = "DIDBHost";
		prop_desc = "Hostname where data import database is running";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -564,8 +564,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "RemotePort";
		prop_desc = "Metadata exporter remote port";
		prop_name = "DIDBPort";
		prop_desc = "Port where data import database is listening";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -577,8 +577,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "RemoteUsername";
		prop_desc = "Metadata exporter login username";
		prop_name = "DIDBUser";
		prop_desc = "User to login in data import database";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -590,8 +590,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "RemotePassword";
		prop_desc = "Metadata exporter remote password";
		prop_name = "DIDBPassword";
		prop_desc = "Password to login in data import database";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -603,8 +603,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "EnableSSL";
		prop_desc = "Enable or disable SSL connections";
		prop_name = "DIDBSchema";
		prop_desc = "Schema where data import tables are located";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -616,8 +616,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabaseHost";
		prop_desc = "Metadata local database host";
		prop_name = "DIDBIndexTable";
		prop_desc = "Index table name";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -629,8 +629,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabasePort";
		prop_desc = "Metadata local database port";
		prop_name = "DIDBRejectedTable";
		prop_desc = "Rejected table name";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -642,8 +642,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabaseUsername";
		prop_desc = "Metadata local database username";
		prop_name = "RemoteHost";
		prop_desc = "Metadata exporter remote host";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -655,8 +655,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabasePassword";
		prop_desc = "Metadata local database password";
		prop_name = "RemotePort";
		prop_desc = "Metadata exporter remote port";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -668,8 +668,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabaseSchema";
		prop_desc = "Metadata local database schema";
		prop_name = "RemoteUsername";
		prop_desc = "Metadata exporter login username";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -681,8 +681,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DatabaseTable";
		prop_desc = "Metadata local database table";
		prop_name = "RemotePassword";
		prop_desc = "Metadata exporter remote password";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -694,11 +694,10 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "RefreshTime";
		prop_desc = "Remote database request period (seconds)";
		prop_def = "10";
		prop_name = "EnableSSL";
		prop_desc = "Enable or disable SSL connections";
		prop_def = "";
		vect_data.clear();
		vect_data.push_back("10");
		if (prop_def.length()>0)
		{
		Tango::DbDatum data(prop_name);
		@@ -708,11 +707,10 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "Timeout";
		prop_desc = "Connection timeout (seconds)";
		prop_def = "60";
		prop_name = "DatabaseHost";
		prop_desc = "Metadata local database host";
		prop_def = "";
		vect_data.clear();
		vect_data.push_back("60");
		if (prop_def.length()>0)
		{
		Tango::DbDatum data(prop_name);
		@@ -722,8 +720,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBHost";
		prop_desc = "Hostname where data import database is running";
		prop_name = "DatabasePort";
		prop_desc = "Metadata local database port";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -735,8 +733,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBPort";
		prop_desc = "Port where data import database is listening";
		prop_name = "DatabaseUsername";
		prop_desc = "Metadata local database username";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -748,8 +746,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBUser";
		prop_desc = "User to login in data import database";
		prop_name = "DatabasePassword";
		prop_desc = "Metadata local database password";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -761,8 +759,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBPassword";
		prop_desc = "Password to login in data import database";
		prop_name = "DatabaseSchema";
		prop_desc = "Metadata local database schema";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -774,8 +772,8 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBSchema";
		prop_desc = "Schema where data import tables are located";
		prop_name = "DatabaseTable";
		prop_desc = "Metadata local database table";
		prop_def = "";
		vect_data.clear();
		if (prop_def.length()>0)
		@@ -787,10 +785,11 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBIndexTable";
		prop_desc = "Index table name";
		prop_def = "";
		prop_name = "RefreshTime";
		prop_desc = "Remote database request period (seconds)";
		prop_def = "10";
		vect_data.clear();
		vect_data.push_back("10");
		if (prop_def.length()>0)
		{
		Tango::DbDatum data(prop_name);
		@@ -800,10 +799,11 @@ void DataImporterClass::set_default_property()
		}
		else
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "DIDBRejectedTable";
		prop_desc = "Rejected table name";
		prop_def = "";
		prop_name = "Timeout";
		prop_desc = "Connection timeout (seconds)";
		prop_def = "60";
		vect_data.clear();
		vect_data.push_back("60");
		if (prop_def.length()>0)
		{
		Tango::DbDatum data(prop_name);