diff --git a/src/DataImporter.cpp b/src/DataImporter.cpp
index 9b7a9e7eed9cc926f7c435f60e19bdcb0c0f4c74..785eef40b43a4d0cf3c7988fa133d6012e8f1f3f 100644
--- a/src/DataImporter.cpp
+++ b/src/DataImporter.cpp
@@ -50,7 +50,7 @@
/**
* DataImporter class description:
- *
+ *
*/
//================================================================
@@ -143,11 +143,11 @@ void DataImporter::init_device()
set_status("Initializing device");
/*----- PROTECTED REGION END -----*/ // DataImporter::init_device_before
-
+
// Get the device properties from database
get_device_property();
-
+
/*----- PROTECTED REGION ID(DataImporter::init_device) ENABLED START -----*/
@@ -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)
@@ -223,7 +223,7 @@ void DataImporter::get_device_property()
// Call database and extract values
if (Tango::Util::instance()->_UseDb==true)
get_db_device()->get_property(dev_prop);
-
+
// get instance on DataImporterClass to get class property
Tango::DbDatum def_prop, cl_prop;
DataImporterClass *ds_class =
@@ -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 -----*/
diff --git a/src/DataImporter.h b/src/DataImporter.h
index e594baeb2a9e16fb1681136c55286c5baf905bb3..bbe9e5f5d60aed6cdc378df80592302915dbd024 100644
--- a/src/DataImporter.h
+++ b/src/DataImporter.h
@@ -48,7 +48,7 @@
/**
* DataImporter class description:
- *
+ *
*/
namespace DataImporter_ns
@@ -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
@@ -162,7 +162,7 @@ public:
DataImporter(Tango::DeviceClass *cl,const char *s,const char *d);
/**
* The device object destructor.
- */
+ */
~DataImporter() {delete_device();};
diff --git a/src/DataImporter.xmi b/src/DataImporter.xmi
index bf4a0e81f66987fa3fd420d99dc331d52a7c7e83..c49aa00573af8b887b1bbfec6736676166dae635 100644
--- a/src/DataImporter.xmi
+++ b/src/DataImporter.xmi
@@ -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"/>
diff --git a/src/DataImporterClass.cpp b/src/DataImporterClass.cpp
index 751d105d03d34be1494d3a8f1aa9e8cb8749ebe3..f29ede1fd2000eb391fe0838023fc64b746bfad6 100644
--- a/src/DataImporterClass.cpp
+++ b/src/DataImporterClass.cpp
@@ -16,20 +16,20 @@ static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc
// project : Data importer
//
// This file is part of Tango device class.
-//
+//
// Tango is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// Tango is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with Tango. If not, see <http://www.gnu.org/licenses/>.
-//
+//
// $Author: $
//
// $Revision: $
@@ -88,7 +88,7 @@ DataImporterClass::DataImporterClass(string &s):Tango::DeviceClass(s)
write_class_property();
/*----- PROTECTED REGION ID(DataImporterClass::constructor) ENABLED START -----*/
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::constructor
cout2 << "Leaving DataImporterClass constructor" << endl;
@@ -103,7 +103,7 @@ DataImporterClass::DataImporterClass(string &s):Tango::DeviceClass(s)
DataImporterClass::~DataImporterClass()
{
/*----- PROTECTED REGION ID(DataImporterClass::destructor) ENABLED START -----*/
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::destructor
_instance = NULL;
@@ -131,8 +131,8 @@ DataImporterClass *DataImporterClass::init(const char *name)
catch (bad_alloc &)
{
throw;
- }
- }
+ }
+ }
return _instance;
}
@@ -252,9 +252,9 @@ Tango::DbDatum DataImporterClass::get_default_class_property(string &prop_name)
void DataImporterClass::get_class_property()
{
/*----- PROTECTED REGION ID(DataImporterClass::get_class_property_before) ENABLED START -----*/
-
+
// Initialize class property data members
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::get_class_property_before
// Read class properties from database.
cl_prop.push_back(Tango::DbDatum("CertificateFile"));
@@ -266,7 +266,7 @@ void DataImporterClass::get_class_property()
cl_prop.push_back(Tango::DbDatum("DIDBSchema"));
cl_prop.push_back(Tango::DbDatum("DIDBIndexTable"));
cl_prop.push_back(Tango::DbDatum("DIDBRejectedTable"));
-
+
// Call database and extract values
if (Tango::Util::instance()->_UseDb==true)
get_db_class()->get_property(cl_prop);
@@ -382,9 +382,9 @@ void DataImporterClass::get_class_property()
}
}
/*----- PROTECTED REGION ID(DataImporterClass::get_class_property_after) ENABLED START -----*/
-
+
// Check class property data members init
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::get_class_property_after
}
@@ -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);
@@ -885,7 +885,7 @@ void DataImporterClass::write_class_property()
header = "$HeadURL: ";
start = header.length();
string strloc = src_path.substr(start, (end-start));
-
+
Tango::DbDatum svn_loc("svn_location");
svn_loc << strloc;
data.push_back(svn_loc);
@@ -894,13 +894,13 @@ void DataImporterClass::write_class_property()
}
// Get CVS or SVN revision tag
-
+
// CVS tag
string tagname(TagName);
header = "$Name: ";
start = header.length();
string endstr(" $");
-
+
end = tagname.find(endstr);
if (end!=string::npos && end>start)
{
@@ -909,17 +909,17 @@ void DataImporterClass::write_class_property()
cvs_tag << strtag;
data.push_back(cvs_tag);
}
-
+
// SVN tag
string svnpath(SvnPath);
header = "$HeadURL: ";
start = header.length();
-
+
end = svnpath.find(endstr);
if (end!=string::npos && end>start)
{
string strloc = svnpath.substr(start, end-start);
-
+
string tagstr ("/tags/");
start = strloc.find(tagstr);
if ( start!=string::npos )
@@ -927,7 +927,7 @@ void DataImporterClass::write_class_property()
start = start + tagstr.length();
end = strloc.find(filename);
string strtag = strloc.substr(start, end-start-1);
-
+
Tango::DbDatum svn_tag("svn_tag");
svn_tag << strtag;
data.push_back(svn_tag);
@@ -968,16 +968,16 @@ void DataImporterClass::write_class_property()
void DataImporterClass::device_factory(const Tango::DevVarStringArray *devlist_ptr)
{
/*----- PROTECTED REGION ID(DataImporterClass::device_factory_before) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::device_factory_before
// Create devices and add it into the device list
for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
{
cout4 << "Device name : " << (*devlist_ptr)[i].in() << endl;
- device_list.push_back(new DataImporter(this, (*devlist_ptr)[i]));
+ device_list.push_back(new DataImporter(this, (*devlist_ptr)[i]));
}
// Manage dynamic attributes if any
@@ -998,9 +998,9 @@ void DataImporterClass::device_factory(const Tango::DevVarStringArray *devlist_p
}
/*----- PROTECTED REGION ID(DataImporterClass::device_factory_after) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::device_factory_after
}
//--------------------------------------------------------
@@ -1013,16 +1013,16 @@ void DataImporterClass::device_factory(const Tango::DevVarStringArray *devlist_p
void DataImporterClass::attribute_factory(vector<Tango::Attr *> &att_list)
{
/*----- PROTECTED REGION ID(DataImporterClass::attribute_factory_before) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::attribute_factory_before
// Create a list of static attributes
create_static_attribute_list(get_class_attr()->get_attr_list());
/*----- PROTECTED REGION ID(DataImporterClass::attribute_factory_after) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::attribute_factory_after
}
//--------------------------------------------------------
@@ -1035,9 +1035,9 @@ void DataImporterClass::attribute_factory(vector<Tango::Attr *> &att_list)
void DataImporterClass::command_factory()
{
/*----- PROTECTED REGION ID(DataImporterClass::command_factory_before) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::command_factory_before
@@ -1060,9 +1060,9 @@ void DataImporterClass::command_factory()
command_list.push_back(pOffCmd);
/*----- PROTECTED REGION ID(DataImporterClass::command_factory_after) ENABLED START -----*/
-
+
// Add your own code
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::command_factory_after
}
@@ -1075,7 +1075,7 @@ void DataImporterClass::command_factory()
* method : DataImporterClass::create_static_attribute_list
* description : Create the a list of static attributes
*
- * @param att_list the ceated attribute list
+ * @param att_list the ceated attribute list
*/
//--------------------------------------------------------
void DataImporterClass::create_static_attribute_list(vector<Tango::Attr *> &att_list)
@@ -1090,7 +1090,7 @@ void DataImporterClass::create_static_attribute_list(vector<Tango::Attr *> &att_
cout2 << defaultAttList.size() << " attributes in default list" << endl;
/*----- PROTECTED REGION ID(DataImporterClass::create_static_att_list) ENABLED START -----*/
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::create_static_att_list
}
@@ -1109,10 +1109,10 @@ void DataImporterClass::erase_dynamic_attributes(const Tango::DevVarStringArray
Tango::Util *tg = Tango::Util::instance();
for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)
- {
+ {
Tango::DeviceImpl *dev_impl = tg->get_device_by_name(((string)(*devlist_ptr)[i]).c_str());
DataImporter *dev = static_cast<DataImporter *> (dev_impl);
-
+
vector<Tango::Attribute *> &dev_att_list = dev->get_device_attr()->get_attribute_list();
vector<Tango::Attribute *>::iterator ite_att;
for (ite_att=dev_att_list.begin() ; ite_att != dev_att_list.end() ; ++ite_att)
@@ -1131,7 +1131,7 @@ void DataImporterClass::erase_dynamic_attributes(const Tango::DevVarStringArray
}
}
/*----- PROTECTED REGION ID(DataImporterClass::erase_dynamic_attributes) ENABLED START -----*/
-
+
/*----- PROTECTED REGION END -----*/ // DataImporterClass::erase_dynamic_attributes
}