From a365052f348c27ef381e03e6dfa7eb03b559074a Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 17 Feb 2017 09:47:58 +0000 Subject: [PATCH 001/145] Branch for the latest 64 bit ACS release -- GitLab From caf0c9baa0edbbd367a00262b1696297eb734a1a Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 5 May 2017 14:01:22 +0000 Subject: [PATCH 002/145] Fix #78: anonymous types deprecated by OMG spec --- .../CommonInterface/idl/BackendsDefinitions.midl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl b/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl index 349f3633c..a24f0bd78 100644 --- a/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl +++ b/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl @@ -44,6 +44,9 @@ module Backends { ACS_ENUM(TPolarization); + typedef sequence AttenuationArray; + typedef sequence PolarizationArray; + /** * This structure reports the information that composes the section header of the data flux. Each section can have one or two inputs. Generally the number of inputs depends on the * the polarization type of the section, if simple LEFT or RIGHT the input is one, if FULL_STOKES the inputs are two. The two positions fields attenuation and IF reports @@ -56,11 +59,11 @@ module Backends { TPolarization polarization; /*!< specify the type of the section */ double bandWidth; /*!< bandwidth in MHz of the section */ double frequency; /*!< start frequency of the section in MHz */ - double attenuation[2]; /*!< attenuation level of the input in db. */ + AttenuationArray attenuation; /*!< attenuation level of the input in db. */ double sampleRate; /*!< sample rate in MHz */ long feed; /*!< beam identifier from which the section comes from */ long inputs; /*!< number of inputs virtually connected to the section, it can be one or two depending on the polarization. */ - long IF[2]; /*!< if identifier for each of the inputs */ + PolarizationArray IF; /*!< if identifier for each of the inputs */ }; /** -- GitLab From 222d219fe3ef0808b91443df5a90a5a8dc23b1fd Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 5 May 2017 14:49:07 +0000 Subject: [PATCH 003/145] Fix #79: undefined symbols in Interfaces/CommonInterface --- .../Interfaces/CommonInterface/src/Makefile | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Common/Interfaces/CommonInterface/src/Makefile b/Common/Interfaces/CommonInterface/src/Makefile index fa84dbb1d..f06b32561 100644 --- a/Common/Interfaces/CommonInterface/src/Makefile +++ b/Common/Interfaces/CommonInterface/src/Makefile @@ -38,14 +38,21 @@ MAKE_PDF = ON # ----------------------------- EXECUTABLES = EXECUTABLES_L = TestReceivers TestManagement #TestAntenna + TestReceivers_OBJECTS = ReceiversModule -TestReceivers_LIBS= ReceiversDefinitionsStubs baci maci +TestReceivers_LIBS= baci maci TestManagement_OBJECTS = ManagementModule -TestManagement_LIBS= ManagmentDefinitionsStubs ManagementErrors baci maci +TestManagement_LIBS= ManagementErrors baci maci + +Antenna_OBJECTS= AntennaModule +Antenna_LIBS = AntennaDefinitions AntennaErrors TestManagement_LIBS AntennaDefinitionsStubs_LIBS + +Backend_OBJECTS= BackendModule +Backend_LIBS = BackendsDefinitions BackendsErrors BackendsDefinitionsStubs_LIBS -#TestAntenna_OBJECTS= AntennaModule -#TestAntenna_LIBS = AntennaDefinitionsStubs AntennaErrors ManagmentDefinitionsStubs ManagementErrors baci maci +MinorServo_OBJECTS= MinorServoModule +MinorServo_LIBS = MinorServoDefinitions MinorServoErrors MinorServoDefinitionsStubs_LIBS # # @@ -60,7 +67,7 @@ xxxxx_LIBS = # # Includes (.h) files (public only) # --------------------------------- -INCLUDES = ReceiversModule.h ManagementModule.h AntennaModule.h +INCLUDES = ReceiversModule.h ManagementModule.h AntennaModule.h # # Configuration Database Files @@ -73,6 +80,15 @@ CDB_SCHEMAS = Managment Antenna Receivers IDL_FILES = ManagmentDefinitions AntennaDefinitions ReceiversDefinitions BackendsDefinitions MinorServoDefinitions TAO_IDLFLAGS = USER_IDL = +ReceiversDefinitionsStubs_LIBS = baciStubs maciStubs +ManagmentDefinitionsStubs_LIBS = baciStubs maciStubs ManagementErrorsStubs +AntennaDefinitionsStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + AntennaErrorsStubs +BackendsDefinitionsStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + BackendsErrorsStubs + +MinorServoDefinitionsStubs_LIBS = baciStubs maciStubs + # # Jarfiles and their directories # -- GitLab From 8b4d5211ea488ee7d8baba7d263ec7189cc17a53 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 5 May 2017 15:47:29 +0000 Subject: [PATCH 004/145] Fix #78 properly, using fixed lenght arrays --- .../Interfaces/CommonInterface/idl/BackendsDefinitions.midl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl b/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl index a24f0bd78..4d28e08ce 100644 --- a/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl +++ b/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl @@ -44,8 +44,8 @@ module Backends { ACS_ENUM(TPolarization); - typedef sequence AttenuationArray; - typedef sequence PolarizationArray; + typedef double AttenuationArray[2]; + typedef long PolarizationArray[2]; /** * This structure reports the information that composes the section header of the data flux. Each section can have one or two inputs. Generally the number of inputs depends on the -- GitLab From 815bcb342998d8fd90e3c47438a017fd11db3c23 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 8 May 2017 09:30:08 +0000 Subject: [PATCH 005/145] Fix #80: undefined symbols in Interfaces/ManagmentInterface --- Common/Interfaces/ManagmentInterface/src/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Common/Interfaces/ManagmentInterface/src/Makefile b/Common/Interfaces/ManagmentInterface/src/Makefile index 5cacdf888..eeabeda3f 100644 --- a/Common/Interfaces/ManagmentInterface/src/Makefile +++ b/Common/Interfaces/ManagmentInterface/src/Makefile @@ -29,6 +29,20 @@ IDL_FILES = DataReceiver FitsWriter MBFitsWriter Scheduler ExternalClients Calib IDL_TAO_FLAGS = USER_IDL = +DataReceiverStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + bulkDataReceiverStubs ComponentErrorsStubs +FitsWriterStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + DataReceiverStubs +MBFitsWriterStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + DataReceiverStubs +SchedulerStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + AntennaDefinitionsStubs ComponentErrorsStubs DataReceiverStubs +ExternalClientsStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + ComponentErrorsStubs +CalibrationToolStubs_LIBS = baciStubs maciStubs DataReceiverStubs +CustomLoggerStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + ComponentErrorsStubs + # # other files to be installed #---------------------------- -- GitLab From 33e9690986aa7946fbd06c02df2a7cee020babbe Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 8 May 2017 12:00:12 +0000 Subject: [PATCH 006/145] Remove useless objects, created when fixing #79 --- Common/Interfaces/CommonInterface/src/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Common/Interfaces/CommonInterface/src/Makefile b/Common/Interfaces/CommonInterface/src/Makefile index f06b32561..c80275755 100644 --- a/Common/Interfaces/CommonInterface/src/Makefile +++ b/Common/Interfaces/CommonInterface/src/Makefile @@ -45,15 +45,6 @@ TestReceivers_LIBS= baci maci TestManagement_OBJECTS = ManagementModule TestManagement_LIBS= ManagementErrors baci maci -Antenna_OBJECTS= AntennaModule -Antenna_LIBS = AntennaDefinitions AntennaErrors TestManagement_LIBS AntennaDefinitionsStubs_LIBS - -Backend_OBJECTS= BackendModule -Backend_LIBS = BackendsDefinitions BackendsErrors BackendsDefinitionsStubs_LIBS - -MinorServo_OBJECTS= MinorServoModule -MinorServo_LIBS = MinorServoDefinitions MinorServoErrors MinorServoDefinitionsStubs_LIBS - # # xxxxx_OBJECTS = -- GitLab From 97c2761944613f9ef9d503c77f1567c526caf0e0 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 8 May 2017 16:59:40 +0000 Subject: [PATCH 007/145] Fix #81: argument time clashes with alma.ACS.Time --- .../AntennaInterface/idl/AntennaBoss.midl | 22 +++++++++---------- .../AntennaInterface/idl/EphemGenerator.idl | 12 +++++----- .../AntennaInterface/idl/Mount.midl | 14 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl b/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl index 62c23cf1e..7d5ace0ee 100644 --- a/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl +++ b/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl @@ -584,17 +584,17 @@ module Antenna { * This method should only be used internally to know the raw coordinates commanded to the mount. You must provide the timemark * your coordinates have to refer to. * @throw CORBA::SyStemException - * @param time this indicates to the routine the time to which the coordinates refer + * @param timemark this indicates to the routine the time to which the coordinates refer * @param az the raw azimuth in radians * @param el the raw elevation in radians */ - void getRawCoordinates(in ACS::Time time,out double az,out double el); + void getRawCoordinates(in ACS::Time timemark,out double az,out double el); /** * This method should only be used internally to know the apparent coordinates commanded. You must provide the timemark * your coordinates have to refer to. Apparent coordinates are included with user offsets and come directly fro ephemeris generator. They should differ from observed coordinate just for pointing errors. * @throw CORBA::SyStemException - * @param time this indicates the time the coordinates refer to + * @param timemark this indicates the time the coordinates refer to * @param az the apparent azimuth in radians * @param el the apparent elevation in radians * @param ra apparent right ascension in radinas @@ -603,48 +603,48 @@ module Antenna { * @param lon galactic longitude corresponding to the apparent equatorial * @param lat galactic latitude corresponding to the apparent equatorial */ - void getApparentCoordinates(in ACS::Time time,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat); + void getApparentCoordinates(in ACS::Time timemark,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat); /** * This method should only be used internally to know the observed equatorial coordinates. A timestamp to which the coordinates * referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of * an interpolation. The equinox is J2000. They directly come from the observed in the horizontal frame. * In case duration is greter than the configured coordinate integration time, the returned coordinates are the result of the average over the duration interval that starts - * from time. + * from timestamp. * @throw CORBA::SystemExcpetion - * @param time the input timestamp + * @param timestamp the input timestamp * @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged * over the provided interval. * @param ra the returned observed right ascension in radians * @param dec the returned observed declination in radians */ - void getObservedEquatorial(in ACS::Time time,in ACS::TimeInterval duration,out double ra,out double dec); + void getObservedEquatorial(in ACS::Time timestamp,in ACS::TimeInterval duration,out double ra,out double dec); /** * This method should only be used internally to know the observed galactic coordinates. A timestamp to which the coordinates * referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of * an interpolation. They are obtained by converting the corresponding J2000 observed equatorial coordinates. * @throw CORBA::SystemExcpetion - * @param time the input timestamp + * @param timestamp the input timestamp * @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged * over the provided interval. * @param ra the returned observed galactic longitude in radians * @param dec the returned observed galactic latitude in radians */ - void getObservedGalactic(in ACS::Time time,in ACS::TimeInterval duration, out double longitude,out double latitude); + void getObservedGalactic(in ACS::Time timestamp,in ACS::TimeInterval duration, out double longitude,out double latitude); /** * This method should only be used internally to know the observed horizontal coordinates. A timestamp to which the coordinates * referes to must be provided. It is highly probable that these cordinates are not "real" (directly read from the antenna) but they are the result of * an interpolation. They are obtained by the encoders coordinates depurated by instrumental effects.. * @throw CORBA::SystemExcpetion - * @param time the input timestamp + * @param timestamp the input timestamp * @param duration duration of the integration, if greater than coordinate integration time the returned values are not instantaneous but are averaged * over the provided interval. * @param ra the returned observed azimuth in radians * @param dec the returned observed elevation in radians */ - void getObservedHorizontal(in ACS::Time time,in ACS::TimeInterval duration,out double az,out double el); + void getObservedHorizontal(in ACS::Time timestamp,in ACS::TimeInterval duration,out double az,out double el); /** * This method should only be used internally to know the user offsets currently commanded diff --git a/Common/Interfaces/AntennaInterface/idl/EphemGenerator.idl b/Common/Interfaces/AntennaInterface/idl/EphemGenerator.idl index b71317d25..eb9b3a0d0 100644 --- a/Common/Interfaces/AntennaInterface/idl/EphemGenerator.idl +++ b/Common/Interfaces/AntennaInterface/idl/EphemGenerator.idl @@ -98,16 +98,16 @@ module Antenna { * This method is only for control software internal use. It used, given a timestamp, to retrive the apparent * horizontal coordinates in one shot. * @throw CORBA::SystemException - * @param time this parameter is used to pass the excat time the caller wants to know the topocentric coordinates. + * @param timestamp this parameter is used to pass the exact time the caller wants to know the topocentric coordinates. * @param az that's the returned value in radians of the azimuth for the requested time. * @param el that's the returned value in radians of the elevation for the requested time. */ - void getHorizontalCoordinate(in ACS::Time time, out double az,out double el); + void getHorizontalCoordinate(in ACS::Time timestamp, out double az,out double el); /** * This method should only be used internally to know the apparent coordinates in all frames. * @throw CORBA::SyStemException - * @param time this indicates the time the coordinates refer to + * @param timestamp this indicates the time the coordinates refer to * @param az the apparent azimuth in radians * @param el the apparent elevation in radians * @param ra apparent right ascension in radinas @@ -116,7 +116,7 @@ module Antenna { * @param lon galactic longitude corresponding to the apparent equatorial * @param lat galactic latitude corresponding to the apparent equatorial */ - void getAllCoordinates(in ACS::Time time,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat); + void getAllCoordinates(in ACS::Time timestamp,out double az,out double el, out double ra,out double dec,out double jepoch,out double lon,out double lat); /** * This method is called internally to know if the telescope is tracking the right position or not. The generator will subtract the @@ -127,7 +127,7 @@ module Antenna { * into account the fact that during acceleration ramps the antenna is not,stritcly speaking, tracking. * The coordinates passed here must be observed (depurated by all the instrumental effects and correction that are used * to point correctly the telescope) - * @param time represent the time that the provided azimuth and elevation referes to. The component will compute its azimuth + * @param timestamp represent the time that the provided azimuth and elevation referes to. The component will compute its azimuth * and elevation in order to compare them. * @param az the azimuth (radians) of the coordinate where the telescope is, if it is nearby (inside HPBW) the computed (by this * component) one, the antenna is tracking. @@ -136,7 +136,7 @@ module Antenna { * @param HPBW the beam width at half power(radians), used to decide if the pointing errors * @return true if the antenna is tracking, false in all other cases. */ - boolean checkTracking (in ACS::Time time,in double az,in double el,in double HPBW); + boolean checkTracking (in ACS::Time timestamp,in double az,in double el,in double HPBW); /** * This method is used to calculate the flux of a source who's parameter diff --git a/Common/Interfaces/AntennaInterface/idl/Mount.midl b/Common/Interfaces/AntennaInterface/idl/Mount.midl index 7474caf2e..b764a7a89 100644 --- a/Common/Interfaces/AntennaInterface/idl/Mount.midl +++ b/Common/Interfaces/AntennaInterface/idl/Mount.midl @@ -148,10 +148,10 @@ module Antenna { * @throw CORBA::SystemException * @param az azimuth of the data point that will be transfered (degrees) * @param el elevation of the data point that will be transfered (degrees) - * @param time time stamp of the data point, the mount will try to reach that point at the given time + * @param timestamp time stamp of the data point, the mount will try to reach that point at the given time * @param restart if true the data point stack will be cleared and all previuos loaded point will be lost. */ - void programTrack(in double az,in double el,in ACS::Time time,in boolean restart) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx); + void programTrack(in double az,in double el,in ACS::Time timestamp,in boolean restart) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx); /** * This method can be used to stop all running operation (jobs that requires long time to complete) or in a more simple way to @@ -246,29 +246,29 @@ module Antenna { * This method is used internally by client component. It is used to read the azimuth, elevation, azimuthOffset and elevationOffset in one shot. * All these information are marked with a timestamp. The returned values are in degrees. At any time if you want to know the obseverd sky point * you have to subtract to each coordinate the respective offset. - * @param time this timestamp marks the other values returned by this method + * @param timestamp this timestamp marks the other values returned by this method * @param azimuth returns the azimuth read directly from the mount encoders * @param elevation returns the elevation read directly from the mount encoders, it is exactly the same value of the property elevation * @param azOff returns the value of the instant offset for the azimuth axe. This value is the last commanded by the method setOffsets. * @param elOff returns the value of the instant offset for the elevation axe. This value is the last commanded by the method setOffsets. - * @param section this parameter brings the information of the section in which the mount is at the epoch given by parameter time. + * @param section this parameter brings the information of the section in which the mount is at the epoch given by parameter timestamp. * @throw CORBA::SystemException * @throw ComponentErrors::ComponentErrorsEx * @thorw AntennaErrors::AntennaErrorsEx */ - void getEncoderCoordinates(out ACS::Time time,out double azimuth,out double elevation,out double azOff, + void getEncoderCoordinates(out ACS::Time timestamp,out double azimuth,out double elevation,out double azOff, out double elOff,out TSections section) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx); /** * This method is internally used to retrieve antenna errors in one time. - * @param time this is the timestamp that marks the other values returned by this method + * @param timestamp this is the timestamp that marks the other values returned by this method * @param azError error in azimuth in degrees * @param elError error in elevation in degrees * @throw CORBA::SystemException * @throw ComponentErrors::ComponentErrorsEx * @thorw AntennaErrors::AntennaErrorsEx */ - void getAntennaErrors(out ACS::Time time,out double azError,out double elError) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx); + void getAntennaErrors(out ACS::Time timestamp,out double azError,out double elError) raises (ComponentErrors::ComponentErrorsEx,AntennaErrors::AntennaErrorsEx); /** * This method is used internally by client components. It can be used to force the azimuth range the mount will travel in order to reach the -- GitLab From c6fb716164fd4b00fc3d45973a52e3faff309343 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 8 May 2017 17:04:30 +0000 Subject: [PATCH 008/145] Fix #82: undefined symbols in Interfaces/AntennaInterface --- Common/Interfaces/AntennaInterface/src/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Common/Interfaces/AntennaInterface/src/Makefile b/Common/Interfaces/AntennaInterface/src/Makefile index f52c04230..e486056f0 100644 --- a/Common/Interfaces/AntennaInterface/src/Makefile +++ b/Common/Interfaces/AntennaInterface/src/Makefile @@ -33,6 +33,22 @@ IDL_FILES = Observatory Mount PointingModel EphemGeneratorMACRO_include \ EphemGenerator SkySource OTF Refraction AntennaBoss Moon IDL_TAO_FLAGS = USER_IDL = +ObservatoryStubs_LIBS = baciStubs maciStubs AntennaDefinitionsStubs ComponentErrorsStubs +MountStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + AntennaErrorsStubs AntennaDefinitionsStubs ComponentErrorsStubs +PointingModelStubs_LIBS = baciStubs maciStubs AntennaErrorsStubs acscomponentStubs +EphemGeneratorStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + AntennaErrorsStubs AntennaDefinitionsStubs +SkySourceStubs_LIBS = baciStubs maciStubs EphemGeneratorStubs ComponentErrorsStubs \ + AntennaErrorsStubs AntennaDefinitionsStubs +OTFStubs_LIBS = baciStubs maciStubs EphemGeneratorStubs ComponentErrorsStubs \ + AntennaErrorsStubs AntennaDefinitionsStubs +RefractionStubs_LIBS = baciStubs maciStubs acscomponentStubs AntennaErrorsStubs +AntennaBossStubs_LIBS = baciStubs maciStubs ManagmentDefinitionsStubs ManagementErrorsStubs \ + EphemGeneratorStubs ComponentErrorsStubs AntennaErrorsStubs \ + AntennaDefinitionsStubs +MoonStubs_LIBS = baciStubs maciStubs EphemGeneratorStubs + # # list of all possible C-sources (used to create automatic dependencies) -- GitLab From 77ab5aa274738ec8b9f795482592300613620a82 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 09:18:11 +0000 Subject: [PATCH 009/145] Fix #83: argument time clashes with alma.ACS.Time --- Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl | 4 ++-- Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl b/Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl index 75bf28c4a..802252b06 100644 --- a/Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl +++ b/Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl @@ -245,11 +245,11 @@ module Receivers { * If the time is lesser the the older one stored in the queue, * then it returns oldest position. * If the time is in advance or 0, it returns the latest position. - * @arg time the time related to the position we want to get + * @arg t the time related to the position we want to get * @return the position * @throw ComponentError::ComponentErrorsEx */ - double getPositionFromHistory(in ACS::Time time) raises (ComponentErrors::ComponentErrorsEx); + double getPositionFromHistory(in ACS::Time t) raises (ComponentErrors::ComponentErrorsEx); /** Return the commanded position in the user reference system diff --git a/Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl b/Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl index 67f96a3c5..c336518c0 100644 --- a/Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl +++ b/Common/Interfaces/ReceiversInterface/idl/GenericDerotator.idl @@ -171,11 +171,11 @@ module Receivers { * If the time is lesser the the older one stored in the queue, * then it returns oldest position. * If the time is in advance or 0, it returns the latest position. - * @arg time the time related to the position we want to get + * @arg t the time related to the position we want to get * @return the position * @throw ComponentError::ComponentErrorsEx */ - double getPositionFromHistory(in ACS::Time time) raises (ComponentErrors::ComponentErrorsEx); + double getPositionFromHistory(in ACS::Time t) raises (ComponentErrors::ComponentErrorsEx); /** -- GitLab From 934fcccf1248d002579d642060728dcc967b899d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 09:18:45 +0000 Subject: [PATCH 010/145] Fix #84: undefined symbols in ReceiversInterface --- .../Interfaces/ReceiversInterface/src/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Common/Interfaces/ReceiversInterface/src/Makefile b/Common/Interfaces/ReceiversInterface/src/Makefile index aeabeb85c..0abdc1d4e 100644 --- a/Common/Interfaces/ReceiversInterface/src/Makefile +++ b/Common/Interfaces/ReceiversInterface/src/Makefile @@ -22,6 +22,22 @@ IDL_FILES = CommonReceiverInterface ReceiversBoss \ GenericReceiver LocalOscillatorInterface \ DewarPositionerDefinitions GenericDerotator DewarPositioner + +CommonReceiverInterfaceStubs_LIBS = baciStubs ComponentErrorsStubs ManagementErrorsStubs \ + ReceiversErrorsStubs +ReceiversBossStubs_LIBS = baciStubs ComponentErrorsStubs ReceiversErrorsStubs \ + ManagmentDefinitionsStubs CommonReceiverInterfaceStubs ReceiversDefinitionsStubs \ + AntennaDefinitionsStubs +GenericReceiverStubs_LIBS = baciStubs ComponentErrorsStubs ReceiversErrorsStubs \ + ReceiversDefinitionsStubs ManagmentDefinitionsStubs CommonReceiverInterfaceStubs +LocalOscillatorInterfaceStubs_LIBS = baciStubs ComponentErrorsStubs ReceiversErrorsStubs +DewarPositionerDefinitionsStubs_LIBS = baciStubs AntennaDefinitionsStubs +GenericDerotatorStubs_LIBS = baciStubs DerotatorErrorsStubs ComponentErrorsStubs \ + ManagmentDefinitionsStubs +DewarPositionerStubs_LIBS = baciStubs maciErrTypeStubs ComponentErrorsStubs \ + ManagmentDefinitionsStubs AntennaDefinitionsStubs DewarPositionerDefinitionsStubs + + # list of all possible C-sources (used to create automatic dependencies) CSOURCENAMES = \ $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ -- GitLab From 115a49780014a9b6b7815742eda7a75be2668722 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 09:50:32 +0000 Subject: [PATCH 011/145] Fix #86: BackendsInterface: argument time clashes with alma.ACS.Time --- Common/Interfaces/BackendsInterface/idl/GenericBackend.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl b/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl index b72b557dd..f30da8b84 100644 --- a/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl +++ b/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl @@ -183,9 +183,9 @@ module Backends { * @throw CORBA::SystemException * @throw BackendsErrors::BackendsErrorsEx * @thorw ComponentErrors::ComponentErrorsEx - * @param time start time of the acquisition. If the time is elapsed the acquisition is started anyway, If a zero is passed the acquisition will be started as soon as possible. + * @param stime start time of the acquisition. If the time is elapsed the acquisition is started anyway, If a zero is passed the acquisition will be started as soon as possible. */ - void sendData(in ACS::Time time) raises (BackendsErrors::BackendsErrorsEx,ComponentErrors::ComponentErrorsEx); + void sendData(in ACS::Time stime) raises (BackendsErrors::BackendsErrorsEx,ComponentErrors::ComponentErrorsEx); /** * Immediately stops the data flows. This is asort of suspend, that means that the data are not sent but the transfer job i still -- GitLab From fb3c4dad4639c26d62bf3261197bd8b76006563e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 09:51:04 +0000 Subject: [PATCH 012/145] Fix #87: undefined symbols in BackendsInterface --- Common/Interfaces/BackendsInterface/src/Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Common/Interfaces/BackendsInterface/src/Makefile b/Common/Interfaces/BackendsInterface/src/Makefile index f79902d73..0720507d8 100644 --- a/Common/Interfaces/BackendsInterface/src/Makefile +++ b/Common/Interfaces/BackendsInterface/src/Makefile @@ -37,6 +37,19 @@ IDL_FILES = GenericBackend BackendsBoss TotalPower NoiseGenerator DigitalXCorrel IDL_TAO_FLAGS = USER_IDL = +GenericBackendStubs_LIBS = baciStubs bulkDataStubs bulkDataSenderStubs BackendsDefinitionsStubs \ + ManagmentDefinitionsStubs ComponentErrorsStubs BackendsErrorsStubs ReceiversDefinitionsStubs +BackendsBossStubs_LIBS = baciStubs BackendsDefinitionsStubs ManagmentDefinitionsStubs \ + ComponentErrorsStubs +TotalPowerStubs_LIBS = baciStubs GenericBackendStubs +NoiseGeneratorStubs_LIBS = baciStubs GenericBackendStubs +DigitalXCorrelatorStubs_LIBS = acscomponentStubs ACSErrTypeFPGAConnectionStubs \ + ACSErrTypeFPGACommunicationStubs ComponentErrorsStubs +HolographyStubs_LIBS = baciStubs GenericBackendStubs +DBBCStubs_LIBS = baciStubs GenericBackendStubs +DFBInterfaceStubs_LIBS = baciStubs GenericBackendStubs +RoachStubs_LIBS = baciStubs GenericBackendStubs + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ -- GitLab From 0d030cc591425e08775cff78853a113aeeaba3f8 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 09:57:53 +0000 Subject: [PATCH 013/145] Fix #88: MinorServoInterface: argument time clashes with alma.ACS.Time --- Common/Interfaces/MinorServoInterface/idl/MinorServo.idl | 4 ++-- Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl b/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl index fe8c5b5b5..4f3bb3fdc 100644 --- a/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl +++ b/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl @@ -413,11 +413,11 @@ module MinorServo { /** Return the servo position at a given time. * If the time is too old, it returns the older position. * If the time is in advance or 0, it returns the latest position. - * @arg time the position time + * @arg t the position time * @return the position * @throw ComponentError::UnexpectedEx */ - ACS::doubleSeq getPositionFromHistory(in ACS::Time time) raises (ComponentErrors::UnexpectedEx); + ACS::doubleSeq getPositionFromHistory(in ACS::Time t) raises (ComponentErrors::UnexpectedEx); /** Clear the position system offset * @arg boolean set_positions if true, it also sets the actual and the future positions diff --git a/Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl b/Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl index f4f54f00f..e3fab914f 100644 --- a/Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl +++ b/Common/Interfaces/MinorServoInterface/idl/MinorServoBoss.idl @@ -270,11 +270,11 @@ module MinorServo { /** Return the positions of the active axes * - * @param time the time related to the position we want to retrieve + * @param t the time related to the position we want to retrieve * @return a sequence of positions, in the same order of the axes parameter of getAxesInfo() * @throw MinorServoErrors::ConfigurationErrorEx if the system is not configured */ - ACS::doubleSeq getAxesPosition(in ACS::Time time) + ACS::doubleSeq getAxesPosition(in ACS::Time t) raises (MinorServoErrors::MinorServoErrorsEx, ComponentErrors::ComponentErrorsEx); -- GitLab From 25ffa6fe4acffe4e301d33744ce3ffeb190a51e0 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 10:01:19 +0000 Subject: [PATCH 014/145] Fix #89: undefined symbols in MinorServoInterface --- Common/Interfaces/MinorServoInterface/src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Common/Interfaces/MinorServoInterface/src/Makefile b/Common/Interfaces/MinorServoInterface/src/Makefile index 3beaaa8c4..52add7d1e 100644 --- a/Common/Interfaces/MinorServoInterface/src/Makefile +++ b/Common/Interfaces/MinorServoInterface/src/Makefile @@ -28,6 +28,10 @@ CSOURCENAMES = \ # IDL_FILES = MinorServo MinorServoBoss +MinorServoStubs_LIBS = baciStubs MinorServoErrorsStubs ComponentErrorsStubs +MinorServoBossStubs_LIBS = baciStubs ComponentErrorsStubs ManagmentDefinitionsStubs \ + MinorServoErrorsStubs AntennaDefinitionsStubs MinorServoDefinitionsStubs + # # INCLUDE STANDARDS # ----------------- -- GitLab From 42302e075e6ea3af692a2df700215f0a8407ed3e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 10:08:31 +0000 Subject: [PATCH 015/145] Fix #90: undefined symbols in WeatherStationInterface --- Common/Interfaces/WeatherStationInterface/src/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Common/Interfaces/WeatherStationInterface/src/Makefile b/Common/Interfaces/WeatherStationInterface/src/Makefile index 5f525fd8f..effd4d55b 100644 --- a/Common/Interfaces/WeatherStationInterface/src/Makefile +++ b/Common/Interfaces/WeatherStationInterface/src/Makefile @@ -45,6 +45,11 @@ IDL_FILES = GenericWeatherStation MeteoData IDL_TAO_FLAGS = USER_IDL = + +GenericWeatherStationStubs_LIBS = baciStubs ManagmentDefinitionsStubs +MeteoDataStubs_LIBS = acscomponentStubs ACSErrTypeCommonStubs + + # # Jarfiles and their directories # -- GitLab From 7cdfc45b9fc7e324cefce604bd98bc7022cd410d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 10:14:11 +0000 Subject: [PATCH 016/145] Fix #91: undefined symbols in ActiveSurfaceInterface --- Common/Interfaces/ActiveSurfaceInterface/src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Common/Interfaces/ActiveSurfaceInterface/src/Makefile b/Common/Interfaces/ActiveSurfaceInterface/src/Makefile index 73f6e4a25..9f872ffd4 100644 --- a/Common/Interfaces/ActiveSurfaceInterface/src/Makefile +++ b/Common/Interfaces/ActiveSurfaceInterface/src/Makefile @@ -115,6 +115,10 @@ CDB_SCHEMAS = ActiveSurface IDL_FILES = ActiveSurfaceBoss TAO_IDLFLAGS = USER_IDL = + +ActiveSurfaceBossStubs_LIBS = baciStubs ManagmentDefinitionsStubs + + # # Jarfiles and their directories # -- GitLab From 590711c0b5e3c340a727ff60a1ceb8f89d38010d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 10:27:53 +0000 Subject: [PATCH 017/145] Fix #92: undefined symbols in XBackendInterface --- Common/Interfaces/XBackendInterface/src/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Common/Interfaces/XBackendInterface/src/Makefile b/Common/Interfaces/XBackendInterface/src/Makefile index ccbeb380e..015c80cbb 100644 --- a/Common/Interfaces/XBackendInterface/src/Makefile +++ b/Common/Interfaces/XBackendInterface/src/Makefile @@ -35,6 +35,9 @@ IDL_FILES = XBackends TAO_IDLFLAGS = USER_IDL = +XBackendsStubs_LIBS = baciStubs GenericBackendStubs + + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ -- GitLab From b9ee425aafa5c46fe638239dbb3679c5601daa4e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 9 May 2017 11:10:28 +0000 Subject: [PATCH 018/145] Fix #93: ambibuous call of overloaded setValue() --- Common/Libraries/IRALibrary/src/DataField.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/Libraries/IRALibrary/src/DataField.cpp b/Common/Libraries/IRALibrary/src/DataField.cpp index 20e1486ce..c0ffb68c1 100644 --- a/Common/Libraries/IRALibrary/src/DataField.cpp +++ b/Common/Libraries/IRALibrary/src/DataField.cpp @@ -97,12 +97,11 @@ void CDataField::setValue(const CString& value) switch (m_type) { case LONGLONG : { m_valueList.back()->setType(baci::BACIValue::type_longLong); - m_valueList.back()->setValue((long long)atoll((const char*)value)); - break; + m_valueList.back()->setValue((const BACIlongLong)atoll((const char*)value)); } case DOUBLEDOUBLEWORD : { m_valueList.back()->setType(baci::BACIValue::type_uLongLong); - m_valueList.back()->setValue((DDWORD)atoll((const char*)value)); + m_valueList.back()->setValue((const BACIuLongLong)atoll((const char*)value)); break; } case DOUBLE : { -- GitLab From 1aefc748ca017518bff1b8345f7db827d45f13ce Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 10 May 2017 09:02:21 +0000 Subject: [PATCH 019/145] Fix #94: Forbids declaration of ACE_Event_Handler_Handle_Timeout_Upcall --- Common/Libraries/IRALibrary/include/ScheduleTimer.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Common/Libraries/IRALibrary/include/ScheduleTimer.h b/Common/Libraries/IRALibrary/include/ScheduleTimer.h index 7962b5a85..95089e1a0 100644 --- a/Common/Libraries/IRALibrary/include/ScheduleTimer.h +++ b/Common/Libraries/IRALibrary/include/ScheduleTimer.h @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -146,7 +147,7 @@ private: } TRecord; typedef std::vector TEvents; typedef TEvents::iterator TEventsIterator; - typedef ACE_Event_Handler_Handle_Timeout_Upcall TUpcall; + typedef ACE_Event_Handler_Handle_Timeout_Upcall TUpcall; typedef ACE_Timer_Heap_T TTimer_Heap; typedef ACE_Thread_Timer_Queue_Adapter TThread_Timer_Queue; -- GitLab From fd7650124f5faf27b612eb9882a73e79d59892dd Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 10 May 2017 12:09:18 +0000 Subject: [PATCH 020/145] Fix #96: use `ACS::Time` instead of `long long unsigned int` --- Common/Servers/Observatory/src/ObservatoryImpl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/Servers/Observatory/src/ObservatoryImpl.cpp b/Common/Servers/Observatory/src/ObservatoryImpl.cpp index acf837895..41d588c15 100644 --- a/Common/Servers/Observatory/src/ObservatoryImpl.cpp +++ b/Common/Servers/Observatory/src/ObservatoryImpl.cpp @@ -241,7 +241,7 @@ Antenna::TSiteInformation ObservatoryImpl::getSiteSummary() throw (CORBA::System void ObservatoryImpl::setDUT1(CORBA::Double val,CORBA::Boolean save) throw (CORBA::SystemException,ComponentErrorsEx) { - unsigned long long timestamp; + ACS::Time timestamp; AUTO_TRACE("ObservatoryImpl::setDUT1()"); try { m_pDUT1->getDevIO()->write(val,timestamp); @@ -267,7 +267,7 @@ void ObservatoryImpl::setDUT1(CORBA::Double val,CORBA::Boolean save) throw (CORB void ObservatoryImpl::setGeodeticModel(Antenna::TGeodeticModel model,CORBA::Boolean save) throw (CORBA::SystemException,ComponentErrorsEx) { - unsigned long long timestamp; + ACS::Time timestamp; AUTO_TRACE("ObservatoryImpl::setGeodeticModel()"); try { m_pgeodeticModel->getDevIO()->write(model,timestamp); @@ -294,7 +294,7 @@ void ObservatoryImpl::setGeodeticModel(Antenna::TGeodeticModel model,CORBA::Bool void ObservatoryImpl::setPoleMotion(CORBA::Double xP,CORBA::Double yP,CORBA::Boolean save) throw (CORBA::SystemException,ComponentErrorsEx) { - unsigned long long timestamp; + ACS::Time timestamp; AUTO_TRACE("ObservatoryImpl::setPoleMotion()"); try { m_pxPolarMotion->getDevIO()->write(xP,timestamp); -- GitLab From 4c59efd9385e2ec634a7fc740cf96d1af7b4681b Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 10 May 2017 12:17:52 +0000 Subject: [PATCH 021/145] Fix #97: Servers/Refraction does not compile --- Common/Servers/Refraction/src/TestIter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Servers/Refraction/src/TestIter.cpp b/Common/Servers/Refraction/src/TestIter.cpp index 1142ea445..dfd4e8cf2 100644 --- a/Common/Servers/Refraction/src/TestIter.cpp +++ b/Common/Servers/Refraction/src/TestIter.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include -- GitLab From 3c61cba9e5bfb32b4e2dafaf00d8ce48bebdd9fc Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 14:34:04 +0000 Subject: [PATCH 022/145] Fix #98: define LOGGING_CHANNEL_KIND because it is no more available in acscommon --- Common/Servers/CustomLogger/include/CustomLoggerImpl.h | 4 ++++ Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Common/Servers/CustomLogger/include/CustomLoggerImpl.h b/Common/Servers/CustomLogger/include/CustomLoggerImpl.h index 3e36afedc..675c18c55 100644 --- a/Common/Servers/CustomLogger/include/CustomLoggerImpl.h +++ b/Common/Servers/CustomLogger/include/CustomLoggerImpl.h @@ -37,6 +37,10 @@ #include #define WRITER_THREAD_NAME "logwriter" +/* We used acscommon::LOGGING_CHANNEL_KIND in ACS-8.2, but + * it is no more available. That is why we are defining it. + */ +const char *const LOGGING_CHANNEL_KIND = ""; /** * Event Type used in the ACS Notification Channel. diff --git a/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp b/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp index 7822c6103..c2cf93480 100644 --- a/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp +++ b/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp @@ -119,7 +119,7 @@ CustomLoggerImpl::initialize() throw (ACSErr::ACSbaseExImpl) CosNaming::Name name(1); name.length(1); name[0].id = CORBA::string_dup(CUSTOM_LOGGING_CHANNEL); - name[0].kind = acscommon::LOGGING_CHANNEL_KIND; + name[0].kind = LOGGING_CHANNEL_KIND; ifgop_ = CosNotifyChannelAdmin::OR_OP; m_nevents_sp->getDevIO()->write((long)0, _timestamp); ACS_SHORT_LOG((LM_DEBUG, "CutomLoggerImpl : resolving name service")); -- GitLab From f444bfcd3a531efba8501b9b45d5c641c952822d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 14:46:08 +0000 Subject: [PATCH 023/145] Fix #101: use terminate_ to avoid collisions with std::terminate --- .../src/AntennaBossTextClient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp b/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp index 931f2aed3..26bfb465c 100644 --- a/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp +++ b/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp @@ -75,11 +75,11 @@ using namespace TW; -static bool terminate; +static bool terminate_; void quintHandler(int sig) { - terminate=true; + terminate_=true; } IRA::CLogGuard guard(GUARDINTERVAL*1000); @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) { TW::CLabel *output_label; TW::CInputCommand *userInput; - terminate=false; + terminate_=false; // mainframe TW::CFrame window(CPoint(0,0),CPoint(WINDOW_WIDTH,WINDOW_HEIGHT),'|','|','-','-'); @@ -569,10 +569,10 @@ int main(int argc, char *argv[]) { window.showFrame(); - while(!terminate) { + while(!terminate_) { //if ((fieldCounter=userInput->parseCommand(fields,MAXFIELDNUMBER))>0) { // there is something input if (userInput->readCommand(inputCommand)) { - if (inputCommand=="exit") terminate=true; + if (inputCommand=="exit") terminate_=true; else if (component->_is_a("IDL:alma/Management/CommandInterpreter:1.0")) { try { char * outputAnswer; -- GitLab From 7364beb9a624fbf566b7556fafc6878f4a4a9ec2 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 14:58:33 +0000 Subject: [PATCH 024/145] Fix #102 renaming terminate to terminate_. --- .../src/ReceiversBossTextClient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp b/Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp index f5f497b2c..c3dd3dfd0 100644 --- a/Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp +++ b/Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp @@ -96,11 +96,11 @@ void NotificationHandler(Receivers::ReceiversDataBlock data,void *handlerParam) } } -static bool terminate; +static bool terminate_; void quintHandler(int sig) { - terminate=true; + terminate_=true; } #define TEMPLATE_4_ROTSYSTEMSTATUS Management::ROTSystemStatus_ptr,ACS::Monitorpattern,ACS::Monitorpattern_var,_TW_CBpattern,ACS::CBpattern_var @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) { TW::CLabel *output_label; TW::CInputCommand *userInput; - terminate=false; + terminate_=false; // mainframe TW::CFrame window(CPoint(0,0),CPoint(WINDOW_WIDTH,WINDOW_HEIGHT),'|','|','-','-'); @@ -503,9 +503,9 @@ int main(int argc, char *argv[]) { ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_INFO,MODULE_NAME"::START")); window.showFrame(); - while(!terminate) { + while(!terminate_) { if (userInput->readCommand(inputCommand)) { - if (inputCommand=="exit") terminate=true; + if (inputCommand=="exit") terminate_=true; else if (component->_is_a("IDL:alma/Management/CommandInterpreter:1.0")) { try { char * outputAnswer; -- GitLab From abbdb69c5389b299d62ea9ed913405110bd2bc62 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 15:38:29 +0000 Subject: [PATCH 025/145] Fix #104: move the scripts from PY_SCRIPTS to SCRIPTS --- Common/Misc/Scripts/src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/Misc/Scripts/src/Makefile b/Common/Misc/Scripts/src/Makefile index 987b3d44a..0de070bfc 100644 --- a/Common/Misc/Scripts/src/Makefile +++ b/Common/Misc/Scripts/src/Makefile @@ -31,7 +31,7 @@ # # Python stuff (public and local) # ---------------------------- -PY_SCRIPTS = data_stats tabbify +PY_SCRIPTS = PY_SCRIPTS_L = PY_MODULES = @@ -41,7 +41,7 @@ PY_PACKAGES = PY_PACKAGES_L = pppppp_MODULES = -SCRIPTS = +SCRIPTS = data_stats tabbify # # list of all possible C-sources (used to create automatic dependencies) -- GitLab From 19ee50b9d0374d2ab3068fad58605059a2d00738 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 15:43:29 +0000 Subject: [PATCH 026/145] Fix #105 changing PY_SCRIPTS to SCRIPTS --- Common/Misc/getTemplateForTests/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Misc/getTemplateForTests/src/Makefile b/Common/Misc/getTemplateForTests/src/Makefile index 273465da4..4d9f9821b 100644 --- a/Common/Misc/getTemplateForTests/src/Makefile +++ b/Common/Misc/getTemplateForTests/src/Makefile @@ -12,7 +12,7 @@ # # Python stuff (public and local) # ---------------------------- -PY_SCRIPTS = getTemplateForTests +SCRIPTS = getTemplateForTests PY_MODULES = gettemplatefortests # -- GitLab From ee3904d5a634d583d0426f6e95aafd5a52ee72e7 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 15:46:36 +0000 Subject: [PATCH 027/145] Fix issue #106 by changing PY_SCRIPTS to SCRIPTS --- Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile b/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile index ee0daf8b4..8892a1432 100644 --- a/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile +++ b/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile @@ -5,7 +5,7 @@ #***************************************** PY_PACKAGES = ReceiverBoardSimImpl -PY_SCRIPTS = receiverboard-sim +SCRIPTS = receiverboard-sim # ----------------- # Include Standards -- GitLab From 89b0348307fe634e62f6753abbb7ff4901d1e0f8 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 11 May 2017 15:49:47 +0000 Subject: [PATCH 028/145] Fix #107 by changing PY_SCRIPTS to SCRIPTS --- Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile b/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile index e0653e1be..93318d30a 100644 --- a/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile +++ b/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile @@ -13,7 +13,7 @@ # # Python stuff (public and local) # ---------------------------- -PY_SCRIPTS = tcpProt-sim +SCRIPTS = tcpProt-sim PY_PACKAGES = TCPGenericProtocolSimImpl -- GitLab From 200f6a509770e17e65573f99d7d49ca971d4d411 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 12 May 2017 11:31:31 +0000 Subject: [PATCH 029/145] Fix #103 using 'all' as a default target --- Common/Clients/CaltoolClient/src/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Common/Clients/CaltoolClient/src/Makefile b/Common/Clients/CaltoolClient/src/Makefile index e777a85fa..4c1a18ab8 100644 --- a/Common/Clients/CaltoolClient/src/Makefile +++ b/Common/Clients/CaltoolClient/src/Makefile @@ -188,12 +188,15 @@ endif # # TARGETS # ------- + +.DEFAULT_GOAL := all + all: gui do_all @echo " . . . 'all' done" clean : clean_all @echo " . . . clean done" - @rm calibrationtool_ui.py + @rm calibrationtool_ui.py* clean_dist : clean_all clean_dist_all @echo " . . . clean_dist done" -- GitLab From 4f2a883642fa33b8275740c90425ecd8aa53d024 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 15 May 2017 09:34:06 +0000 Subject: [PATCH 030/145] Fix #108: unresolved symbols in SRTAntennaInterface --- SRT/Interfaces/SRTAntennaInterface/src/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SRT/Interfaces/SRTAntennaInterface/src/Makefile b/SRT/Interfaces/SRTAntennaInterface/src/Makefile index 287045949..1630634b1 100644 --- a/SRT/Interfaces/SRTAntennaInterface/src/Makefile +++ b/SRT/Interfaces/SRTAntennaInterface/src/Makefile @@ -35,6 +35,8 @@ IDL_FILES = SRTMount TAO_IDLFLAGS = USER_IDL = +SRTMountStubs_LIBS = baciStubs MountStubs + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ -- GitLab From 194e4f255f2f91d41e5019c752a3d035c8bdc9c7 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 15 May 2017 09:44:08 +0000 Subject: [PATCH 031/145] Fix #109: unresolved symbols in SRTActiveSurfaceInterface --- SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile b/SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile index 5ca84e377..50728f21a 100644 --- a/SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile +++ b/SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile @@ -133,6 +133,11 @@ CDB_SCHEMAS = IDL_FILES = lan usd SRTActiveSurfaceBoss IDL_TAO_FLAGS = USER_IDL = +lanStubs_LIBS = baciStubs ASErrorsStubs +usdStubs_LIBS = baciStubs ASErrorsStubs +SRTActiveSurfaceBossStubs_LIBS = baciStubs ComponentErrorsStubs ASErrorsStubs \ + ManagmentDefinitionsStubs ActiveSurfaceBossStubs + # # Jarfiles and their directories # -- GitLab From 582196c049aafe6ac9dd1179122a3ceada1cc874 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 15 May 2017 09:48:52 +0000 Subject: [PATCH 032/145] Fix #110: unresolved symbols in SRTWeatherStationInterface --- SRT/Interfaces/SRTWeatherStationInterface/src/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SRT/Interfaces/SRTWeatherStationInterface/src/Makefile b/SRT/Interfaces/SRTWeatherStationInterface/src/Makefile index 252068afd..1f1a25639 100644 --- a/SRT/Interfaces/SRTWeatherStationInterface/src/Makefile +++ b/SRT/Interfaces/SRTWeatherStationInterface/src/Makefile @@ -45,6 +45,9 @@ IDL_FILES = SRTWeatherStation IDL_TAO_FLAGS = USER_IDL = +SRTWeatherStationStubs_LIBS = baciStubs GenericWeatherStationStubs + + # # Jarfiles and their directories # -- GitLab From a9e19108a70adb2495e80f30dcedfad450bf8411 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 15 May 2017 09:58:36 +0000 Subject: [PATCH 033/145] Fix #111: unresolved symbols in SRTReceiversInterface --- SRT/Interfaces/SRTReceiversInterface/src/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SRT/Interfaces/SRTReceiversInterface/src/Makefile b/SRT/Interfaces/SRTReceiversInterface/src/Makefile index 39f2df012..c5666177c 100644 --- a/SRT/Interfaces/SRTReceiversInterface/src/Makefile +++ b/SRT/Interfaces/SRTReceiversInterface/src/Makefile @@ -13,6 +13,12 @@ CDB_SCHEMAS = SRTLPBandNoiseMarkLookUpTable SRTLPBandReceiverModeSetup \ # IDL Files and flags IDL_FILES = SRTKBandMF SRTSBandMF SRT7GHz SRTLPBand SRTKBandDerotator +SRTKBandMFStubs_LIBS = baciStubs ComponentErrorsStubs GenericReceiverStubs +SRTSBandMFStubs_LIBS = baciStubs ComponentErrorsStubs GenericReceiverStubs +SRT7GHzStubs_LIBS = baciStubs ComponentErrorsStubs GenericReceiverStubs +SRTLPBandStubs_LIBS = baciStubs ComponentErrorsStubs GenericReceiverStubs ManagmentDefinitionsStubs +SRTKBandDerotatorStubs_LIBS = baciStubs ComponentErrorsStubs GenericDerotatorStubs + # list of all possible C-sources (used to create automatic dependencies) CSOURCENAMES = \ -- GitLab From 87ad15ddb1cb58d71b94eef92a96ee7521d3762d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Mon, 15 May 2017 10:17:58 +0000 Subject: [PATCH 034/145] Fix #112: DFBBackend does not compile because of conflicting declaration --- SRT/Servers/DFBBackend/include/DFBImpl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Servers/DFBBackend/include/DFBImpl.h b/SRT/Servers/DFBBackend/include/DFBImpl.h index 2aa96952c..494814ec4 100644 --- a/SRT/Servers/DFBBackend/include/DFBImpl.h +++ b/SRT/Servers/DFBBackend/include/DFBImpl.h @@ -241,7 +241,7 @@ class DFBImpl : public virtual BulkDataSenderDefaultImpl,public virtual POA_Back - virtual CORBA::Boolean command(const char *ddd,CORBA::String_out ddd) throw (CORBA::SystemException); + virtual CORBA::Boolean command(const char *ddd, CORBA::String_out answer) throw (CORBA::SystemException); /** -- GitLab From fce0faa9c63914d00ac60f73260bb360c91d1b65 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 16 May 2017 09:21:56 +0000 Subject: [PATCH 035/145] Fix #115: move the script from PY_SCIPTS to SCRIPTS --- SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile b/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile index 709015de9..c611e823e 100644 --- a/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile +++ b/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile @@ -5,7 +5,7 @@ #***************************************** PY_PACKAGES = SRTMSCUSimImpl -PY_SCRIPTS = srt-mscu-sim +SCRIPTS = srt-mscu-sim # ----------------- # Include Standards -- GitLab From 13a770f5892077f77e24a5db934c0a73c138b96d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 16 May 2017 09:50:28 +0000 Subject: [PATCH 036/145] Fix #116: Remove the DFBBackend --- SRT/Servers/DFBBackend/.cproject | 306 ------------ SRT/Servers/DFBBackend/.ecpproperties | 10 - SRT/Servers/DFBBackend/.project | 83 ---- SRT/Servers/DFBBackend/ChangeLog | 1 - .../config/CDB/alma/BACKENDS/DFB/DFB.xml | 29 -- .../DFBBackend/config/CDB/schemas/DFB.xsd | 70 --- SRT/Servers/DFBBackend/include/CommandLine.h | 55 --- SRT/Servers/DFBBackend/include/Common.h | 44 -- SRT/Servers/DFBBackend/include/DFBImpl.h | 460 ------------------ .../DFBBackend/src/.idl-compilation-end | 0 .../DFBBackend/src/.idl-compilation-start | 0 SRT/Servers/DFBBackend/src/CommandLine.cpp | 135 ----- SRT/Servers/DFBBackend/src/Configuration.cpp | 76 --- SRT/Servers/DFBBackend/src/DFBImpl.cpp | 288 ----------- SRT/Servers/DFBBackend/src/Makefile | 224 --------- 15 files changed, 1781 deletions(-) delete mode 100644 SRT/Servers/DFBBackend/.cproject delete mode 100644 SRT/Servers/DFBBackend/.ecpproperties delete mode 100644 SRT/Servers/DFBBackend/.project delete mode 100644 SRT/Servers/DFBBackend/ChangeLog delete mode 100644 SRT/Servers/DFBBackend/config/CDB/alma/BACKENDS/DFB/DFB.xml delete mode 100644 SRT/Servers/DFBBackend/config/CDB/schemas/DFB.xsd delete mode 100644 SRT/Servers/DFBBackend/include/CommandLine.h delete mode 100644 SRT/Servers/DFBBackend/include/Common.h delete mode 100644 SRT/Servers/DFBBackend/include/DFBImpl.h delete mode 100644 SRT/Servers/DFBBackend/src/.idl-compilation-end delete mode 100644 SRT/Servers/DFBBackend/src/.idl-compilation-start delete mode 100644 SRT/Servers/DFBBackend/src/CommandLine.cpp delete mode 100644 SRT/Servers/DFBBackend/src/Configuration.cpp delete mode 100644 SRT/Servers/DFBBackend/src/DFBImpl.cpp delete mode 100644 SRT/Servers/DFBBackend/src/Makefile diff --git a/SRT/Servers/DFBBackend/.cproject b/SRT/Servers/DFBBackend/.cproject deleted file mode 100644 index 1feba50be..000000000 --- a/SRT/Servers/DFBBackend/.cproject +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SRT/Servers/DFBBackend/.ecpproperties b/SRT/Servers/DFBBackend/.ecpproperties deleted file mode 100644 index 50afa5cc0..000000000 --- a/SRT/Servers/DFBBackend/.ecpproperties +++ /dev/null @@ -1,10 +0,0 @@ -#ECP Compilation Preferences -#Mon Mar 26 14:54:30 CEST 2012 -.INVOKE_COMPILERS= -.INCLUDE_PATHS=${INTROOT}/idl -.CUSTOM_OPTIONS=false -.GENERATE_SKELETONS=false -.GENERATE_TIES=false -.GENERATE_STUBS=true -.COMPILE=false -.OUTPUT_DIRECTORY= diff --git a/SRT/Servers/DFBBackend/.project b/SRT/Servers/DFBBackend/.project deleted file mode 100644 index bb2ea5708..000000000 --- a/SRT/Servers/DFBBackend/.project +++ /dev/null @@ -1,83 +0,0 @@ - - - DFBBackend - - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - ?name? - - - - org.eclipse.cdt.make.core.append_environment - true - - - org.eclipse.cdt.make.core.autoBuildTarget - all - - - org.eclipse.cdt.make.core.buildArguments - - - - org.eclipse.cdt.make.core.buildCommand - make - - - org.eclipse.cdt.make.core.buildLocation - /home/spoppi/ACS_SRT_SVN2/ACS/trunk/SRT/Servers/DFBBackend/src - - - org.eclipse.cdt.make.core.cleanBuildTarget - clean - - - org.eclipse.cdt.make.core.contents - org.eclipse.cdt.make.core.activeConfigSettings - - - org.eclipse.cdt.make.core.enableAutoBuild - false - - - org.eclipse.cdt.make.core.enableCleanBuild - true - - - org.eclipse.cdt.make.core.enableFullBuild - true - - - org.eclipse.cdt.make.core.fullBuildTarget - all - - - org.eclipse.cdt.make.core.stopOnError - true - - - org.eclipse.cdt.make.core.useDefaultBuildCmd - false - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - - diff --git a/SRT/Servers/DFBBackend/ChangeLog b/SRT/Servers/DFBBackend/ChangeLog deleted file mode 100644 index a6bf091b5..000000000 --- a/SRT/Servers/DFBBackend/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -"@(#) $Id$" diff --git a/SRT/Servers/DFBBackend/config/CDB/alma/BACKENDS/DFB/DFB.xml b/SRT/Servers/DFBBackend/config/CDB/alma/BACKENDS/DFB/DFB.xml deleted file mode 100644 index 5e1eeb248..000000000 --- a/SRT/Servers/DFBBackend/config/CDB/alma/BACKENDS/DFB/DFB.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - diff --git a/SRT/Servers/DFBBackend/config/CDB/schemas/DFB.xsd b/SRT/Servers/DFBBackend/config/CDB/schemas/DFB.xsd deleted file mode 100644 index 92d26b31b..000000000 --- a/SRT/Servers/DFBBackend/config/CDB/schemas/DFB.xsd +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - Enlist all possible configuration for the backend. many parameters can change for example the number of inputs, - the input type (BWG,Gregorian....) the used devices and so on. All the configuration are hard coded in the component, - so in order to add a configuration a piece of code in the component should reflect the addition. - - - - - - - the backend is connected to the 4 inputs of the secondary focus 22Ghz 7 feeds receiver - - - - - - - the backend is connected to the 2 inputs of the secondary focus 5Ghz receiver, LCP and RCP are reported respectively - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SRT/Servers/DFBBackend/include/CommandLine.h b/SRT/Servers/DFBBackend/include/CommandLine.h deleted file mode 100644 index df7ab42af..000000000 --- a/SRT/Servers/DFBBackend/include/CommandLine.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * CommandLine.h - * - * Created on: Oct 23, 2013 - * Author: spoppi - */ - -#ifndef COMMANDLINE_H_ -#define COMMANDLINE_H_ - -#include "Socket.h" -#include -#include -#include -#include -#include -#include -#include - -namespace DFB { - -class CCommandLine: public IRA::CSocket { -public: - CCommandLine(); - virtual ~CCommandLine(); - int go(string time); - int go(); - - int stop(void); - int cycle(string params); - int fileOpen(string name); - int fileClose(); - int configuration(string cfg); - int observer(string obs); - int obstype(string obstype); - int source(string source); - int frequency(double freq); - int restFrequency(double rfreq); - int frequencyInvert(bool finv); - -private: - string m_prefix; - string zeroFill(int n); // fill the string length of the command with zero filled values. - string composeCmd(string cmd); - - - -}; - - - - -} - -#endif /* COMMANDLINE_H_ */ diff --git a/SRT/Servers/DFBBackend/include/Common.h b/SRT/Servers/DFBBackend/include/Common.h deleted file mode 100644 index fcb4559d0..000000000 --- a/SRT/Servers/DFBBackend/include/Common.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef _COMMON_H_ -#define _COMMON_H_ - -/* **************************************************************************************************** */ -/* IRA Istituto di Radioastronomia */ -/* $Id: Common.h,v 1.1 2011-03-14 14:15:07 a.orlati Exp $ */ -/* */ -/* This code is under GNU General Public Licence (GPL). */ -/* */ -/* Who when What */ -/* Andrea Orlati(aorlati@ira.inaf.it) 15/10/2008 Creation */ - - -// if define the data are not sent to the bulk data transfer but printed to the screen. For production version it must be -// commented out -//#define BKD_DEBUG - -// some hard coded, hardware dependant constants -#define STARTFREQUENCY 50.0 // this is the start frequency of all IF inputs -#define BINSNUMBER 1 -#define SAMPLETYPE float -#define SAMPLESIZE sizeof(SAMPLETYPE) // - -#define SENDBUFFERSIZE 100 -#define RECBUFFERSIZE 512 -#define DATABUFFERSIZE 64000 -#define MAX_SECTION_NUMBER 14 -#define MAX_BOARDS_NUMBER 14 - -#define DEFAULT_SAMPLE_RATE 0.000025 //one sample every 40 milliseconds -//#define DEFAULT_SAMPLE_RATE 0.001 //one sample every 1 milliseconds -#define DEFAULT_INTEGRATION 0 // no second of integration -#define DEFAULT_DIODE_SWITCH_PERIOD 0 // the cal diode is not switched - -#define MAX_BAND_WIDTH 2350.0 -#define MIN_BAND_WIDTH 300.0 - -#define MAX_ATTENUATION 15.0 -#define MIN_ATTENUATION 0.0 - -#define MAX_SAMPLE_RATE 0.001 // one millisecond - -#define FLOW_NUMBER 1 -#endif /*COMMON_H_*/ diff --git a/SRT/Servers/DFBBackend/include/DFBImpl.h b/SRT/Servers/DFBBackend/include/DFBImpl.h deleted file mode 100644 index 494814ec4..000000000 --- a/SRT/Servers/DFBBackend/include/DFBImpl.h +++ /dev/null @@ -1,460 +0,0 @@ -/* - * DFBImpl.h - * - * Created on: Mar 26, 2012 - * Author: spoppi - */ - -#ifndef DFBIMPL_H_ -#define DFBIMPL_H_ - -#ifndef __cplusplus -#error This is a C++ include file and cannot be used from plain C -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -/**************************************/ -//Component Errors - -#include -#include -#include -#include - -//************************************/ -#include -#include -#include -#include -//#include "SenderThread.h" -#include - - - -/*************************************/ - -/** - * @mainpage DFBImpl backend - * @date 26/03/2012 - * @version 0.0.1 - * @author Sergio Poppi - * @remarks compiler version 4.1.2 - - */ - - -#include - -using namespace baci; -using namespace ACSBulkDataError; -// class CSenderThread; - - -class DFBImpl : public virtual BulkDataSenderDefaultImpl,public virtual POA_Backends::DFB -{ - public: - /** - * Constructor. - * @param CompName component's name. This is also the name that will be used to find the configuration data for the component in the Configuration Database. - * @param containerServices pointer to the class that exposes all services offered by container - */ - DFBImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices); - /** - * Destructor. - */ - virtual ~DFBImpl(); - - /** - * Called to give the component time to initialize itself. The component reads in configuration files/parameters, builds up connection. - * Called before execute. It is implemented as a synchronous (blocking) call. - * @throw ACSErr::ACSbaseExImpl - */ - virtual void initialize() throw (ACSErr::ACSbaseExImpl); - - /** - * Called after initialize() to tell the component that it has to be ready to accept incoming functional calls any time. - * Must be implemented as a synchronous (blocking) call. In this class the default implementation only logs the COMPSTATE_OPERATIONAL - * @throw ACSErr::ACSbaseExImpl - */ - virtual void execute() throw (ACSErr::ACSbaseExImpl); - - /** - * Called by the container before destroying the server in a normal situation. This function takes charge of releasing all resources. - */ - virtual void cleanUp(); - - /** - * Called by the container in case of error or emergency situation. This function tries to free all resources even though there is no - * warranty that the function is completely executed before the component is destroyed. - */ - virtual void aboutToAbort(); - - /** - * It is used to start the data transfer (e.g. send parameters to the receiver) - * The component sets up the hardware - * - * @throw CORBA::SystemException - * @throw BackendsErrors::BackendsErrorsEx - * @arg \c BackendsErrors::TXErrorEx - * @throw ComponentErrors::ComponentErrorsEx - * @arg \c ComponentErrors::UnexpectedEx - */ - virtual void sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx); - - /** - * Starts effectively to send the bulk of data to the receiver. The invocation of this method is forced to be far enough to the invocation - * of sendHeader (in order to respect the backend data channel latency). In order for this call to succeed, the component must be - * in CCommandLine::TstatusFields::SUSPEND mode. - * @throw CORBA::SystemException - * @throw BackendsErrors::BackendsErrorsEx - * @throw ComponentErrors::ComponentErrorsEx - * @arg \c ComponentErrors::UnexpectedEx - * @param startTime represent the exact time that the acquisition should start. Of caourse this has effect only if the call - * to that method arrives reasonably before the given time. - */ - virtual void sendData(ACS::Time startTiime) throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx); - - /** - * It suspend the data transfer. If the backend must not be in suspend mode. - * It contain a call to the DigitalXCorrelator component - * - * @throw CORBA::SystemException - * @throw BackendsErrors::BackendsErrorsEx - * @throw ComponentErrors::ComponentErrorsEx - * @arg \c ComponentErrors::UnexpectedEx - */ - virtual void sendStop() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx); - - /** - * This immediately terminates the transfer job (previously begun by the call to sendHeader()). - * @throw CORBA::SystemException - * @throw BackendsErrors::BackendsErrorsEx - * @throw ComponentErrors::ComponentErrorsEx - */ - virtual void terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx); - - - /** - * This function will control the calibration diode switching. - * @thorw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param interleave this parmater controls the switching frequency of the calibration diode. If it is zero (default) the diode is not - * switched (always turned off). if a one is given the backend will produce one sample (using the sampleRate) - * with the mark switecehd off and one with the mark switched on. A two means two sample with the mark switched off and - * one with the mark switched on.....and so on. A negative will not change the value of the parameter. - */ - virtual void initialize(const char * configuration) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - /** - * Call this function in order to get a total power measure for each input channel. - * @thorw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param integration it represents the integration time (milliseconds) the backend will use to produce the measure. - * If zero the default value of 1 second is used. A negative will forse the backend to adopt the value set via a call - * to (setIntegration()). - * @param wait force the backend to wait for twice the integration time. This allow signal level changes to be detected properly - * @return a sequence of double values that reports for each backend the total power measured during the integration time. - * The caller must take care of freeing it. - */ - - virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - /** - * This method is used to inform the component about the proper conversion factor between Kelvin and counts. This value is used for the tsys computation during - * the sampling. If this method is never issued the default value of 1 will be used for all the channels. - * @throw CORBA::SystemException - * @param ratio this is the sequence of required values one for each channel. - */ - virtual void setKelvinCountsRatio(const ACS::doubleSeq& ratio,const ACS::doubleSeq& tsys) throw (CORBA::SystemException); -/** - * This method is used to tune the attenuation level of each of the virtual input of the system. - * @throw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param input is the identifier number of the input that we want to configure. - * @param att new attenuation level, It could be in the range 0-15. A negative will keep the previous value. - */ - virtual void setAttenuation(CORBA::Long input,CORBA::Double att) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - -/** - * This method enables or disables the data streaming of the inputs. if a input is disable the input is not sampled and the - * data are not sent to the network. - * @throw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param enable this must be a sequence of exactly inputsNumber elements. The inputs are enabled (default) if - * the corresponding value is positive. A negative value disables the input, whilst a zero keep the current configuration. - */ - virtual void enableChannels(const ACS::longSeq& enable) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - - virtual void setIntegration(CORBA::Long Integration) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - /** - * In order to get the inputs definition in just one call. The returned argument contains the configuration sequentially, the first element corresponds to the first input and so on. - * @throw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param freq given in MHz is the initial frequency of input band - * @param bandwidth given in MHz is the band width of the input - * @param feed dives the feed number the input belongs to - * @param polarization given the feed it select the polarization to which the input is connected to. Plaese notice this parameter has nothing to do with the polarization of the section. - * @return the number of inputs, in other words is the lenght of the returned sequences - */ - virtual CORBA::Long getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - - - /** - * This method allows the client to interface the component by sending text commands. The command is parsed and executed according the - * defined command syntax and grammar. This method is required to implement the Managment::CommandInterpreter interface. - * @throw CORBA::SystemException - * @throw ManagementErrors::CommandLineErrorEx - * @param configCommand this string contains the string that will be executed - * @return answer the string that reports the command execution results or in case, errors - */ - - - - virtual CORBA::Boolean command(const char *ddd, CORBA::String_out answer) throw (CORBA::SystemException); - - - /** - * Call this function in order to get a total power measure for each input channel. The measure is done when the inputs are directly - * connected to the 50 Ohm. - * @thorw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param integration it represents the integration time (milliseconds) the backend will use to do the measure. - * If zero the default value of 1 second is used. A negative will forse the backend to adopt the value set by a call - * to (setIntegration()). - * @return a sequence of double values that reports for each backend the total power measured during the integration time. - * The caller must take care of freeing it. - */ - virtual ACS::doubleSeq * getZero () throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - - /** - * Call this function to set the current time (from the local computer) into the backend. - * @thorw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @arg \c ComponentErrors::Timeout - * @arg \c BackendsErrors::Connection - * @arg \c ComponentErrors::SocketError - */ - - - virtual void setTime() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, - BackendsErrors::BackendsErrorsEx); - - /** - * This function will control the calibration diode switching. - * @thorw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param interleave this parmater controls the switching frequency of the calibration diode. If it is zero (default) the diode is not - * switched (always turned off). if a one is given the backend will produce one sample (using the sampleRate) - * with the mark switecehd off and one with the mark switched on. A two means two sample with the mark switched off and - * one with the mark switched on.....and so on. A negative will not change the value of the parameter. - */ - virtual void activateNoiseCalibrationSwitching(CORBA::Long interleave) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - /** - * This method will configure an input channel of the backend. The input is identified by a numeric identifier. - * @throw CORBA::SystemException - * @throw ComponentErrors::ComponentErrorsEx - * @throw BackendsErrors::BackendsErrorsEx - * @param input identifier of the input to be configured. it must be in the correct range (from 0 to inputsNumber) - * otherwise an exception is raisen. - * @param freq new freqency value for the input. This value represents the start frequency of the input filter(Mhz). In this - * implementation it is ignored, so a negative should be given. - * @param bw new bandWidth value in MHz. if a value of the sequence is negative the bandwidth of the corresponding - * input is unchanged. If the value is not legal an exception is thrown. - * @param feed identifier of the feed - * @param pol this value ask the input to send data for one polarization or for all Stokes parameters. Possible values are - * BKND_LCP, BKND_RCP or BKND_FULL_STOKE or a negative to keep the current value. In this implementation the component expects only a negative - * because is not possble to change this parameter. On the contrary a warning log message is posted. - * @param sr new sample rate value (Mhz). In this implementation represents the frequency of the sampling of the total power - * A negative keeps the previous value unchanged. Since the backend does not support different sample rates, - * the current one is used also for all other inputs. - * @param bins number of bins produced for each input. This value is significant for spectrometers. For that implementation - * this value is ignored since it must be always 1. If this is not the case a warning messagge is logged. - */ - virtual void setSection(CORBA::Long input,CORBA::Double freq,CORBA::Double bw,CORBA::Long feed,CORBA::Long pol,CORBA::Double sr,CORBA::Long bins) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); - - - /** - * Returns a reference to the time property Implementation of IDL interface. - * @return pointer to read-only unsigned long long property time - */ - virtual ACS::ROuLongLong_ptr time() throw (CORBA::SystemException); - - /** - * Returns a reference to the backendName property Implementation of IDL interface. - * @return pointer to read-only string property backendName - */ - virtual ACS::ROstring_ptr backendName() throw (CORBA::SystemException); - - /** - * Returns a reference to the bandWidth property implementation of the IDL interface. - * @return pointer to read-only double sequence property bandWidth - */ - virtual ACS::ROdoubleSeq_ptr bandWidth() throw (CORBA::SystemException); - - /** - * Returns a reference to the frequency property implementation of the IDL interface. - * @return pointer to read-only double sequence property frequency - */ - virtual ACS::ROdoubleSeq_ptr frequency() throw (CORBA::SystemException); - - /** - * Returns a reference to the sampleRate property implementation of the IDL interface. - * @return pointer to read-only double sequence property sampleRate - */ - virtual ACS::ROdoubleSeq_ptr sampleRate() throw (CORBA::SystemException); - - /** - * Returns a reference to the attenuation property implementation of the IDL interface. - * @return pointer to read-only double sequence property attenuation - */ - virtual ACS::ROdoubleSeq_ptr attenuation() throw (CORBA::SystemException); - - /** - * Returns a reference to the polarization property implementation of the IDL interface. - * @return pointer to read-only long sequence property polarization - */ - virtual ACS::ROlongSeq_ptr polarization() throw (CORBA::SystemException); - - /** - * Returns a reference to the bins property Implementation of IDL interface. - * @return pointer to read-only long property binsNumber - */ - virtual ACS::ROlongSeq_ptr bins() throw (CORBA::SystemException); - - /** - * Returns a reference to the inputsNumber property Implementation of IDL interface. - * @return pointer to read-only long property inputsNumber - */ - virtual ACS::ROlong_ptr inputsNumber() throw (CORBA::SystemException); - - /** - * Returns a reference to the integration property Implementation of IDL interface. - * @return pointer to read-only long property integration - */ - virtual ACS::ROlong_ptr integration() throw (CORBA::SystemException); - /** - * Returns a reference to the inputSection property Implementation of IDL interface. - * @return pointer to read-only long property inputSection - */ - virtual ACS::ROlongSeq_ptr inputSection() throw (CORBA::SystemException); - - /** - * Returns a reference to the status implementation of IDL interface. - * @return pointer to read-only pattern property status - */ - - virtual ACS::ROpattern_ptr status() throw (CORBA::SystemException); - - /** - * Returns a reference to the busy implementation of IDL interface. - * @return pointer to read-only long property busy - */ - virtual Management::ROTBoolean_ptr busy() throw (CORBA::SystemException); -/** - * Returns a reference to the feed property Implementation of IDL interface. - * @return pointer to read-only long sequence property feed - */ - virtual ACS::ROlongSeq_ptr feed() throw (CORBA::SystemException); - - /** - * Returns a reference to the systemTemperature property implementation of the IDL interface. - * @return pointer to read-only double sequence property systemTemperature - */ - virtual ACS::ROdoubleSeq_ptr systemTemperature() throw (CORBA::SystemException); - - /** - * Returns a reference to the sectionsNumber property Implementation of IDL interface. - * @return pointer to read-only long property sectionsNumber - */ - virtual ACS::ROlong_ptr sectionsNumber() throw (CORBA::SystemException); - - - -protected: - virtual void startSend() throw (CORBA::SystemException, AVStartSendErrorEx) { }; //removed - - virtual void paceData() throw (CORBA::SystemException, AVPaceDataErrorEx) { }; - - virtual void stopSend() throw (CORBA::SystemException, AVStopSendErrorEx) { }; - -private: - - IRA::CString m_sAddress; - WORD m_wPort; - - -// struct THeaderRecord { -// Backends::TMainHeader header; -// Backends::TChannelHeader chHeader[MAX_INPUT_NUMBER]; -// }; - - - SmartPropertyPointer m_ptime; - SmartPropertyPointer m_pbackendName; - SmartPropertyPointer m_pbandWidth; - SmartPropertyPointer m_pfrequency; - SmartPropertyPointer m_psampleRate; - SmartPropertyPointer m_pattenuation; - SmartPropertyPointer m_ppolarization; - SmartPropertyPointer m_pbins; - SmartPropertyPointer m_pinputsNumber; - SmartPropertyPointer m_pintegration; - SmartPropertyPointer m_pstatus; - SmartPropertyPointer< ROEnumImpl > m_pbusy; - SmartPropertyPointer m_pfeed; - SmartPropertyPointer m_ptsys; - SmartPropertyPointer m_psectionsNumber; - SmartPropertyPointer m_pinputSection; - - void deleteAll(); - - - - -}; - - - - - - -#endif /* DFBIMPL_H_ */ diff --git a/SRT/Servers/DFBBackend/src/.idl-compilation-end b/SRT/Servers/DFBBackend/src/.idl-compilation-end deleted file mode 100644 index e69de29bb..000000000 diff --git a/SRT/Servers/DFBBackend/src/.idl-compilation-start b/SRT/Servers/DFBBackend/src/.idl-compilation-start deleted file mode 100644 index e69de29bb..000000000 diff --git a/SRT/Servers/DFBBackend/src/CommandLine.cpp b/SRT/Servers/DFBBackend/src/CommandLine.cpp deleted file mode 100644 index 287e1cd3f..000000000 --- a/SRT/Servers/DFBBackend/src/CommandLine.cpp +++ /dev/null @@ -1,135 +0,0 @@ -/* - * CommandLine.cpp - * - * Created on: Oct 23, 2013 - * Author: spoppi - */ - -#include "CommandLine.h" - -namespace DFB { - -CCommandLine::CCommandLine() { - // TODO Auto-generated constructor stub - - - -} - -CCommandLine::~CCommandLine() { - // TODO Auto-generated destructor stub -} - -string CCommandLine::zerofill(int n) -{ - - - stringstream stream(""); - stream.width(4); - stream.fill('0'); - stream << n; - return stream.str(); - -} - -string CCommandLine::composeCmd(string cmd) -{ - string composed_cmd; - transform(cmd.begin(), cmd.end(),cmd.begin(), ::toupper);// capitalize - composed_cmd=m_prefix+" "+zerofill(cmd.size())+cmd; - return composed_cmd; - -} - - -int CCommandLine::configuration(string cfg) -{ - - - return 0; - - -} - -int CCommandLine::cycle(string) -{ - - - return 0; -} - -int CCommandLine::fileClose() -{ - - return 0; -} - -int CCommandLine::fileOpen(string name) -{ - - return 0; - -} - -int CCommandLine::frequency(double freq) -{ - - return 0; -} - -int CCommandLine::frequencyInvert(bool finv) -{ - - return 0; -} - -int CCommandLine::go(string time){ - - return 0; - -} - -int CCommandLine::go(){ - - return 0; - -} -int CCommandLine::observer(string obs) -{ - - - return 0; - -} - -int CCommandLine::obstype(string obstype) -{ - - return 0; -} - -int CCommandLine::restFrequency(double freq) -{ - - - return 0; -} - -int CCommandLine::source(string source) -{ - - - return 0; - -} - -int CCommandLine::stop() -{ - -} - - - -} - - diff --git a/SRT/Servers/DFBBackend/src/Configuration.cpp b/SRT/Servers/DFBBackend/src/Configuration.cpp deleted file mode 100644 index ea3dd8a49..000000000 --- a/SRT/Servers/DFBBackend/src/Configuration.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Configuration.cpp - * - * Created on: Jul 26, 2013 - * Author: spoppi - */ - -#include "Configuration.h" - -#define _GET_DWORD_ATTRIBUTE(ATTRIB,DESCR,FIELD) { \ - DWORD tmpw; \ - if (!CIRATools::getDBValue(Services,ATTRIB,tmpw)) { \ - _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"CConfiguration::Init()"); \ - dummy.setFieldName(ATTRIB); \ - throw dummy; \ - } \ - else { \ - FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ - } \ -} - -#define _GET_STRING_ATTRIBUTE(ATTRIB,DESCR,FIELD) { \ - CString tmps; \ - if (!CIRATools::getDBValue(Services,ATTRIB,tmps)) { \ - _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"::CConfiguration::Init()"); \ - dummy.setFieldName(ATTRIB); \ - throw dummy; \ - } \ - else { \ - FIELD=tmps; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %s",(const char*)tmps); \ - } \ -} - -CConfiguration::CConfiguration() -{ - m_configurationTable=NULL; -} - -CConfiguration::~CConfiguration() -{ - if (m_configurationTable!=NULL) { - m_configurationTable->closeTable(); - delete m_configurationTable; - } -} - - -void CConfiguration::init(maci::ContainerServices *Services) throw (ComponentErrors::CDBAccessExImpl,ComponentErrors::MemoryAllocationExImpl,ComponentErrors::IRALibraryResourceExImpl) -{ - _GET_STRING_ATTRIBUTE("IPAddress","TCP/IP address is: ",m_sAddress); - _GET_DWORD_ATTRIBUTE("Port","Port is: ",m_wPort); - - // read the configurations - IRA::CError error; - try { - m_configurationTable=(CDBTable *)new CDBTable(Services,"Configuration","DataBlock/TotalPower"); - } - catch (std::bad_alloc& ex) { - _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"TotalPowerImpl::initialize()"); - throw dummy; - } - error.Reset(); - if (!error.isNoError()) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,error); - dummy.setCode(error.getErrorCode()); - dummy.setDescription((const char*)error.getDescription()); - throw dummy; - } - if (!m_configurationTable->openTable(error)) { - _EXCPT_FROM_ERROR(ComponentErrors::CDBAccessExImpl, dummy, error); - throw dummy; - } - -} diff --git a/SRT/Servers/DFBBackend/src/DFBImpl.cpp b/SRT/Servers/DFBBackend/src/DFBImpl.cpp deleted file mode 100644 index dcae8f28f..000000000 --- a/SRT/Servers/DFBBackend/src/DFBImpl.cpp +++ /dev/null @@ -1,288 +0,0 @@ -/* - * DFBImpl.cpp - * - * Created on: Mar 26, 2012 - * Author: spoppi - */ - - - -#include "DFBImpl.h" -//#include "vltPort.h" -#include -#include -#include -//#include "Common.h" -#include -#include - -#define _GET_DWORD_ATTRIBUTE(ATTRIB,DESCR,FIELD) { \ - DWORD tmpw; \ - if (!CIRATools::getDBValue(Services,ATTRIB,tmpw)) { \ - _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"CConfiguration::Init()"); \ - dummy.setFieldName(ATTRIB); \ - throw dummy; \ - } \ - else { \ - FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ - } \ -} - -#define _GET_STRING_ATTRIBUTE(ATTRIB,DESCR,FIELD) { \ - CString tmps; \ - if (!CIRATools::getDBValue(Services,ATTRIB,tmps)) { \ - _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"::CConfiguration::Init()"); \ - dummy.setFieldName(ATTRIB); \ - throw dummy; \ - } \ - else { \ - FIELD=tmps; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %s",(const char*)tmps); \ - } \ -}Configuration - - - -DFBImpl::DFBImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices): -BulkDataSenderDefaultImpl(CompName,containerServices), - m_ptime(this), - m_pbackendName(this), - m_pbandWidth(this), - m_pfrequency(this), - m_psampleRate(this), - m_pattenuation(this), - m_ppolarization(this), - m_pbins(this), - m_pinputsNumber(this), - m_pintegration(this), - m_pstatus(this), - m_pbusy(this), - m_pfeed(this), - m_ptsys(this), - m_psectionsNumber(this), - m_pinputSection(this) - - - { - AUTO_TRACE("DFBImpl::DFBImpl"); - - - } - -DFBImpl::~DFBImpl() -{ - AUTO_TRACE("DFBImpl::~HolographyImpl()"); - - -} - -void DFBImpl::initialize() throw (ACSErr::ACSbaseExImpl) -{ - AUTO_TRACE("DFBImpl::initialize()"); - try { - m_ptime=new ROuLongLong(getContainerServices()->getName()+":time",getComponent()); - m_pbackendName=new ROstring(getContainerServices()->getName()+":backendName",getComponent()); - m_pbandWidth=new ROdoubleSeq(getContainerServices()->getName()+":bandWidth",getComponent()); - m_pfrequency=new ROdoubleSeq(getContainerServices()->getName()+":frequency",getComponent()); - m_psampleRate=new ROdoubleSeq(getContainerServices()->getName()+":sampleRate",getComponent()); - m_pattenuation=new ROdoubleSeq(getContainerServices()->getName()+":attenuation",getComponent()); - m_ppolarization=new ROlongSeq(getContainerServices()->getName()+":polarization",getComponent()); - m_pinputsNumber=new ROlong(getContainerServices()->getName()+":inputsNumber",getComponent()); - m_pbins=new ROlongSeq(getContainerServices()->getName()+":bins",getComponent()); - m_pintegration=new ROlong(getContainerServices()->getName()+":integration",getComponent()); - m_pstatus=new ROpattern(getContainerServices()->getName()+":status",getComponent()); - m_pbusy=new ROEnumImpl - (getContainerServices()->getName()+":busy",getComponent()); - m_pfeed=new ROlongSeq(getContainerServices()->getName()+":feed",getComponent()); - m_ptsys=new ROdoubleSeq(getContainerServices()->getName()+":systemTemperature",getComponent()); - m_psectionsNumber=new ROlong(getContainerServices()->getName()+":sectionsNumber",getComponent()); -// m_initialized=true; -// m_parser=new CParser(10); - - - - -/* _GET_STRING_ATTRIBUTE("IPAddress","TCP/IP address is: ",m_sAddress);*/ -// _GET_DWORD_ATTRIBUTE("Port","Port is: ",m_wPort); - - - } - catch (std::bad_alloc& ex) { - _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"HolographyImpConfigurationl::initialize()"); - - throw dummy; - } - - -} - -void DFBImpl::execute() throw (ACSErr::ACSbaseExImpl) -{ - AUTO_TRACE("DFBImpl::execute()"); - -} - -void DFBImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx) -{ - AUTO_TRACE("DFBImpl::sendHeader()"); - -} - -void DFBImpl::sendData(ACS::Time startTime) throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx) - -{ - AUTO_TRACE("DFBImpl::sendData()"); - -} - -void DFBImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx) -{ - AUTO_TRACE("DFBImpl::sendStop()"); -} - -void DFBImpl::terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, - ComponentErrors::ComponentErrorsEx){ - - - AUTO_TRACE("DFBImpl::terminate()"); - -} - -void DFBImpl::initialize(const char * configuration) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){ - - -} - -void DFBImpl::aboutToAbort() -{ - AUTO_TRACE("DFBImpl::aboutToAbort()"); - -} - -void DFBImpl::cleanUp(){ - AUTO_TRACE("DFBImpl::cleanUp()"); - -} -void DFBImpl::deleteAll(){ - - AUTO_TRACE("DFBImpl::deleteAll()"); - -} - - -ACS::doubleSeq *DFBImpl::getTpi () throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){ - - AUTO_TRACE("DFBImpl::getTpi()" -); - ACS::doubleSeq_var tpi=new ACS::doubleSeq; - tpi->length(1); - tpi[0]=0; - return tpi._retn(); - -} - -ACS::doubleSeq * DFBImpl::getZero () throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) - { - ACS::doubleSeq_var tpi=new ACS::doubleSeq; - AUTO_TRACE("DFBImpl::getZero() not used"); - tpi->length(1); - tpi[0]=0; - - - return tpi._retn(); -} - -void DFBImpl::setKelvinCountsRatio(const ACS::doubleSeq& ratio, const ACS::doubleSeq& tsys) throw (CORBA::SystemException) -{ - AUTO_TRACE("DFBImpl::setKelvinCountsRatio() not used"); -// -} - - -void DFBImpl::enableChannels(const ACS::longSeq& enable) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, - BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::enableChannels() not used"); - -} -void DFBImpl::setTime() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, - BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::setTime() not used"); - -} - -void DFBImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::setAttenutation() not used"); - -} - -CORBA::Long DFBImpl::getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::getInputs() not used"); - return 0; -} - - -void DFBImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) throw (CORBA::SystemException, - ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::activateNoiseCalibrationSwitching() not used"); - -} - - -CORBA::Boolean DFBImpl::command(const char *cmd,CORBA::String_out answer) throw (CORBA::SystemException) -{ - - AUTO_TRACE("DFBImpl::command()"); - IRA::CString out; - IRA::CString in; - bool res; - res=CORBA::string_dup((const char *)out); - return res; -} - -void DFBImpl::setSection(CORBA::Long input,CORBA::Double freq,CORBA::Double bw,CORBA::Long feed,CORBA::Long pol,CORBA::Double sr,CORBA::Long bins) throw ( - CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::setSection() - not used"); - -} - -void DFBImpl::setIntegration(CORBA::Long Integration) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, - BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("DFBImpl::setIntegration() - not used"); - -} - - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROuLongLong,m_ptime,time); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROstring,m_pbackendName,backendName); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROdoubleSeq,m_pbandWidth,bandWidth); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROdoubleSeq,m_pfrequency,frequency); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROdoubleSeq,m_psampleRate,sampleRate); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROdoubleSeq,m_pattenuation,attenuation); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlongSeq,m_ppolarization,polarization); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlongSeq,m_pbins,bins); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlong,m_pinputsNumber,inputsNumber); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlong,m_pintegration,integration); - _PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROpattern,m_pstatus,status); - _PROPERTY_REFERENCE_CPP(DFBImpl,Management::ROTBoolean,m_pbusy,busy); -_PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlongSeq,m_pfeed,feed); -_PROPERTY_REFERENCE_CPP(DFBImpl, -ACS::ROdoubleSeq,m_ptsys,systemTemperature); -_PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlong,m_psectionsNumber,sectionsNumber); -_PROPERTY_REFERENCE_CPP(DFBImpl,ACS::ROlongSeq,m_pinputSection,inputSection); -#include -MACI_DLL_SUPPORT_FUNCTIONS(DFBImpl) - diff --git a/SRT/Servers/DFBBackend/src/Makefile b/SRT/Servers/DFBBackend/src/Makefile deleted file mode 100644 index 4b7a2d0c0..000000000 --- a/SRT/Servers/DFBBackend/src/Makefile +++ /dev/null @@ -1,224 +0,0 @@ -#******************************************************************************* -# ALMA - Atacama Large Millimiter Array -# (c) UNSPECIFIED - FILL IN, 2015 -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# "@(#) $Id$" -# -# Makefile of ........ -# -# who when what -# -------- -------- ---------------------------------------------- -# spoppi 2015-03-25 created -# - -#******************************************************************************* -# This Makefile follows VLT Standards (see Makefile(5) for more). -#******************************************************************************* -# REMARKS -# None -#------------------------------------------------------------------------ - -# -# user definable C-compilation flags -#USER_CFLAGS = - -# -# additional include and library search paths -#USER_INC = -#USER_LIB = - -# -# MODULE CODE DESCRIPTION: -# ------------------------ -# As a general rule: public file are "cleaned" and "installed" -# local (_L) are not "installed". - -# -# C programs (public and local) -# ----------------------------- -EXECUTABLES = -EXECUTABLES_L = - -# -# -DFBImpl_OBJECTS = DFBImpl - -DFBImpl_LIBS = IRALibrary GenericBackendStubs DFBInterfaceStubs ManagmentDefinitionsStubs \ - BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs \ - bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors\ - ParserErrors ManagementErrors -# -# special compilation flags for single c sources -#yyyyy_CFLAGS = - -# -# Includes (.h) files (public only) -# --------------------------------- -INCLUDES = - -# -# Libraries (public and local) -# ---------------------------- -LIBRARIES = DFBImpl -LIBRARIES_L = - -# -# -lllll_OBJECTS = - -# -# Scripts (public and local) -# ---------------------------- -SCRIPTS = -SCRIPTS_L = - -# -# TCL scripts (public and local) -# ------------------------------ -TCL_SCRIPTS = -TCL_SCRIPTS_L = - -# -# Python stuff (public and local) -# ---------------------------- -PY_SCRIPTS = -PY_SCRIPTS_L = - -PY_MODULES = -PY_MODULES_L = - -PY_PACKAGES = -PY_PACKAGES_L = -pppppp_MODULES = - -# -# -tttttt_OBJECTS = -tttttt_TCLSH = -tttttt_LIBS = - -# -# TCL libraries (public and local) -# ------------------------------ -TCL_LIBRARIES = -TCL_LIBRARIES_L = - -# -# -tttlll_OBJECTS = - -# -# Configuration Database Files -# ---------------------------- -CDB_SCHEMAS = DFB - -# -# IDL Files and flags -# -IDL_FILES = -TAO_IDLFLAGS = -USER_IDL = -# -# Jarfiles and their directories -# -JARFILES= -jjj_DIRS= -jjj_EXTRAS= -# -# java sources in Jarfile on/off -DEBUG= -# -# ACS XmlIdl generation on/off -# -XML_IDL= -# -# Java Component Helper Classes generation on/off -# -COMPONENT_HELPERS= -# -# Java Entity Classes generation on/off -# -XSDBIND= -# -# Schema Config files for the above -# -XSDBIND_INCLUDE= -# man pages to be done -# -------------------- -MANSECTIONS = -MAN1 = -MAN3 = -MAN5 = -MAN7 = -MAN8 = - -# -# local man pages -# --------------- -MANl = - -# -# ASCII file to be converted into Framemaker-MIF -# -------------------- -ASCII_TO_MIF = - -# -# other files to be installed -#---------------------------- -INSTALL_FILES = - -# -# list of all possible C-sources (used to create automatic dependencies) -# ------------------------------ -CSOURCENAMES = \ - $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ - $(foreach rtos, $(RTAI_MODULES) , $($(rtos)_OBJECTS)) \ - $(foreach lib, $(LIBRARIES) $(LIBRARIES_L), $($(lib)_OBJECTS)) - -# -#>>>>> END OF standard rules - -# -# INCLUDE STANDARDS -# ----------------- - -MAKEDIRTMP := $(shell searchFile include/acsMakefile) -ifneq ($(MAKEDIRTMP),\#error\#) - MAKEDIR := $(MAKEDIRTMP)/include - include $(MAKEDIR)/acsMakefile -endif - -# -# TARGETS -# ------- -all: do_all - @echo " . . . 'all' done" - -clean : clean_all - @echo " . . . clean done" - -clean_dist : clean_all clean_dist_all - @echo " . . . clean_dist done" - -man : do_man - @echo " . . . man page(s) done" - -install : install_all - @echo " . . . installation done" - - -#___oOo___ -- GitLab From c260c9e23a602cc50f1e62ed86576117f2c9be8d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 16 May 2017 11:34:08 +0000 Subject: [PATCH 037/145] Fix #118: change the TARGETSYS env variable to STATION --- SystemMake/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 8c3cc840e..81f68cc4f 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -70,7 +70,7 @@ NT_SERVERS:= NotoReceivers NotoMount NotoWeatherStation NotoActiveSurface NT_CLIENTS:=NotoMountTextClient NT_MISC:=NotoScripts -ifeq ($(TARGETSYS),SRT) +ifeq ($(STATION),SRT) #Add all modules included in the SRT system in this sequence #Doc, (Errors, Interfacies, Libraries, Servers, Clients, Misc) MODULES:=SRTDox \ @@ -107,7 +107,7 @@ ifeq ($(TARGETSYS),SRT) CDB_SVN_LOCATION="SRT/Configuration/CDB" SYSTEM_SVN_MODULES=Common SRT else -ifeq ($(TARGETSYS),MED) +ifeq ($(STATION),Medicina) #Add all modules included in the Medicina system in this sequence #Doc, (Errors, Interfacies, Libraries, Servers, Clients, Misc) MODULES:=MEDDox \ @@ -139,7 +139,7 @@ ifeq ($(TARGETSYS),MED) CDB_SVN_LOCATION="Medicina/Configuration/CDB" SYSTEM_SVN_MODULES=Common Medicina else -ifeq ($(TARGETSYS),NT) +ifeq ($(STATION),Noto) #Add all modules included in the Noto system in this sequence #Doc, (Errors, Interfacies, Libraries, Servers, Clients, Misc) MODULES:= ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors \ @@ -168,7 +168,7 @@ ifeq ($(TARGETSYS),NT) SYSTEM_SVN_MODULES=Common Medicina Noto else - RESULT:=$(error TARGETSYS variable is not set correctly!) + RESULT:=$(error STATION variable is not set correctly!) endif endif endif @@ -204,16 +204,16 @@ NT_MODULES:=$(NT_ERRORS) \ $(NT_CLIENTS) \ $(NT_MISC) -ifeq ($(TARGETSYS), SRT) +ifeq ($(STATION), SRT) TELESCOPE_MODULES:=$(SRT_MODULES) else -ifeq ($(TARGETSYS), MED) +ifeq ($(STATION), Medicina) TELESCOPE_MODULES:=$(MED_MODULES) else -ifeq ($(TARGETSYS), NT) +ifeq ($(STATION), Noto) TELESCOPE_MODULES:=$(NT_MODULES) else - RESULT:=$(error TARGETSYS variable is not set correctly!) + RESULT:=$(error STATION variable is not set correctly!) endif endif endif -- GitLab From e750719bbd01e3601a0bcfb88298391374cbb5eb Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 16 May 2017 14:18:54 +0000 Subject: [PATCH 038/145] Fix #120: use 'rm -f' in make clean --- Common/Clients/CaltoolClient/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/Clients/CaltoolClient/src/Makefile b/Common/Clients/CaltoolClient/src/Makefile index 4c1a18ab8..a5b7b7209 100644 --- a/Common/Clients/CaltoolClient/src/Makefile +++ b/Common/Clients/CaltoolClient/src/Makefile @@ -196,7 +196,7 @@ all: gui do_all clean : clean_all @echo " . . . clean done" - @rm calibrationtool_ui.py* + @rm -f calibrationtool_ui.py* clean_dist : clean_all clean_dist_all @echo " . . . clean_dist done" -- GitLab From ae111b316c52df9e024caf4d62141fde084d05df Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 17 May 2017 14:32:47 +0000 Subject: [PATCH 039/145] Fix #121: exclude the introot from the PathFinder --- SystemMake/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 81f68cc4f..033ce3a10 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -221,7 +221,7 @@ endif CURRENT_DIR:=$(shell pwd)/.. define PathFinder - $(shell for MOD in $(1); do find ${CURRENT_DIR} -name $${MOD} -not -path *CDB* -not -path *site-packages* \( -type d -o -type l \) -print; done) + $(shell for MOD in $(1); do find ${CURRENT_DIR} -name $${MOD} -not -path *ntroot* -not -path *CDB* -not -path *site-packages* \( -type d -o -type l \) -print; done) endef #if the INTROOT varaible is not defined the make is stopped -- GitLab From d1a1d0ca6dc713f2c249ddf20a2b3c1a3e60dcbc Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 17 May 2017 15:38:11 +0000 Subject: [PATCH 040/145] Partial fix of #117: add all to the default target --- SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile b/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile index 839c9d6a1..8d00f14ec 100644 --- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile +++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile @@ -302,6 +302,8 @@ $(QT_UI_FILES_EXTERN_MOC_H): moc_%.cpp: ../include/%.h $(QT_UI_FILES_EXTERN_H) $(QT_UI_FILES_EXTERN_MOC_CPP): moc_%.cpp: %.cpp $(QT_UI_FILES_EXTERN_CPP) $(QTDIR)/bin/moc -o $@ $< +.DEFAULT_GOAL := all + #qt: $(QT_UI_FILES_H) $(QT_UI_FILES_CPP) $(QT_UI_FILES_MOC) $(QT_UI_FILES_EXTERN_MOC_H) $(QT_UI_FILES_EXTERN_MOC_CPP) qt: $(QT_UI_FILES_H) $(QT_UI_FILES_MOC) $(QT_UI_FILES_EXTERN_MOC_H) $(QT_UI_FILES_EXTERN_MOC_CPP) @echo " . . . 'qt' done" -- GitLab From 44ef947b274a1227727dcbaee9a4bed519bb3ba5 Mon Sep 17 00:00:00 2001 From: Marco Bartolini Date: Wed, 17 May 2017 15:58:51 +0000 Subject: [PATCH 041/145] Refactored ModbusChannel to use ACE mutexes instead of boost --- Common/Libraries/ModbusChannel/include/ModbusChannel.h | 5 +++-- Common/Libraries/ModbusChannel/src/Makefile | 4 ++-- Common/Libraries/ModbusChannel/src/ModbusChannel.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Common/Libraries/ModbusChannel/include/ModbusChannel.h b/Common/Libraries/ModbusChannel/include/ModbusChannel.h index e789aa2d6..350392acc 100755 --- a/Common/Libraries/ModbusChannel/include/ModbusChannel.h +++ b/Common/Libraries/ModbusChannel/include/ModbusChannel.h @@ -1,13 +1,14 @@ #ifndef MODBUSCHANNEL_HPP #define MODBUSCHANNEL_HPP +#include +#include #include #include #include #include #include #include -#include #define MODBUS_DEFAULT_PORT MODBUS_TCP_DEFAULT_PORT #define MODBUS_TIMEOUT 2 @@ -89,7 +90,7 @@ class ModbusChannel T get(int address); //throw ModbusError private: /* class members */ - boost::mutex _connection_guard; + BACIMutex _connection_guard; std::string _server_ip; int _server_port; bool _is_connected; diff --git a/Common/Libraries/ModbusChannel/src/Makefile b/Common/Libraries/ModbusChannel/src/Makefile index cafe62fc5..7f7d4241a 100644 --- a/Common/Libraries/ModbusChannel/src/Makefile +++ b/Common/Libraries/ModbusChannel/src/Makefile @@ -23,7 +23,7 @@ # # additional include and library search paths -#USER_INC = +#USER_INC = #USER_LIB = # @@ -62,7 +62,7 @@ LIBRARIES_L = # # ModbusChannel_OBJECTS = ModbusChannel -ModbusChannel_LIBS = modbus boost_thread +ModbusChannel_LIBS = modbus acsnc # # Scripts (public and local) diff --git a/Common/Libraries/ModbusChannel/src/ModbusChannel.cpp b/Common/Libraries/ModbusChannel/src/ModbusChannel.cpp index aa498e742..6f59f736c 100755 --- a/Common/Libraries/ModbusChannel/src/ModbusChannel.cpp +++ b/Common/Libraries/ModbusChannel/src/ModbusChannel.cpp @@ -53,7 +53,7 @@ ModbusChannel::~ModbusChannel() void ModbusChannel::connect() { - boost::mutex::scoped_lock lock(_connection_guard); + baci::ThreadSyncGuard lock(&_connection_guard); int rc; if(!(this->_is_connected)) { @@ -66,7 +66,7 @@ ModbusChannel::connect() void ModbusChannel::disconnect() { - boost::mutex::scoped_lock lock(_connection_guard); + baci::ThreadSyncGuard lock(&_connection_guard); if(this->_is_connected){ modbus_close(this->_modbus_context); this->_is_connected = false; -- GitLab From 5e44ee0bb7ee6ca823c0f0ae3e43ad749d5e9fbb Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 18 May 2017 12:36:04 +0000 Subject: [PATCH 042/145] Fix #119: remove the SVN variables from the SystemMake --- SystemMake/Makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 033ce3a10..f2d11dfbc 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -234,20 +234,20 @@ ifndef ACS_CDB RESULT:=$(error ACS_CDB variable is not set!) endif -#if the SYSLOCATION variable is not set the make process is stopped -ifndef SYSLOCATION - RESULT:=$(error SYSLOCATION variable is not set!) -endif +# #if the SYSLOCATION variable is not set the make process is stopped +# ifndef SYSLOCATION +# RESULT:=$(error SYSLOCATION variable is not set!) +# endif -#if the SVNUSER variable is not set the make process is stopped -ifndef SVNUSER - RESULT:=$(error SVNUSER variable is not set!) -endif +# #if the SVNUSER variable is not set the make process is stopped +# ifndef SVNUSER +# RESULT:=$(error SVNUSER variable is not set!) +# endif -#if the SYSTEM_SVN_TAG variable is not set the make process is stopped -ifndef SYSTEM_SVN_TAG - RESULT:=$(error SYSTEM_SVN_TAG variable is not set!) -endif +# #if the SYSTEM_SVN_TAG variable is not set the make process is stopped +# ifndef SYSTEM_SVN_TAG +# RESULT:=$(error SYSTEM_SVN_TAG variable is not set!) +# endif #set up the Modules file for each IDL and CPP documentation $(foreach i, $(IDL_DOC), $(eval $(i)_MODULES_PATH:=$(call PathFinder,$($(i)_MODULES)))) @@ -328,12 +328,12 @@ install: make -C $${i} install ; \ done -cdb: - @cd $(ACS_CDB); ln -s $(SYSLOCATION)/$(SYSTEM_SVN_TAG)/$(CDB_SVN_LOCATION) CDB - -sources: - @cd $(SYSLOCATION) ; svn checkout svn+ssh://$(SVNUSER)@nuraghe-devel.oa-cagliari.inaf.it/ACS/tags/$(SYSTEM_SVN_TAG)/$${i} - +# cdb: +# @cd $(ACS_CDB); ln -s $(SYSLOCATION)/$(SYSTEM_SVN_TAG)/$(CDB_SVN_LOCATION) CDB +# +# sources: +# @cd $(SYSLOCATION) ; svn checkout svn+ssh://$(SVNUSER)@nuraghe-devel.oa-cagliari.inaf.it/ACS/tags/$(SYSTEM_SVN_TAG)/$${i} + man: @echo "creating documentation tree....." @if [ ! -d $(DOC) ]; then mkdir $(DOC) ; fi -- GitLab From 98dc14d3e6dc6fecb32fad15af60ffdebf828fb3 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 13:09:36 +0000 Subject: [PATCH 043/145] Fix #117: remove the QtOpenGL link from the Makefile --- SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile b/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile index 8d00f14ec..0c906031b 100644 --- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile +++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile @@ -55,7 +55,6 @@ USER_LIB = -lACE \ -lQtDesigner \ -lQtGui \ -lQtNetwork \ - -lQtOpenGL \ -lQtSql \ -lQtSvg \ -lQtTest \ -- GitLab From ebb22b216cfded289e9e752adccb6b66be728d94 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 13:29:34 +0000 Subject: [PATCH 044/145] Fix #123: include Tokenizer_T.h --- SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp b/SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp index 707b3ad26..12ab78799 100644 --- a/SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp +++ b/SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp @@ -1,6 +1,7 @@ // $Id: SRTMountTextClient.cpp,v 1.5 2011-06-01 18:25:35 a.orlati Exp $ #include "SRTMountTextClient.h" +#include #define _GET_ACS_PROPERTY(TYPE,NAME) TYPE##_var NAME; \ { \ -- GitLab From c7af3aa712a049be0e8ca18d595fe312b582ff7e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 13:39:42 +0000 Subject: [PATCH 045/145] Fix #124: unresolved symbols in MedicinaAntennaInterface --- Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile b/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile index 3aaefb520..03f19c114 100644 --- a/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile +++ b/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile @@ -34,6 +34,8 @@ IDL_FILES = MedicinaMount IDL_TAO_FLAGS = USER_IDL = +MedicinaMountStubs_LIBS = baciStubs MountStubs + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ -- GitLab From 935c6b8f575360aa64a6ed5002154b56d76a91ad Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 13:48:22 +0000 Subject: [PATCH 046/145] Fix #125: unresolved symbols in MedicinaWeatherStationInterface --- .../Interfaces/MedicinaWeatherStationInterface/src/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile b/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile index 2a1bb7f03..74ec9b899 100644 --- a/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile +++ b/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile @@ -45,6 +45,9 @@ IDL_FILES = MedWeatherStation IDL_TAO_FLAGS = USER_IDL = + +MedWeatherStationStubs_LIBS = baciStubs GenericWeatherStationStubs + # # Jarfiles and their directories # -- GitLab From 362f36da033b0619d2164cf4eeb8a04c71951d96 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:05:18 +0000 Subject: [PATCH 047/145] Fix #127: change terminate to terminate_ to avoid conflict with std --- .../src/MedicinaMountTextClient.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Medicina/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp b/Medicina/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp index a30b945e9..c04127d77 100644 --- a/Medicina/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp +++ b/Medicina/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp @@ -25,11 +25,11 @@ using namespace TW; -static bool terminate; +static bool terminate_; void quintHandler(int sig) { - terminate=true; + terminate_=true; } #define TEMPLATE_4_ROTMODES Antenna::ROTCommonModes_ptr,ACS::Monitorpattern,ACS::Monitorpattern_var,_TW_CBpattern,ACS::CBpattern_var @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) { //_IRA_LOGFILTER_DECLARE; - terminate=false; + terminate_=false; /* Main frame */ TW::CFrame window(CPoint(0,0),CPoint(WINDOW_WIDTH,WINDOW_HEIGHT),'|','|','-','-'); @@ -509,10 +509,10 @@ int main(int argc, char *argv[]) { /** now it is possible to show the frame */ ACS_LOG(LM_FULL_INFO,"mountTui::Main()",(LM_INFO,"START")); window.showFrame(); - while(!terminate) { + while(!terminate_) { if ((fieldCounter=usrInput->parseCommand(fields,MAXFIELDNUMBER))>0) { fields[0].MakeUpper(); - if (fields[0]=="EXIT") terminate=true; + if (fields[0]=="EXIT") terminate_=true; } client.run(tv); tv.set(0,MAINTHREADSLEEPTIME*1000); -- GitLab From bf648de8ccfafae1f4578f68852f0ddc47705e99 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:13:12 +0000 Subject: [PATCH 048/145] Fix #128: unresolved symbols in NotoActiveSurfaceInterface --- Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile b/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile index 0f4f51d6e..bd5ef1144 100644 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile +++ b/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile @@ -134,6 +134,10 @@ CDB_SCHEMAS = IDL_FILES = NotoActiveSurfaceBoss IDL_TAO_FLAGS = USER_IDL = + +NotoActiveSurfaceBossStubs_LIBS = baciStubs ComponentErrorsStubs ASErrorsStubs \ + ManagmentDefinitionsStubs ActiveSurfaceBossStubs + # # Jarfiles and their directories # -- GitLab From 8bbd494ee0ba0558147a91b509bee6ac50e17719 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:16:40 +0000 Subject: [PATCH 049/145] Fix #129: unresolved symbols in NotoReceiversInterface --- Noto/Interfaces/NotoReceiversInterface/src/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Noto/Interfaces/NotoReceiversInterface/src/Makefile b/Noto/Interfaces/NotoReceiversInterface/src/Makefile index 8e5c044b7..6b2f6cadd 100644 --- a/Noto/Interfaces/NotoReceiversInterface/src/Makefile +++ b/Noto/Interfaces/NotoReceiversInterface/src/Makefile @@ -11,6 +11,8 @@ CDB_SCHEMAS = # IDL Files and flags IDL_FILES = NotoAllReceivers +NotoAllReceiversStubs_LIBS = baciStubs ComponentErrorsStubs GenericReceiverStubs + # list of all possible C-sources (used to create automatic dependencies) CSOURCENAMES = \ $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ -- GitLab From 195f4b5e28ad9b4cc8aaf05a523f8119eba060f6 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:20:55 +0000 Subject: [PATCH 050/145] Fix #130: remove object files from NotoActiveSurfaceInterface --- .../object/NotoActiveSurfaceBossC.cpp | 7525 --------- .../object/NotoActiveSurfaceBossC.h | 2695 --- .../object/NotoActiveSurfaceBossC.inl | 369 - .../object/NotoActiveSurfaceBossS.cpp | 13663 ---------------- .../object/NotoActiveSurfaceBossS.h | 2508 --- 5 files changed, 26760 deletions(-) delete mode 100644 Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp delete mode 100644 Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.h delete mode 100644 Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.inl delete mode 100644 Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.cpp delete mode 100644 Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.h diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp deleted file mode 100644 index 08e7dead5..000000000 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp +++ /dev/null @@ -1,7525 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.5 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:381 - - -#include "NotoActiveSurfaceBossC.h" -#include "tao/AnyTypeCode/Null_RefCount_Policy.h" -#include "tao/AnyTypeCode/TypeCode_Constants.h" -#include "tao/AnyTypeCode/Alias_TypeCode_Static.h" -#include "tao/AnyTypeCode/Enum_TypeCode_Static.h" -#include "tao/AnyTypeCode/Objref_TypeCode_Static.h" -#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h" -#include "tao/AnyTypeCode/String_TypeCode_Static.h" -#include "tao/CDR.h" -#include "tao/Exception_Data.h" -#include "tao/Invocation_Adapter.h" -#include "tao/Object_T.h" -#include "tao/CDR.h" -#include "tao/AnyTypeCode/Any.h" -#include "tao/AnyTypeCode/Any_Impl_T.h" -#include "tao/AnyTypeCode/Any_Dual_Impl_T.h" -#include "tao/AnyTypeCode/Any_Basic_Impl_T.h" -#include "tao/Basic_Arguments.h" -#include "tao/Fixed_Size_Argument_T.h" -#include "tao/Object_Argument_T.h" -#include "tao/Var_Size_Argument_T.h" -#include "ace/OS_NS_string.h" - -#if !defined (__ACE_INLINE__) -#include "NotoActiveSurfaceBossC.inl" -#endif /* !defined INLINE */ - -// TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:73 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - -// Arg traits specializations. -namespace TAO -{ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_STRINGSEQ__ARG_TRAITS_) -#define _ACS_STRINGSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::stringSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_TIMESEQ__ARG_TRAITS_) -#define _ACS_TIMESEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::TimeSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_CONDITIONSEQ__ARG_TRAITS_) -#define _ACS_CONDITIONSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::ConditionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACSERR_COMPLETION__ARG_TRAITS_) -#define _ACSERR_COMPLETION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACSErr::Completion, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCIN__ARG_TRAITS_) -#define _ACS_CBDESCIN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Fixed_Size_Arg_Traits_T< - ACS::CBDescIn, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCOUT__ARG_TRAITS_) -#define _ACS_CBDESCOUT__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Fixed_Size_Arg_Traits_T< - ACS::CBDescOut, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_SUBSCRIPTION__ARG_TRAITS_) -#define _ACS_SUBSCRIPTION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Subscription_ptr, - ACS::Subscription_var, - ACS::Subscription_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITOR__ARG_TRAITS_) -#define _ACS_MONITOR__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Monitor_ptr, - ACS::Monitor_var, - ACS::Monitor_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITORPATTERN__ARG_TRAITS_) -#define _ACS_MONITORPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Monitorpattern_ptr, - ACS::Monitorpattern_var, - ACS::Monitorpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBVOID__ARG_TRAITS_) -#define _ACS_CBVOID__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::CBvoid_ptr, - ACS::CBvoid_var, - ACS::CBvoid_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBPATTERN__ARG_TRAITS_) -#define _ACS_CBPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::CBpattern_ptr, - ACS::CBpattern_var, - ACS::CBpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_ALARMPATTERN__ARG_TRAITS_) -#define _ACS_ALARMPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Alarmpattern_ptr, - ACS::Alarmpattern_var, - ACS::Alarmpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_MANAGEMENT_ROTBOOLEAN__ARG_TRAITS_) -#define _MANAGEMENT_ROTBOOLEAN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - Management::ROTBoolean_ptr, - Management::ROTBoolean_var, - Management::ROTBoolean_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTION__ARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Basic_Arg_Traits_T< - ActiveSurface::TASOneWayAction, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTIONSEQ__ARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTIONSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ActiveSurface::TASOneWayActionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASPROFILE__ARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILE__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Basic_Arg_Traits_T< - ActiveSurface::TASProfile, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASPROFILESEQ__ARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILESEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ActiveSurface::TASProfileSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE__ARG_TRAITS_) -#define _ACTIVESURFACE_ROTASPROFILE__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ActiveSurface::ROTASProfile_ptr, - ActiveSurface::ROTASProfile_var, - ActiveSurface::ROTASProfile_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/enum_typecode.cpp:31 -static char const * const _tao_enumerators_ActiveSurface_TASOneWayAction[] = - { - "AS_STOP", - "AS_SETUP", - "AS_STOW", - "AS_REFPOS", - "AS_UP", - "AS_DOWN", - "AS_BOTTOM", - "AS_TOP", - "AS_UPDATE", - "AS_CORRECTION", - "AS_MOVE", - "AS_PROFILE" - - }; - -static TAO::TypeCode::Enum - _tao_tc_ActiveSurface_TASOneWayAction ( - "IDL:alma/ActiveSurface/TASOneWayAction:1.0", - "TASOneWayAction", - _tao_enumerators_ActiveSurface_TASOneWayAction, - 12); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASOneWayAction = - &_tao_tc_ActiveSurface_TASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTIONSEQ_CS_) -#define _ACTIVESURFACE_TASONEWAYACTIONSEQ_CS_ - -ActiveSurface::TASOneWayActionSeq::TASOneWayActionSeq (void) -{} - -ActiveSurface::TASOneWayActionSeq::TASOneWayActionSeq ( - ::CORBA::ULong max - ) - : TAO::unbounded_value_sequence< - TASOneWayAction - > - (max) -{} - -ActiveSurface::TASOneWayActionSeq::TASOneWayActionSeq ( - ::CORBA::ULong max, - ::CORBA::ULong length, - ActiveSurface::TASOneWayAction * buffer, - ::CORBA::Boolean release - ) - : TAO::unbounded_value_sequence< - TASOneWayAction - > - (max, length, buffer, release) -{} - -ActiveSurface::TASOneWayActionSeq::TASOneWayActionSeq ( - const TASOneWayActionSeq &seq - ) - : TAO::unbounded_value_sequence< - TASOneWayAction - > - (seq) -{} - -ActiveSurface::TASOneWayActionSeq::~TASOneWayActionSeq (void) -{} - -void ActiveSurface::TASOneWayActionSeq::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - TASOneWayActionSeq * _tao_tmp_pointer = - static_cast (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:516 - - -#ifndef _TAO_TYPECODE_ActiveSurface_TASOneWayActionSeq_GUARD -#define _TAO_TYPECODE_ActiveSurface_TASOneWayActionSeq_GUARD - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace TypeCode - { - namespace - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - ActiveSurface_TASOneWayActionSeq_0 ( - ::CORBA::tk_sequence, - &ActiveSurface::_tc_TASOneWayAction, - 0U); - - ::CORBA::TypeCode_ptr const tc_ActiveSurface_TASOneWayActionSeq_0 = - &ActiveSurface_TASOneWayActionSeq_0; - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* _TAO_TYPECODE_ActiveSurface_TASOneWayActionSeq_GUARD */ - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASOneWayActionSeq ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASOneWayActionSeq:1.0", - "TASOneWayActionSeq", - &TAO::TypeCode::tc_ActiveSurface_TASOneWayActionSeq_0); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASOneWayActionSeq = - &_tao_tc_ActiveSurface_TASOneWayActionSeq; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::CBTASOneWayAction. - -ActiveSurface::CBTASOneWayAction_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::CBTASOneWayAction_ptr p) -{ - return ActiveSurface::CBTASOneWayAction::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::CBTASOneWayAction_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::CBTASOneWayAction_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::CBTASOneWayAction::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::CBTASOneWayAction_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::CBTASOneWayAction::working ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_CBTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_CBTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "working", - 7, - this->the_TAO_CBTASOneWayAction_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::CBTASOneWayAction::done ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_CBTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_CBTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "done", - 4, - this->the_TAO_CBTASOneWayAction_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::CBTASOneWayAction::CBTASOneWayAction (void) - : the_TAO_CBTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_CBTASOneWayAction_setup_collocation (); -} - -void -ActiveSurface::CBTASOneWayAction::ActiveSurface_CBTASOneWayAction_setup_collocation () -{ - if (::ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_CBTASOneWayAction_Proxy_Broker_ = - ::ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_Callback_setup_collocation (); -} - -ActiveSurface::CBTASOneWayAction::~CBTASOneWayAction (void) -{} - -void -ActiveSurface::CBTASOneWayAction::_tao_any_destructor (void *_tao_void_pointer) -{ - CBTASOneWayAction *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::CBTASOneWayAction_ptr -ActiveSurface::CBTASOneWayAction::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0", - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::CBTASOneWayAction_ptr -ActiveSurface::CBTASOneWayAction::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0", - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::CBTASOneWayAction_ptr -ActiveSurface::CBTASOneWayAction::_duplicate (CBTASOneWayAction_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::CBTASOneWayAction::_tao_release (CBTASOneWayAction_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::CBTASOneWayAction::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::CBTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0"; -} - -::CORBA::Boolean -ActiveSurface::CBTASOneWayAction::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_CBTASOneWayAction ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0", - "CBTASOneWayAction"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_CBTASOneWayAction = - &_tao_tc_ActiveSurface_CBTASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASOneWayActionCB ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASOneWayActionCB:1.0", - "TASOneWayActionCB", - &ActiveSurface::_tc_CBTASOneWayAction); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASOneWayActionCB = - &_tao_tc_ActiveSurface_TASOneWayActionCB; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::AlarmTASOneWayAction. - -ActiveSurface::AlarmTASOneWayAction_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::AlarmTASOneWayAction_ptr p) -{ - return ActiveSurface::AlarmTASOneWayAction::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::AlarmTASOneWayAction_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::AlarmTASOneWayAction_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::AlarmTASOneWayAction::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::AlarmTASOneWayAction_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::AlarmTASOneWayAction::alarm_raised ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_AlarmTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_AlarmTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "alarm_raised", - 12, - this->the_TAO_AlarmTASOneWayAction_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::AlarmTASOneWayAction::alarm_cleared ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_AlarmTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_AlarmTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "alarm_cleared", - 13, - this->the_TAO_AlarmTASOneWayAction_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::AlarmTASOneWayAction::AlarmTASOneWayAction (void) - : the_TAO_AlarmTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_AlarmTASOneWayAction_setup_collocation (); -} - -void -ActiveSurface::AlarmTASOneWayAction::ActiveSurface_AlarmTASOneWayAction_setup_collocation () -{ - if (::ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_AlarmTASOneWayAction_Proxy_Broker_ = - ::ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_Callback_setup_collocation (); -} - -ActiveSurface::AlarmTASOneWayAction::~AlarmTASOneWayAction (void) -{} - -void -ActiveSurface::AlarmTASOneWayAction::_tao_any_destructor (void *_tao_void_pointer) -{ - AlarmTASOneWayAction *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::AlarmTASOneWayAction_ptr -ActiveSurface::AlarmTASOneWayAction::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0", - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::AlarmTASOneWayAction_ptr -ActiveSurface::AlarmTASOneWayAction::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0", - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::AlarmTASOneWayAction_ptr -ActiveSurface::AlarmTASOneWayAction::_duplicate (AlarmTASOneWayAction_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::AlarmTASOneWayAction::_tao_release (AlarmTASOneWayAction_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::AlarmTASOneWayAction::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::AlarmTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0"; -} - -::CORBA::Boolean -ActiveSurface::AlarmTASOneWayAction::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_AlarmTASOneWayAction ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0", - "AlarmTASOneWayAction"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_AlarmTASOneWayAction = - &_tao_tc_ActiveSurface_AlarmTASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASOneWayActionAlarm ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASOneWayActionAlarm:1.0", - "TASOneWayActionAlarm", - &ActiveSurface::_tc_AlarmTASOneWayAction); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASOneWayActionAlarm = - &_tao_tc_ActiveSurface_TASOneWayActionAlarm; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::PTASOneWayAction. - -ActiveSurface::PTASOneWayAction_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::PTASOneWayAction_ptr p) -{ - return ActiveSurface::PTASOneWayAction::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::PTASOneWayAction_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::PTASOneWayAction_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::PTASOneWayAction::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::PTASOneWayAction_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASOneWayAction ActiveSurface::PTASOneWayAction::get_sync ( - ::ACSErr::Completion_out c) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACSErr::Completion>::out_arg_val _tao_c (c); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_c - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "get_sync", - 8, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::PTASOneWayAction::get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "get_async", - 9, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::CORBA::Long ActiveSurface::PTASOneWayAction::get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASOneWayActionSeq_out vs, - ::ACS::TimeSeq_out ts) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::CORBA::Long>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_n_last_values (n_last_values); - TAO::Arg_Traits< ::ActiveSurface::TASOneWayActionSeq>::out_arg_val _tao_vs (vs); - TAO::Arg_Traits< ::ACS::TimeSeq>::out_arg_val _tao_ts (ts); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_n_last_values, - &_tao_vs, - &_tao_ts - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "get_history", - 11, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Monitorpattern_ptr ActiveSurface::PTASOneWayAction::create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Monitorpattern>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "create_monitor", - 14, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Monitor_ptr ActiveSurface::PTASOneWayAction::create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Monitor>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::Time>::in_arg_val _tao_start_time (start_time); - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_start_time, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "create_postponed_monitor", - 24, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::TimeInterval ActiveSurface::PTASOneWayAction::default_timer_trigger ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::TimeInterval>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_default_timer_trigger", - 26, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::TimeInterval ActiveSurface::PTASOneWayAction::min_timer_trigger ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::TimeInterval>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_min_timer_trigger", - 22, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASOneWayAction ActiveSurface::PTASOneWayAction::default_value ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_default_value", - 18, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::stringSeq * ActiveSurface::PTASOneWayAction::statesDescription ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::stringSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_statesDescription", - 22, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::ConditionSeq * ActiveSurface::PTASOneWayAction::condition ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::ConditionSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_condition", - 14, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASOneWayActionSeq * ActiveSurface::PTASOneWayAction::allStates ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_PTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_allStates", - 14, - this->the_TAO_PTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -ActiveSurface::PTASOneWayAction::PTASOneWayAction (void) - : the_TAO_PTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_PTASOneWayAction_setup_collocation (); -} - -void -ActiveSurface::PTASOneWayAction::ActiveSurface_PTASOneWayAction_setup_collocation () -{ - if (::ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_PTASOneWayAction_Proxy_Broker_ = - ::ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_TypelessProperty_setup_collocation (); -} - -ActiveSurface::PTASOneWayAction::~PTASOneWayAction (void) -{} - -void -ActiveSurface::PTASOneWayAction::_tao_any_destructor (void *_tao_void_pointer) -{ - PTASOneWayAction *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::PTASOneWayAction_ptr -ActiveSurface::PTASOneWayAction::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0", - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::PTASOneWayAction_ptr -ActiveSurface::PTASOneWayAction::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0", - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::PTASOneWayAction_ptr -ActiveSurface::PTASOneWayAction::_duplicate (PTASOneWayAction_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::PTASOneWayAction::_tao_release (PTASOneWayAction_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::PTASOneWayAction::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::PTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/PTASOneWayAction:1.0"; -} - -::CORBA::Boolean -ActiveSurface::PTASOneWayAction::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_PTASOneWayAction ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0", - "PTASOneWayAction"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_PTASOneWayAction = - &_tao_tc_ActiveSurface_PTASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::ROTASOneWayAction. - -ActiveSurface::ROTASOneWayAction_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::ROTASOneWayAction_ptr p) -{ - return ActiveSurface::ROTASOneWayAction::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::ROTASOneWayAction_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::ROTASOneWayAction_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::ROTASOneWayAction::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::ROTASOneWayAction_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Subscription_ptr ActiveSurface::ROTASOneWayAction::new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Subscription>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::Alarmpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "new_subscription_AlarmEnum", - 26, - this->the_TAO_ROTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASOneWayActionSeq * ActiveSurface::ROTASOneWayAction::alarm_on ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_alarm_on", - 13, - this->the_TAO_ROTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASOneWayActionSeq * ActiveSurface::ROTASOneWayAction::alarm_off ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_alarm_off", - 14, - this->the_TAO_ROTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -ActiveSurface::ROTASOneWayAction::ROTASOneWayAction (void) - : the_TAO_ROTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_ROTASOneWayAction_setup_collocation (); -} - -void -ActiveSurface::ROTASOneWayAction::ActiveSurface_ROTASOneWayAction_setup_collocation () -{ - if (::ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_ROTASOneWayAction_Proxy_Broker_ = - ::ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer (this); - } - - this->ActiveSurface_PTASOneWayAction_setup_collocation (); -} - -ActiveSurface::ROTASOneWayAction::~ROTASOneWayAction (void) -{} - -void -ActiveSurface::ROTASOneWayAction::_tao_any_destructor (void *_tao_void_pointer) -{ - ROTASOneWayAction *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::ROTASOneWayAction_ptr -ActiveSurface::ROTASOneWayAction::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0", - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::ROTASOneWayAction_ptr -ActiveSurface::ROTASOneWayAction::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0", - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::ROTASOneWayAction_ptr -ActiveSurface::ROTASOneWayAction::_duplicate (ROTASOneWayAction_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::ROTASOneWayAction::_tao_release (ROTASOneWayAction_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::ROTASOneWayAction::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::ROTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0"; -} - -::CORBA::Boolean -ActiveSurface::ROTASOneWayAction::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_ROTASOneWayAction ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0", - "ROTASOneWayAction"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_ROTASOneWayAction = - &_tao_tc_ActiveSurface_ROTASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::RWTASOneWayAction. - -ActiveSurface::RWTASOneWayAction_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::RWTASOneWayAction_ptr p) -{ - return ActiveSurface::RWTASOneWayAction::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::RWTASOneWayAction_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::RWTASOneWayAction_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::RWTASOneWayAction::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::RWTASOneWayAction_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACSErr::Completion * ActiveSurface::RWTASOneWayAction::set_sync ( - ::ActiveSurface::TASOneWayAction value) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< ::ACSErr::Completion>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "set_sync", - 8, - this->the_TAO_RWTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::RWTASOneWayAction::set_async ( - ::ActiveSurface::TASOneWayAction value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACS::CBvoid>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "set_async", - 9, - this->the_TAO_RWTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::RWTASOneWayAction::set_nonblocking ( - ::ActiveSurface::TASOneWayAction value) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASOneWayAction_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASOneWayAction_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value (value); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "set_nonblocking", - 15, - this->the_TAO_RWTASOneWayAction_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::RWTASOneWayAction::RWTASOneWayAction (void) - : the_TAO_RWTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_RWTASOneWayAction_setup_collocation (); -} - -void -ActiveSurface::RWTASOneWayAction::ActiveSurface_RWTASOneWayAction_setup_collocation () -{ - if (::ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_RWTASOneWayAction_Proxy_Broker_ = - ::ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer (this); - } - - this->ActiveSurface_PTASOneWayAction_setup_collocation (); -} - -ActiveSurface::RWTASOneWayAction::~RWTASOneWayAction (void) -{} - -void -ActiveSurface::RWTASOneWayAction::_tao_any_destructor (void *_tao_void_pointer) -{ - RWTASOneWayAction *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::RWTASOneWayAction_ptr -ActiveSurface::RWTASOneWayAction::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0", - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::RWTASOneWayAction_ptr -ActiveSurface::RWTASOneWayAction::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0", - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::RWTASOneWayAction_ptr -ActiveSurface::RWTASOneWayAction::_duplicate (RWTASOneWayAction_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::RWTASOneWayAction::_tao_release (RWTASOneWayAction_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::RWTASOneWayAction::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::RWTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0"; -} - -::CORBA::Boolean -ActiveSurface::RWTASOneWayAction::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_RWTASOneWayAction ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0", - "RWTASOneWayAction"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_RWTASOneWayAction = - &_tao_tc_ActiveSurface_RWTASOneWayAction; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/enum_typecode.cpp:31 -static char const * const _tao_enumerators_ActiveSurface_TASProfile[] = - { - "AS_SHAPED", - "AS_SHAPED_FIXED", - "AS_PARABOLIC", - "AS_PARABOLIC_FIXED" - - }; - -static TAO::TypeCode::Enum - _tao_tc_ActiveSurface_TASProfile ( - "IDL:alma/ActiveSurface/TASProfile:1.0", - "TASProfile", - _tao_enumerators_ActiveSurface_TASProfile, - 4); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASProfile = - &_tao_tc_ActiveSurface_TASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/sequence_cs.cpp:65 - -#if !defined (_ACTIVESURFACE_TASPROFILESEQ_CS_) -#define _ACTIVESURFACE_TASPROFILESEQ_CS_ - -ActiveSurface::TASProfileSeq::TASProfileSeq (void) -{} - -ActiveSurface::TASProfileSeq::TASProfileSeq ( - ::CORBA::ULong max - ) - : TAO::unbounded_value_sequence< - TASProfile - > - (max) -{} - -ActiveSurface::TASProfileSeq::TASProfileSeq ( - ::CORBA::ULong max, - ::CORBA::ULong length, - ActiveSurface::TASProfile * buffer, - ::CORBA::Boolean release - ) - : TAO::unbounded_value_sequence< - TASProfile - > - (max, length, buffer, release) -{} - -ActiveSurface::TASProfileSeq::TASProfileSeq ( - const TASProfileSeq &seq - ) - : TAO::unbounded_value_sequence< - TASProfile - > - (seq) -{} - -ActiveSurface::TASProfileSeq::~TASProfileSeq (void) -{} - -void ActiveSurface::TASProfileSeq::_tao_any_destructor ( - void * _tao_void_pointer - ) -{ - TASProfileSeq * _tao_tmp_pointer = - static_cast (_tao_void_pointer); - delete _tao_tmp_pointer; -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/typecode_defn.cpp:516 - - -#ifndef _TAO_TYPECODE_ActiveSurface_TASProfileSeq_GUARD -#define _TAO_TYPECODE_ActiveSurface_TASProfileSeq_GUARD - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace TAO -{ - namespace TypeCode - { - namespace - { - TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy> - ActiveSurface_TASProfileSeq_0 ( - ::CORBA::tk_sequence, - &ActiveSurface::_tc_TASProfile, - 0U); - - ::CORBA::TypeCode_ptr const tc_ActiveSurface_TASProfileSeq_0 = - &ActiveSurface_TASProfileSeq_0; - } - } -} - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* _TAO_TYPECODE_ActiveSurface_TASProfileSeq_GUARD */ - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASProfileSeq ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASProfileSeq:1.0", - "TASProfileSeq", - &TAO::TypeCode::tc_ActiveSurface_TASProfileSeq_0); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASProfileSeq = - &_tao_tc_ActiveSurface_TASProfileSeq; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::CBTASProfile. - -ActiveSurface::CBTASProfile_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::CBTASProfile_ptr p) -{ - return ActiveSurface::CBTASProfile::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::CBTASProfile_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::CBTASProfile_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::CBTASProfile::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::CBTASProfile_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::CBTASProfile::working ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_CBTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_CBTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "working", - 7, - this->the_TAO_CBTASProfile_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::CBTASProfile::done ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_CBTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_CBTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "done", - 4, - this->the_TAO_CBTASProfile_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::CBTASProfile::CBTASProfile (void) - : the_TAO_CBTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_CBTASProfile_setup_collocation (); -} - -void -ActiveSurface::CBTASProfile::ActiveSurface_CBTASProfile_setup_collocation () -{ - if (::ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_CBTASProfile_Proxy_Broker_ = - ::ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_Callback_setup_collocation (); -} - -ActiveSurface::CBTASProfile::~CBTASProfile (void) -{} - -void -ActiveSurface::CBTASProfile::_tao_any_destructor (void *_tao_void_pointer) -{ - CBTASProfile *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::CBTASProfile_ptr -ActiveSurface::CBTASProfile::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/CBTASProfile:1.0", - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::CBTASProfile_ptr -ActiveSurface::CBTASProfile::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/CBTASProfile:1.0", - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::CBTASProfile_ptr -ActiveSurface::CBTASProfile::_duplicate (CBTASProfile_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::CBTASProfile::_tao_release (CBTASProfile_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::CBTASProfile::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/CBTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::CBTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/CBTASProfile:1.0"; -} - -::CORBA::Boolean -ActiveSurface::CBTASProfile::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_CBTASProfile ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/CBTASProfile:1.0", - "CBTASProfile"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_CBTASProfile = - &_tao_tc_ActiveSurface_CBTASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASProfileCB ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASProfileCB:1.0", - "TASProfileCB", - &ActiveSurface::_tc_CBTASProfile); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASProfileCB = - &_tao_tc_ActiveSurface_TASProfileCB; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::AlarmTASProfile. - -ActiveSurface::AlarmTASProfile_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::AlarmTASProfile_ptr p) -{ - return ActiveSurface::AlarmTASProfile::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::AlarmTASProfile_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::AlarmTASProfile_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::AlarmTASProfile::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::AlarmTASProfile_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::AlarmTASProfile::alarm_raised ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_AlarmTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_AlarmTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "alarm_raised", - 12, - this->the_TAO_AlarmTASProfile_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::AlarmTASProfile::alarm_cleared ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_AlarmTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_AlarmTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c (c); - TAO::Arg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "alarm_cleared", - 13, - this->the_TAO_AlarmTASProfile_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::AlarmTASProfile::AlarmTASProfile (void) - : the_TAO_AlarmTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_AlarmTASProfile_setup_collocation (); -} - -void -ActiveSurface::AlarmTASProfile::ActiveSurface_AlarmTASProfile_setup_collocation () -{ - if (::ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_AlarmTASProfile_Proxy_Broker_ = - ::ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_Callback_setup_collocation (); -} - -ActiveSurface::AlarmTASProfile::~AlarmTASProfile (void) -{} - -void -ActiveSurface::AlarmTASProfile::_tao_any_destructor (void *_tao_void_pointer) -{ - AlarmTASProfile *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::AlarmTASProfile_ptr -ActiveSurface::AlarmTASProfile::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/AlarmTASProfile:1.0", - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::AlarmTASProfile_ptr -ActiveSurface::AlarmTASProfile::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/AlarmTASProfile:1.0", - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::AlarmTASProfile_ptr -ActiveSurface::AlarmTASProfile::_duplicate (AlarmTASProfile_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::AlarmTASProfile::_tao_release (AlarmTASProfile_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::AlarmTASProfile::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/AlarmTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::AlarmTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/AlarmTASProfile:1.0"; -} - -::CORBA::Boolean -ActiveSurface::AlarmTASProfile::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_AlarmTASProfile ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/AlarmTASProfile:1.0", - "AlarmTASProfile"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_AlarmTASProfile = - &_tao_tc_ActiveSurface_AlarmTASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_typecode/alias_typecode.cpp:50 - -static TAO::TypeCode::Alias - _tao_tc_ActiveSurface_TASProfileAlarm ( - ::CORBA::tk_alias, - "IDL:alma/ActiveSurface/TASProfileAlarm:1.0", - "TASProfileAlarm", - &ActiveSurface::_tc_AlarmTASProfile); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_TASProfileAlarm = - &_tao_tc_ActiveSurface_TASProfileAlarm; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::PTASProfile. - -ActiveSurface::PTASProfile_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::PTASProfile_ptr p) -{ - return ActiveSurface::PTASProfile::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::PTASProfile_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::PTASProfile_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::PTASProfile::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::PTASProfile_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASProfile ActiveSurface::PTASProfile::get_sync ( - ::ACSErr::Completion_out c) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACSErr::Completion>::out_arg_val _tao_c (c); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_c - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "get_sync", - 8, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::PTASProfile::get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "get_async", - 9, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::CORBA::Long ActiveSurface::PTASProfile::get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASProfileSeq_out vs, - ::ACS::TimeSeq_out ts) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::CORBA::Long>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_n_last_values (n_last_values); - TAO::Arg_Traits< ::ActiveSurface::TASProfileSeq>::out_arg_val _tao_vs (vs); - TAO::Arg_Traits< ::ACS::TimeSeq>::out_arg_val _tao_ts (ts); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_n_last_values, - &_tao_vs, - &_tao_ts - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "get_history", - 11, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Monitorpattern_ptr ActiveSurface::PTASProfile::create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Monitorpattern>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "create_monitor", - 14, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Monitor_ptr ActiveSurface::PTASProfile::create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Monitor>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::Time>::in_arg_val _tao_start_time (start_time); - TAO::Arg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_start_time, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "create_postponed_monitor", - 24, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::TimeInterval ActiveSurface::PTASProfile::default_timer_trigger ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::TimeInterval>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_default_timer_trigger", - 26, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::TimeInterval ActiveSurface::PTASProfile::min_timer_trigger ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::TimeInterval>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_min_timer_trigger", - 22, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASProfile ActiveSurface::PTASProfile::default_value ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_default_value", - 18, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::stringSeq * ActiveSurface::PTASProfile::statesDescription ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::stringSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_statesDescription", - 22, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::ConditionSeq * ActiveSurface::PTASProfile::condition ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::ConditionSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_condition", - 14, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASProfileSeq * ActiveSurface::PTASProfile::allStates ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_PTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_PTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_allStates", - 14, - this->the_TAO_PTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -ActiveSurface::PTASProfile::PTASProfile (void) - : the_TAO_PTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_PTASProfile_setup_collocation (); -} - -void -ActiveSurface::PTASProfile::ActiveSurface_PTASProfile_setup_collocation () -{ - if (::ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_PTASProfile_Proxy_Broker_ = - ::ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer (this); - } - - this->ACS_TypelessProperty_setup_collocation (); -} - -ActiveSurface::PTASProfile::~PTASProfile (void) -{} - -void -ActiveSurface::PTASProfile::_tao_any_destructor (void *_tao_void_pointer) -{ - PTASProfile *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::PTASProfile_ptr -ActiveSurface::PTASProfile::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/PTASProfile:1.0", - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::PTASProfile_ptr -ActiveSurface::PTASProfile::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/PTASProfile:1.0", - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::PTASProfile_ptr -ActiveSurface::PTASProfile::_duplicate (PTASProfile_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::PTASProfile::_tao_release (PTASProfile_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::PTASProfile::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::PTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/PTASProfile:1.0"; -} - -::CORBA::Boolean -ActiveSurface::PTASProfile::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_PTASProfile ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/PTASProfile:1.0", - "PTASProfile"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_PTASProfile = - &_tao_tc_ActiveSurface_PTASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::ROTASProfile. - -ActiveSurface::ROTASProfile_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::ROTASProfile_ptr p) -{ - return ActiveSurface::ROTASProfile::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::ROTASProfile_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::ROTASProfile_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::ROTASProfile::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::ROTASProfile_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACS::Subscription_ptr ActiveSurface::ROTASProfile::new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACS::Subscription>::ret_val _tao_retval; - TAO::Arg_Traits< ::ACS::Alarmpattern>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "new_subscription_AlarmEnum", - 26, - this->the_TAO_ROTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASProfileSeq * ActiveSurface::ROTASProfile::alarm_on ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_alarm_on", - 13, - this->the_TAO_ROTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::TASProfileSeq * ActiveSurface::ROTASProfile::alarm_off ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_ROTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_ROTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_alarm_off", - 14, - this->the_TAO_ROTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -ActiveSurface::ROTASProfile::ROTASProfile (void) - : the_TAO_ROTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_ROTASProfile_setup_collocation (); -} - -void -ActiveSurface::ROTASProfile::ActiveSurface_ROTASProfile_setup_collocation () -{ - if (::ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_ROTASProfile_Proxy_Broker_ = - ::ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer (this); - } - - this->ActiveSurface_PTASProfile_setup_collocation (); -} - -ActiveSurface::ROTASProfile::~ROTASProfile (void) -{} - -void -ActiveSurface::ROTASProfile::_tao_any_destructor (void *_tao_void_pointer) -{ - ROTASProfile *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::ROTASProfile_ptr -ActiveSurface::ROTASProfile::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/ROTASProfile:1.0", - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::ROTASProfile_ptr -ActiveSurface::ROTASProfile::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/ROTASProfile:1.0", - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::ROTASProfile_ptr -ActiveSurface::ROTASProfile::_duplicate (ROTASProfile_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::ROTASProfile::_tao_release (ROTASProfile_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::ROTASProfile::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ROTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::ROTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/ROTASProfile:1.0"; -} - -::CORBA::Boolean -ActiveSurface::ROTASProfile::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_ROTASProfile ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/ROTASProfile:1.0", - "ROTASProfile"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_ROTASProfile = - &_tao_tc_ActiveSurface_ROTASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::RWTASProfile. - -ActiveSurface::RWTASProfile_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::RWTASProfile_ptr p) -{ - return ActiveSurface::RWTASProfile::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::RWTASProfile_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::RWTASProfile_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::RWTASProfile::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::RWTASProfile_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ACSErr::Completion * ActiveSurface::RWTASProfile::set_sync ( - ::ActiveSurface::TASProfile value) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< ::ACSErr::Completion>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "set_sync", - 8, - this->the_TAO_RWTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::RWTASProfile::set_async ( - ::ActiveSurface::TASProfile value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - TAO::Arg_Traits< ::ACS::CBvoid>::in_arg_val _tao_cb (cb); - TAO::Arg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc (desc); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value, - &_tao_cb, - &_tao_desc - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "set_async", - 9, - this->the_TAO_RWTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::RWTASProfile::set_nonblocking ( - ::ActiveSurface::TASProfile value) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_RWTASProfile_Proxy_Broker_ == 0) - { - ActiveSurface_RWTASProfile_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value (value); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_value - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "set_nonblocking", - 15, - this->the_TAO_RWTASProfile_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); -} - -ActiveSurface::RWTASProfile::RWTASProfile (void) - : the_TAO_RWTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_RWTASProfile_setup_collocation (); -} - -void -ActiveSurface::RWTASProfile::ActiveSurface_RWTASProfile_setup_collocation () -{ - if (::ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_RWTASProfile_Proxy_Broker_ = - ::ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer (this); - } - - this->ActiveSurface_PTASProfile_setup_collocation (); -} - -ActiveSurface::RWTASProfile::~RWTASProfile (void) -{} - -void -ActiveSurface::RWTASProfile::_tao_any_destructor (void *_tao_void_pointer) -{ - RWTASProfile *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::RWTASProfile_ptr -ActiveSurface::RWTASProfile::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/RWTASProfile:1.0", - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::RWTASProfile_ptr -ActiveSurface::RWTASProfile::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/RWTASProfile:1.0", - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::RWTASProfile_ptr -ActiveSurface::RWTASProfile::_duplicate (RWTASProfile_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::RWTASProfile::_tao_release (RWTASProfile_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::RWTASProfile::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/RWTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::RWTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/RWTASProfile:1.0"; -} - -::CORBA::Boolean -ActiveSurface::RWTASProfile::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_RWTASProfile ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/RWTASProfile:1.0", - "RWTASProfile"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_RWTASProfile = - &_tao_tc_ActiveSurface_RWTASProfile; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_cs.cpp:60 - -// Traits specializations for ActiveSurface::NotoActiveSurfaceBoss. - -ActiveSurface::NotoActiveSurfaceBoss_ptr -TAO::Objref_Traits::duplicate ( - ActiveSurface::NotoActiveSurfaceBoss_ptr p) -{ - return ActiveSurface::NotoActiveSurfaceBoss::_duplicate (p); -} - -void -TAO::Objref_Traits::release ( - ActiveSurface::NotoActiveSurfaceBoss_ptr p) -{ - ::CORBA::release (p); -} - -ActiveSurface::NotoActiveSurfaceBoss_ptr -TAO::Objref_Traits::nil (void) -{ - return ActiveSurface::NotoActiveSurfaceBoss::_nil (); -} - -::CORBA::Boolean -TAO::Objref_Traits::marshal ( - const ActiveSurface::NotoActiveSurfaceBoss_ptr p, - TAO_OutputCDR & cdr) -{ - return ::CORBA::Object::marshal (p, cdr); -} - -// Function pointer for collocation factory initialization. -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ) = 0; - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::Management::ROTBoolean_ptr ActiveSurface::NotoActiveSurfaceBoss::enabled ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< ::Management::ROTBoolean>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_enabled", - 12, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::ActiveSurface::ROTASProfile_ptr ActiveSurface::NotoActiveSurfaceBoss::pprofile ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< ::ActiveSurface::ROTASProfile>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_pprofile", - 13, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -::Management::ROTBoolean_ptr ActiveSurface::NotoActiveSurfaceBoss::tracking ( - void) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< ::Management::ROTBoolean>::ret_val _tao_retval; - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 1, - "_get_tracking", - 13, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke (0, 0); - - return _tao_retval.retn (); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::stop ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_stop_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "stop", - 4, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_stop_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::stow ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_stow_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "stow", - 4, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_stow_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::refPos ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_refPos_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "refPos", - 6, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_refPos_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::update ( - ::CORBA::Double elevation) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Double>::in_arg_val _tao_elevation (elevation); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_elevation - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_update_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "update", - 6, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_update_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::move ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Long incr) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_incr (incr); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius, - &_tao_incr - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_move_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 5, - "move", - 4, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_move_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::correction ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Double correction) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - TAO::Arg_Traits< ::CORBA::Double>::in_arg_val _tao_correction (correction); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius, - &_tao_correction - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_correction_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 5, - "correction", - 10, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_correction_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::setProfile ( - ::ActiveSurface::TASProfile profile) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_profile (profile); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_profile - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_setProfile_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 2, - "setProfile", - 10, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_setProfile_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::usdStatus4GUIClient ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out status) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_status (status); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_status - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_usdStatus4GUIClient_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "usdStatus4GUIClient", - 19, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_usdStatus4GUIClient_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::setActuator ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out actPos, - ::CORBA::Long_out cmdPos, - ::CORBA::Long_out Fmin, - ::CORBA::Long_out Fmax, - ::CORBA::Long_out acc, - ::CORBA::Long_out delay) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_actPos (actPos); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_cmdPos (cmdPos); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_Fmin (Fmin); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_Fmax (Fmax); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_acc (acc); - TAO::Arg_Traits< ::CORBA::Long>::out_arg_val _tao_delay (delay); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_actPos, - &_tao_cmdPos, - &_tao_Fmin, - &_tao_Fmax, - &_tao_acc, - &_tao_delay - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_setActuator_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 9, - "setActuator", - 11, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_setActuator_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::up ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_up_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "up", - 2, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_up_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::down ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_down_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "down", - 4, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_down_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::bottom ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_bottom_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "bottom", - 6, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_bottom_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::top ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_top_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "top", - 3, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_top_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::reset ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_reset_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "reset", - 5, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_reset_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::recoverUSD ( - ::CORBA::Long circle, - ::CORBA::Long actuator) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_recoverUSD_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 3, - "recoverUSD", - 10, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_recoverUSD_exceptiondata, - 1 - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::calibrate ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "calibrate", - 9, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_, - TAO::TAO_ONEWAY_INVOCATION - ); - - _tao_call.invoke (0, 0); -} - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_cs.cpp:78 - -void ActiveSurface::NotoActiveSurfaceBoss::calVer ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) -{ - if (!this->is_evaluated ()) - { - ::CORBA::Object::tao_object_initialize (this); - } - - if (this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ == 0) - { - ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); - } - - TAO::Arg_Traits< void>::ret_val _tao_retval; - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_circle (circle); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator (actuator); - TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_radius (radius); - - TAO::Argument *_the_tao_operation_signature [] = - { - &_tao_retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static TAO::Exception_Data - _tao_ActiveSurface_NotoActiveSurfaceBoss_calVer_exceptiondata [] = - { - { - "IDL:alma/ComponentErrors/ComponentErrorsEx:1.0", - ComponentErrors::ComponentErrorsEx::_alloc -#if TAO_HAS_INTERCEPTORS == 1 - , ComponentErrors::_tc_ComponentErrorsEx -#endif /* TAO_HAS_INTERCEPTORS */ - } - }; - - TAO::Invocation_Adapter _tao_call ( - this, - _the_tao_operation_signature, - 4, - "calVer", - 6, - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ - ); - - _tao_call.invoke ( - _tao_ActiveSurface_NotoActiveSurfaceBoss_calVer_exceptiondata, - 1 - ); -} - -ActiveSurface::NotoActiveSurfaceBoss::NotoActiveSurfaceBoss (void) - : the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ (0) -{ - this->ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); -} - -void -ActiveSurface::NotoActiveSurfaceBoss::ActiveSurface_NotoActiveSurfaceBoss_setup_collocation () -{ - if (::ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer) - { - this->the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ = - ::ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer (this); - } - - this->ActiveSurface_ActiveSurfaceBoss_setup_collocation (); -} - -ActiveSurface::NotoActiveSurfaceBoss::~NotoActiveSurfaceBoss (void) -{} - -void -ActiveSurface::NotoActiveSurfaceBoss::_tao_any_destructor (void *_tao_void_pointer) -{ - NotoActiveSurfaceBoss *_tao_tmp_pointer = - static_cast (_tao_void_pointer); - ::CORBA::release (_tao_tmp_pointer); -} - -ActiveSurface::NotoActiveSurfaceBoss_ptr -ActiveSurface::NotoActiveSurfaceBoss::_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0", - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::NotoActiveSurfaceBoss_ptr -ActiveSurface::NotoActiveSurfaceBoss::_unchecked_narrow ( - ::CORBA::Object_ptr _tao_objref - ) -{ - return - TAO::Narrow_Utils::unchecked_narrow ( - _tao_objref, - "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0", - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer - ); -} - -ActiveSurface::NotoActiveSurfaceBoss_ptr -ActiveSurface::NotoActiveSurfaceBoss::_duplicate (NotoActiveSurfaceBoss_ptr obj) -{ - if (! ::CORBA::is_nil (obj)) - { - obj->_add_ref (); - } - - return obj; -} - -void -ActiveSurface::NotoActiveSurfaceBoss::_tao_release (NotoActiveSurfaceBoss_ptr obj) -{ - ::CORBA::release (obj); -} - -::CORBA::Boolean -ActiveSurface::NotoActiveSurfaceBoss::_is_a (const char *value) -{ - if ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/ACSComponent:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicComponent:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/Management/CommandInterpreter:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/Management/Subsystem:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ActiveSurfaceBoss:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ) - { - return true; // success using local knowledge - } - else - { - return this->::CORBA::Object::_is_a (value); - } -} - -const char* ActiveSurface::NotoActiveSurfaceBoss::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0"; -} - -::CORBA::Boolean -ActiveSurface::NotoActiveSurfaceBoss::marshal (TAO_OutputCDR &cdr) -{ - return (cdr << this); -} - -// TAO_IDL - Generated from -// be/be_visitor_typecode/objref_typecode.cpp:76 - -static TAO::TypeCode::Objref - _tao_tc_ActiveSurface_NotoActiveSurfaceBoss ( - ::CORBA::tk_objref, - "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0", - "NotoActiveSurfaceBoss"); - -namespace ActiveSurface -{ - ::CORBA::TypeCode_ptr const _tc_NotoActiveSurfaceBoss = - &_tao_tc_ActiveSurface_NotoActiveSurfaceBoss; -} - - - -// TAO_IDL - Generated from -// be/be_visitor_enum/any_op_cs.cpp:52 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -void operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::TASOneWayAction _tao_elem - ) -{ - TAO::Any_Basic_Impl_T::insert ( - _tao_any, - ActiveSurface::_tc_TASOneWayAction, - _tao_elem - ); -} - -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::TASOneWayAction &_tao_elem - ) -{ - return - TAO::Any_Basic_Impl_T::extract ( - _tao_any, - ActiveSurface::_tc_TASOneWayAction, - _tao_elem - ); -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - -// Copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - const ActiveSurface::TASOneWayActionSeq &_tao_elem - ) -{ - if (0 == &_tao_elem) // Trying to de-reference NULL object - _tao_any <<= static_cast( 0 ); // Use non-copying insertion of a NULL - else - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - ActiveSurface::TASOneWayActionSeq::_tao_any_destructor, - ActiveSurface::_tc_TASOneWayActionSeq, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::TASOneWayActionSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - ActiveSurface::TASOneWayActionSeq::_tao_any_destructor, - ActiveSurface::_tc_TASOneWayActionSeq, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::TASOneWayActionSeq *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const ActiveSurface::TASOneWayActionSeq *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - const ActiveSurface::TASOneWayActionSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - ActiveSurface::TASOneWayActionSeq::_tao_any_destructor, - ActiveSurface::_tc_TASOneWayActionSeq, - _tao_elem - ); -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - CBTASOneWayAction_ptr _tao_elem) - { - CBTASOneWayAction_ptr _tao_objptr = - CBTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - CBTASOneWayAction_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - CBTASOneWayAction::_tao_any_destructor, - _tc_CBTASOneWayAction, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - CBTASOneWayAction_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - CBTASOneWayAction::_tao_any_destructor, - _tc_CBTASOneWayAction, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::CBTASOneWayAction_ptr _tao_elem) -{ - ActiveSurface::CBTASOneWayAction_ptr _tao_objptr = - ActiveSurface::CBTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::CBTASOneWayAction_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::CBTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_CBTASOneWayAction, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::CBTASOneWayAction_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::CBTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_CBTASOneWayAction, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - AlarmTASOneWayAction_ptr _tao_elem) - { - AlarmTASOneWayAction_ptr _tao_objptr = - AlarmTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - AlarmTASOneWayAction_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - AlarmTASOneWayAction::_tao_any_destructor, - _tc_AlarmTASOneWayAction, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - AlarmTASOneWayAction_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - AlarmTASOneWayAction::_tao_any_destructor, - _tc_AlarmTASOneWayAction, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASOneWayAction_ptr _tao_elem) -{ - ActiveSurface::AlarmTASOneWayAction_ptr _tao_objptr = - ActiveSurface::AlarmTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASOneWayAction_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::AlarmTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_AlarmTASOneWayAction, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASOneWayAction_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::AlarmTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_AlarmTASOneWayAction, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - PTASOneWayAction_ptr _tao_elem) - { - PTASOneWayAction_ptr _tao_objptr = - PTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - PTASOneWayAction_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - PTASOneWayAction::_tao_any_destructor, - _tc_PTASOneWayAction, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - PTASOneWayAction_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - PTASOneWayAction::_tao_any_destructor, - _tc_PTASOneWayAction, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::PTASOneWayAction_ptr _tao_elem) -{ - ActiveSurface::PTASOneWayAction_ptr _tao_objptr = - ActiveSurface::PTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::PTASOneWayAction_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::PTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_PTASOneWayAction, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::PTASOneWayAction_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::PTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_PTASOneWayAction, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ROTASOneWayAction_ptr _tao_elem) - { - ROTASOneWayAction_ptr _tao_objptr = - ROTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ROTASOneWayAction_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - ROTASOneWayAction::_tao_any_destructor, - _tc_ROTASOneWayAction, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - ROTASOneWayAction_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - ROTASOneWayAction::_tao_any_destructor, - _tc_ROTASOneWayAction, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::ROTASOneWayAction_ptr _tao_elem) -{ - ActiveSurface::ROTASOneWayAction_ptr _tao_objptr = - ActiveSurface::ROTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::ROTASOneWayAction_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::ROTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_ROTASOneWayAction, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::ROTASOneWayAction_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::ROTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_ROTASOneWayAction, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - RWTASOneWayAction_ptr _tao_elem) - { - RWTASOneWayAction_ptr _tao_objptr = - RWTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - RWTASOneWayAction_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - RWTASOneWayAction::_tao_any_destructor, - _tc_RWTASOneWayAction, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - RWTASOneWayAction_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - RWTASOneWayAction::_tao_any_destructor, - _tc_RWTASOneWayAction, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::RWTASOneWayAction_ptr _tao_elem) -{ - ActiveSurface::RWTASOneWayAction_ptr _tao_objptr = - ActiveSurface::RWTASOneWayAction::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::RWTASOneWayAction_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::RWTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_RWTASOneWayAction, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::RWTASOneWayAction_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::RWTASOneWayAction::_tao_any_destructor, - ActiveSurface::_tc_RWTASOneWayAction, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_enum/any_op_cs.cpp:52 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -void operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::TASProfile _tao_elem - ) -{ - TAO::Any_Basic_Impl_T::insert ( - _tao_any, - ActiveSurface::_tc_TASProfile, - _tao_elem - ); -} - -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::TASProfile &_tao_elem - ) -{ - return - TAO::Any_Basic_Impl_T::extract ( - _tao_any, - ActiveSurface::_tc_TASProfile, - _tao_elem - ); -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_cs.cpp:54 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - -// Copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - const ActiveSurface::TASProfileSeq &_tao_elem - ) -{ - if (0 == &_tao_elem) // Trying to de-reference NULL object - _tao_any <<= static_cast( 0 ); // Use non-copying insertion of a NULL - else - TAO::Any_Dual_Impl_T::insert_copy ( - _tao_any, - ActiveSurface::TASProfileSeq::_tao_any_destructor, - ActiveSurface::_tc_TASProfileSeq, - _tao_elem - ); -} - -// Non-copying insertion. -void operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::TASProfileSeq *_tao_elem - ) -{ - TAO::Any_Dual_Impl_T::insert ( - _tao_any, - ActiveSurface::TASProfileSeq::_tao_any_destructor, - ActiveSurface::_tc_TASProfileSeq, - _tao_elem - ); -} - -// Extraction to non-const pointer (deprecated). -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::TASProfileSeq *&_tao_elem - ) -{ - return _tao_any >>= const_cast< - const ActiveSurface::TASProfileSeq *&> ( - _tao_elem - ); -} - -// Extraction to const pointer. -::CORBA::Boolean operator>>= ( - const ::CORBA::Any &_tao_any, - const ActiveSurface::TASProfileSeq *&_tao_elem - ) -{ - return - TAO::Any_Dual_Impl_T::extract ( - _tao_any, - ActiveSurface::TASProfileSeq::_tao_any_destructor, - ActiveSurface::_tc_TASProfileSeq, - _tao_elem - ); -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - CBTASProfile_ptr _tao_elem) - { - CBTASProfile_ptr _tao_objptr = - CBTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - CBTASProfile_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - CBTASProfile::_tao_any_destructor, - _tc_CBTASProfile, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - CBTASProfile_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - CBTASProfile::_tao_any_destructor, - _tc_CBTASProfile, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::CBTASProfile_ptr _tao_elem) -{ - ActiveSurface::CBTASProfile_ptr _tao_objptr = - ActiveSurface::CBTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::CBTASProfile_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::CBTASProfile::_tao_any_destructor, - ActiveSurface::_tc_CBTASProfile, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::CBTASProfile_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::CBTASProfile::_tao_any_destructor, - ActiveSurface::_tc_CBTASProfile, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - AlarmTASProfile_ptr _tao_elem) - { - AlarmTASProfile_ptr _tao_objptr = - AlarmTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - AlarmTASProfile_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - AlarmTASProfile::_tao_any_destructor, - _tc_AlarmTASProfile, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - AlarmTASProfile_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - AlarmTASProfile::_tao_any_destructor, - _tc_AlarmTASProfile, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASProfile_ptr _tao_elem) -{ - ActiveSurface::AlarmTASProfile_ptr _tao_objptr = - ActiveSurface::AlarmTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASProfile_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::AlarmTASProfile::_tao_any_destructor, - ActiveSurface::_tc_AlarmTASProfile, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::AlarmTASProfile_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::AlarmTASProfile::_tao_any_destructor, - ActiveSurface::_tc_AlarmTASProfile, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - PTASProfile_ptr _tao_elem) - { - PTASProfile_ptr _tao_objptr = - PTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - PTASProfile_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - PTASProfile::_tao_any_destructor, - _tc_PTASProfile, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - PTASProfile_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - PTASProfile::_tao_any_destructor, - _tc_PTASProfile, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::PTASProfile_ptr _tao_elem) -{ - ActiveSurface::PTASProfile_ptr _tao_objptr = - ActiveSurface::PTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::PTASProfile_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::PTASProfile::_tao_any_destructor, - ActiveSurface::_tc_PTASProfile, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::PTASProfile_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::PTASProfile::_tao_any_destructor, - ActiveSurface::_tc_PTASProfile, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ROTASProfile_ptr _tao_elem) - { - ROTASProfile_ptr _tao_objptr = - ROTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - ROTASProfile_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - ROTASProfile::_tao_any_destructor, - _tc_ROTASProfile, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - ROTASProfile_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - ROTASProfile::_tao_any_destructor, - _tc_ROTASProfile, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::ROTASProfile_ptr _tao_elem) -{ - ActiveSurface::ROTASProfile_ptr _tao_objptr = - ActiveSurface::ROTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::ROTASProfile_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::ROTASProfile::_tao_any_destructor, - ActiveSurface::_tc_ROTASProfile, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::ROTASProfile_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::ROTASProfile::_tao_any_destructor, - ActiveSurface::_tc_ROTASProfile, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - RWTASProfile_ptr _tao_elem) - { - RWTASProfile_ptr _tao_objptr = - RWTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - RWTASProfile_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - RWTASProfile::_tao_any_destructor, - _tc_RWTASProfile, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - RWTASProfile_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - RWTASProfile::_tao_any_destructor, - _tc_RWTASProfile, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::RWTASProfile_ptr _tao_elem) -{ - ActiveSurface::RWTASProfile_ptr _tao_objptr = - ActiveSurface::RWTASProfile::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::RWTASProfile_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::RWTASProfile::_tao_any_destructor, - ActiveSurface::_tc_RWTASProfile, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::RWTASProfile_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::RWTASProfile::_tao_any_destructor, - ActiveSurface::_tc_RWTASProfile, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_cs.cpp:51 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - template<> - ::CORBA::Boolean - Any_Impl_T::to_object ( - ::CORBA::Object_ptr &_tao_elem - ) const - { - _tao_elem = ::CORBA::Object::_duplicate (this->value_); - return true; - } -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - - - /// Copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - NotoActiveSurfaceBoss_ptr _tao_elem) - { - NotoActiveSurfaceBoss_ptr _tao_objptr = - NotoActiveSurfaceBoss::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; - } - - /// Non-copying insertion. - void - operator<<= ( - ::CORBA::Any &_tao_any, - NotoActiveSurfaceBoss_ptr *_tao_elem) - { - TAO::Any_Impl_T::insert ( - _tao_any, - NotoActiveSurfaceBoss::_tao_any_destructor, - _tc_NotoActiveSurfaceBoss, - *_tao_elem) - } - - ::CORBA::Boolean - operator>>= ( - const ::CORBA::Any &_tao_any, - NotoActiveSurfaceBoss_ptr &_tao_elem) - { - return - TAO::Any_Impl_T::extract ( - _tao_any, - NotoActiveSurfaceBoss::_tao_any_destructor, - _tc_NotoActiveSurfaceBoss, - _tao_elem) - } -} - -#else - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -/// Copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::NotoActiveSurfaceBoss_ptr _tao_elem) -{ - ActiveSurface::NotoActiveSurfaceBoss_ptr _tao_objptr = - ActiveSurface::NotoActiveSurfaceBoss::_duplicate (_tao_elem); - _tao_any <<= &_tao_objptr; -} - -/// Non-copying insertion. -void -operator<<= ( - ::CORBA::Any &_tao_any, - ActiveSurface::NotoActiveSurfaceBoss_ptr *_tao_elem) -{ - TAO::Any_Impl_T::insert ( - _tao_any, - ActiveSurface::NotoActiveSurfaceBoss::_tao_any_destructor, - ActiveSurface::_tc_NotoActiveSurfaceBoss, - *_tao_elem); -} - -::CORBA::Boolean -operator>>= ( - const ::CORBA::Any &_tao_any, - ActiveSurface::NotoActiveSurfaceBoss_ptr &_tao_elem) -{ - return - TAO::Any_Impl_T::extract ( - _tao_any, - ActiveSurface::NotoActiveSurfaceBoss::_tao_any_destructor, - ActiveSurface::_tc_NotoActiveSurfaceBoss, - _tao_elem); -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_cs.cpp:51 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< (TAO_OutputCDR &strm, ActiveSurface::TASOneWayAction _tao_enumerator) -{ - return strm << static_cast< ::CORBA::ULong> (_tao_enumerator); -} - -::CORBA::Boolean operator>> (TAO_InputCDR &strm, ActiveSurface::TASOneWayAction & _tao_enumerator) -{ - ::CORBA::ULong _tao_temp = 0; - ::CORBA::Boolean const _tao_success = strm >> _tao_temp; - - if (_tao_success) - { - _tao_enumerator = static_cast (_tao_temp); - } - - return _tao_success; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:96 -#if !defined _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_CPP_ -#define _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_CPP_ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::TASOneWayActionSeq &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::TASOneWayActionSeq &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_CPP_ */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::CBTASOneWayAction_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::CBTASOneWayAction_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::CBTASOneWayAction RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::AlarmTASOneWayAction_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::AlarmTASOneWayAction_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::AlarmTASOneWayAction RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::PTASOneWayAction_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::PTASOneWayAction_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::PTASOneWayAction RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::ROTASOneWayAction_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::ROTASOneWayAction_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::ROTASOneWayAction RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::RWTASOneWayAction_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::RWTASOneWayAction_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::RWTASOneWayAction RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_cs.cpp:51 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< (TAO_OutputCDR &strm, ActiveSurface::TASProfile _tao_enumerator) -{ - return strm << static_cast< ::CORBA::ULong> (_tao_enumerator); -} - -::CORBA::Boolean operator>> (TAO_InputCDR &strm, ActiveSurface::TASProfile & _tao_enumerator) -{ - ::CORBA::ULong _tao_temp = 0; - ::CORBA::Boolean const _tao_success = strm >> _tao_temp; - - if (_tao_success) - { - _tao_enumerator = static_cast (_tao_temp); - } - - return _tao_success; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_cs.cpp:96 -#if !defined _TAO_CDR_OP_ActiveSurface_TASProfileSeq_CPP_ -#define _TAO_CDR_OP_ActiveSurface_TASProfileSeq_CPP_ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::TASProfileSeq &_tao_sequence - ) -{ - return TAO::marshal_sequence(strm, _tao_sequence); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::TASProfileSeq &_tao_sequence - ) -{ - return TAO::demarshal_sequence(strm, _tao_sequence); -} - - -TAO_END_VERSIONED_NAMESPACE_DECL - -#endif /* _TAO_CDR_OP_ActiveSurface_TASProfileSeq_CPP_ */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::CBTASProfile_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::CBTASProfile_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::CBTASProfile RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::AlarmTASProfile_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::AlarmTASProfile_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::AlarmTASProfile RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::PTASProfile_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::PTASProfile_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::PTASProfile RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::ROTASProfile_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::ROTASProfile_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::ROTASProfile RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::RWTASProfile_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::RWTASProfile_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::RWTASProfile RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_cs.cpp:63 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::NotoActiveSurfaceBoss_ptr _tao_objref) -{ - ::CORBA::Object_ptr _tao_corba_obj = _tao_objref; - return (strm << _tao_corba_obj); -} - -::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::NotoActiveSurfaceBoss_ptr &_tao_objref) -{ - ::CORBA::Object_var obj; - - if (!(strm >> obj.inout ())) - { - return false; - } - - typedef ::ActiveSurface::NotoActiveSurfaceBoss RHS_SCOPED_NAME; - - // Narrow to the right type. - _tao_objref = - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer - ); - - return true; -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.h b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.h deleted file mode 100644 index c61820223..000000000 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.h +++ /dev/null @@ -1,2695 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.5 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:135 - -#ifndef _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSC_H_ -#define _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSC_H_ - - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#include "tao/AnyTypeCode/AnyTypeCode_methods.h" -#include "tao/ORB.h" -#include "tao/SystemException.h" -#include "tao/Basic_Types.h" -#include "tao/ORB_Constants.h" -#include "tao/Object.h" -#include "tao/String_Manager_T.h" -#include "tao/Sequence_T.h" -#include "tao/Objref_VarOut_T.h" -#include "tao/Seq_Var_T.h" -#include "tao/Seq_Out_T.h" -#include /**/ "tao/Versioned_Namespace.h" - -#include "baciC.h" -#include "enumpropMACROC.h" -#include "ComponentErrorsC.h" -#include "ASErrorsC.h" -#include "ManagmentDefinitionsC.h" -#include "ActiveSurfaceBossC.h" - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO - -// TAO_IDL - Generated from -// be/be_visitor_root/root_ch.cpp:62 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - -namespace TAO -{ - class Collocation_Proxy_Broker; - template class Narrow_Utils; -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:49 - -namespace ActiveSurface -{ - - // TAO_IDL - Generated from - // be/be_visitor_enum/enum_ch.cpp:57 - - enum TASOneWayAction - { - AS_STOP, - AS_SETUP, - AS_STOW, - AS_REFPOS, - AS_UP, - AS_DOWN, - AS_BOTTOM, - AS_TOP, - AS_UPDATE, - AS_CORRECTION, - AS_MOVE, - AS_PROFILE - }; - - typedef TASOneWayAction &TASOneWayAction_out; - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASOneWayAction; - - // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:107 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTIONSEQ_CH_) -#define _ACTIVESURFACE_TASONEWAYACTIONSEQ_CH_ - - class TASOneWayActionSeq; - - typedef - TAO_FixedSeq_Var_T< - TASOneWayActionSeq - > - TASOneWayActionSeq_var; - - typedef - TAO_Seq_Out_T< - TASOneWayActionSeq - > - TASOneWayActionSeq_out; - - class TASOneWayActionSeq - : public - TAO::unbounded_value_sequence< - TASOneWayAction - > - { - public: - TASOneWayActionSeq (void); - TASOneWayActionSeq ( ::CORBA::ULong max); - TASOneWayActionSeq ( - ::CORBA::ULong max, - ::CORBA::ULong length, - TASOneWayAction* buffer, - ::CORBA::Boolean release = false - ); - TASOneWayActionSeq (const TASOneWayActionSeq &); - virtual ~TASOneWayActionSeq (void); - - static void _tao_any_destructor (void *); - - typedef TASOneWayActionSeq_var _var_type; - typedef TASOneWayActionSeq_out _out_type; - - - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASOneWayActionSeq; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_CBTASONEWAYACTION__VAR_OUT_CH_) -#define _ACTIVESURFACE_CBTASONEWAYACTION__VAR_OUT_CH_ - - class CBTASOneWayAction; - typedef CBTASOneWayAction *CBTASOneWayAction_ptr; - - typedef - TAO_Objref_Var_T< - CBTASOneWayAction - > - CBTASOneWayAction_var; - - typedef - TAO_Objref_Out_T< - CBTASOneWayAction - > - CBTASOneWayAction_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_CBTASONEWAYACTION_CH_) -#define _ACTIVESURFACE_CBTASONEWAYACTION_CH_ - - class CBTASOneWayAction - : public virtual ::ACS::Callback - { - public: - friend class TAO::Narrow_Utils; - typedef CBTASOneWayAction_ptr _ptr_type; - typedef CBTASOneWayAction_var _var_type; - typedef CBTASOneWayAction_out _out_type; - - // The static operations. - static CBTASOneWayAction_ptr _duplicate (CBTASOneWayAction_ptr obj); - - static void _tao_release (CBTASOneWayAction_ptr obj); - - static CBTASOneWayAction_ptr _narrow (::CORBA::Object_ptr obj); - static CBTASOneWayAction_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static CBTASOneWayAction_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void working ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void done ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_CBTASOneWayAction_Proxy_Broker_; - - protected: - // Concrete interface only. - CBTASOneWayAction (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_CBTASOneWayAction_setup_collocation (void); - - // Concrete non-local interface only. - CBTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - CBTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~CBTASOneWayAction (void); - - private: - // Private and unimplemented for concrete interfaces. - CBTASOneWayAction (const CBTASOneWayAction &); - - void operator= (const CBTASOneWayAction &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_CBTASOneWayAction; - - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:330 - - typedef CBTASOneWayAction TASOneWayActionCB; - typedef CBTASOneWayAction_ptr TASOneWayActionCB_ptr; - typedef CBTASOneWayAction_var TASOneWayActionCB_var; - typedef CBTASOneWayAction_out TASOneWayActionCB_out; - - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASOneWayActionCB; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_ALARMTASONEWAYACTION__VAR_OUT_CH_) -#define _ACTIVESURFACE_ALARMTASONEWAYACTION__VAR_OUT_CH_ - - class AlarmTASOneWayAction; - typedef AlarmTASOneWayAction *AlarmTASOneWayAction_ptr; - - typedef - TAO_Objref_Var_T< - AlarmTASOneWayAction - > - AlarmTASOneWayAction_var; - - typedef - TAO_Objref_Out_T< - AlarmTASOneWayAction - > - AlarmTASOneWayAction_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_ALARMTASONEWAYACTION_CH_) -#define _ACTIVESURFACE_ALARMTASONEWAYACTION_CH_ - - class AlarmTASOneWayAction - : public virtual ::ACS::Callback - { - public: - friend class TAO::Narrow_Utils; - typedef AlarmTASOneWayAction_ptr _ptr_type; - typedef AlarmTASOneWayAction_var _var_type; - typedef AlarmTASOneWayAction_out _out_type; - - // The static operations. - static AlarmTASOneWayAction_ptr _duplicate (AlarmTASOneWayAction_ptr obj); - - static void _tao_release (AlarmTASOneWayAction_ptr obj); - - static AlarmTASOneWayAction_ptr _narrow (::CORBA::Object_ptr obj); - static AlarmTASOneWayAction_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static AlarmTASOneWayAction_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void alarm_raised ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void alarm_cleared ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_AlarmTASOneWayAction_Proxy_Broker_; - - protected: - // Concrete interface only. - AlarmTASOneWayAction (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_AlarmTASOneWayAction_setup_collocation (void); - - // Concrete non-local interface only. - AlarmTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - AlarmTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~AlarmTASOneWayAction (void); - - private: - // Private and unimplemented for concrete interfaces. - AlarmTASOneWayAction (const AlarmTASOneWayAction &); - - void operator= (const AlarmTASOneWayAction &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_AlarmTASOneWayAction; - - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:330 - - typedef AlarmTASOneWayAction TASOneWayActionAlarm; - typedef AlarmTASOneWayAction_ptr TASOneWayActionAlarm_ptr; - typedef AlarmTASOneWayAction_var TASOneWayActionAlarm_var; - typedef AlarmTASOneWayAction_out TASOneWayActionAlarm_out; - - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASOneWayActionAlarm; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_PTASONEWAYACTION__VAR_OUT_CH_) -#define _ACTIVESURFACE_PTASONEWAYACTION__VAR_OUT_CH_ - - class PTASOneWayAction; - typedef PTASOneWayAction *PTASOneWayAction_ptr; - - typedef - TAO_Objref_Var_T< - PTASOneWayAction - > - PTASOneWayAction_var; - - typedef - TAO_Objref_Out_T< - PTASOneWayAction - > - PTASOneWayAction_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_PTASONEWAYACTION_CH_) -#define _ACTIVESURFACE_PTASONEWAYACTION_CH_ - - class PTASOneWayAction - : public virtual ::ACS::TypelessProperty - { - public: - friend class TAO::Narrow_Utils; - typedef PTASOneWayAction_ptr _ptr_type; - typedef PTASOneWayAction_var _var_type; - typedef PTASOneWayAction_out _out_type; - - // The static operations. - static PTASOneWayAction_ptr _duplicate (PTASOneWayAction_ptr obj); - - static void _tao_release (PTASOneWayAction_ptr obj); - - static PTASOneWayAction_ptr _narrow (::CORBA::Object_ptr obj); - static PTASOneWayAction_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static PTASOneWayAction_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASOneWayAction get_sync ( - ::ACSErr::Completion_out c); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Long get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASOneWayActionSeq_out vs, - ::ACS::TimeSeq_out ts); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Monitorpattern_ptr create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Monitor_ptr create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::TimeInterval default_timer_trigger ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::TimeInterval min_timer_trigger ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASOneWayAction default_value ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::stringSeq * statesDescription ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::ConditionSeq * condition ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASOneWayActionSeq * allStates ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_PTASOneWayAction_Proxy_Broker_; - - protected: - // Concrete interface only. - PTASOneWayAction (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_PTASOneWayAction_setup_collocation (void); - - // Concrete non-local interface only. - PTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - PTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~PTASOneWayAction (void); - - private: - // Private and unimplemented for concrete interfaces. - PTASOneWayAction (const PTASOneWayAction &); - - void operator= (const PTASOneWayAction &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_PTASOneWayAction; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_ROTASONEWAYACTION__VAR_OUT_CH_) -#define _ACTIVESURFACE_ROTASONEWAYACTION__VAR_OUT_CH_ - - class ROTASOneWayAction; - typedef ROTASOneWayAction *ROTASOneWayAction_ptr; - - typedef - TAO_Objref_Var_T< - ROTASOneWayAction - > - ROTASOneWayAction_var; - - typedef - TAO_Objref_Out_T< - ROTASOneWayAction - > - ROTASOneWayAction_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_ROTASONEWAYACTION_CH_) -#define _ACTIVESURFACE_ROTASONEWAYACTION_CH_ - - class ROTASOneWayAction - : public virtual ::ActiveSurface::PTASOneWayAction - { - public: - friend class TAO::Narrow_Utils; - typedef ROTASOneWayAction_ptr _ptr_type; - typedef ROTASOneWayAction_var _var_type; - typedef ROTASOneWayAction_out _out_type; - - // The static operations. - static ROTASOneWayAction_ptr _duplicate (ROTASOneWayAction_ptr obj); - - static void _tao_release (ROTASOneWayAction_ptr obj); - - static ROTASOneWayAction_ptr _narrow (::CORBA::Object_ptr obj); - static ROTASOneWayAction_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static ROTASOneWayAction_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Subscription_ptr new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASOneWayActionSeq * alarm_on ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASOneWayActionSeq * alarm_off ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_ROTASOneWayAction_Proxy_Broker_; - - protected: - // Concrete interface only. - ROTASOneWayAction (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_ROTASOneWayAction_setup_collocation (void); - - // Concrete non-local interface only. - ROTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - ROTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~ROTASOneWayAction (void); - - private: - // Private and unimplemented for concrete interfaces. - ROTASOneWayAction (const ROTASOneWayAction &); - - void operator= (const ROTASOneWayAction &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_ROTASOneWayAction; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_RWTASONEWAYACTION__VAR_OUT_CH_) -#define _ACTIVESURFACE_RWTASONEWAYACTION__VAR_OUT_CH_ - - class RWTASOneWayAction; - typedef RWTASOneWayAction *RWTASOneWayAction_ptr; - - typedef - TAO_Objref_Var_T< - RWTASOneWayAction - > - RWTASOneWayAction_var; - - typedef - TAO_Objref_Out_T< - RWTASOneWayAction - > - RWTASOneWayAction_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_RWTASONEWAYACTION_CH_) -#define _ACTIVESURFACE_RWTASONEWAYACTION_CH_ - - class RWTASOneWayAction - : public virtual ::ActiveSurface::PTASOneWayAction - { - public: - friend class TAO::Narrow_Utils; - typedef RWTASOneWayAction_ptr _ptr_type; - typedef RWTASOneWayAction_var _var_type; - typedef RWTASOneWayAction_out _out_type; - - // The static operations. - static RWTASOneWayAction_ptr _duplicate (RWTASOneWayAction_ptr obj); - - static void _tao_release (RWTASOneWayAction_ptr obj); - - static RWTASOneWayAction_ptr _narrow (::CORBA::Object_ptr obj); - static RWTASOneWayAction_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static RWTASOneWayAction_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACSErr::Completion * set_sync ( - ::ActiveSurface::TASOneWayAction value); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void set_async ( - ::ActiveSurface::TASOneWayAction value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void set_nonblocking ( - ::ActiveSurface::TASOneWayAction value); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_RWTASOneWayAction_Proxy_Broker_; - - protected: - // Concrete interface only. - RWTASOneWayAction (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_RWTASOneWayAction_setup_collocation (void); - - // Concrete non-local interface only. - RWTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - RWTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~RWTASOneWayAction (void); - - private: - // Private and unimplemented for concrete interfaces. - RWTASOneWayAction (const RWTASOneWayAction &); - - void operator= (const RWTASOneWayAction &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_RWTASOneWayAction; - - // TAO_IDL - Generated from - // be/be_visitor_enum/enum_ch.cpp:57 - - enum TASProfile - { - AS_SHAPED, - AS_SHAPED_FIXED, - AS_PARABOLIC, - AS_PARABOLIC_FIXED - }; - - typedef TASProfile &TASProfile_out; - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASProfile; - - // TAO_IDL - Generated from - // be/be_visitor_sequence/sequence_ch.cpp:107 - -#if !defined (_ACTIVESURFACE_TASPROFILESEQ_CH_) -#define _ACTIVESURFACE_TASPROFILESEQ_CH_ - - class TASProfileSeq; - - typedef - TAO_FixedSeq_Var_T< - TASProfileSeq - > - TASProfileSeq_var; - - typedef - TAO_Seq_Out_T< - TASProfileSeq - > - TASProfileSeq_out; - - class TASProfileSeq - : public - TAO::unbounded_value_sequence< - TASProfile - > - { - public: - TASProfileSeq (void); - TASProfileSeq ( ::CORBA::ULong max); - TASProfileSeq ( - ::CORBA::ULong max, - ::CORBA::ULong length, - TASProfile* buffer, - ::CORBA::Boolean release = false - ); - TASProfileSeq (const TASProfileSeq &); - virtual ~TASProfileSeq (void); - - static void _tao_any_destructor (void *); - - typedef TASProfileSeq_var _var_type; - typedef TASProfileSeq_out _out_type; - - - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASProfileSeq; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_CBTASPROFILE__VAR_OUT_CH_) -#define _ACTIVESURFACE_CBTASPROFILE__VAR_OUT_CH_ - - class CBTASProfile; - typedef CBTASProfile *CBTASProfile_ptr; - - typedef - TAO_Objref_Var_T< - CBTASProfile - > - CBTASProfile_var; - - typedef - TAO_Objref_Out_T< - CBTASProfile - > - CBTASProfile_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_CBTASPROFILE_CH_) -#define _ACTIVESURFACE_CBTASPROFILE_CH_ - - class CBTASProfile - : public virtual ::ACS::Callback - { - public: - friend class TAO::Narrow_Utils; - typedef CBTASProfile_ptr _ptr_type; - typedef CBTASProfile_var _var_type; - typedef CBTASProfile_out _out_type; - - // The static operations. - static CBTASProfile_ptr _duplicate (CBTASProfile_ptr obj); - - static void _tao_release (CBTASProfile_ptr obj); - - static CBTASProfile_ptr _narrow (::CORBA::Object_ptr obj); - static CBTASProfile_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static CBTASProfile_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void working ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void done ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_CBTASProfile_Proxy_Broker_; - - protected: - // Concrete interface only. - CBTASProfile (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_CBTASProfile_setup_collocation (void); - - // Concrete non-local interface only. - CBTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - CBTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~CBTASProfile (void); - - private: - // Private and unimplemented for concrete interfaces. - CBTASProfile (const CBTASProfile &); - - void operator= (const CBTASProfile &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_CBTASProfile; - - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:330 - - typedef CBTASProfile TASProfileCB; - typedef CBTASProfile_ptr TASProfileCB_ptr; - typedef CBTASProfile_var TASProfileCB_var; - typedef CBTASProfile_out TASProfileCB_out; - - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASProfileCB; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_ALARMTASPROFILE__VAR_OUT_CH_) -#define _ACTIVESURFACE_ALARMTASPROFILE__VAR_OUT_CH_ - - class AlarmTASProfile; - typedef AlarmTASProfile *AlarmTASProfile_ptr; - - typedef - TAO_Objref_Var_T< - AlarmTASProfile - > - AlarmTASProfile_var; - - typedef - TAO_Objref_Out_T< - AlarmTASProfile - > - AlarmTASProfile_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_ALARMTASPROFILE_CH_) -#define _ACTIVESURFACE_ALARMTASPROFILE_CH_ - - class AlarmTASProfile - : public virtual ::ACS::Callback - { - public: - friend class TAO::Narrow_Utils; - typedef AlarmTASProfile_ptr _ptr_type; - typedef AlarmTASProfile_var _var_type; - typedef AlarmTASProfile_out _out_type; - - // The static operations. - static AlarmTASProfile_ptr _duplicate (AlarmTASProfile_ptr obj); - - static void _tao_release (AlarmTASProfile_ptr obj); - - static AlarmTASProfile_ptr _narrow (::CORBA::Object_ptr obj); - static AlarmTASProfile_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static AlarmTASProfile_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void alarm_raised ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void alarm_cleared ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_AlarmTASProfile_Proxy_Broker_; - - protected: - // Concrete interface only. - AlarmTASProfile (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_AlarmTASProfile_setup_collocation (void); - - // Concrete non-local interface only. - AlarmTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - AlarmTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~AlarmTASProfile (void); - - private: - // Private and unimplemented for concrete interfaces. - AlarmTASProfile (const AlarmTASProfile &); - - void operator= (const AlarmTASProfile &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_AlarmTASProfile; - - // TAO_IDL - Generated from - // be/be_visitor_typedef/typedef_ch.cpp:330 - - typedef AlarmTASProfile TASProfileAlarm; - typedef AlarmTASProfile_ptr TASProfileAlarm_ptr; - typedef AlarmTASProfile_var TASProfileAlarm_var; - typedef AlarmTASProfile_out TASProfileAlarm_out; - - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_TASProfileAlarm; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_PTASPROFILE__VAR_OUT_CH_) -#define _ACTIVESURFACE_PTASPROFILE__VAR_OUT_CH_ - - class PTASProfile; - typedef PTASProfile *PTASProfile_ptr; - - typedef - TAO_Objref_Var_T< - PTASProfile - > - PTASProfile_var; - - typedef - TAO_Objref_Out_T< - PTASProfile - > - PTASProfile_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_PTASPROFILE_CH_) -#define _ACTIVESURFACE_PTASPROFILE_CH_ - - class PTASProfile - : public virtual ::ACS::TypelessProperty - { - public: - friend class TAO::Narrow_Utils; - typedef PTASProfile_ptr _ptr_type; - typedef PTASProfile_var _var_type; - typedef PTASProfile_out _out_type; - - // The static operations. - static PTASProfile_ptr _duplicate (PTASProfile_ptr obj); - - static void _tao_release (PTASProfile_ptr obj); - - static PTASProfile_ptr _narrow (::CORBA::Object_ptr obj); - static PTASProfile_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static PTASProfile_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASProfile get_sync ( - ::ACSErr::Completion_out c); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::CORBA::Long get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASProfileSeq_out vs, - ::ACS::TimeSeq_out ts); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Monitorpattern_ptr create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Monitor_ptr create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::TimeInterval default_timer_trigger ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::TimeInterval min_timer_trigger ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASProfile default_value ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::stringSeq * statesDescription ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::ConditionSeq * condition ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASProfileSeq * allStates ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_PTASProfile_Proxy_Broker_; - - protected: - // Concrete interface only. - PTASProfile (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_PTASProfile_setup_collocation (void); - - // Concrete non-local interface only. - PTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - PTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~PTASProfile (void); - - private: - // Private and unimplemented for concrete interfaces. - PTASProfile (const PTASProfile &); - - void operator= (const PTASProfile &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_PTASProfile; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE__VAR_OUT_CH_) -#define _ACTIVESURFACE_ROTASPROFILE__VAR_OUT_CH_ - - class ROTASProfile; - typedef ROTASProfile *ROTASProfile_ptr; - - typedef - TAO_Objref_Var_T< - ROTASProfile - > - ROTASProfile_var; - - typedef - TAO_Objref_Out_T< - ROTASProfile - > - ROTASProfile_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE_CH_) -#define _ACTIVESURFACE_ROTASPROFILE_CH_ - - class ROTASProfile - : public virtual ::ActiveSurface::PTASProfile - { - public: - friend class TAO::Narrow_Utils; - typedef ROTASProfile_ptr _ptr_type; - typedef ROTASProfile_var _var_type; - typedef ROTASProfile_out _out_type; - - // The static operations. - static ROTASProfile_ptr _duplicate (ROTASProfile_ptr obj); - - static void _tao_release (ROTASProfile_ptr obj); - - static ROTASProfile_ptr _narrow (::CORBA::Object_ptr obj); - static ROTASProfile_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static ROTASProfile_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACS::Subscription_ptr new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASProfileSeq * alarm_on ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::TASProfileSeq * alarm_off ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_ROTASProfile_Proxy_Broker_; - - protected: - // Concrete interface only. - ROTASProfile (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_ROTASProfile_setup_collocation (void); - - // Concrete non-local interface only. - ROTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - ROTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~ROTASProfile (void); - - private: - // Private and unimplemented for concrete interfaces. - ROTASProfile (const ROTASProfile &); - - void operator= (const ROTASProfile &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_ROTASProfile; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_RWTASPROFILE__VAR_OUT_CH_) -#define _ACTIVESURFACE_RWTASPROFILE__VAR_OUT_CH_ - - class RWTASProfile; - typedef RWTASProfile *RWTASProfile_ptr; - - typedef - TAO_Objref_Var_T< - RWTASProfile - > - RWTASProfile_var; - - typedef - TAO_Objref_Out_T< - RWTASProfile - > - RWTASProfile_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_RWTASPROFILE_CH_) -#define _ACTIVESURFACE_RWTASPROFILE_CH_ - - class RWTASProfile - : public virtual ::ActiveSurface::PTASProfile - { - public: - friend class TAO::Narrow_Utils; - typedef RWTASProfile_ptr _ptr_type; - typedef RWTASProfile_var _var_type; - typedef RWTASProfile_out _out_type; - - // The static operations. - static RWTASProfile_ptr _duplicate (RWTASProfile_ptr obj); - - static void _tao_release (RWTASProfile_ptr obj); - - static RWTASProfile_ptr _narrow (::CORBA::Object_ptr obj); - static RWTASProfile_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static RWTASProfile_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ACSErr::Completion * set_sync ( - ::ActiveSurface::TASProfile value); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void set_async ( - ::ActiveSurface::TASProfile value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void set_nonblocking ( - ::ActiveSurface::TASProfile value); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_RWTASProfile_Proxy_Broker_; - - protected: - // Concrete interface only. - RWTASProfile (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_RWTASProfile_setup_collocation (void); - - // Concrete non-local interface only. - RWTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - RWTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~RWTASProfile (void); - - private: - // Private and unimplemented for concrete interfaces. - RWTASProfile (const RWTASProfile &); - - void operator= (const RWTASProfile &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_RWTASProfile; - - // TAO_IDL - Generated from - // be/be_interface.cpp:644 - -#if !defined (_ACTIVESURFACE_NOTOACTIVESURFACEBOSS__VAR_OUT_CH_) -#define _ACTIVESURFACE_NOTOACTIVESURFACEBOSS__VAR_OUT_CH_ - - class NotoActiveSurfaceBoss; - typedef NotoActiveSurfaceBoss *NotoActiveSurfaceBoss_ptr; - - typedef - TAO_Objref_Var_T< - NotoActiveSurfaceBoss - > - NotoActiveSurfaceBoss_var; - - typedef - TAO_Objref_Out_T< - NotoActiveSurfaceBoss - > - NotoActiveSurfaceBoss_out; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:54 - -#if !defined (_ACTIVESURFACE_NOTOACTIVESURFACEBOSS_CH_) -#define _ACTIVESURFACE_NOTOACTIVESURFACEBOSS_CH_ - - class NotoActiveSurfaceBoss - : public virtual ::ActiveSurface::ActiveSurfaceBoss - { - public: - friend class TAO::Narrow_Utils; - typedef NotoActiveSurfaceBoss_ptr _ptr_type; - typedef NotoActiveSurfaceBoss_var _var_type; - typedef NotoActiveSurfaceBoss_out _out_type; - - // The static operations. - static NotoActiveSurfaceBoss_ptr _duplicate (NotoActiveSurfaceBoss_ptr obj); - - static void _tao_release (NotoActiveSurfaceBoss_ptr obj); - - static NotoActiveSurfaceBoss_ptr _narrow (::CORBA::Object_ptr obj); - static NotoActiveSurfaceBoss_ptr _unchecked_narrow (::CORBA::Object_ptr obj); - static NotoActiveSurfaceBoss_ptr _nil (void) - { - return static_cast (0); - } - - static void _tao_any_destructor (void *); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::Management::ROTBoolean_ptr enabled ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::ActiveSurface::ROTASProfile_ptr pprofile ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual ::Management::ROTBoolean_ptr tracking ( - void); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void stop ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void stow ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void refPos ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void update ( - ::CORBA::Double elevation); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void move ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Long incr); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void correction ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Double correction); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void setProfile ( - ::ActiveSurface::TASProfile profile); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void usdStatus4GUIClient ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out status); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void setActuator ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out actPos, - ::CORBA::Long_out cmdPos, - ::CORBA::Long_out Fmin, - ::CORBA::Long_out Fmax, - ::CORBA::Long_out acc, - ::CORBA::Long_out delay); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void up ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void down ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void bottom ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void top ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void reset ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void recoverUSD ( - ::CORBA::Long circle, - ::CORBA::Long actuator); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void calibrate ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_ch.cpp:46 - - virtual void calVer ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius); - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_ch.cpp:216 - - virtual ::CORBA::Boolean _is_a (const char *type_id); - virtual const char* _interface_repository_id (void) const; - virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); - private: - TAO::Collocation_Proxy_Broker *the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_; - - protected: - // Concrete interface only. - NotoActiveSurfaceBoss (void); - - // These methods travese the inheritance tree and set the - // parents piece of the given class in the right mode. - virtual void ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (void); - - // Concrete non-local interface only. - NotoActiveSurfaceBoss ( - IOP::IOR *ior, - TAO_ORB_Core *orb_core = 0); - - // Non-local interface only. - NotoActiveSurfaceBoss ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated = false, - TAO_Abstract_ServantBase *servant = 0, - TAO_ORB_Core *orb_core = 0); - - virtual ~NotoActiveSurfaceBoss (void); - - private: - // Private and unimplemented for concrete interfaces. - NotoActiveSurfaceBoss (const NotoActiveSurfaceBoss &); - - void operator= (const NotoActiveSurfaceBoss &); - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_typecode/typecode_decl.cpp:49 - - extern ::CORBA::TypeCode_ptr const _tc_NotoActiveSurfaceBoss; - -// TAO_IDL - Generated from -// be/be_visitor_module/module_ch.cpp:78 - -} // module ActiveSurface - -// Proxy Broker Factory function pointer declarations. - -// TAO_IDL - Generated from -// be/be_visitor_root/root.cpp:139 - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -extern -TAO::Collocation_Proxy_Broker * -(*ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer) ( - ::CORBA::Object_ptr obj - ); - -// TAO_IDL - Generated from -// be/be_visitor_traits.cpp:64 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -// Traits specializations. -namespace TAO -{ - -#if !defined (_ACTIVESURFACE_CBTASONEWAYACTION__TRAITS_) -#define _ACTIVESURFACE_CBTASONEWAYACTION__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::CBTASOneWayAction> - { - static ::ActiveSurface::CBTASOneWayAction_ptr duplicate ( - ::ActiveSurface::CBTASOneWayAction_ptr p - ); - static void release ( - ::ActiveSurface::CBTASOneWayAction_ptr p - ); - static ::ActiveSurface::CBTASOneWayAction_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::CBTASOneWayAction_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_ALARMTASONEWAYACTION__TRAITS_) -#define _ACTIVESURFACE_ALARMTASONEWAYACTION__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::AlarmTASOneWayAction> - { - static ::ActiveSurface::AlarmTASOneWayAction_ptr duplicate ( - ::ActiveSurface::AlarmTASOneWayAction_ptr p - ); - static void release ( - ::ActiveSurface::AlarmTASOneWayAction_ptr p - ); - static ::ActiveSurface::AlarmTASOneWayAction_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::AlarmTASOneWayAction_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_PTASONEWAYACTION__TRAITS_) -#define _ACTIVESURFACE_PTASONEWAYACTION__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::PTASOneWayAction> - { - static ::ActiveSurface::PTASOneWayAction_ptr duplicate ( - ::ActiveSurface::PTASOneWayAction_ptr p - ); - static void release ( - ::ActiveSurface::PTASOneWayAction_ptr p - ); - static ::ActiveSurface::PTASOneWayAction_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::PTASOneWayAction_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_ROTASONEWAYACTION__TRAITS_) -#define _ACTIVESURFACE_ROTASONEWAYACTION__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::ROTASOneWayAction> - { - static ::ActiveSurface::ROTASOneWayAction_ptr duplicate ( - ::ActiveSurface::ROTASOneWayAction_ptr p - ); - static void release ( - ::ActiveSurface::ROTASOneWayAction_ptr p - ); - static ::ActiveSurface::ROTASOneWayAction_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::ROTASOneWayAction_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_RWTASONEWAYACTION__TRAITS_) -#define _ACTIVESURFACE_RWTASONEWAYACTION__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::RWTASOneWayAction> - { - static ::ActiveSurface::RWTASOneWayAction_ptr duplicate ( - ::ActiveSurface::RWTASOneWayAction_ptr p - ); - static void release ( - ::ActiveSurface::RWTASOneWayAction_ptr p - ); - static ::ActiveSurface::RWTASOneWayAction_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::RWTASOneWayAction_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_CBTASPROFILE__TRAITS_) -#define _ACTIVESURFACE_CBTASPROFILE__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::CBTASProfile> - { - static ::ActiveSurface::CBTASProfile_ptr duplicate ( - ::ActiveSurface::CBTASProfile_ptr p - ); - static void release ( - ::ActiveSurface::CBTASProfile_ptr p - ); - static ::ActiveSurface::CBTASProfile_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::CBTASProfile_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_ALARMTASPROFILE__TRAITS_) -#define _ACTIVESURFACE_ALARMTASPROFILE__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::AlarmTASProfile> - { - static ::ActiveSurface::AlarmTASProfile_ptr duplicate ( - ::ActiveSurface::AlarmTASProfile_ptr p - ); - static void release ( - ::ActiveSurface::AlarmTASProfile_ptr p - ); - static ::ActiveSurface::AlarmTASProfile_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::AlarmTASProfile_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_PTASPROFILE__TRAITS_) -#define _ACTIVESURFACE_PTASPROFILE__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::PTASProfile> - { - static ::ActiveSurface::PTASProfile_ptr duplicate ( - ::ActiveSurface::PTASProfile_ptr p - ); - static void release ( - ::ActiveSurface::PTASProfile_ptr p - ); - static ::ActiveSurface::PTASProfile_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::PTASProfile_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_ROTASPROFILE__TRAITS_) -#define _ACTIVESURFACE_ROTASPROFILE__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::ROTASProfile> - { - static ::ActiveSurface::ROTASProfile_ptr duplicate ( - ::ActiveSurface::ROTASProfile_ptr p - ); - static void release ( - ::ActiveSurface::ROTASProfile_ptr p - ); - static ::ActiveSurface::ROTASProfile_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::ROTASProfile_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_RWTASPROFILE__TRAITS_) -#define _ACTIVESURFACE_RWTASPROFILE__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::RWTASProfile> - { - static ::ActiveSurface::RWTASProfile_ptr duplicate ( - ::ActiveSurface::RWTASProfile_ptr p - ); - static void release ( - ::ActiveSurface::RWTASProfile_ptr p - ); - static ::ActiveSurface::RWTASProfile_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::RWTASProfile_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ - -#if !defined (_ACTIVESURFACE_NOTOACTIVESURFACEBOSS__TRAITS_) -#define _ACTIVESURFACE_NOTOACTIVESURFACEBOSS__TRAITS_ - - template<> - struct Objref_Traits< ::ActiveSurface::NotoActiveSurfaceBoss> - { - static ::ActiveSurface::NotoActiveSurfaceBoss_ptr duplicate ( - ::ActiveSurface::NotoActiveSurfaceBoss_ptr p - ); - static void release ( - ::ActiveSurface::NotoActiveSurfaceBoss_ptr p - ); - static ::ActiveSurface::NotoActiveSurfaceBoss_ptr nil (void); - static ::CORBA::Boolean marshal ( - const ::ActiveSurface::NotoActiveSurfaceBoss_ptr p, - TAO_OutputCDR & cdr - ); - }; - -#endif /* end #if !defined */ -} -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_enum/any_op_ch.cpp:52 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - void operator<<= (::CORBA::Any &, ActiveSurface::TASOneWayAction); - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::TASOneWayAction &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:53 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= ( ::CORBA::Any &, const ActiveSurface::TASOneWayActionSeq &); // copying version - void operator<<= ( ::CORBA::Any &, ActiveSurface::TASOneWayActionSeq*); // noncopying version - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::TASOneWayActionSeq *&); // deprecated - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ActiveSurface::TASOneWayActionSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, CBTASOneWayAction_ptr); // copying - void operator<<= ( ::CORBA::Any &, CBTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CBTASOneWayAction_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::CBTASOneWayAction_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::CBTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::CBTASOneWayAction_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, AlarmTASOneWayAction_ptr); // copying - void operator<<= ( ::CORBA::Any &, AlarmTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, AlarmTASOneWayAction_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::AlarmTASOneWayAction_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::AlarmTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::AlarmTASOneWayAction_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, PTASOneWayAction_ptr); // copying - void operator<<= ( ::CORBA::Any &, PTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, PTASOneWayAction_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::PTASOneWayAction_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::PTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::PTASOneWayAction_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, ROTASOneWayAction_ptr); // copying - void operator<<= ( ::CORBA::Any &, ROTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ROTASOneWayAction_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::ROTASOneWayAction_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::ROTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::ROTASOneWayAction_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, RWTASOneWayAction_ptr); // copying - void operator<<= ( ::CORBA::Any &, RWTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RWTASOneWayAction_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::RWTASOneWayAction_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::RWTASOneWayAction_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::RWTASOneWayAction_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_enum/any_op_ch.cpp:52 -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - void operator<<= (::CORBA::Any &, ActiveSurface::TASProfile); - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::TASProfile &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/any_op_ch.cpp:53 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= ( ::CORBA::Any &, const ActiveSurface::TASProfileSeq &); // copying version - void operator<<= ( ::CORBA::Any &, ActiveSurface::TASProfileSeq*); // noncopying version - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::TASProfileSeq *&); // deprecated - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ActiveSurface::TASProfileSeq *&); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, CBTASProfile_ptr); // copying - void operator<<= ( ::CORBA::Any &, CBTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, CBTASProfile_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::CBTASProfile_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::CBTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::CBTASProfile_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, AlarmTASProfile_ptr); // copying - void operator<<= ( ::CORBA::Any &, AlarmTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, AlarmTASProfile_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::AlarmTASProfile_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::AlarmTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::AlarmTASProfile_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, PTASProfile_ptr); // copying - void operator<<= ( ::CORBA::Any &, PTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, PTASProfile_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::PTASProfile_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::PTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::PTASProfile_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, ROTASProfile_ptr); // copying - void operator<<= ( ::CORBA::Any &, ROTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ROTASProfile_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::ROTASProfile_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::ROTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::ROTASProfile_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, RWTASProfile_ptr); // copying - void operator<<= ( ::CORBA::Any &, RWTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, RWTASProfile_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::RWTASProfile_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::RWTASProfile_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::RWTASProfile_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_interface/any_op_ch.cpp:54 - - - -#if defined (ACE_ANY_OPS_USE_NAMESPACE) - -namespace ActiveSurface -{ - void operator<<= ( ::CORBA::Any &, NotoActiveSurfaceBoss_ptr); // copying - void operator<<= ( ::CORBA::Any &, NotoActiveSurfaceBoss_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, NotoActiveSurfaceBoss_ptr &); -} - -#else - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - void operator<<= (::CORBA::Any &, ActiveSurface::NotoActiveSurfaceBoss_ptr); // copying - void operator<<= (::CORBA::Any &, ActiveSurface::NotoActiveSurfaceBoss_ptr *); // non-copying - ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ActiveSurface::NotoActiveSurfaceBoss_ptr &); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif - -// TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_ch.cpp:50 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &strm, ActiveSurface::TASOneWayAction _tao_enumerator); - ::CORBA::Boolean operator>> (TAO_InputCDR &strm, ActiveSurface::TASOneWayAction &_tao_enumerator); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_H_ -#define _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_H_ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - ::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::TASOneWayActionSeq &_tao_sequence - ); - ::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::TASOneWayActionSeq &_tao_sequence - ); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif /* _TAO_CDR_OP_ActiveSurface_TASOneWayActionSeq_H_ */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::CBTASOneWayAction_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::CBTASOneWayAction_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::AlarmTASOneWayAction_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::AlarmTASOneWayAction_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::PTASOneWayAction_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::PTASOneWayAction_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::ROTASOneWayAction_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::ROTASOneWayAction_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::RWTASOneWayAction_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::RWTASOneWayAction_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_enum/cdr_op_ch.cpp:50 - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &strm, ActiveSurface::TASProfile _tao_enumerator); - ::CORBA::Boolean operator>> (TAO_InputCDR &strm, ActiveSurface::TASProfile &_tao_enumerator); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_sequence/cdr_op_ch.cpp:71 - -#if !defined _TAO_CDR_OP_ActiveSurface_TASProfileSeq_H_ -#define _TAO_CDR_OP_ActiveSurface_TASProfileSeq_H_ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - - - ::CORBA::Boolean operator<< ( - TAO_OutputCDR &strm, - const ActiveSurface::TASProfileSeq &_tao_sequence - ); - ::CORBA::Boolean operator>> ( - TAO_InputCDR &strm, - ActiveSurface::TASProfileSeq &_tao_sequence - ); -TAO_END_VERSIONED_NAMESPACE_DECL - - - -#endif /* _TAO_CDR_OP_ActiveSurface_TASProfileSeq_H_ */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::CBTASProfile_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::CBTASProfile_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::AlarmTASProfile_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::AlarmTASProfile_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::PTASProfile_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::PTASProfile_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::ROTASProfile_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::ROTASProfile_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::RWTASProfile_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::RWTASProfile_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/cdr_op_ch.cpp:55 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ActiveSurface::NotoActiveSurfaceBoss_ptr ); - ::CORBA::Boolean operator>> (TAO_InputCDR &, ActiveSurface::NotoActiveSurfaceBoss_ptr &); - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1226 -#if defined (__ACE_INLINE__) -#include "NotoActiveSurfaceBossC.inl" -#endif /* defined INLINE */ - -#endif /* ifndef */ - - diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.inl b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.inl deleted file mode 100644 index 0a6bef02f..000000000 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.inl +++ /dev/null @@ -1,369 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.5 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_CBTASONEWAYACTION___CI_) -#define _ACTIVESURFACE_CBTASONEWAYACTION___CI_ - -ACE_INLINE -ActiveSurface::CBTASOneWayAction::CBTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_CBTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_CBTASOneWayAction_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::CBTASOneWayAction::CBTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_CBTASOneWayAction_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_ALARMTASONEWAYACTION___CI_) -#define _ACTIVESURFACE_ALARMTASONEWAYACTION___CI_ - -ACE_INLINE -ActiveSurface::AlarmTASOneWayAction::AlarmTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_AlarmTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_AlarmTASOneWayAction_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::AlarmTASOneWayAction::AlarmTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_AlarmTASOneWayAction_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_PTASONEWAYACTION___CI_) -#define _ACTIVESURFACE_PTASONEWAYACTION___CI_ - -ACE_INLINE -ActiveSurface::PTASOneWayAction::PTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_PTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_PTASOneWayAction_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::PTASOneWayAction::PTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_PTASOneWayAction_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_ROTASONEWAYACTION___CI_) -#define _ACTIVESURFACE_ROTASONEWAYACTION___CI_ - -ACE_INLINE -ActiveSurface::ROTASOneWayAction::ROTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_ROTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_ROTASOneWayAction_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::ROTASOneWayAction::ROTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_ROTASOneWayAction_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_RWTASONEWAYACTION___CI_) -#define _ACTIVESURFACE_RWTASONEWAYACTION___CI_ - -ACE_INLINE -ActiveSurface::RWTASOneWayAction::RWTASOneWayAction ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_RWTASOneWayAction_Proxy_Broker_ (0) -{ - this->ActiveSurface_RWTASOneWayAction_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::RWTASOneWayAction::RWTASOneWayAction ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_RWTASOneWayAction_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_CBTASPROFILE___CI_) -#define _ACTIVESURFACE_CBTASPROFILE___CI_ - -ACE_INLINE -ActiveSurface::CBTASProfile::CBTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_CBTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_CBTASProfile_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::CBTASProfile::CBTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_CBTASProfile_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_ALARMTASPROFILE___CI_) -#define _ACTIVESURFACE_ALARMTASPROFILE___CI_ - -ACE_INLINE -ActiveSurface::AlarmTASProfile::AlarmTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_AlarmTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_AlarmTASProfile_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::AlarmTASProfile::AlarmTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_AlarmTASProfile_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_PTASPROFILE___CI_) -#define _ACTIVESURFACE_PTASPROFILE___CI_ - -ACE_INLINE -ActiveSurface::PTASProfile::PTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_PTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_PTASProfile_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::PTASProfile::PTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_PTASProfile_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE___CI_) -#define _ACTIVESURFACE_ROTASPROFILE___CI_ - -ACE_INLINE -ActiveSurface::ROTASProfile::ROTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_ROTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_ROTASProfile_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::ROTASProfile::ROTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_ROTASProfile_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_RWTASPROFILE___CI_) -#define _ACTIVESURFACE_RWTASPROFILE___CI_ - -ACE_INLINE -ActiveSurface::RWTASProfile::RWTASProfile ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_RWTASProfile_Proxy_Broker_ (0) -{ - this->ActiveSurface_RWTASProfile_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::RWTASProfile::RWTASProfile ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_RWTASProfile_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ci.cpp:70 - -#if !defined (_ACTIVESURFACE_NOTOACTIVESURFACEBOSS___CI_) -#define _ACTIVESURFACE_NOTOACTIVESURFACEBOSS___CI_ - -ACE_INLINE -ActiveSurface::NotoActiveSurfaceBoss::NotoActiveSurfaceBoss ( - TAO_Stub *objref, - ::CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (objref, _tao_collocated, servant, oc), - the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ (0) -{ - this->ActiveSurface_NotoActiveSurfaceBoss_setup_collocation (); -} - -ACE_INLINE -ActiveSurface::NotoActiveSurfaceBoss::NotoActiveSurfaceBoss ( - IOP::IOR *ior, - TAO_ORB_Core *oc - ) - : ::CORBA::Object (ior, oc) - , the_TAO_NotoActiveSurfaceBoss_Proxy_Broker_ (0) -{ -} - -#endif /* end #if !defined */ - diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.cpp b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.cpp deleted file mode 100644 index b23c68bbe..000000000 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.cpp +++ /dev/null @@ -1,13663 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.5 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - - -// TAO_IDL - Generated from -// be/be_codegen.cpp:703 - -#ifndef _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSS_CPP_ -#define _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSS_CPP_ - - -#include "NotoActiveSurfaceBossS.h" -#include "tao/PortableServer/Operation_Table_Perfect_Hash.h" -#include "tao/PortableServer/Upcall_Command.h" -#include "tao/PortableServer/Upcall_Wrapper.h" -#include "tao/TAO_Server_Request.h" -#include "tao/ORB_Core.h" -#include "tao/Profile.h" -#include "tao/Stub.h" -#include "tao/IFR_Client_Adapter.h" -#include "tao/Object_T.h" -#include "tao/AnyTypeCode/TypeCode.h" -#include "tao/AnyTypeCode/DynamicC.h" -#include "tao/CDR.h" -#include "tao/operation_details.h" -#include "tao/PortableInterceptor.h" -#include "tao/PortableServer/Basic_SArguments.h" -#include "tao/PortableServer/Fixed_Size_SArgument_T.h" -#include "tao/PortableServer/Object_SArgument_T.h" -#include "tao/PortableServer/Special_Basic_SArguments.h" -#include "tao/PortableServer/UB_String_SArguments.h" -#include "tao/PortableServer/Var_Size_SArgument_T.h" -#include "tao/PortableServer/TypeCode_SArg_Traits.h" -#include "tao/PortableServer/Object_SArg_Traits.h" -#include "tao/PortableServer/get_arg.h" -#include "tao/Special_Basic_Arguments.h" -#include "tao/UB_String_Arguments.h" -#include "tao/Basic_Arguments.h" -#include "tao/Fixed_Size_Argument_T.h" -#include "tao/Object_Argument_T.h" -#include "tao/Var_Size_Argument_T.h" -#include "ace/Dynamic_Service.h" -#include "ace/Malloc_Allocator.h" - -#if !defined (__ACE_INLINE__) -#include "NotoActiveSurfaceBossS.inl" -#endif /* !defined INLINE */ - -// TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:73 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - -// Arg traits specializations. -namespace TAO -{ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_STRINGSEQ__SARG_TRAITS_) -#define _ACS_STRINGSEQ__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ACS::stringSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_TIMESEQ__SARG_TRAITS_) -#define _ACS_TIMESEQ__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ACS::TimeSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_CONDITIONSEQ__SARG_TRAITS_) -#define _ACS_CONDITIONSEQ__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ACS::ConditionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACSERR_COMPLETION__SARG_TRAITS_) -#define _ACSERR_COMPLETION__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ACSErr::Completion, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCIN__SARG_TRAITS_) -#define _ACS_CBDESCIN__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Fixed_Size_SArg_Traits_T< - ACS::CBDescIn, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCOUT__SARG_TRAITS_) -#define _ACS_CBDESCOUT__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Fixed_Size_SArg_Traits_T< - ACS::CBDescOut, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_SUBSCRIPTION__SARG_TRAITS_) -#define _ACS_SUBSCRIPTION__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::Subscription_ptr, - ACS::Subscription_var, - ACS::Subscription_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITOR__SARG_TRAITS_) -#define _ACS_MONITOR__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::Monitor_ptr, - ACS::Monitor_var, - ACS::Monitor_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITORPATTERN__SARG_TRAITS_) -#define _ACS_MONITORPATTERN__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::Monitorpattern_ptr, - ACS::Monitorpattern_var, - ACS::Monitorpattern_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBVOID__SARG_TRAITS_) -#define _ACS_CBVOID__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::CBvoid_ptr, - ACS::CBvoid_var, - ACS::CBvoid_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBPATTERN__SARG_TRAITS_) -#define _ACS_CBPATTERN__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::CBpattern_ptr, - ACS::CBpattern_var, - ACS::CBpattern_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_ALARMPATTERN__SARG_TRAITS_) -#define _ACS_ALARMPATTERN__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ACS::Alarmpattern_ptr, - ACS::Alarmpattern_var, - ACS::Alarmpattern_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_MANAGEMENT_ROTBOOLEAN__SARG_TRAITS_) -#define _MANAGEMENT_ROTBOOLEAN__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - Management::ROTBoolean_ptr, - Management::ROTBoolean_var, - Management::ROTBoolean_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTION__SARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTION__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Basic_SArg_Traits_T< - ActiveSurface::TASOneWayAction, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTIONSEQ__SARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTIONSEQ__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ActiveSurface::TASOneWayActionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASPROFILE__SARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILE__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Basic_SArg_Traits_T< - ActiveSurface::TASProfile, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASPROFILESEQ__SARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILESEQ__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Var_Size_SArg_Traits_T< - ActiveSurface::TASProfileSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE__SARG_TRAITS_) -#define _ACTIVESURFACE_ROTASPROFILE__SARG_TRAITS_ - - template<> - class SArg_Traits - : public - Object_SArg_Traits_T< - ActiveSurface::ROTASProfile_ptr, - ActiveSurface::ROTASProfile_var, - ActiveSurface::ROTASProfile_out, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_visitor_arg_traits.cpp:73 - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - - -// Arg traits specializations. -namespace TAO -{ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_STRINGSEQ__ARG_TRAITS_) -#define _ACS_STRINGSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::stringSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_TIMESEQ__ARG_TRAITS_) -#define _ACS_TIMESEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::TimeSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACS_CONDITIONSEQ__ARG_TRAITS_) -#define _ACS_CONDITIONSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACS::ConditionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACSERR_COMPLETION__ARG_TRAITS_) -#define _ACSERR_COMPLETION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ACSErr::Completion, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCIN__ARG_TRAITS_) -#define _ACS_CBDESCIN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Fixed_Size_Arg_Traits_T< - ACS::CBDescIn, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:868 - -#if !defined (_ACS_CBDESCOUT__ARG_TRAITS_) -#define _ACS_CBDESCOUT__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Fixed_Size_Arg_Traits_T< - ACS::CBDescOut, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_SUBSCRIPTION__ARG_TRAITS_) -#define _ACS_SUBSCRIPTION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Subscription_ptr, - ACS::Subscription_var, - ACS::Subscription_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITOR__ARG_TRAITS_) -#define _ACS_MONITOR__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Monitor_ptr, - ACS::Monitor_var, - ACS::Monitor_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_MONITORPATTERN__ARG_TRAITS_) -#define _ACS_MONITORPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Monitorpattern_ptr, - ACS::Monitorpattern_var, - ACS::Monitorpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBVOID__ARG_TRAITS_) -#define _ACS_CBVOID__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::CBvoid_ptr, - ACS::CBvoid_var, - ACS::CBvoid_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_CBPATTERN__ARG_TRAITS_) -#define _ACS_CBPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::CBpattern_ptr, - ACS::CBpattern_var, - ACS::CBpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACS_ALARMPATTERN__ARG_TRAITS_) -#define _ACS_ALARMPATTERN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ACS::Alarmpattern_ptr, - ACS::Alarmpattern_var, - ACS::Alarmpattern_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_MANAGEMENT_ROTBOOLEAN__ARG_TRAITS_) -#define _MANAGEMENT_ROTBOOLEAN__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - Management::ROTBoolean_ptr, - Management::ROTBoolean_var, - Management::ROTBoolean_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTION__ARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTION__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Basic_Arg_Traits_T< - ActiveSurface::TASOneWayAction, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASONEWAYACTIONSEQ__ARG_TRAITS_) -#define _ACTIVESURFACE_TASONEWAYACTIONSEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ActiveSurface::TASOneWayActionSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:826 - -#if !defined (_ACTIVESURFACE_TASPROFILE__ARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILE__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Basic_Arg_Traits_T< - ActiveSurface::TASProfile, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:620 - -#if !defined (_ACTIVESURFACE_TASPROFILESEQ__ARG_TRAITS_) -#define _ACTIVESURFACE_TASPROFILESEQ__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Var_Size_Arg_Traits_T< - ActiveSurface::TASProfileSeq, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ - - // TAO_IDL - Generated from - // be/be_visitor_arg_traits.cpp:141 - -#if !defined (_ACTIVESURFACE_ROTASPROFILE__ARG_TRAITS_) -#define _ACTIVESURFACE_ROTASPROFILE__ARG_TRAITS_ - - template<> - class Arg_Traits - : public - Object_Arg_Traits_T< - ActiveSurface::ROTASProfile_ptr, - ActiveSurface::ROTASProfile_var, - ActiveSurface::ROTASProfile_out, - TAO::Objref_Traits, - TAO::Any_Insert_Policy_Stream - > - { - }; - -#endif /* end #if !defined */ -} - -TAO_END_VERSIONED_NAMESPACE_DECL - - - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_CBTASOneWayAction_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_CBTASOneWayAction_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_CBTASOneWayAction_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 0, 0, 19, 0, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 5, 19, 19, 0, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, -#else - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 0, 19, 0, 19, 19, - 0, 0, 19, 0, 19, 19, 19, 19, 19, 19, - 0, 19, 19, 19, 19, 19, 5, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_CBTASOneWayAction_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 8, - MIN_WORD_LENGTH = 4, - MAX_WORD_LENGTH = 14, - MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 18, - HASH_VALUE_RANGE = 15, - DUPLICATES = 0, - WORDLIST_SIZE = 12 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"done", &POA_ActiveSurface::CBTASOneWayAction::done_skel, 0}, - {"_is_a", &POA_ActiveSurface::CBTASOneWayAction::_is_a_skel, 0}, - {"",0,0}, - {"working", &POA_ActiveSurface::CBTASOneWayAction::working_skel, 0}, - {"",0,0}, - {"negotiate", &POA_ActiveSurface::CBTASOneWayAction::negotiate_skel, 0}, - {"_interface", &POA_ActiveSurface::CBTASOneWayAction::_interface_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_repository_id", &POA_ActiveSurface::CBTASOneWayAction::_repository_id_skel, 0}, - {"_component", &POA_ActiveSurface::CBTASOneWayAction::_component_skel, 0}, - {"",0,0},{"",0,0}, - {"_non_existent", &POA_ActiveSurface::CBTASOneWayAction::_non_existent_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_CBTASOneWayAction_Perfect_Hash_OpTable tao_ActiveSurface_CBTASOneWayAction_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::CBTASOneWayAction::CBTASOneWayAction (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_CBTASOneWayAction_optable; -} - -POA_ActiveSurface::CBTASOneWayAction::CBTASOneWayAction (const CBTASOneWayAction& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Callback (rhs) -{ -} - -POA_ActiveSurface::CBTASOneWayAction::~CBTASOneWayAction (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class working_CBTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline working_CBTASOneWayAction ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->working ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::CBTASOneWayAction::working_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - working_CBTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class done_CBTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline done_CBTASOneWayAction ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->done ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::CBTASOneWayAction::done_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - done_CBTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_CBTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_CBTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASOneWayAction::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - _is_a_CBTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_CBTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_CBTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASOneWayAction::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - _non_existent_CBTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_CBTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_CBTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASOneWayAction::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - _repository_id_CBTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::CBTASOneWayAction::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_CBTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_CBTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::CBTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::CBTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASOneWayAction::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASOneWayAction * const impl = - static_cast (servant); - - _get_component_CBTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::CBTASOneWayAction::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::CBTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/CBTASOneWayAction:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::CBTASOneWayAction::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::CBTASOneWayAction * -POA_ActiveSurface::CBTASOneWayAction::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::CBTASOneWayAction STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_CBTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_AlarmTASOneWayAction_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_AlarmTASOneWayAction_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_AlarmTASOneWayAction_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 0, 0, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 5, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, -#else - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 0, 19, 0, 19, 19, - 0, 0, 19, 19, 19, 19, 19, 19, 19, 19, - 0, 19, 19, 19, 19, 19, 5, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_AlarmTASOneWayAction_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 8, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 14, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 18, - HASH_VALUE_RANGE = 14, - DUPLICATES = 0, - WORDLIST_SIZE = 13 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::AlarmTASOneWayAction::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"negotiate", &POA_ActiveSurface::AlarmTASOneWayAction::negotiate_skel, 0}, - {"_interface", &POA_ActiveSurface::AlarmTASOneWayAction::_interface_skel, 0}, - {"",0,0}, - {"alarm_raised", &POA_ActiveSurface::AlarmTASOneWayAction::alarm_raised_skel, 0}, - {"alarm_cleared", &POA_ActiveSurface::AlarmTASOneWayAction::alarm_cleared_skel, 0}, - {"_repository_id", &POA_ActiveSurface::AlarmTASOneWayAction::_repository_id_skel, 0}, - {"_component", &POA_ActiveSurface::AlarmTASOneWayAction::_component_skel, 0}, - {"",0,0},{"",0,0}, - {"_non_existent", &POA_ActiveSurface::AlarmTASOneWayAction::_non_existent_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_AlarmTASOneWayAction_Perfect_Hash_OpTable tao_ActiveSurface_AlarmTASOneWayAction_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::AlarmTASOneWayAction::AlarmTASOneWayAction (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_AlarmTASOneWayAction_optable; -} - -POA_ActiveSurface::AlarmTASOneWayAction::AlarmTASOneWayAction (const AlarmTASOneWayAction& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Callback (rhs) -{ -} - -POA_ActiveSurface::AlarmTASOneWayAction::~AlarmTASOneWayAction (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class alarm_raised_AlarmTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline alarm_raised_AlarmTASOneWayAction ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->alarm_raised ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::AlarmTASOneWayAction::alarm_raised_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - alarm_raised_AlarmTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class alarm_cleared_AlarmTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline alarm_cleared_AlarmTASOneWayAction ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->alarm_cleared ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::AlarmTASOneWayAction::alarm_cleared_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - alarm_cleared_AlarmTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_AlarmTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_AlarmTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASOneWayAction::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - _is_a_AlarmTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_AlarmTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_AlarmTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASOneWayAction::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - _non_existent_AlarmTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_AlarmTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_AlarmTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASOneWayAction::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - _repository_id_AlarmTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::AlarmTASOneWayAction::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_AlarmTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_AlarmTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::AlarmTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::AlarmTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASOneWayAction::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASOneWayAction * const impl = - static_cast (servant); - - _get_component_AlarmTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::AlarmTASOneWayAction::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::AlarmTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/AlarmTASOneWayAction:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::AlarmTASOneWayAction::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::AlarmTASOneWayAction * -POA_ActiveSurface::AlarmTASOneWayAction::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::AlarmTASOneWayAction STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_AlarmTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_PTASOneWayAction_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_PTASOneWayAction_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_PTASOneWayAction_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, - 50, 15, 0, 0, 10, 0, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 5, - 50, 50, 50, 10, 50, 50, 50, 50, 50, 50, - 50, 50, 15, 20, 50, 50, 50, 50, 0, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, -#else - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 0, 50, 0, 50, 15, - 0, 0, 10, 0, 50, 50, 50, 50, 50, 50, - 5, 50, 50, 50, 10, 15, 20, 50, 50, 50, - 50, 0, 50, 50, 50, 50, 50, 50, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_PTASOneWayAction_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 25, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 49, - HASH_VALUE_RANGE = 45, - DUPLICATES = 0, - WORDLIST_SIZE = 30 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::PTASOneWayAction::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_name", &POA_ActiveSurface::PTASOneWayAction::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::PTASOneWayAction::_interface_skel, 0}, - {"get_history", &POA_ActiveSurface::PTASOneWayAction::get_history_skel, 0}, - {"",0,0},{"",0,0}, - {"_repository_id", &POA_ActiveSurface::PTASOneWayAction::_repository_id_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_default_value", &POA_ActiveSurface::PTASOneWayAction::_get_default_value_skel, 0}, - {"_get_condition", &POA_ActiveSurface::PTASOneWayAction::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::PTASOneWayAction::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::PTASOneWayAction::_get_description_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::PTASOneWayAction::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::PTASOneWayAction::get_async_skel, 0}, - {"_get_units", &POA_ActiveSurface::PTASOneWayAction::_get_units_skel, 0}, - {"get_characteristic_by_name", &POA_ActiveSurface::PTASOneWayAction::get_characteristic_by_name_skel, 0}, - {"_get_statesDescription", &POA_ActiveSurface::PTASOneWayAction::_get_statesDescription_skel, 0}, - {"",0,0}, - {"_get_allStates", &POA_ActiveSurface::PTASOneWayAction::_get_allStates_skel, 0}, - {"_component", &POA_ActiveSurface::PTASOneWayAction::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::PTASOneWayAction::_get_format_skel, 0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::PTASOneWayAction::_get_min_timer_trigger_skel, 0}, - {"_non_existent", &POA_ActiveSurface::PTASOneWayAction::_non_existent_skel, 0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::PTASOneWayAction::_get_characteristic_component_name_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::PTASOneWayAction::_get_default_timer_trigger_skel, 0}, - {"",0,0}, - {"get_all_characteristics", &POA_ActiveSurface::PTASOneWayAction::get_all_characteristics_skel, 0}, - {"create_monitor", &POA_ActiveSurface::PTASOneWayAction::create_monitor_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"find_characteristic", &POA_ActiveSurface::PTASOneWayAction::find_characteristic_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_postponed_monitor", &POA_ActiveSurface::PTASOneWayAction::create_postponed_monitor_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_PTASOneWayAction_Perfect_Hash_OpTable tao_ActiveSurface_PTASOneWayAction_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::PTASOneWayAction::PTASOneWayAction (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_PTASOneWayAction_optable; -} - -POA_ActiveSurface::PTASOneWayAction::PTASOneWayAction (const PTASOneWayAction& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs) -{ -} - -POA_ActiveSurface::PTASOneWayAction::~PTASOneWayAction (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_sync_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline get_sync_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACSErr::Completion>::out_arg_type arg_1 = - TAO::Portable_Server::get_out_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_->get_sync ( - arg_1); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::get_sync_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::ret_val retval; - TAO::SArg_Traits< ::ACSErr::Completion>::out_arg_val _tao_c; - - TAO::Argument * const args[] = - { - &retval, - &_tao_c - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - get_sync_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_async_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline get_async_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - this->servant_->get_async ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::get_async_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - get_async_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_history_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline get_history_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::out_arg_type arg_2 = - TAO::Portable_Server::get_out_arg< ::ActiveSurface::TASOneWayActionSeq> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::TimeSeq>::out_arg_type arg_3 = - TAO::Portable_Server::get_out_arg< ::ACS::TimeSeq> ( - this->operation_details_, - this->args_, - 3); - - retval = - this->servant_->get_history ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::get_history_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Long>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_n_last_values; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::out_arg_val _tao_vs; - TAO::SArg_Traits< ::ACS::TimeSeq>::out_arg_val _tao_ts; - - TAO::Argument * const args[] = - { - &retval, - &_tao_n_last_values, - &_tao_vs, - &_tao_ts - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - get_history_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class create_monitor_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline create_monitor_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Monitorpattern>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Monitorpattern> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - retval = - this->servant_->create_monitor ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::create_monitor_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Monitorpattern>::ret_val retval; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - create_monitor_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class create_postponed_monitor_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline create_postponed_monitor_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Monitor>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Monitor> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::Time>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::Time> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 3); - - retval = - this->servant_->create_postponed_monitor ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Monitor>::ret_val retval; - TAO::SArg_Traits< ::ACS::Time>::in_arg_val _tao_start_time; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_start_time, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - create_postponed_monitor_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_default_timer_trigger_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_default_timer_trigger_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::TimeInterval> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->default_timer_trigger (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_default_timer_trigger_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_min_timer_trigger_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_min_timer_trigger_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::TimeInterval> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->min_timer_trigger (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_min_timer_trigger_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_default_value_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_default_value_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->default_value (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_default_value_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_default_value_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_statesDescription_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_statesDescription_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::stringSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::stringSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->statesDescription (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::stringSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_statesDescription_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_condition_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_condition_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::ConditionSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::ConditionSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->condition (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_condition_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::ConditionSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_condition_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_allStates_PTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_allStates_PTASOneWayAction ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASOneWayActionSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->allStates (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASOneWayAction::_get_allStates_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_allStates_PTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_PTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_PTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASOneWayAction::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _is_a_PTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_PTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_PTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASOneWayAction::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _non_existent_PTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_PTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_PTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASOneWayAction::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _repository_id_PTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::PTASOneWayAction::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_PTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_PTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::PTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::PTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASOneWayAction::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASOneWayAction * const impl = - static_cast (servant); - - _get_component_PTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::PTASOneWayAction::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::PTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/PTASOneWayAction:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::PTASOneWayAction::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::PTASOneWayAction * -POA_ActiveSurface::PTASOneWayAction::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::PTASOneWayAction STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_PTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_ROTASOneWayAction_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_ROTASOneWayAction_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_ROTASOneWayAction_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, - 60, 30, 15, 0, 5, 0, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 10, 0, - 60, 60, 60, 5, 60, 60, 60, 60, 60, 60, - 60, 60, 10, 30, 60, 60, 60, 60, 0, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, -#else - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 0, 60, 0, 60, 30, - 15, 0, 5, 0, 60, 60, 60, 60, 60, 10, - 0, 60, 60, 60, 5, 10, 30, 60, 60, 60, - 60, 0, 60, 60, 60, 60, 60, 60, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_ROTASOneWayAction_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 28, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 59, - HASH_VALUE_RANGE = 55, - DUPLICATES = 0, - WORDLIST_SIZE = 33 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::ROTASOneWayAction::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_name", &POA_ActiveSurface::ROTASOneWayAction::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::ROTASOneWayAction::_interface_skel, 0}, - {"get_history", &POA_ActiveSurface::ROTASOneWayAction::get_history_skel, 0}, - {"",0,0}, - {"_get_alarm_on", &POA_ActiveSurface::ROTASOneWayAction::_get_alarm_on_skel, 0}, - {"_get_condition", &POA_ActiveSurface::ROTASOneWayAction::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::ROTASOneWayAction::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::ROTASOneWayAction::_get_description_skel, 0}, - {"",0,0}, - {"_get_default_value", &POA_ActiveSurface::ROTASOneWayAction::_get_default_value_skel, 0}, - {"_get_alarm_off", &POA_ActiveSurface::ROTASOneWayAction::_get_alarm_off_skel, 0}, - {"_get_units", &POA_ActiveSurface::ROTASOneWayAction::_get_units_skel, 0}, - {"",0,0}, - {"_get_statesDescription", &POA_ActiveSurface::ROTASOneWayAction::_get_statesDescription_skel, 0}, - {"",0,0}, - {"_get_allStates", &POA_ActiveSurface::ROTASOneWayAction::_get_allStates_skel, 0}, - {"",0,0}, - {"get_characteristic_by_name", &POA_ActiveSurface::ROTASOneWayAction::get_characteristic_by_name_skel, 0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::ROTASOneWayAction::_get_min_timer_trigger_skel, 0}, - {"",0,0}, - {"_repository_id", &POA_ActiveSurface::ROTASOneWayAction::_repository_id_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::ROTASOneWayAction::_get_default_timer_trigger_skel, 0}, - {"",0,0}, - {"get_all_characteristics", &POA_ActiveSurface::ROTASOneWayAction::get_all_characteristics_skel, 0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::ROTASOneWayAction::_get_characteristic_component_name_skel, 0}, - {"",0,0}, - {"new_subscription_AlarmEnum", &POA_ActiveSurface::ROTASOneWayAction::new_subscription_AlarmEnum_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::ROTASOneWayAction::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::ROTASOneWayAction::get_async_skel, 0}, - {"_component", &POA_ActiveSurface::ROTASOneWayAction::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::ROTASOneWayAction::_get_format_skel, 0}, - {"",0,0}, - {"_non_existent", &POA_ActiveSurface::ROTASOneWayAction::_non_existent_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_monitor", &POA_ActiveSurface::ROTASOneWayAction::create_monitor_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"find_characteristic", &POA_ActiveSurface::ROTASOneWayAction::find_characteristic_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_postponed_monitor", &POA_ActiveSurface::ROTASOneWayAction::create_postponed_monitor_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_ROTASOneWayAction_Perfect_Hash_OpTable tao_ActiveSurface_ROTASOneWayAction_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::ROTASOneWayAction::ROTASOneWayAction (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_ROTASOneWayAction_optable; -} - -POA_ActiveSurface::ROTASOneWayAction::ROTASOneWayAction (const ROTASOneWayAction& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs), - POA_ActiveSurface::PTASOneWayAction (rhs) -{ -} - -POA_ActiveSurface::ROTASOneWayAction::~ROTASOneWayAction (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class new_subscription_AlarmEnum_ROTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline new_subscription_AlarmEnum_ROTASOneWayAction ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Subscription>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Subscription> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::Alarmpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::Alarmpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - retval = - this->servant_->new_subscription_AlarmEnum ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASOneWayAction::new_subscription_AlarmEnum_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Subscription>::ret_val retval; - TAO::SArg_Traits< ::ACS::Alarmpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - new_subscription_AlarmEnum_ROTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_alarm_on_ROTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_alarm_on_ROTASOneWayAction ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASOneWayActionSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->alarm_on (); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASOneWayAction::_get_alarm_on_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _get_alarm_on_ROTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_alarm_off_ROTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline _get_alarm_off_ROTASOneWayAction ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASOneWayActionSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->alarm_off (); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASOneWayAction::_get_alarm_off_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayActionSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _get_alarm_off_ROTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_ROTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_ROTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASOneWayAction::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _is_a_ROTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_ROTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_ROTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASOneWayAction::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _non_existent_ROTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_ROTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_ROTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASOneWayAction::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _repository_id_ROTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::ROTASOneWayAction::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_ROTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_ROTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::ROTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::ROTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASOneWayAction::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASOneWayAction * const impl = - static_cast (servant); - - _get_component_ROTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::ROTASOneWayAction::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::ROTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/ROTASOneWayAction:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::ROTASOneWayAction::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::ROTASOneWayAction * -POA_ActiveSurface::ROTASOneWayAction::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::ROTASOneWayAction STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_ROTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_RWTASOneWayAction_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_RWTASOneWayAction_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_RWTASOneWayAction_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 0, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 0, - 62, 0, 10, 10, 3, 25, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 15, - 62, 62, 62, 25, 62, 62, 62, 62, 62, 62, - 62, 62, 0, 5, 62, 62, 62, 62, 0, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, -#else - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 0, 62, 0, 62, 0, - 10, 10, 3, 25, 62, 62, 62, 62, 62, 62, - 15, 62, 62, 62, 25, 0, 5, 62, 62, 62, - 62, 0, 62, 62, 62, 62, 62, 62, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_RWTASOneWayAction_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 28, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 61, - HASH_VALUE_RANGE = 57, - DUPLICATES = 0, - WORDLIST_SIZE = 33 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::RWTASOneWayAction::_is_a_skel, 0}, - {"",0,0},{"",0,0}, - {"set_sync", &POA_ActiveSurface::RWTASOneWayAction::set_sync_skel, 0}, - {"set_async", &POA_ActiveSurface::RWTASOneWayAction::set_async_skel, 0}, - {"_get_units", &POA_ActiveSurface::RWTASOneWayAction::_get_units_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_allStates", &POA_ActiveSurface::RWTASOneWayAction::_get_allStates_skel, 0}, - {"_component", &POA_ActiveSurface::RWTASOneWayAction::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::RWTASOneWayAction::_get_format_skel, 0}, - {"",0,0}, - {"_non_existent", &POA_ActiveSurface::RWTASOneWayAction::_non_existent_skel, 0}, - {"_get_name", &POA_ActiveSurface::RWTASOneWayAction::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::RWTASOneWayAction::_interface_skel, 0}, - {"",0,0}, - {"find_characteristic", &POA_ActiveSurface::RWTASOneWayAction::find_characteristic_skel, 0}, - {"",0,0}, - {"_repository_id", &POA_ActiveSurface::RWTASOneWayAction::_repository_id_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_default_value", &POA_ActiveSurface::RWTASOneWayAction::_get_default_value_skel, 0}, - {"_get_condition", &POA_ActiveSurface::RWTASOneWayAction::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::RWTASOneWayAction::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::RWTASOneWayAction::_get_description_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::RWTASOneWayAction::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::RWTASOneWayAction::get_async_skel, 0}, - {"",0,0}, - {"get_history", &POA_ActiveSurface::RWTASOneWayAction::get_history_skel, 0}, - {"_get_statesDescription", &POA_ActiveSurface::RWTASOneWayAction::_get_statesDescription_skel, 0}, - {"",0,0}, - {"create_monitor", &POA_ActiveSurface::RWTASOneWayAction::create_monitor_skel, 0}, - {"set_nonblocking", &POA_ActiveSurface::RWTASOneWayAction::set_nonblocking_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::RWTASOneWayAction::_get_characteristic_component_name_skel, 0}, - {"",0,0},{"",0,0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::RWTASOneWayAction::_get_min_timer_trigger_skel, 0}, - {"get_all_characteristics", &POA_ActiveSurface::RWTASOneWayAction::get_all_characteristics_skel, 0}, - {"create_postponed_monitor", &POA_ActiveSurface::RWTASOneWayAction::create_postponed_monitor_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::RWTASOneWayAction::_get_default_timer_trigger_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"get_characteristic_by_name", &POA_ActiveSurface::RWTASOneWayAction::get_characteristic_by_name_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_RWTASOneWayAction_Perfect_Hash_OpTable tao_ActiveSurface_RWTASOneWayAction_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::RWTASOneWayAction::RWTASOneWayAction (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_RWTASOneWayAction_optable; -} - -POA_ActiveSurface::RWTASOneWayAction::RWTASOneWayAction (const RWTASOneWayAction& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs), - POA_ActiveSurface::PTASOneWayAction (rhs) -{ -} - -POA_ActiveSurface::RWTASOneWayAction::~RWTASOneWayAction (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_sync_RWTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline set_sync_RWTASOneWayAction ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACSErr::Completion>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_->set_sync ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASOneWayAction::set_sync_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACSErr::Completion>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - set_sync_RWTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_async_RWTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline set_async_RWTASOneWayAction ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBvoid>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBvoid> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->set_async ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASOneWayAction::set_async_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACS::CBvoid>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - set_async_RWTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_nonblocking_RWTASOneWayAction - : public TAO::Upcall_Command - { - public: - inline set_nonblocking_RWTASOneWayAction ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASOneWayAction> ( - this->operation_details_, - this->args_, - 1); - - this->servant_->set_nonblocking ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASOneWayAction::set_nonblocking_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASOneWayAction>::in_arg_val _tao_value; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - set_nonblocking_RWTASOneWayAction command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_RWTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_RWTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASOneWayAction::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - _is_a_RWTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_RWTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_RWTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASOneWayAction::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - _non_existent_RWTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_RWTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_RWTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASOneWayAction::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - _repository_id_RWTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::RWTASOneWayAction::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_RWTASOneWayAction_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_RWTASOneWayAction_Upcall_Command ( - POA_ActiveSurface::RWTASOneWayAction * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::RWTASOneWayAction * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASOneWayAction::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASOneWayAction * const impl = - static_cast (servant); - - _get_component_RWTASOneWayAction_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::RWTASOneWayAction::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::RWTASOneWayAction::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/RWTASOneWayAction:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::RWTASOneWayAction::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::RWTASOneWayAction * -POA_ActiveSurface::RWTASOneWayAction::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::RWTASOneWayAction STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_RWTASOneWayAction_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_CBTASProfile_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_CBTASProfile_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_CBTASProfile_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 0, 0, 19, 0, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 5, 19, 19, 0, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, -#else - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 0, 19, 0, 19, 19, - 0, 0, 19, 0, 19, 19, 19, 19, 19, 19, - 0, 19, 19, 19, 19, 19, 5, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_CBTASProfile_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 8, - MIN_WORD_LENGTH = 4, - MAX_WORD_LENGTH = 14, - MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 18, - HASH_VALUE_RANGE = 15, - DUPLICATES = 0, - WORDLIST_SIZE = 12 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"done", &POA_ActiveSurface::CBTASProfile::done_skel, 0}, - {"_is_a", &POA_ActiveSurface::CBTASProfile::_is_a_skel, 0}, - {"",0,0}, - {"working", &POA_ActiveSurface::CBTASProfile::working_skel, 0}, - {"",0,0}, - {"negotiate", &POA_ActiveSurface::CBTASProfile::negotiate_skel, 0}, - {"_interface", &POA_ActiveSurface::CBTASProfile::_interface_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_repository_id", &POA_ActiveSurface::CBTASProfile::_repository_id_skel, 0}, - {"_component", &POA_ActiveSurface::CBTASProfile::_component_skel, 0}, - {"",0,0},{"",0,0}, - {"_non_existent", &POA_ActiveSurface::CBTASProfile::_non_existent_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_CBTASProfile_Perfect_Hash_OpTable tao_ActiveSurface_CBTASProfile_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::CBTASProfile::CBTASProfile (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_CBTASProfile_optable; -} - -POA_ActiveSurface::CBTASProfile::CBTASProfile (const CBTASProfile& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Callback (rhs) -{ -} - -POA_ActiveSurface::CBTASProfile::~CBTASProfile (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class working_CBTASProfile - : public TAO::Upcall_Command - { - public: - inline working_CBTASProfile ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->working ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::CBTASProfile::working_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - working_CBTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class done_CBTASProfile - : public TAO::Upcall_Command - { - public: - inline done_CBTASProfile ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->done ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::CBTASProfile::done_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - done_CBTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_CBTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_CBTASProfile_Upcall_Command ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASProfile::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - _is_a_CBTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_CBTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_CBTASProfile_Upcall_Command ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASProfile::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - _non_existent_CBTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_CBTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_CBTASProfile_Upcall_Command ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASProfile::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - _repository_id_CBTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::CBTASProfile::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_CBTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_CBTASProfile_Upcall_Command ( - POA_ActiveSurface::CBTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::CBTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::CBTASProfile::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::CBTASProfile * const impl = - static_cast (servant); - - _get_component_CBTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::CBTASProfile::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/CBTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::CBTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/CBTASProfile:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::CBTASProfile::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::CBTASProfile * -POA_ActiveSurface::CBTASProfile::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::CBTASProfile STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_CBTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_AlarmTASProfile_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_AlarmTASProfile_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_AlarmTASProfile_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 0, 0, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 0, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 5, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, -#else - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 0, 19, 0, 19, 19, - 0, 0, 19, 19, 19, 19, 19, 19, 19, 19, - 0, 19, 19, 19, 19, 19, 5, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_AlarmTASProfile_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 8, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 14, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 18, - HASH_VALUE_RANGE = 14, - DUPLICATES = 0, - WORDLIST_SIZE = 13 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::AlarmTASProfile::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"negotiate", &POA_ActiveSurface::AlarmTASProfile::negotiate_skel, 0}, - {"_interface", &POA_ActiveSurface::AlarmTASProfile::_interface_skel, 0}, - {"",0,0}, - {"alarm_raised", &POA_ActiveSurface::AlarmTASProfile::alarm_raised_skel, 0}, - {"alarm_cleared", &POA_ActiveSurface::AlarmTASProfile::alarm_cleared_skel, 0}, - {"_repository_id", &POA_ActiveSurface::AlarmTASProfile::_repository_id_skel, 0}, - {"_component", &POA_ActiveSurface::AlarmTASProfile::_component_skel, 0}, - {"",0,0},{"",0,0}, - {"_non_existent", &POA_ActiveSurface::AlarmTASProfile::_non_existent_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_AlarmTASProfile_Perfect_Hash_OpTable tao_ActiveSurface_AlarmTASProfile_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::AlarmTASProfile::AlarmTASProfile (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_AlarmTASProfile_optable; -} - -POA_ActiveSurface::AlarmTASProfile::AlarmTASProfile (const AlarmTASProfile& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Callback (rhs) -{ -} - -POA_ActiveSurface::AlarmTASProfile::~AlarmTASProfile (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class alarm_raised_AlarmTASProfile - : public TAO::Upcall_Command - { - public: - inline alarm_raised_AlarmTASProfile ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->alarm_raised ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::AlarmTASProfile::alarm_raised_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - alarm_raised_AlarmTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class alarm_cleared_AlarmTASProfile - : public TAO::Upcall_Command - { - public: - inline alarm_cleared_AlarmTASProfile ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescOut> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->alarm_cleared ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::AlarmTASProfile::alarm_cleared_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACSErr::Completion>::in_arg_val _tao_c; - TAO::SArg_Traits< ::ACS::CBDescOut>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_c, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - alarm_cleared_AlarmTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_AlarmTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_AlarmTASProfile_Upcall_Command ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASProfile::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - _is_a_AlarmTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_AlarmTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_AlarmTASProfile_Upcall_Command ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASProfile::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - _non_existent_AlarmTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_AlarmTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_AlarmTASProfile_Upcall_Command ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASProfile::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - _repository_id_AlarmTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::AlarmTASProfile::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_AlarmTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_AlarmTASProfile_Upcall_Command ( - POA_ActiveSurface::AlarmTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::AlarmTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::AlarmTASProfile::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::AlarmTASProfile * const impl = - static_cast (servant); - - _get_component_AlarmTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::AlarmTASProfile::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Callback:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/AlarmTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::AlarmTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/AlarmTASProfile:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::AlarmTASProfile::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::AlarmTASProfile * -POA_ActiveSurface::AlarmTASProfile::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::AlarmTASProfile STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_AlarmTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_PTASProfile_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_PTASProfile_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_PTASProfile_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 0, - 50, 15, 0, 0, 10, 0, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 5, - 50, 50, 50, 10, 50, 50, 50, 50, 50, 50, - 50, 50, 15, 20, 50, 50, 50, 50, 0, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, -#else - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 0, 50, 0, 50, 15, - 0, 0, 10, 0, 50, 50, 50, 50, 50, 50, - 5, 50, 50, 50, 10, 15, 20, 50, 50, 50, - 50, 0, 50, 50, 50, 50, 50, 50, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_PTASProfile_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 25, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 49, - HASH_VALUE_RANGE = 45, - DUPLICATES = 0, - WORDLIST_SIZE = 30 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::PTASProfile::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_name", &POA_ActiveSurface::PTASProfile::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::PTASProfile::_interface_skel, 0}, - {"get_history", &POA_ActiveSurface::PTASProfile::get_history_skel, 0}, - {"",0,0},{"",0,0}, - {"_repository_id", &POA_ActiveSurface::PTASProfile::_repository_id_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_default_value", &POA_ActiveSurface::PTASProfile::_get_default_value_skel, 0}, - {"_get_condition", &POA_ActiveSurface::PTASProfile::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::PTASProfile::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::PTASProfile::_get_description_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::PTASProfile::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::PTASProfile::get_async_skel, 0}, - {"_get_units", &POA_ActiveSurface::PTASProfile::_get_units_skel, 0}, - {"get_characteristic_by_name", &POA_ActiveSurface::PTASProfile::get_characteristic_by_name_skel, 0}, - {"_get_statesDescription", &POA_ActiveSurface::PTASProfile::_get_statesDescription_skel, 0}, - {"",0,0}, - {"_get_allStates", &POA_ActiveSurface::PTASProfile::_get_allStates_skel, 0}, - {"_component", &POA_ActiveSurface::PTASProfile::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::PTASProfile::_get_format_skel, 0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::PTASProfile::_get_min_timer_trigger_skel, 0}, - {"_non_existent", &POA_ActiveSurface::PTASProfile::_non_existent_skel, 0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::PTASProfile::_get_characteristic_component_name_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::PTASProfile::_get_default_timer_trigger_skel, 0}, - {"",0,0}, - {"get_all_characteristics", &POA_ActiveSurface::PTASProfile::get_all_characteristics_skel, 0}, - {"create_monitor", &POA_ActiveSurface::PTASProfile::create_monitor_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"find_characteristic", &POA_ActiveSurface::PTASProfile::find_characteristic_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_postponed_monitor", &POA_ActiveSurface::PTASProfile::create_postponed_monitor_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_PTASProfile_Perfect_Hash_OpTable tao_ActiveSurface_PTASProfile_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_PTASProfile_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::PTASProfile::PTASProfile (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_PTASProfile_optable; -} - -POA_ActiveSurface::PTASProfile::PTASProfile (const PTASProfile& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs) -{ -} - -POA_ActiveSurface::PTASProfile::~PTASProfile (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_sync_PTASProfile - : public TAO::Upcall_Command - { - public: - inline get_sync_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACSErr::Completion>::out_arg_type arg_1 = - TAO::Portable_Server::get_out_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_->get_sync ( - arg_1); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::get_sync_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::ret_val retval; - TAO::SArg_Traits< ::ACSErr::Completion>::out_arg_val _tao_c; - - TAO::Argument * const args[] = - { - &retval, - &_tao_c - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - get_sync_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_async_PTASProfile - : public TAO::Upcall_Command - { - public: - inline get_async_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - this->servant_->get_async ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::get_async_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - get_async_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class get_history_PTASProfile - : public TAO::Upcall_Command - { - public: - inline get_history_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::out_arg_type arg_2 = - TAO::Portable_Server::get_out_arg< ::ActiveSurface::TASProfileSeq> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::TimeSeq>::out_arg_type arg_3 = - TAO::Portable_Server::get_out_arg< ::ACS::TimeSeq> ( - this->operation_details_, - this->args_, - 3); - - retval = - this->servant_->get_history ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::get_history_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Long>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_n_last_values; - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::out_arg_val _tao_vs; - TAO::SArg_Traits< ::ACS::TimeSeq>::out_arg_val _tao_ts; - - TAO::Argument * const args[] = - { - &retval, - &_tao_n_last_values, - &_tao_vs, - &_tao_ts - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - get_history_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class create_monitor_PTASProfile - : public TAO::Upcall_Command - { - public: - inline create_monitor_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Monitorpattern>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Monitorpattern> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - retval = - this->servant_->create_monitor ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::create_monitor_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Monitorpattern>::ret_val retval; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - create_monitor_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class create_postponed_monitor_PTASProfile - : public TAO::Upcall_Command - { - public: - inline create_postponed_monitor_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Monitor>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Monitor> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::Time>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::Time> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBpattern> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 3); - - retval = - this->servant_->create_postponed_monitor ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Monitor>::ret_val retval; - TAO::SArg_Traits< ::ACS::Time>::in_arg_val _tao_start_time; - TAO::SArg_Traits< ::ACS::CBpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_start_time, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - create_postponed_monitor_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_default_timer_trigger_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_default_timer_trigger_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::TimeInterval> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->default_timer_trigger (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_default_timer_trigger_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_min_timer_trigger_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_min_timer_trigger_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::TimeInterval> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->min_timer_trigger (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::TimeInterval>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_min_timer_trigger_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_default_value_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_default_value_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->default_value (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_default_value_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_default_value_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_statesDescription_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_statesDescription_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::stringSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::stringSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->statesDescription (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::stringSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_statesDescription_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_condition_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_condition_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::ConditionSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::ConditionSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->condition (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_condition_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::ConditionSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_condition_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_allStates_PTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_allStates_PTASProfile ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASProfileSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->allStates (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::PTASProfile::_get_allStates_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_allStates_PTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_PTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_PTASProfile_Upcall_Command ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASProfile::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _is_a_PTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_PTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_PTASProfile_Upcall_Command ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASProfile::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _non_existent_PTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_PTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_PTASProfile_Upcall_Command ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASProfile::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _repository_id_PTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::PTASProfile::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_PTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_PTASProfile_Upcall_Command ( - POA_ActiveSurface::PTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::PTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::PTASProfile::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::PTASProfile * const impl = - static_cast (servant); - - _get_component_PTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::PTASProfile::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::PTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/PTASProfile:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::PTASProfile::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::PTASProfile * -POA_ActiveSurface::PTASProfile::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::PTASProfile STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_PTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_ROTASProfile_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_ROTASProfile_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_ROTASProfile_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 0, - 60, 30, 15, 0, 5, 0, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 10, 0, - 60, 60, 60, 5, 60, 60, 60, 60, 60, 60, - 60, 60, 10, 30, 60, 60, 60, 60, 0, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, -#else - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 60, 0, 60, 0, 60, 30, - 15, 0, 5, 0, 60, 60, 60, 60, 60, 10, - 0, 60, 60, 60, 5, 10, 30, 60, 60, 60, - 60, 0, 60, 60, 60, 60, 60, 60, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_ROTASProfile_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 28, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 59, - HASH_VALUE_RANGE = 55, - DUPLICATES = 0, - WORDLIST_SIZE = 33 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::ROTASProfile::_is_a_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_name", &POA_ActiveSurface::ROTASProfile::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::ROTASProfile::_interface_skel, 0}, - {"get_history", &POA_ActiveSurface::ROTASProfile::get_history_skel, 0}, - {"",0,0}, - {"_get_alarm_on", &POA_ActiveSurface::ROTASProfile::_get_alarm_on_skel, 0}, - {"_get_condition", &POA_ActiveSurface::ROTASProfile::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::ROTASProfile::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::ROTASProfile::_get_description_skel, 0}, - {"",0,0}, - {"_get_default_value", &POA_ActiveSurface::ROTASProfile::_get_default_value_skel, 0}, - {"_get_alarm_off", &POA_ActiveSurface::ROTASProfile::_get_alarm_off_skel, 0}, - {"_get_units", &POA_ActiveSurface::ROTASProfile::_get_units_skel, 0}, - {"",0,0}, - {"_get_statesDescription", &POA_ActiveSurface::ROTASProfile::_get_statesDescription_skel, 0}, - {"",0,0}, - {"_get_allStates", &POA_ActiveSurface::ROTASProfile::_get_allStates_skel, 0}, - {"",0,0}, - {"get_characteristic_by_name", &POA_ActiveSurface::ROTASProfile::get_characteristic_by_name_skel, 0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::ROTASProfile::_get_min_timer_trigger_skel, 0}, - {"",0,0}, - {"_repository_id", &POA_ActiveSurface::ROTASProfile::_repository_id_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::ROTASProfile::_get_default_timer_trigger_skel, 0}, - {"",0,0}, - {"get_all_characteristics", &POA_ActiveSurface::ROTASProfile::get_all_characteristics_skel, 0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::ROTASProfile::_get_characteristic_component_name_skel, 0}, - {"",0,0}, - {"new_subscription_AlarmEnum", &POA_ActiveSurface::ROTASProfile::new_subscription_AlarmEnum_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::ROTASProfile::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::ROTASProfile::get_async_skel, 0}, - {"_component", &POA_ActiveSurface::ROTASProfile::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::ROTASProfile::_get_format_skel, 0}, - {"",0,0}, - {"_non_existent", &POA_ActiveSurface::ROTASProfile::_non_existent_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_monitor", &POA_ActiveSurface::ROTASProfile::create_monitor_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"find_characteristic", &POA_ActiveSurface::ROTASProfile::find_characteristic_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"create_postponed_monitor", &POA_ActiveSurface::ROTASProfile::create_postponed_monitor_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_ROTASProfile_Perfect_Hash_OpTable tao_ActiveSurface_ROTASProfile_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::ROTASProfile::ROTASProfile (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_ROTASProfile_optable; -} - -POA_ActiveSurface::ROTASProfile::ROTASProfile (const ROTASProfile& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs), - POA_ActiveSurface::PTASProfile (rhs) -{ -} - -POA_ActiveSurface::ROTASProfile::~ROTASProfile (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class new_subscription_AlarmEnum_ROTASProfile - : public TAO::Upcall_Command - { - public: - inline new_subscription_AlarmEnum_ROTASProfile ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACS::Subscription>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACS::Subscription> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ACS::Alarmpattern>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ACS::Alarmpattern> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 2); - - retval = - this->servant_->new_subscription_AlarmEnum ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASProfile::new_subscription_AlarmEnum_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACS::Subscription>::ret_val retval; - TAO::SArg_Traits< ::ACS::Alarmpattern>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - new_subscription_AlarmEnum_ROTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_alarm_on_ROTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_alarm_on_ROTASProfile ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASProfileSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->alarm_on (); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASProfile::_get_alarm_on_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _get_alarm_on_ROTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_alarm_off_ROTASProfile - : public TAO::Upcall_Command - { - public: - inline _get_alarm_off_ROTASProfile ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::TASProfileSeq> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->alarm_off (); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::ROTASProfile::_get_alarm_off_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::TASProfileSeq>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _get_alarm_off_ROTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_ROTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_ROTASProfile_Upcall_Command ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASProfile::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _is_a_ROTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_ROTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_ROTASProfile_Upcall_Command ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASProfile::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _non_existent_ROTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_ROTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_ROTASProfile_Upcall_Command ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASProfile::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _repository_id_ROTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::ROTASProfile::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_ROTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_ROTASProfile_Upcall_Command ( - POA_ActiveSurface::ROTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::ROTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::ROTASProfile::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::ROTASProfile * const impl = - static_cast (servant); - - _get_component_ROTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::ROTASProfile::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ROTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::ROTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/ROTASProfile:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::ROTASProfile::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::ROTASProfile * -POA_ActiveSurface::ROTASProfile::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::ROTASProfile STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_ROTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_RWTASProfile_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_RWTASProfile_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_RWTASProfile_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 0, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 0, - 62, 0, 10, 10, 3, 25, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 15, - 62, 62, 62, 25, 62, 62, 62, 62, 62, 62, - 62, 62, 0, 5, 62, 62, 62, 62, 0, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, -#else - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, - 62, 62, 62, 62, 62, 0, 62, 0, 62, 0, - 10, 10, 3, 25, 62, 62, 62, 62, 62, 62, - 15, 62, 62, 62, 25, 0, 5, 62, 62, 62, - 62, 0, 62, 62, 62, 62, 62, 62, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_RWTASProfile_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 28, - MIN_WORD_LENGTH = 5, - MAX_WORD_LENGTH = 34, - MIN_HASH_VALUE = 5, - MAX_HASH_VALUE = 61, - HASH_VALUE_RANGE = 57, - DUPLICATES = 0, - WORDLIST_SIZE = 33 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"_is_a", &POA_ActiveSurface::RWTASProfile::_is_a_skel, 0}, - {"",0,0},{"",0,0}, - {"set_sync", &POA_ActiveSurface::RWTASProfile::set_sync_skel, 0}, - {"set_async", &POA_ActiveSurface::RWTASProfile::set_async_skel, 0}, - {"_get_units", &POA_ActiveSurface::RWTASProfile::_get_units_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_allStates", &POA_ActiveSurface::RWTASProfile::_get_allStates_skel, 0}, - {"_component", &POA_ActiveSurface::RWTASProfile::_component_skel, 0}, - {"_get_format", &POA_ActiveSurface::RWTASProfile::_get_format_skel, 0}, - {"",0,0}, - {"_non_existent", &POA_ActiveSurface::RWTASProfile::_non_existent_skel, 0}, - {"_get_name", &POA_ActiveSurface::RWTASProfile::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::RWTASProfile::_interface_skel, 0}, - {"",0,0}, - {"find_characteristic", &POA_ActiveSurface::RWTASProfile::find_characteristic_skel, 0}, - {"",0,0}, - {"_repository_id", &POA_ActiveSurface::RWTASProfile::_repository_id_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_default_value", &POA_ActiveSurface::RWTASProfile::_get_default_value_skel, 0}, - {"_get_condition", &POA_ActiveSurface::RWTASProfile::_get_condition_skel, 0}, - {"_get_resolution", &POA_ActiveSurface::RWTASProfile::_get_resolution_skel, 0}, - {"_get_description", &POA_ActiveSurface::RWTASProfile::_get_description_skel, 0}, - {"",0,0}, - {"get_sync", &POA_ActiveSurface::RWTASProfile::get_sync_skel, 0}, - {"get_async", &POA_ActiveSurface::RWTASProfile::get_async_skel, 0}, - {"",0,0}, - {"get_history", &POA_ActiveSurface::RWTASProfile::get_history_skel, 0}, - {"_get_statesDescription", &POA_ActiveSurface::RWTASProfile::_get_statesDescription_skel, 0}, - {"",0,0}, - {"create_monitor", &POA_ActiveSurface::RWTASProfile::create_monitor_skel, 0}, - {"set_nonblocking", &POA_ActiveSurface::RWTASProfile::set_nonblocking_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"_get_characteristic_component_name", &POA_ActiveSurface::RWTASProfile::_get_characteristic_component_name_skel, 0}, - {"",0,0},{"",0,0}, - {"_get_min_timer_trigger", &POA_ActiveSurface::RWTASProfile::_get_min_timer_trigger_skel, 0}, - {"get_all_characteristics", &POA_ActiveSurface::RWTASProfile::get_all_characteristics_skel, 0}, - {"create_postponed_monitor", &POA_ActiveSurface::RWTASProfile::create_postponed_monitor_skel, 0}, - {"",0,0}, - {"_get_default_timer_trigger", &POA_ActiveSurface::RWTASProfile::_get_default_timer_trigger_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"get_characteristic_by_name", &POA_ActiveSurface::RWTASProfile::get_characteristic_by_name_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_RWTASProfile_Perfect_Hash_OpTable tao_ActiveSurface_RWTASProfile_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::RWTASProfile::RWTASProfile (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_RWTASProfile_optable; -} - -POA_ActiveSurface::RWTASProfile::RWTASProfile (const RWTASProfile& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::OffShoot (rhs), - POA_ACS::Property (rhs), - POA_ACS::TypelessProperty (rhs), - POA_ActiveSurface::PTASProfile (rhs) -{ -} - -POA_ActiveSurface::RWTASProfile::~RWTASProfile (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_sync_RWTASProfile - : public TAO::Upcall_Command - { - public: - inline set_sync_RWTASProfile ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACSErr::Completion>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACSErr::Completion> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_->set_sync ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASProfile::set_sync_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACSErr::Completion>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - set_sync_RWTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_async_RWTASProfile - : public TAO::Upcall_Command - { - public: - inline set_async_RWTASProfile ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::ACS::CBvoid>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::ACS::CBvoid> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::ACS::CBDescIn> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->set_async ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASProfile::set_async_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - TAO::SArg_Traits< ::ACS::CBvoid>::in_arg_val _tao_cb; - TAO::SArg_Traits< ::ACS::CBDescIn>::in_arg_val _tao_desc; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value, - &_tao_cb, - &_tao_desc - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - set_async_RWTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class set_nonblocking_RWTASProfile - : public TAO::Upcall_Command - { - public: - inline set_nonblocking_RWTASProfile ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - this->servant_->set_nonblocking ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::RWTASProfile::set_nonblocking_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_value; - - TAO::Argument * const args[] = - { - &retval, - &_tao_value - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - set_nonblocking_RWTASProfile command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_RWTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_RWTASProfile_Upcall_Command ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASProfile::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - _is_a_RWTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_RWTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_RWTASProfile_Upcall_Command ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASProfile::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - _non_existent_RWTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_RWTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_RWTASProfile_Upcall_Command ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASProfile::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - _repository_id_RWTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::RWTASProfile::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_RWTASProfile_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_RWTASProfile_Upcall_Command ( - POA_ActiveSurface::RWTASProfile * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::RWTASProfile * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::RWTASProfile::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::RWTASProfile * const impl = - static_cast (servant); - - _get_component_RWTASProfile_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::RWTASProfile::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/OffShoot:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/Property:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/TypelessProperty:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/PTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/RWTASProfile:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::RWTASProfile::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/RWTASProfile:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::RWTASProfile::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::RWTASProfile * -POA_ActiveSurface::RWTASProfile::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::RWTASProfile STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_RWTASProfile_Proxy_Broker_Factory_function_pointer - ); -} - -// TAO_IDL - Generated from -// be/be_interface.cpp:1555 - -class TAO_ActiveSurface_NotoActiveSurfaceBoss_Perfect_Hash_OpTable - : public TAO_Perfect_Hash_OpTable -{ -private: - unsigned int hash (const char *str, unsigned int len); - -public: - const TAO_operation_db_entry * lookup (const char *str, unsigned int len); -}; - -/* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: /alma/ACS-8.2/TAO/ACE_wrappers/build/linux/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ActiveSurface_NotoActiveSurfaceBoss_Perfect_Hash_OpTable -N lookup */ -unsigned int -TAO_ActiveSurface_NotoActiveSurfaceBoss_Perfect_Hash_OpTable::hash (const char *str, unsigned int len) -{ - static const unsigned char asso_values[] = - { -#if defined (ACE_MVS) - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 0, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 35, - 0, 20, 10, 0, 15, 5, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 10, 70, 0, 30, - 70, 25, 70, 10, 70, 70, 70, 70, 70, 70, - 70, 70, 5, 10, 35, 70, 40, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 25, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, -#else - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 25, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 0, 70, 35, 0, 20, - 10, 0, 15, 5, 70, 70, 70, 10, 70, 0, - 30, 70, 25, 70, 10, 5, 10, 35, 70, 40, - 70, 70, 70, 70, 70, 70, 70, 70, -#endif /* ACE_MVS */ - }; - return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]]; -} - -const TAO_operation_db_entry * -TAO_ActiveSurface_NotoActiveSurfaceBoss_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len) -{ - enum - { - TOTAL_KEYWORDS = 37, - MIN_WORD_LENGTH = 2, - MAX_WORD_LENGTH = 26, - MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 69, - HASH_VALUE_RANGE = 66, - DUPLICATES = 0, - WORDLIST_SIZE = 41 - }; - - static const TAO_operation_db_entry wordlist[] = - { - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"move", &POA_ActiveSurface::NotoActiveSurfaceBoss::move_skel, 0}, - {"",0,0}, - {"bottom", &POA_ActiveSurface::NotoActiveSurfaceBoss::bottom_skel, 0}, - {"",0,0},{"",0,0}, - {"_get_name", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_name_skel, 0}, - {"_interface", &POA_ActiveSurface::NotoActiveSurfaceBoss::_interface_skel, 0}, - {"",0,0},{"",0,0}, - {"_get_pprofile", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_pprofile_skel, 0}, - {"",0,0}, - {"setProfile", &POA_ActiveSurface::NotoActiveSurfaceBoss::setProfile_skel, 0}, - {"_get_status", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_status_skel, 0}, - {"",0,0}, - {"_get_tracking", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_tracking_skel, 0}, - {"_get_componentState", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_componentState_skel, 0}, - {"_component", &POA_ActiveSurface::NotoActiveSurfaceBoss::_component_skel, 0}, - {"refPos", &POA_ActiveSurface::NotoActiveSurfaceBoss::refPos_skel, 0}, - {"_get_enabled", &POA_ActiveSurface::NotoActiveSurfaceBoss::_get_enabled_skel, 0}, - {"_non_existent", &POA_ActiveSurface::NotoActiveSurfaceBoss::_non_existent_skel, 0}, - {"_repository_id", &POA_ActiveSurface::NotoActiveSurfaceBoss::_repository_id_skel, 0}, - {"reset", &POA_ActiveSurface::NotoActiveSurfaceBoss::reset_skel, 0}, - {"setActuator", &POA_ActiveSurface::NotoActiveSurfaceBoss::setActuator_skel, 0}, - {"",0,0},{"",0,0}, - {"calibrate", &POA_ActiveSurface::NotoActiveSurfaceBoss::calibrate_skel, 0}, - {"descriptor", &POA_ActiveSurface::NotoActiveSurfaceBoss::descriptor_skel, 0}, - {"get_characteristic_by_name", &POA_ActiveSurface::NotoActiveSurfaceBoss::get_characteristic_by_name_skel, 0}, - {"",0,0}, - {"get_all_characteristics", &POA_ActiveSurface::NotoActiveSurfaceBoss::get_all_characteristics_skel, 0}, - {"stop", &POA_ActiveSurface::NotoActiveSurfaceBoss::stop_skel, 0}, - {"setup", &POA_ActiveSurface::NotoActiveSurfaceBoss::setup_skel, 0}, - {"calVer", &POA_ActiveSurface::NotoActiveSurfaceBoss::calVer_skel, 0}, - {"command", &POA_ActiveSurface::NotoActiveSurfaceBoss::command_skel, 0}, - {"top", &POA_ActiveSurface::NotoActiveSurfaceBoss::top_skel, 0}, - {"park", &POA_ActiveSurface::NotoActiveSurfaceBoss::park_skel, 0}, - {"_is_a", &POA_ActiveSurface::NotoActiveSurfaceBoss::_is_a_skel, 0}, - {"update", &POA_ActiveSurface::NotoActiveSurfaceBoss::update_skel, 0}, - {"",0,0},{"",0,0}, - {"down", &POA_ActiveSurface::NotoActiveSurfaceBoss::down_skel, 0}, - {"recoverUSD", &POA_ActiveSurface::NotoActiveSurfaceBoss::recoverUSD_skel, 0}, - {"",0,0},{"",0,0},{"",0,0}, - {"stow", &POA_ActiveSurface::NotoActiveSurfaceBoss::stow_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"find_characteristic", &POA_ActiveSurface::NotoActiveSurfaceBoss::find_characteristic_skel, 0}, - {"asOff", &POA_ActiveSurface::NotoActiveSurfaceBoss::asOff_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"correction", &POA_ActiveSurface::NotoActiveSurfaceBoss::correction_skel, 0}, - {"",0,0}, - {"up", &POA_ActiveSurface::NotoActiveSurfaceBoss::up_skel, 0}, - {"",0,0}, - {"usdStatus4GUIClient", &POA_ActiveSurface::NotoActiveSurfaceBoss::usdStatus4GUIClient_skel, 0}, - {"",0,0},{"",0,0},{"",0,0},{"",0,0}, - {"asOn", &POA_ActiveSurface::NotoActiveSurfaceBoss::asOn_skel, 0}, - }; - - if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) - { - unsigned int key = hash (str, len); - - if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE) - { - const char *s = wordlist[key].opname; - - if (*str == *s && !strncmp (str + 1, s + 1, len - 1)) - return &wordlist[key]; - } - } - return 0; -} - -static TAO_ActiveSurface_NotoActiveSurfaceBoss_Perfect_Hash_OpTable tao_ActiveSurface_NotoActiveSurfaceBoss_optable; - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:984 - -TAO::Collocation_Proxy_Broker * -ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr) -{ - return reinterpret_cast (0xdead); // Dummy -} - -int -ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_Initializer (size_t) -{ - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer = - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function; - - return 0; -} - -static int -ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_Initializer ( - reinterpret_cast (ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_Initializer) - ); - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:103 - -POA_ActiveSurface::NotoActiveSurfaceBoss::NotoActiveSurfaceBoss (void) - : TAO_ServantBase () -{ - this->optable_ = &tao_ActiveSurface_NotoActiveSurfaceBoss_optable; -} - -POA_ActiveSurface::NotoActiveSurfaceBoss::NotoActiveSurfaceBoss (const NotoActiveSurfaceBoss& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_ACS::ACSComponent (rhs), - POA_ACS::CharacteristicModel (rhs), - POA_ACS::CharacteristicComponent (rhs), - POA_Management::CommandInterpreter (rhs), - POA_Management::Subsystem (rhs), - POA_ActiveSurface::ActiveSurfaceBoss (rhs) -{ -} - -POA_ActiveSurface::NotoActiveSurfaceBoss::~NotoActiveSurfaceBoss (void) -{ -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_enabled_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline _get_enabled_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::Management::ROTBoolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::Management::ROTBoolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->enabled (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_get_enabled_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::Management::ROTBoolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _get_enabled_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_pprofile_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline _get_pprofile_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::ROTASProfile>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ActiveSurface::ROTASProfile> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->pprofile (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_get_pprofile_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ActiveSurface::ROTASProfile>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _get_pprofile_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_tracking_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline _get_tracking_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::Management::ROTBoolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::Management::ROTBoolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_->tracking (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_get_tracking_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::Management::ROTBoolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _get_tracking_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class stop_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline stop_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->stop ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::stop_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - stop_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class stow_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline stow_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->stow ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::stow_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - stow_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class refPos_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline refPos_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->refPos ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::refPos_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - refPos_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class update_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline update_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Double>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Double> ( - this->operation_details_, - this->args_, - 1); - - this->servant_->update ( - arg_1); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::update_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Double>::in_arg_val _tao_elevation; - - TAO::Argument * const args[] = - { - &retval, - &_tao_elevation - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - update_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class move_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline move_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_4 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 4); - - this->servant_->move ( - arg_1 - , arg_2 - , arg_3 - , arg_4); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::move_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_incr; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius, - &_tao_incr - }; - - static size_t const nargs = 5; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - move_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class correction_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline correction_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - TAO::SArg_Traits< ::CORBA::Double>::in_arg_type arg_4 = - TAO::Portable_Server::get_in_arg< ::CORBA::Double> ( - this->operation_details_, - this->args_, - 4); - - this->servant_->correction ( - arg_1 - , arg_2 - , arg_3 - , arg_4); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::correction_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - TAO::SArg_Traits< ::CORBA::Double>::in_arg_val _tao_correction; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius, - &_tao_correction - }; - - static size_t const nargs = 5; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - correction_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class setProfile_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline setProfile_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::ActiveSurface::TASProfile> ( - this->operation_details_, - this->args_, - 1); - - this->servant_->setProfile ( - arg_1); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::setProfile_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::ActiveSurface::TASProfile>::in_arg_val _tao_profile; - - TAO::Argument * const args[] = - { - &retval, - &_tao_profile - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - setProfile_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class usdStatus4GUIClient_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline usdStatus4GUIClient_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_3 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->usdStatus4GUIClient ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::usdStatus4GUIClient_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_status; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_status - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - usdStatus4GUIClient_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class setActuator_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline setActuator_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_3 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_4 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 4); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_5 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 5); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_6 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 6); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_7 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 7); - - TAO::SArg_Traits< ::CORBA::Long>::out_arg_type arg_8 = - TAO::Portable_Server::get_out_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 8); - - this->servant_->setActuator ( - arg_1 - , arg_2 - , arg_3 - , arg_4 - , arg_5 - , arg_6 - , arg_7 - , arg_8); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::setActuator_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_actPos; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_cmdPos; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_Fmin; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_Fmax; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_acc; - TAO::SArg_Traits< ::CORBA::Long>::out_arg_val _tao_delay; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_actPos, - &_tao_cmdPos, - &_tao_Fmin, - &_tao_Fmax, - &_tao_acc, - &_tao_delay - }; - - static size_t const nargs = 9; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - setActuator_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class up_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline up_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->up ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::up_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - up_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class down_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline down_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->down ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::down_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - down_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class bottom_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline bottom_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->bottom ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::bottom_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - bottom_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class top_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline top_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->top ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::top_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - top_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class reset_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline reset_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->reset ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::reset_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - reset_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class recoverUSD_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline recoverUSD_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - this->servant_->recoverUSD ( - arg_1 - , arg_2); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::recoverUSD_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator - }; - - static size_t const nargs = 3; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - recoverUSD_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class calibrate_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline calibrate_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->calibrate ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::calibrate_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - calibrate_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class calVer_NotoActiveSurfaceBoss - : public TAO::Upcall_Command - { - public: - inline calVer_NotoActiveSurfaceBoss ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 1); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_2 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 2); - - TAO::SArg_Traits< ::CORBA::Long>::in_arg_type arg_3 = - TAO::Portable_Server::get_in_arg< ::CORBA::Long> ( - this->operation_details_, - this->args_, - 3); - - this->servant_->calVer ( - arg_1 - , arg_2 - , arg_3); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -// TAO_IDL - Generated from -// be/be_visitor_operation/operation_ss.cpp:190 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::calVer_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const exceptions[] = - { - ComponentErrors::_tc_ComponentErrorsEx - }; - static ::CORBA::ULong const nexceptions = 1; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< void>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_circle; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_actuator; - TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_radius; - - TAO::Argument * const args[] = - { - &retval, - &_tao_circle, - &_tao_actuator, - &_tao_radius - }; - - static size_t const nargs = 4; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - calVer_NotoActiveSurfaceBoss command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - - - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:169 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _is_a_NotoActiveSurfaceBoss_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_NotoActiveSurfaceBoss_Upcall_Command ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - retval = - this->servant_-> _is_a ( - arg_1); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_is_a_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _is_a_NotoActiveSurfaceBoss_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _non_existent_NotoActiveSurfaceBoss_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_NotoActiveSurfaceBoss_Upcall_Command ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _non_existent (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_non_existent_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _non_existent_NotoActiveSurfaceBoss_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _repository_id_NotoActiveSurfaceBoss_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _repository_id_NotoActiveSurfaceBoss_Upcall_Command ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Char *> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _repository_id (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_repository_id_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _repository_id_NotoActiveSurfaceBoss_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:508 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_interface_skel ( - TAO_ServerRequest & server_request, - void * /* servant_upcall */, - void * servant) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); - } - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - ::CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == false) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_operation/upcall_command_ss.cpp:136 - - class _get_component_NotoActiveSurfaceBoss_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_NotoActiveSurfaceBoss_Upcall_Command ( - POA_ActiveSurface::NotoActiveSurfaceBoss * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - retval = - this->servant_-> _get_component (); - } - - private: - POA_ActiveSurface::NotoActiveSurfaceBoss * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; -} - - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_component_skel ( - TAO_ServerRequest & server_request, - void * TAO_INTERCEPTOR (servant_upcall), - void * servant - ) -{ -#if TAO_HAS_INTERCEPTORS == 1 - static ::CORBA::TypeCode_ptr const * const exceptions = 0; - static ::CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_ActiveSurface::NotoActiveSurfaceBoss * const impl = - static_cast (servant); - - _get_component_NotoActiveSurfaceBoss_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); -} - -::CORBA::Boolean POA_ActiveSurface::NotoActiveSurfaceBoss::_is_a (const char* value) -{ - return - ( - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/ACSComponent:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicModel:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ACS/CharacteristicComponent:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/Management/CommandInterpreter:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/Management/Subsystem:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/ActiveSurfaceBoss:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0" - ) || - !ACE_OS::strcmp ( - value, - "IDL:omg.org/CORBA/Object:1.0" - ) - ); -} - -const char* POA_ActiveSurface::NotoActiveSurfaceBoss::_interface_repository_id (void) const -{ - return "IDL:alma/ActiveSurface/NotoActiveSurfaceBoss:1.0"; -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:926 - -void POA_ActiveSurface::NotoActiveSurfaceBoss::_dispatch (TAO_ServerRequest & req, void * servant_upcall) -{ - this->synchronous_upcall_dispatch (req, servant_upcall, this); -} - -// TAO_IDL - Generated from -// be/be_visitor_interface/interface_ss.cpp:852 - -ActiveSurface::NotoActiveSurfaceBoss * -POA_ActiveSurface::NotoActiveSurfaceBoss::_this (void) -{ - TAO_Stub *stub = this->_create_stub (); - - TAO_Stub_Auto_Ptr safe_stub (stub); - ::CORBA::Object_ptr tmp = CORBA::Object_ptr (); - - ::CORBA::Boolean const _tao_opt_colloc = - stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects (); - - ACE_NEW_RETURN ( - tmp, - ::CORBA::Object (stub, _tao_opt_colloc, this), - 0 - ); - - ::CORBA::Object_var obj = tmp; - (void) safe_stub.release (); - - typedef ::ActiveSurface::NotoActiveSurfaceBoss STUB_SCOPED_NAME; - return - TAO::Narrow_Utils::unchecked_narrow ( - obj.in (), - ActiveSurface__TAO_NotoActiveSurfaceBoss_Proxy_Broker_Factory_function_pointer - ); -} - -#endif /* ifndef */ - diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.h b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.h deleted file mode 100644 index f828d625a..000000000 --- a/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossS.h +++ /dev/null @@ -1,2508 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.5 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -// TAO_IDL - Generated from -// be/be_codegen.cpp:487 - -#ifndef _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSS_H_ -#define _TAO_IDL____OBJECT_NOTOACTIVESURFACEBOSSS_H_ - - -#include "NotoActiveSurfaceBossC.h" -#include "baciS.h" -#include "enumpropMACROS.h" -#include "ComponentErrorsS.h" -#include "ASErrorsS.h" -#include "ManagmentDefinitionsS.h" -#include "ActiveSurfaceBossS.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/Collocation_Proxy_Broker.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/PortableServer/Servant_Base.h" - -// TAO_IDL - Generated from -// be/be_visitor_module/module_sh.cpp:49 - -namespace POA_ActiveSurface -{ - - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class CBTASOneWayAction; - typedef CBTASOneWayAction *CBTASOneWayAction_ptr; - - class CBTASOneWayAction - : public virtual POA_ACS::Callback - { - protected: - CBTASOneWayAction (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::CBTASOneWayAction _stub_type; - typedef ::ActiveSurface::CBTASOneWayAction_ptr _stub_ptr_type; - typedef ::ActiveSurface::CBTASOneWayAction_var _stub_var_type; - - CBTASOneWayAction (const CBTASOneWayAction& rhs); - virtual ~CBTASOneWayAction (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::CBTASOneWayAction *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void working ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void working_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void done ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void done_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - negotiate_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class AlarmTASOneWayAction; - typedef AlarmTASOneWayAction *AlarmTASOneWayAction_ptr; - - class AlarmTASOneWayAction - : public virtual POA_ACS::Callback - { - protected: - AlarmTASOneWayAction (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::AlarmTASOneWayAction _stub_type; - typedef ::ActiveSurface::AlarmTASOneWayAction_ptr _stub_ptr_type; - typedef ::ActiveSurface::AlarmTASOneWayAction_var _stub_var_type; - - AlarmTASOneWayAction (const AlarmTASOneWayAction& rhs); - virtual ~AlarmTASOneWayAction (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::AlarmTASOneWayAction *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void alarm_raised ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void alarm_raised_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void alarm_cleared ( - ::ActiveSurface::TASOneWayAction value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void alarm_cleared_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - negotiate_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class PTASOneWayAction; - typedef PTASOneWayAction *PTASOneWayAction_ptr; - - class PTASOneWayAction - : public virtual POA_ACS::TypelessProperty - { - protected: - PTASOneWayAction (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::PTASOneWayAction _stub_type; - typedef ::ActiveSurface::PTASOneWayAction_ptr _stub_ptr_type; - typedef ::ActiveSurface::PTASOneWayAction_var _stub_var_type; - - PTASOneWayAction (const PTASOneWayAction& rhs); - virtual ~PTASOneWayAction (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::PTASOneWayAction *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASOneWayAction get_sync ( - ::ACSErr::Completion_out c) = 0; - - static void get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::CORBA::Long get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASOneWayActionSeq_out vs, - ::ACS::TimeSeq_out ts) = 0; - - static void get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Monitorpattern_ptr create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Monitor_ptr create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::TimeInterval default_timer_trigger ( - void) = 0; - - static void _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::TimeInterval min_timer_trigger ( - void) = 0; - - static void _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASOneWayAction default_value ( - void) = 0; - - static void _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::stringSeq * statesDescription ( - void) = 0; - - static void _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::ConditionSeq * condition ( - void) = 0; - - static void _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASOneWayActionSeq * allStates ( - void) = 0; - - static void _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class ROTASOneWayAction; - typedef ROTASOneWayAction *ROTASOneWayAction_ptr; - - class ROTASOneWayAction - : public virtual POA_ActiveSurface::PTASOneWayAction - { - protected: - ROTASOneWayAction (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::ROTASOneWayAction _stub_type; - typedef ::ActiveSurface::ROTASOneWayAction_ptr _stub_ptr_type; - typedef ::ActiveSurface::ROTASOneWayAction_var _stub_var_type; - - ROTASOneWayAction (const ROTASOneWayAction& rhs); - virtual ~ROTASOneWayAction (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::ROTASOneWayAction *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Subscription_ptr new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void new_subscription_AlarmEnum_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASOneWayActionSeq * alarm_on ( - void) = 0; - - static void _get_alarm_on_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASOneWayActionSeq * alarm_off ( - void) = 0; - - static void _get_alarm_off_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class RWTASOneWayAction; - typedef RWTASOneWayAction *RWTASOneWayAction_ptr; - - class RWTASOneWayAction - : public virtual POA_ActiveSurface::PTASOneWayAction - { - protected: - RWTASOneWayAction (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::RWTASOneWayAction _stub_type; - typedef ::ActiveSurface::RWTASOneWayAction_ptr _stub_ptr_type; - typedef ::ActiveSurface::RWTASOneWayAction_var _stub_var_type; - - RWTASOneWayAction (const RWTASOneWayAction& rhs); - virtual ~RWTASOneWayAction (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::RWTASOneWayAction *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACSErr::Completion * set_sync ( - ::ActiveSurface::TASOneWayAction value) = 0; - - static void set_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void set_async ( - ::ActiveSurface::TASOneWayAction value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void set_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void set_nonblocking ( - ::ActiveSurface::TASOneWayAction value) = 0; - - static void set_nonblocking_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class CBTASProfile; - typedef CBTASProfile *CBTASProfile_ptr; - - class CBTASProfile - : public virtual POA_ACS::Callback - { - protected: - CBTASProfile (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::CBTASProfile _stub_type; - typedef ::ActiveSurface::CBTASProfile_ptr _stub_ptr_type; - typedef ::ActiveSurface::CBTASProfile_var _stub_var_type; - - CBTASProfile (const CBTASProfile& rhs); - virtual ~CBTASProfile (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::CBTASProfile *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void working ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void working_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void done ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void done_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - negotiate_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class AlarmTASProfile; - typedef AlarmTASProfile *AlarmTASProfile_ptr; - - class AlarmTASProfile - : public virtual POA_ACS::Callback - { - protected: - AlarmTASProfile (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::AlarmTASProfile _stub_type; - typedef ::ActiveSurface::AlarmTASProfile_ptr _stub_ptr_type; - typedef ::ActiveSurface::AlarmTASProfile_var _stub_var_type; - - AlarmTASProfile (const AlarmTASProfile& rhs); - virtual ~AlarmTASProfile (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::AlarmTASProfile *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void alarm_raised ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void alarm_raised_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void alarm_cleared ( - ::ActiveSurface::TASProfile value, - const ::ACSErr::Completion & c, - const ::ACS::CBDescOut & desc) = 0; - - static void alarm_cleared_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - negotiate_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class PTASProfile; - typedef PTASProfile *PTASProfile_ptr; - - class PTASProfile - : public virtual POA_ACS::TypelessProperty - { - protected: - PTASProfile (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::PTASProfile _stub_type; - typedef ::ActiveSurface::PTASProfile_ptr _stub_ptr_type; - typedef ::ActiveSurface::PTASProfile_var _stub_var_type; - - PTASProfile (const PTASProfile& rhs); - virtual ~PTASProfile (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::PTASProfile *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASProfile get_sync ( - ::ACSErr::Completion_out c) = 0; - - static void get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void get_async ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::CORBA::Long get_history ( - ::CORBA::Long n_last_values, - ::ActiveSurface::TASProfileSeq_out vs, - ::ACS::TimeSeq_out ts) = 0; - - static void get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Monitorpattern_ptr create_monitor ( - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Monitor_ptr create_postponed_monitor ( - ::ACS::Time start_time, - ::ACS::CBpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::TimeInterval default_timer_trigger ( - void) = 0; - - static void _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::TimeInterval min_timer_trigger ( - void) = 0; - - static void _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASProfile default_value ( - void) = 0; - - static void _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::stringSeq * statesDescription ( - void) = 0; - - static void _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::ConditionSeq * condition ( - void) = 0; - - static void _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASProfileSeq * allStates ( - void) = 0; - - static void _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class ROTASProfile; - typedef ROTASProfile *ROTASProfile_ptr; - - class ROTASProfile - : public virtual POA_ActiveSurface::PTASProfile - { - protected: - ROTASProfile (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::ROTASProfile _stub_type; - typedef ::ActiveSurface::ROTASProfile_ptr _stub_ptr_type; - typedef ::ActiveSurface::ROTASProfile_var _stub_var_type; - - ROTASProfile (const ROTASProfile& rhs); - virtual ~ROTASProfile (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::ROTASProfile *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACS::Subscription_ptr new_subscription_AlarmEnum ( - ::ACS::Alarmpattern_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void new_subscription_AlarmEnum_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASProfileSeq * alarm_on ( - void) = 0; - - static void _get_alarm_on_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::TASProfileSeq * alarm_off ( - void) = 0; - - static void _get_alarm_off_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class RWTASProfile; - typedef RWTASProfile *RWTASProfile_ptr; - - class RWTASProfile - : public virtual POA_ActiveSurface::PTASProfile - { - protected: - RWTASProfile (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::RWTASProfile _stub_type; - typedef ::ActiveSurface::RWTASProfile_ptr _stub_ptr_type; - typedef ::ActiveSurface::RWTASProfile_var _stub_var_type; - - RWTASProfile (const RWTASProfile& rhs); - virtual ~RWTASProfile (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::RWTASProfile *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ACSErr::Completion * set_sync ( - ::ActiveSurface::TASProfile value) = 0; - - static void set_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void set_async ( - ::ActiveSurface::TASProfile value, - ::ACS::CBvoid_ptr cb, - const ::ACS::CBDescIn & desc) = 0; - - static void set_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void set_nonblocking ( - ::ActiveSurface::TASProfile value) = 0; - - static void set_nonblocking_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_characteristic_component_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_description_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_format_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_units_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_resolution_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_sync_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_async_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_history_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - create_postponed_monitor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_min_timer_trigger_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_default_value_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_statesDescription_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_condition_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_allStates_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - - // TAO_IDL - Generated from - // be/be_visitor_interface/interface_sh.cpp:87 - - class NotoActiveSurfaceBoss; - typedef NotoActiveSurfaceBoss *NotoActiveSurfaceBoss_ptr; - - class NotoActiveSurfaceBoss - : public virtual POA_ActiveSurface::ActiveSurfaceBoss - { - protected: - NotoActiveSurfaceBoss (void); - - public: - // Useful for template programming. - typedef ::ActiveSurface::NotoActiveSurfaceBoss _stub_type; - typedef ::ActiveSurface::NotoActiveSurfaceBoss_ptr _stub_ptr_type; - typedef ::ActiveSurface::NotoActiveSurfaceBoss_var _stub_var_type; - - NotoActiveSurfaceBoss (const NotoActiveSurfaceBoss& rhs); - virtual ~NotoActiveSurfaceBoss (void); - - virtual ::CORBA::Boolean _is_a (const char* logical_type_id); - - static void _is_a_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _interface_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _component_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant - ); - - static void _repository_id_skel ( - TAO_ServerRequest & req, - void * servant_upcall, - void * servant); - - virtual void _dispatch ( - TAO_ServerRequest & req, - void * servant_upcall); - - ::ActiveSurface::NotoActiveSurfaceBoss *_this (void); - - virtual const char* _interface_repository_id (void) const; - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::Management::ROTBoolean_ptr enabled ( - void) = 0; - - static void _get_enabled_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::ActiveSurface::ROTASProfile_ptr pprofile ( - void) = 0; - - static void _get_pprofile_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual ::Management::ROTBoolean_ptr tracking ( - void) = 0; - - static void _get_tracking_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void stop ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void stop_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void stow ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void stow_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void refPos ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void refPos_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void update ( - ::CORBA::Double elevation) = 0; - - static void update_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void move ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Long incr) = 0; - - static void move_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void correction ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius, - ::CORBA::Double correction) = 0; - - static void correction_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void setProfile ( - ::ActiveSurface::TASProfile profile) = 0; - - static void setProfile_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void usdStatus4GUIClient ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out status) = 0; - - static void usdStatus4GUIClient_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void setActuator ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long_out actPos, - ::CORBA::Long_out cmdPos, - ::CORBA::Long_out Fmin, - ::CORBA::Long_out Fmax, - ::CORBA::Long_out acc, - ::CORBA::Long_out delay) = 0; - - static void setActuator_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void up ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void up_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void down ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void down_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void bottom ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void bottom_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void top ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void top_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void reset ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void reset_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void recoverUSD ( - ::CORBA::Long circle, - ::CORBA::Long actuator) = 0; - - static void recoverUSD_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void calibrate ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void calibrate_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_visitor_operation/operation_sh.cpp:45 - - virtual void calVer ( - ::CORBA::Long circle, - ::CORBA::Long actuator, - ::CORBA::Long radius) = 0; - - static void calVer_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_componentState_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_characteristic_by_name_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - find_characteristic_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - get_all_characteristics_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - descriptor_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - command_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - static void - _get_status_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - setup_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - park_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - asOff_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - - // TAO_IDL - Generated from - // be/be_interface.cpp:2043 - - static void - asOn_skel ( - TAO_ServerRequest & server_request, - void * servant_upcall, - void * servant - ); - }; - -// TAO_IDL - Generated from -// be/be_visitor_module/module_sh.cpp:80 - -} // module ActiveSurface - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1288 - - -#if defined (__ACE_INLINE__) -#include "NotoActiveSurfaceBossS.inl" -#endif /* defined INLINE */ - -#endif /* ifndef */ - -- GitLab From ac5213fcaa91f3d42f44b9f4db00785af417b2a4 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:24:50 +0000 Subject: [PATCH 051/145] Fix #131: unresolved symbols in NotoWeatherStationInterface --- Noto/Interfaces/NotoWeatherStationInterface/src/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile b/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile index 47e1465a4..876406d86 100644 --- a/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile +++ b/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile @@ -45,6 +45,9 @@ IDL_FILES = NotoWeatherStation IDL_TAO_FLAGS = USER_IDL = + +NotoWeatherStationStubs_LIBS = baciStubs GenericWeatherStationStubs + # # Jarfiles and their directories # -- GitLab From ea9634a8bed1e23629ca4b9f6ea69e4d2a56f6c8 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 19 May 2017 14:33:36 +0000 Subject: [PATCH 052/145] Fix #132: unresolved symbols in NotoMinorServoInterface --- Noto/Interfaces/NotoMinorServoInterface/src/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Noto/Interfaces/NotoMinorServoInterface/src/Makefile b/Noto/Interfaces/NotoMinorServoInterface/src/Makefile index acde96493..e7b950fbd 100644 --- a/Noto/Interfaces/NotoMinorServoInterface/src/Makefile +++ b/Noto/Interfaces/NotoMinorServoInterface/src/Makefile @@ -115,6 +115,9 @@ CDB_SCHEMAS = IDL_FILES = NotoMinorServoBoss TAO_IDLFLAGS = USER_IDL = + +NotoMinorServoBossStubs_LIBS = baciStubs ManagmentDefinitionsStubs + # # Jarfiles and their directories # -- GitLab From a53becd3d9790b6eb9474ec0ca8fb8b5afdafd69 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 31 May 2017 10:27:29 +0000 Subject: [PATCH 053/145] Fix #133: warnings in SRTMinorServo --- .../SRTMinorServo/src/MinorServoBossImpl.cpp | 9 ++++-- .../SRTMinorServo/src/WPStatusUpdater.cpp | 30 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp b/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp index ea0f2066f..e478eb3eb 100644 --- a/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp +++ b/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp @@ -979,7 +979,7 @@ ACS::Time MinorServoBossImpl::getMinScanStartingTime( if((m_configuration->m_component_refs).count(comp_name)) { component_ref = (m_configuration->m_component_refs)[comp_name]; - if(!CORBA::is_nil(component_ref)) + if(!CORBA::is_nil(component_ref)) { if(!component_ref->isReady()) { THROW_EX(ManagementErrors, ConfigurationErrorEx, @@ -1115,6 +1115,7 @@ ACS::Time MinorServoBossImpl::getMinScanStartingTime( ); } } + } } else { THROW_EX( @@ -1602,7 +1603,7 @@ void MinorServoBossImpl::clearOffset(const char *servo, string offset_type) thro if(m_component_refs.count(*iter)) { component_ref = MinorServo::WPServo::_nil(); component_ref = m_component_refs[*iter]; - if(!CORBA::is_nil(component_ref)) + if(!CORBA::is_nil(component_ref)) { if(offset_type == "user") { if(component_ref->isReady()) { try { @@ -1620,7 +1621,7 @@ void MinorServoBossImpl::clearOffset(const char *servo, string offset_type) thro ACS_SHORT_LOG((LM_WARNING, msg.c_str())); } } - else + else { if(offset_type == "system") { if(component_ref->isReady()) { try { @@ -1644,6 +1645,8 @@ void MinorServoBossImpl::clearOffset(const char *servo, string offset_type) thro impl.log(LM_DEBUG); throw impl.getMinorServoErrorsEx(); } + } + } } } } diff --git a/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp b/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp index eb4a85bad..1db3dddc2 100644 --- a/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp +++ b/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp @@ -212,7 +212,11 @@ void WPStatusUpdater::runLoop() } if(diff > MAX_TIME_DIFF) { - ACS_SHORT_LOG((LM_WARNING, "In WPStatusUpdater: abs(actual_time - actual_pos_time) = %llu", diff)); + ACS_SHORT_LOG(( + LM_WARNING, + "In WPStatusUpdater: abs(actual_time - actual_pos_time) = %llu", + static_cast(diff) + )); } else { CSecAreaResourceWrapper > > lst_secure_requests = (m_params->cmd_pos_list)->Get(); @@ -225,7 +229,11 @@ void WPStatusUpdater::runLoop() (m_params->expire_time)->cmdPos[address] = (((*lst_secure_requests)[address])[idx]).position; if(act_pos.length() != ((m_params->expire_time)->cmdPos[address]).length()) { - ACS_SHORT_LOG((LM_ERROR, "@%d: Wrong number of axes in the actual position.", getTimeStamp())); + ACS_SHORT_LOG(( + LM_ERROR, + "@%llu: Wrong number of axes in the actual position.", + static_cast(getTimeStamp()) + )); } else { // Updating of actual position property @@ -255,7 +263,11 @@ void WPStatusUpdater::runLoop() } catch(PosNotFoundEx) { if(m_clean_counter[address]) { - ACS_SHORT_LOG((LM_WARNING, "In WPStatusUpdater: cmd position at @%llu not found!", act_pos_time)); + ACS_SHORT_LOG(( + LM_WARNING, + "In WPStatusUpdater: cmd position at @%llu not found!", + static_cast(act_pos_time) + )); m_clean_counter[address] = false; } else @@ -285,12 +297,20 @@ void WPStatusUpdater::runLoop() } catch (const std::exception &e) { pthread_mutex_unlock(m_params->status_mutex); - ACS_SHORT_LOG((LM_ERROR, "@%ll: unexpected error updating the status.", timestamp)); + ACS_SHORT_LOG(( + LM_ERROR, + "@%llu: unexpected error updating the status.", + static_cast(timestamp) + )); ACS_SHORT_LOG((LM_ERROR, e.what())); } catch (...) { pthread_mutex_unlock(m_params->status_mutex); - ACS_SHORT_LOG((LM_ERROR, "@%ll: unexpected error updating the status.", timestamp)); + ACS_SHORT_LOG(( + LM_ERROR, + "@%llu: unexpected error updating the status.", + static_cast(timestamp) + )); } } -- GitLab From ab3a0ab9b00a02951a1b8052165de6d324b522d2 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 31 May 2017 13:10:43 +0000 Subject: [PATCH 054/145] Fix #134: warnings in SRT7GhzReceiver --- SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp | 2 +- SRT/Servers/SRT7GHzReceiver/src/MonitorThread.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp b/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp index f71d54b35..65cc04fea 100644 --- a/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp +++ b/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp @@ -26,7 +26,7 @@ using namespace IRA; } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } diff --git a/SRT/Servers/SRT7GHzReceiver/src/MonitorThread.cpp b/SRT/Servers/SRT7GHzReceiver/src/MonitorThread.cpp index d536e765d..1e677b915 100644 --- a/SRT/Servers/SRT7GHzReceiver/src/MonitorThread.cpp +++ b/SRT/Servers/SRT7GHzReceiver/src/MonitorThread.cpp @@ -32,7 +32,15 @@ void CMonitorThread::onStart() m_currentSampling=time*10; // uSec to 100 nanoSec if (m_currentResponseTime(m_currentResponseTime)/10 + ) + ); setResponseTime(m_currentResponseTime); } } -- GitLab From bacc5202ca628642f1b34c58f6207ce180edf355 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 31 May 2017 13:27:47 +0000 Subject: [PATCH 055/145] Fix #135: warnings in SRTLPBandReceiver --- SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp | 4 ++-- SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp b/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp index a210c6a52..4e2b163c8 100755 --- a/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp +++ b/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp @@ -27,7 +27,7 @@ using namespace IRA; } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } @@ -415,7 +415,7 @@ void CConfiguration::init(maci::ContainerServices *Services) throw ( "CConfiguration::init()", ( LM_DEBUG, - "SYNTH_VALUE_ENTRY: %lf %lf %ld", + "SYNTH_VALUE_ENTRY: %lld %lf %lf", m_taperVector[i].feed, m_taperVector[i].frequency, m_taperVector[i].taper diff --git a/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp b/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp index ae97ac608..d79431f8e 100755 --- a/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp +++ b/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp @@ -37,8 +37,15 @@ void CMonitorThread::onStart() if(m_currentResponseTime < m_currentSampling+m_currentSampling/10) { // Force the response time to be at least 10% more than sampling time m_currentResponseTime = m_currentSampling + m_currentSampling / 10; - ACS_LOG(LM_FULL_INFO, "SRTLPBandReceiverImpl::execute()", (LM_WARNING, \ - "WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec", m_currentResponseTime/10)); + ACS_LOG( + LM_FULL_INFO, + "SRTLPBandReceiverImpl::execute()", + ( + LM_WARNING, + "WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec", + static_cast(m_currentResponseTime/10) + ) + ); setResponseTime(m_currentResponseTime); } } -- GitLab From 50af31f123d1d01dd93ec6b6158c44f885ddb8d4 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 31 May 2017 13:41:55 +0000 Subject: [PATCH 056/145] Fix #136: warnings in SRTKBandMFReceiver --- .../SRTKBandMFReceiver/src/Configuration.cpp | 2 +- .../SRTKBandMFReceiver/src/MonitorThread.cpp | 11 ++++-- .../SRTKBandMFReceiver/src/icdSocket.cpp | 34 +++++++++---------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp b/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp index d552e255e..cd2fa4ca4 100644 --- a/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp +++ b/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp @@ -27,7 +27,7 @@ using namespace IRA; } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } diff --git a/SRT/Servers/SRTKBandMFReceiver/src/MonitorThread.cpp b/SRT/Servers/SRTKBandMFReceiver/src/MonitorThread.cpp index fe0b7d1e0..7ad8c6924 100644 --- a/SRT/Servers/SRTKBandMFReceiver/src/MonitorThread.cpp +++ b/SRT/Servers/SRTKBandMFReceiver/src/MonitorThread.cpp @@ -37,8 +37,15 @@ void CMonitorThread::onStart() if(m_currentResponseTime < m_currentSampling+m_currentSampling/10) { // Force the response time to be at least 10% more than sampling time m_currentResponseTime = m_currentSampling + m_currentSampling / 10; - ACS_LOG(LM_FULL_INFO, "SRTKBandMFReceiverImpl::execute()", (LM_WARNING, \ - "WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec", m_currentResponseTime/10)); + ACS_LOG( + LM_FULL_INFO, + "SRTKBandMFReceiverImpl::execute()", + ( + LM_WARNING, + "WATCH_DOG_RESPONSE_TIME_ADJUSTED_TO_FIT_SAMPLING_TIME: %llu uSec", + static_cast(m_currentResponseTime/10) + ) + ); setResponseTime(m_currentResponseTime); } } diff --git a/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp b/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp index 6d80cf97d..a6125f776 100644 --- a/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp +++ b/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp @@ -347,7 +347,7 @@ void icdSocket::setSpeed(DWORD speed) throw ( if(speed < m_ICD_MIN_SPEED || speed > m_ICD_MAX_SPEED) { - ACS_SHORT_LOG((LM_ERROR, "# Error - max speed out of range [%.2f, %.2f] rpm", + ACS_SHORT_LOG((LM_ERROR, "# Error - max speed out of range [%u, %u] rpm", m_ICD_MIN_SPEED, m_ICD_MAX_SPEED)); m_icd_summary_status |= (1 << W); @@ -882,10 +882,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError m_icd_verbose_status &= ~(1 << WRONG_RFLAG) ; m_icd_verbose_status &= ~(1 << WRONG_RCODE) ; ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)", - (const char*)buff[ICD_BUFF_LEN-5], - (const char*)buff[ICD_BUFF_LEN-4], - (const char*)buff[ICD_BUFF_LEN-3], - (const char*)buff[ICD_BUFF_LEN-2] + (unsigned char)buff[ICD_BUFF_LEN-5], + (unsigned char)buff[ICD_BUFF_LEN-4], + (unsigned char)buff[ICD_BUFF_LEN-3], + (unsigned char)buff[ICD_BUFF_LEN-2] )); break ; @@ -895,10 +895,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError m_icd_verbose_status &= ~(1 << WRONG_RCODE) ; ACS_SHORT_LOG((LM_ERROR, "# WRONG RESPONSE FLAG. First byte: %X", buff[0])); ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)", - (const char*)buff[ICD_BUFF_LEN-5], - (const char*)buff[ICD_BUFF_LEN-4], - (const char*)buff[ICD_BUFF_LEN-3], - (const char*)buff[ICD_BUFF_LEN-2] + (unsigned char)buff[ICD_BUFF_LEN-5], + (unsigned char)buff[ICD_BUFF_LEN-4], + (unsigned char)buff[ICD_BUFF_LEN-3], + (unsigned char)buff[ICD_BUFF_LEN-2] )); break ; @@ -928,10 +928,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError m_icd_verbose_status &= ~(1 << WRONG_RCODE) ; ACS_SHORT_LOG((LM_ERROR, "# WRONG RESPONSE FLAG. First byte: %X", buff[0])); ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)", - (const char*)buff[ICD_BUFF_LEN-5], - (const char*)buff[ICD_BUFF_LEN-4], - (const char*)buff[ICD_BUFF_LEN-3], - (const char*)buff[ICD_BUFF_LEN-2] + (unsigned char)buff[ICD_BUFF_LEN-5], + (unsigned char)buff[ICD_BUFF_LEN-4], + (unsigned char)buff[ICD_BUFF_LEN-3], + (unsigned char)buff[ICD_BUFF_LEN-2] )); break ; @@ -940,10 +940,10 @@ void icdSocket::responseCheck(BYTE *buff, bool check=true) throw (ComponentError m_icd_verbose_status &= ~(1 << WRONG_RFLAG) ; m_icd_verbose_status &= ~(1 << WRONG_RCODE) ; ACS_SHORT_LOG((LM_ERROR, "# CMDERR - ERROR CODE: (%c%c%c%ch)", - (const char*)buff[ICD_BUFF_LEN-5], - (const char*)buff[ICD_BUFF_LEN-4], - (const char*)buff[ICD_BUFF_LEN-3], - (const char*)buff[ICD_BUFF_LEN-2] + (unsigned char)buff[ICD_BUFF_LEN-5], + (unsigned char)buff[ICD_BUFF_LEN-4], + (unsigned char)buff[ICD_BUFF_LEN-3], + (unsigned char)buff[ICD_BUFF_LEN-2] )); break ; -- GitLab From ebef6d56ff3a0247793fdb021f3f9fac42fba8fc Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 31 May 2017 13:52:54 +0000 Subject: [PATCH 057/145] Fix #137: warnings in IRALibrary/MicroControllerBoard.cpp --- Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp b/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp index 0180d49cb..18a766000 100644 --- a/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp +++ b/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp @@ -192,9 +192,10 @@ std::vector MicroControllerBoard::receive(void) throw (MicroControllerBoar throw MicroControllerBoardEx("Mismatch between command id of request and answer."); // Check if the request parameters are the same as those at the beginning of the answer parameters - if(!data.empty()) - if(data.size() < m_parameters.size()) + if(!data.empty()) { + if(data.size() < m_parameters.size()) { throw MicroControllerBoardEx("Mismatch between parameters size of answer and request."); + } else { for(std::vector::size_type idx=0; idx != m_parameters.size(); idx++) if(data[idx] != m_parameters[idx]) @@ -207,6 +208,7 @@ std::vector MicroControllerBoard::receive(void) throw (MicroControllerBoar for(std::vector::size_type idx=m_parameters.size(); idx != data.size(); idx++) clean_data.push_back(data[idx]); } + } // Compute and verify the checksum std::vector base_checksum; -- GitLab From 2ca1f731f97eec2e670803a1d8c5e8da64c60cc2 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 09:47:31 +0000 Subject: [PATCH 058/145] Fix #144: change TARGETSYS to STATION in SRTMinorServo tests --- SRT/Servers/SRTMinorServo/test/functional/test_failure.py | 2 +- SRT/Servers/SRTMinorServo/test/functional/test_setup.py | 2 +- .../test/functional/test_setup_after_manual_movement.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py index 13a25edc8..1c9c15f3c 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py @@ -19,7 +19,7 @@ FNULL = open(os.devnull, 'w') class TestFailure(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py index 6ed8b8a1b..e41c7e2a6 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -20,7 +20,7 @@ __author__ = "Marco Buttu " class SetupTest(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py index 8c101110e..62e1d8402 100755 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py @@ -20,7 +20,7 @@ __author__ = "Marco Buttu " class CannotSetupTest(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): -- GitLab From 45fb289bc996b3921b8943fe8169dc1b4e21afa5 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 09:54:05 +0000 Subject: [PATCH 059/145] Change TARGETSYS to STATION in SRTLPBandReceiver tests (#144) --- SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py b/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py index ef00d3d05..990a28123 100644 --- a/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py +++ b/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py @@ -12,7 +12,7 @@ from Acspy.Util import ACSCorba class TestLO(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): -- GitLab From 546ef50fc404d71b24ab6699b1d811fe6f4e30c4 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 10:02:37 +0000 Subject: [PATCH 060/145] Fix #144: replace TARGETSYS to STATION in all tests --- .../test/functional/commands/test_servoSetup.py | 2 +- .../test/functional/commands/test_setServoASConfiguration.py | 2 +- .../test/functional/commands/test_setServoElevationTracking.py | 2 +- .../test/functional/commands/test_setServoOffset.py | 2 +- .../MinorServoInterface/test/functional/test_clearUserOffset.py | 2 +- .../MinorServoInterface/test/functional/test_getAxesInfo.py | 2 +- .../MinorServoInterface/test/functional/test_getAxesPosition.py | 2 +- .../test/functional/test_getCentralScanPosition.py | 2 +- .../MinorServoInterface/test/functional/test_position.py | 2 +- .../Interfaces/MinorServoInterface/test/functional/test_scan.py | 2 +- .../test/functional/test_setASConfiguration.py | 2 +- .../test/functional/test_setElevationTracking.py | 2 +- .../MinorServoInterface/test/functional/test_systemOffset.py | 2 +- .../MinorServoInterface/test/functional/test_userOffset.py | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py index fd1d0c146..b7c45b11c 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestServoSetupCmd(unittest2.TestCase): """Test the servoSetup command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py index c13391cbd..313de2431 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py @@ -20,7 +20,7 @@ __author__ = "Marco Buttu " class TestSetServoASConfigurationCmd(unittest2.TestCase): """Test the setServoASConfiguration command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py index 044e0b2aa..7c4412699 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestSetServoElevationTrackingCmd(unittest2.TestCase): """Test the setServoElevationTracking command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py index 7120fdd1f..d8b53e07a 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestSetServoOffsetCmd(unittest2.TestCase): """Test the setServoOffset command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py index 31b8bfefd..afe2ddffd 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestClearUserOffset(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py index 05962f5c9..c7a2a43c7 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py @@ -20,7 +20,7 @@ __author__ = "Marco Buttu " class TestGetAxesInfo(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py index a77ebdb72..9d79a1979 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py @@ -20,7 +20,7 @@ __author__ = "Marco Buttu " class TestGetAxesPosition(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py index 966b392ef..de5d5fcb0 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py @@ -12,7 +12,7 @@ __author__ = "Marco Buttu " class TestGetCentralScanPosition(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py index 28b03f12a..daa6887cc 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class PositionTest(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py index dc4baec9a..532d4fdb2 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py @@ -21,7 +21,7 @@ __author__ = "Marco Buttu " class ScanBaseTest(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py index c998123bb..3e047c747 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py @@ -11,7 +11,7 @@ __author__ = "Marco Buttu " class TestSetASConfiguration(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py index 04d560530..13e8e3fd6 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py @@ -11,7 +11,7 @@ __author__ = "Marco Buttu " class TestSetElevationTracking(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py index 42c11ae80..464f3bfff 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestSystemOffset(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py index 61293ac06..2f5e1fccb 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py @@ -19,7 +19,7 @@ __author__ = "Marco Buttu " class TestUserOffset(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): -- GitLab From 6ea3c1b8945ad81733d6cd2daa84a276ca32efd8 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 10:13:26 +0000 Subject: [PATCH 061/145] Fix #118: rename TARGETSYS to STATION --- Common/Servers/ReceiversBoss/src/Makefile | 6 +++--- Common/Servers/XBackend/src/Makefile | 4 ++-- SRT/Misc/SRTEnv/src/.nuraghe/nuragherc | 2 +- SystemBuild/install_stable_build.sh | 6 +++--- SystemBuild/package_stable_release.sh | 12 ++++++------ SystemMake/README | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Common/Servers/ReceiversBoss/src/Makefile b/Common/Servers/ReceiversBoss/src/Makefile index bd15ee255..80d83efc4 100644 --- a/Common/Servers/ReceiversBoss/src/Makefile +++ b/Common/Servers/ReceiversBoss/src/Makefile @@ -21,9 +21,9 @@ # user definable C-compilation flags # a quick comment on this: in order to control receivers a t med the boss is in charge of doing much more things that it has to. So # different code is required until new specific component to control the receivers for Medicina are written -ifeq ($(TARGETSYS),MED) +ifeq ($(STATION),Medicina) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED' -else ifeq ($(TARGETSYS),NT) +else ifeq ($(STATION),Noto) USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD' else USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD' @@ -50,7 +50,7 @@ EXECUTABLES_L = # ReceiversBossImpl_OBJECTS = ReceiversBossImpl RecvBossCore Configuration WatchingThread ReceiversBossImpl_LDFLAGS = -ifeq ($(TARGETSYS),NT) +ifeq ($(STATION),Noto) ReceiversBossImpl_LIBS = IRALibrary ComponentErrors CommonReceiverInterfaceStubs ReceiversBossStubs ReceiversDefinitionsStubs AntennaDefinitionsStubs GenericReceiverStubs \ DewarPositionerStubs ManagmentDefinitionsStubs DewarPositionerDefinitionsStubs ManagementErrors ParserErrors ReceiversErrors acsnc \ BackendsDefinitionsStubs TotalPowerStubs GenericBackendStubs BackendsErrors bulkDataStubs bulkDataReceiverStubs \ diff --git a/Common/Servers/XBackend/src/Makefile b/Common/Servers/XBackend/src/Makefile index 54c276b63..4b049c3be 100644 --- a/Common/Servers/XBackend/src/Makefile +++ b/Common/Servers/XBackend/src/Makefile @@ -19,9 +19,9 @@ # a quick comment on this: in order to control the Medicina version of the backend a small change of the code is required so I force the # definition of a symbol that can be used by the c++ precompiler. -ifeq ($(TARGETSYS),MED) +ifeq ($(STATION),Medicina) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_MED' -else ifeq ($(TARGETSYS),NT) +else ifeq ($(STATION),Noto) USER_CFLAGS = -U 'COMPILE_TARGET_STANDARD' -U 'COMPILE_TARGET_MED' -D 'COMPILE_TARGET_NT' else USER_CFLAGS = -U 'COMPILE_TARGET_MED' -U 'COMPILE_TARGET_NT' -D 'COMPILE_TARGET_STANDARD' diff --git a/SRT/Misc/SRTEnv/src/.nuraghe/nuragherc b/SRT/Misc/SRTEnv/src/.nuraghe/nuragherc index 728c9fa38..2dafaa099 100644 --- a/SRT/Misc/SRTEnv/src/.nuraghe/nuragherc +++ b/SRT/Misc/SRTEnv/src/.nuraghe/nuragherc @@ -17,7 +17,7 @@ export NURAGHETAG=0.4 export NURAGHEBRANCH=DerotatorAndMinorServo # Set the SVN environment -export TARGETSYS=SRT +export STATION=SRT export SYSLOCATION=$NURAGHEROOT/ACS/trunk/ export SYSTEM_SVN_TAG=nuraghe-$NURAGHETAG export SVNUSER=gavino diff --git a/SystemBuild/install_stable_build.sh b/SystemBuild/install_stable_build.sh index 373ac26ae..867e82293 100644 --- a/SystemBuild/install_stable_build.sh +++ b/SystemBuild/install_stable_build.sh @@ -4,8 +4,8 @@ if [ -d "$DISCOS_CDB" ]; then echo "replacing $ACS_CDB with $DISCOS_CDB" ACS_CDB=$DISCOS_CDB fi -NEW_INTROOT=${INTROOT_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE -NEW_CDB=${CDB_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE +NEW_INTROOT=${INTROOT_PREFIX}/${STATION}/${REPO_VERSION}/STABLE +NEW_CDB=${CDB_PREFIX}/${STATION}/${REPO_VERSION}/STABLE rm -rf $NEW_INTROOT rm -rf $NEW_CDB mkdir -p $NEW_INTROOT @@ -14,4 +14,4 @@ cp -r $INTROOT/* $NEW_INTROOT/ mkdir -p $NEW_CDB chmod -R u+rwx $NEW_CDB cp -r ${ACS_CDB}/CDB ${NEW_CDB}/ -echo "Installed new stable version of $TARGETSYS" +echo "Installed new stable version of $STATION" diff --git a/SystemBuild/package_stable_release.sh b/SystemBuild/package_stable_release.sh index 93191529f..82abb0704 100644 --- a/SystemBuild/package_stable_release.sh +++ b/SystemBuild/package_stable_release.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex BASENAME=`basename ${REPO_VERSION}` -BASEDIR=discos/${TARGETSYS}/${BASENAME} +BASEDIR=discos/${STATION}/${BASENAME} BUILDINFO=${BASEDIR}/buildinfo.txt BASHRC=${BASEDIR}/bashrc source ~/.bashrc @@ -12,8 +12,8 @@ rm -rf discos mkdir -p ${BASEDIR}/introot mkdir -p ${BASEDIR}/cdb chown -R manager:acs ${BASEDIR} -cp -r ${INTROOT_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE/* ${BASEDIR}/introot/ -cp -r ${CDB_PREFIX}/${TARGETSYS}/${REPO_VERSION}/STABLE/* ${BASEDIR}/cdb/ +cp -r ${INTROOT_PREFIX}/${STATION}/${REPO_VERSION}/STABLE/* ${BASEDIR}/introot/ +cp -r ${CDB_PREFIX}/${STATION}/${REPO_VERSION}/STABLE/* ${BASEDIR}/cdb/ touch ${BUILDINFO} printf "build id:\t${BUILD_ID}\n" >> ${BUILDINFO} printf "build number:\t${BUILD_DISPLAY_NAME}\n" >> ${BUILDINFO} @@ -25,11 +25,11 @@ printf "* Azdora build parameters *\n" >> ${BUILDINFO printf "******************************************************\n" >> ${BUILDINFO} printf "INTROOT_PREFIX:\t${INTROOT_PREFIX}\n" >> ${BUILDINFO} printf "CDB_PREFIX:\t${CDB_PREFIX}\n" >> ${BUILDINFO} -printf "TARGETSYS:\t${TARGETSYS}\n" >> ${BUILDINFO} +printf "STATION:\t${STATION}\n" >> ${BUILDINFO} printf "REPO_VERSION:\t${REPO_VERSION}\n" >> ${BUILDINFO} touch ${BASHRC} printf "export INTROOT=/${BASEDIR}/introot\n" >> ${BASHRC} printf "export ACS_CDB=/${BASEDIR}/cdb\n" >> ${BASHRC} -printf "export TARGETSYS=${TARGETSYS}\n" >> ${BASHRC} +printf "export STATION=${STATION}\n" >> ${BASHRC} printf "export REPO_VERSION=${REPO_VERSION}\n" >> ${BASHRC} -tar czvf discos-${TARGETSYS}-${BASENAME}-b${BUILD_NUMBER}.tar.gz discos +tar czvf discos-${STATION}-${BASENAME}-b${BUILD_NUMBER}.tar.gz discos diff --git a/SystemMake/README b/SystemMake/README index a88ed457a..80a76e64d 100644 --- a/SystemMake/README +++ b/SystemMake/README @@ -1,4 +1,4 @@ -1) in order to build the whole system the TARGETSYS variable must point to either SRT or MED +1) in order to build the whole system the STATION variable must point to either SRT or MED 2) The documentation will be produced to the location pointed by the varialbe DOCROOT, if the variable is not set the default location $HOME/docroot is taken 3) The variable ACS_CDB is required to be set. -- GitLab From 790c2b5d15f9ff858e8bf5d9c03cebafa6453d34 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 10:42:14 +0000 Subject: [PATCH 062/145] Add .gitignore file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..0440de820 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.branchenv +introot* -- GitLab From 7b826010307437bb3282f6a9f6cbf66aad59eace Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 10:51:17 +0000 Subject: [PATCH 063/145] Fix #145: replace unittest2 to unittest --- .../test/PyMinorServoTest/simunittest.py | 8 ++++---- .../functional/commands/test_servoSetup.py | 6 +++--- .../commands/test_setServoASConfiguration.py | 6 +++--- .../test_setServoElevationTracking.py | 6 +++--- .../commands/test_setServoOffset.py | 6 +++--- .../test/functional/test_clearUserOffset.py | 6 +++--- .../test/functional/test_getAxesInfo.py | 6 +++--- .../test/functional/test_getAxesPosition.py | 6 +++--- .../functional/test_getCentralScanPosition.py | 6 +++--- .../test/functional/test_position.py | 6 +++--- .../test/functional/test_scan.py | 6 +++--- .../functional/test_setASConfiguration.py | 6 +++--- .../functional/test_setElevationTracking.py | 6 +++--- .../test/functional/test_systemOffset.py | 6 +++--- .../test/functional/test_userOffset.py | 6 +++--- .../tests/functional/test_no_svn.py | 6 +++--- .../tests/functional/test_logging.py | 4 ++-- .../Servers/PyDewarPositioner/test/README.rst | 2 +- .../test/dependencies/unittest2-0.5.1.tar.gz | Bin 62470 -> 62469 bytes .../test/functional/commands/test_command.py | 6 +++--- .../test_derotatorClearAutoRewindingSteps.py | 6 +++--- .../commands/test_derotatorGetCmdPosition.py | 6 +++--- .../commands/test_derotatorGetMaxLimit.py | 6 +++--- .../commands/test_derotatorGetMinLimit.py | 6 +++--- .../test_derotatorGetRewindingStep.py | 6 +++--- .../commands/test_derotatorGetScanInfo.py | 6 +++--- .../commands/test_derotatorIsReady.py | 6 +++--- .../test_derotatorIsRewindingRequired.py | 6 +++--- .../commands/test_derotatorIsUpdating.py | 6 +++--- .../functional/commands/test_derotatorPark.py | 6 +++--- .../commands/test_derotatorRewind.py | 6 +++--- .../test_derotatorSetConfiguration.py | 6 +++--- .../commands/test_derotatorSetup.py | 6 +++--- .../test_derotatorXetAutoRewindingSteps.py | 6 +++--- .../commands/test_derotatorXetPosition.py | 6 +++--- .../test_derotatorXetRewindingMode.py | 6 +++--- .../functional/configurations/test_bsc.py | 6 +++--- .../functional/configurations/test_bsc_opt.py | 6 +++--- .../functional/configurations/test_custom.py | 6 +++--- .../configurations/test_custom_opt.py | 6 +++--- .../functional/configurations/test_fixed.py | 6 +++--- .../functional/configurations/test_generic.py | 6 +++--- .../test/functional/test_get-setPosition.py | 6 +++--- .../functional/test_getManagementStatus.py | 6 +++--- .../functional/test_getPositionFromHistory.py | 6 +++--- .../test/functional/test_getScanInfo.py | 6 +++--- .../test/functional/test_isReady.py | 6 +++--- .../test/functional/test_isSlewing.py | 6 +++--- .../test/functional/test_nchannel.py | 6 +++--- .../test/functional/test_offset.py | 6 +++--- .../test/functional/test_park.py | 6 +++--- .../test/functional/test_rewind.py | 6 +++--- .../test/functional/test_rewindingmodes.py | 6 +++--- .../test/functional/test_setup.py | 6 +++--- .../test/functional/test_status_property.py | 6 +++--- .../test/interface/commands/test_command.py | 6 +++--- .../test_derotatorClearAutoRewindingSteps.py | 6 +++--- .../commands/test_derotatorGetCmdPosition.py | 6 +++--- .../test_derotatorGetRewindingStep.py | 6 +++--- .../commands/test_derotatorGetScanInfo.py | 6 +++--- .../commands/test_derotatorIsReady.py | 6 +++--- .../test_derotatorIsRewindingRequired.py | 6 +++--- .../commands/test_derotatorIsUpdating.py | 6 +++--- .../interface/commands/test_derotatorPark.py | 6 +++--- .../commands/test_derotatorRewind.py | 6 +++--- .../test_derotatorSetConfiguration.py | 6 +++--- .../interface/commands/test_derotatorSetup.py | 6 +++--- .../test_derotatorXetAutoRewindingSteps.py | 6 +++--- .../commands/test_derotatorXetPosition.py | 6 +++--- .../test_derotatorXetRewindingMode.py | 6 +++--- .../test/interface/configurations/test_bsc.py | 6 +++--- .../interface/configurations/test_bsc_opt.py | 6 +++--- .../interface/configurations/test_custom.py | 6 +++--- .../configurations/test_custom_opt.py | 6 +++--- .../interface/configurations/test_fixed.py | 6 +++--- .../interface/configurations/test_generic.py | 6 +++--- .../test/interface/test_get-setPosition.py | 6 +++--- .../interface/test_getManagementStatus.py | 6 +++--- .../interface/test_getPositionFromHistory.py | 6 +++--- .../test/interface/test_getScanInfo.py | 6 +++--- .../test/interface/test_isReady.py | 6 +++--- .../test/interface/test_isSlewing.py | 6 +++--- .../test/interface/test_nchannel.py | 6 +++--- .../test/interface/test_offset.py | 6 +++--- .../test/interface/test_park.py | 6 +++--- .../test/interface/test_rewind.py | 6 +++--- .../test/interface/test_rewindingmodes.py | 6 +++--- .../test/interface/test_setup.py | 6 +++--- .../test/interface/test_status_property.py | 6 +++--- .../test/no_auto/updatePositionValues.py | 2 +- .../test/pyunit/cdbconf/test_cdbconf.py | 6 +++--- .../test/pyunit/devios/test_status.py | 6 +++--- .../posgen/test_galactic_parallactic.py | 6 +++--- .../test/pyunit/posgen/test_goto.py | 6 +++--- .../test/pyunit/posgen/test_parallactic.py | 6 +++--- .../test/pyunit/positioner/test_dec2bin.py | 6 +++--- .../pyunit/positioner/test_getScanInfo.py | 6 +++--- .../test/pyunit/positioner/test_goTo.py | 6 +++--- .../test/pyunit/positioner/test_init.py | 6 +++--- .../test/pyunit/positioner/test_offset.py | 6 +++--- .../test/pyunit/positioner/test_park.py | 6 +++--- .../test/pyunit/positioner/test_setup.py | 6 +++--- .../pyunit/positioner/test_startUpdating.py | 6 +++--- .../test/pyunit/positioner/test_status.py | 6 +++--- .../test/pyunit/positioner/test_stop.py | 6 +++--- .../test/pyunit/publisher/test_publisher.py | 6 +++--- .../PyDewarPositioner/test/run_coverage | 2 +- .../test/test_commandline.py | 12 ++++++------ .../PyLocalOscillator/test/test_component.py | 6 +++--- Common/Tests/test/cdb/test_procedures.py | 6 +++--- .../LocalOscillator/test/test_commandline.py | 6 +++--- .../LocalOscillator/test/test_component.py | 6 +++--- .../test/PyLPBandTest/simunittest.py | 8 ++++---- .../test/functional/test_lo.py | 6 +++--- .../test/functional/test_failure.py | 6 +++--- .../test/functional/test_setup.py | 6 +++--- .../test_setup_after_manual_movement.py | 6 +++--- 117 files changed, 346 insertions(+), 346 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py b/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py index 3a4821c9f..34642418c 100644 --- a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py +++ b/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py @@ -1,7 +1,7 @@ import os import sys import time -import unittest2 +import unittest import subprocess def run(test_case): @@ -14,11 +14,11 @@ def run(test_case): try: subprocess.Popen(['%s-sim' % server_name, 'start'], stdout=FNULL, stderr=FNULL) time.sleep(1) # Give the server the time to start - suite = unittest2.TestSuite() - tests = unittest2.TestLoader().loadTestsFromTestCase(test_case) + suite = unittest.TestSuite() + tests = unittest.TestLoader().loadTestsFromTestCase(test_case) suite.addTests(tests) print 'Running the tests using the antenna simulators...' - unittest2.TextTestRunner(verbosity=2).run(suite) + unittest.TextTestRunner(verbosity=2).run(suite) finally: subprocess.Popen(['%s-sim' % server_name, 'stop'], stdout=FNULL, stderr=FNULL) time.sleep(2) # Give the server the time to stop diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py index b7c45b11c..aa862cae0 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_servoSetup.py @@ -3,7 +3,7 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest import MinorServo import Management @@ -16,7 +16,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestServoSetupCmd(unittest2.TestCase): +class TestServoSetupCmd(unittest.TestCase): """Test the servoSetup command""" telescope = os.getenv('STATION') @@ -56,7 +56,7 @@ class TestServoSetupCmd(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestServoSetupCmd) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py index 313de2431..a4d0b257d 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoASConfiguration.py @@ -3,7 +3,7 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest import MinorServo import Management @@ -17,7 +17,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoASConfigurationCmd(unittest2.TestCase): +class TestSetServoASConfigurationCmd(unittest.TestCase): """Test the setServoASConfiguration command""" telescope = os.getenv('STATION') @@ -39,6 +39,6 @@ class TestSetServoASConfigurationCmd(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: simunittest.run(TestSetServoASConfigurationCmd) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py index 7c4412699..7d67f7ad1 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoElevationTracking.py @@ -3,7 +3,7 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest import MinorServo import Management @@ -16,7 +16,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoElevationTrackingCmd(unittest2.TestCase): +class TestSetServoElevationTrackingCmd(unittest.TestCase): """Test the setServoElevationTracking command""" telescope = os.getenv('STATION') @@ -40,7 +40,7 @@ class TestSetServoElevationTrackingCmd(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestSetServoElevationTrackingCmd) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py index d8b53e07a..64888d527 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/commands/test_setServoOffset.py @@ -3,7 +3,7 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest import MinorServo import Management @@ -16,7 +16,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoOffsetCmd(unittest2.TestCase): +class TestSetServoOffsetCmd(unittest.TestCase): """Test the setServoOffset command""" telescope = os.getenv('STATION') @@ -35,4 +35,4 @@ class TestSetServoOffsetCmd(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py index afe2ddffd..fa5b373e6 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py @@ -3,7 +3,7 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest import MinorServo import Management @@ -17,7 +17,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestClearUserOffset(unittest2.TestCase): +class TestClearUserOffset(unittest.TestCase): telescope = os.getenv('STATION') @@ -37,6 +37,6 @@ class TestClearUserOffset(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: simunittest.run(TestClearUserOffset) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py index c7a2a43c7..665dae329 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py @@ -5,7 +5,7 @@ import math import time import datetime -import unittest2 +import unittest import MinorServo import Management @@ -18,7 +18,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestGetAxesInfo(unittest2.TestCase): +class TestGetAxesInfo(unittest.TestCase): telescope = os.getenv('STATION') @@ -66,7 +66,7 @@ class TestGetAxesInfo(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestGetAxesInfo) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py index 9d79a1979..c25f4511b 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py @@ -5,7 +5,7 @@ import math import time import datetime -import unittest2 +import unittest import MinorServo import Management @@ -18,7 +18,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestGetAxesPosition(unittest2.TestCase): +class TestGetAxesPosition(unittest.TestCase): telescope = os.getenv('STATION') @@ -63,7 +63,7 @@ class TestGetAxesPosition(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestGetAxesPosition) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py index de5d5fcb0..6bf4acfea 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py @@ -2,7 +2,7 @@ from __future__ import with_statement import os -import unittest2 +import unittest from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient @@ -10,7 +10,7 @@ from MinorServoErrors import MinorServoErrorsEx __author__ = "Marco Buttu " -class TestGetCentralScanPosition(unittest2.TestCase): +class TestGetCentralScanPosition(unittest.TestCase): telescope = os.getenv('STATION') @@ -29,7 +29,7 @@ class TestGetCentralScanPosition(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: simunittest.run(TestGetCentralScanPosition) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py index daa6887cc..ad4304267 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest2 # https://pypi.python.org/pypi/unittest2 +import unittest # https://pypi.python.org/pypi/unittest import Management import MinorServo import Antenna @@ -17,7 +17,7 @@ from Acspy.Util import ACSCorba __author__ = "Marco Buttu " -class PositionTest(unittest2.TestCase): +class PositionTest(unittest.TestCase): telescope = os.getenv('STATION') @@ -102,7 +102,7 @@ class PositionTest(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main(verbosity=2, failfast=True) # Real test using the antenna CDB + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(PositionTest) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py index 532d4fdb2..367a251f9 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest2 # https://pypi.python.org/pypi/unittest2 +import unittest # https://pypi.python.org/pypi/unittest import Management import MinorServo import Antenna @@ -19,7 +19,7 @@ from Acspy.Util import ACSCorba __author__ = "Marco Buttu " -class ScanBaseTest(unittest2.TestCase): +class ScanBaseTest(unittest.TestCase): telescope = os.getenv('STATION') @@ -400,7 +400,7 @@ class ScanInterfaceTest(ScanBaseTest): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main(verbosity=2, failfast=True) # Real test using the antenna CDB + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(ScanTest) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py index 3e047c747..fd122027c 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py @@ -1,7 +1,7 @@ from __future__ import with_statement import os -import unittest2 +import unittest from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient @@ -9,7 +9,7 @@ from MinorServoErrors import MinorServoErrorsEx __author__ = "Marco Buttu " -class TestSetASConfiguration(unittest2.TestCase): +class TestSetASConfiguration(unittest.TestCase): telescope = os.getenv('STATION') @@ -35,6 +35,6 @@ class TestSetASConfiguration(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: simunittest.run(TestSetASConfiguration) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py index 13e8e3fd6..59d30bdaa 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py @@ -1,7 +1,7 @@ from __future__ import with_statement import os -import unittest2 +import unittest from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient @@ -9,7 +9,7 @@ from MinorServoErrors import MinorServoErrorsEx __author__ = "Marco Buttu " -class TestSetElevationTracking(unittest2.TestCase): +class TestSetElevationTracking(unittest.TestCase): telescope = os.getenv('STATION') @@ -35,6 +35,6 @@ class TestSetElevationTracking(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: simunittest.run(TestSetElevationTracking) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py index 464f3bfff..4e0e9ea44 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py @@ -4,7 +4,7 @@ import os import math import time import datetime -import unittest2 +import unittest import MinorServo import Management @@ -17,7 +17,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSystemOffset(unittest2.TestCase): +class TestSystemOffset(unittest.TestCase): telescope = os.getenv('STATION') @@ -72,7 +72,7 @@ class TestSystemOffset(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestSystemOffset) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py index 2f5e1fccb..952050d7b 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py @@ -4,7 +4,7 @@ import os import math import time import datetime -import unittest2 +import unittest import MinorServo import Management @@ -17,7 +17,7 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestUserOffset(unittest2.TestCase): +class TestUserOffset(unittest.TestCase): telescope = os.getenv('STATION') @@ -73,7 +73,7 @@ class TestUserOffset(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestUserOffset) diff --git a/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py b/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py index 1ad0d7a5d..50f37224c 100644 --- a/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py +++ b/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py @@ -2,10 +2,10 @@ import os import shutil import subprocess -import unittest2 +import unittest -class TestGetTemplateForTest(unittest2.TestCase): +class TestGetTemplateForTest(unittest.TestCase): """Test the getTemplateForTest command""" def setUp(self): @@ -25,4 +25,4 @@ class TestGetTemplateForTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/CustomLogger/tests/functional/test_logging.py b/Common/Servers/CustomLogger/tests/functional/test_logging.py index d5526403a..af3a437b6 100644 --- a/Common/Servers/CustomLogger/tests/functional/test_logging.py +++ b/Common/Servers/CustomLogger/tests/functional/test_logging.py @@ -8,7 +8,7 @@ import subprocess import signal import sys -import unittest2 +import unittest from Acspy.Clients.SimpleClient import PySimpleClient import Management @@ -32,7 +32,7 @@ class LoggingThread(Thread): self._stop_now = True -class CustomLoggerTests(unittest2.TestCase): +class CustomLoggerTests(unittest.TestCase): def setUp(self): self.client = PySimpleClient() self.custom_logger = self.client.getComponent(COMPONENT_NAME) diff --git a/Common/Servers/PyDewarPositioner/test/README.rst b/Common/Servers/PyDewarPositioner/test/README.rst index eee049555..21e24ef87 100644 --- a/Common/Servers/PyDewarPositioner/test/README.rst +++ b/Common/Servers/PyDewarPositioner/test/README.rst @@ -22,7 +22,7 @@ Dependencies The directory ``dependencies`` contains all the dependencies needed for the tests executions. These dependencies are: - * unittest2 + * unittest * mocker Other requirements diff --git a/Common/Servers/PyDewarPositioner/test/dependencies/unittest2-0.5.1.tar.gz b/Common/Servers/PyDewarPositioner/test/dependencies/unittest2-0.5.1.tar.gz index fad2ab26372b714cd920e76590a853f0a164c98a..26f00631c9757928bc03c11acd0bfc087417b1f4 100755 GIT binary patch delta 12 TcmZpB!QA?Sd4l*xiFcm?CK?7a delta 14 VcmZpD!QA$Od4f2j(MIuip8+l=24w&M diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py index 57f264b40..442b11d89 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class CommandTest(unittest2.TestCase): +class CommandTest(unittest.TestCase): """Test the DewarPositioner.command() method""" def setUp(self): @@ -45,4 +45,4 @@ class CommandTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorClearAutoRewindingSteps.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorClearAutoRewindingSteps.py index 17e449853..cebbb2686 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorClearAutoRewindingSteps.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorClearAutoRewindingSteps.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorClearAutoRewindingStepsTest(unittest2.TestCase): +class DerotatorClearAutoRewindingStepsTest(unittest.TestCase): """Test the derotoatrClearAutoRewindingSteps command""" def test_clearAutoRewindingSteps(self): @@ -22,4 +22,4 @@ class DerotatorClearAutoRewindingStepsTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetCmdPosition.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetCmdPosition.py index e3771b64e..a8c843b11 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetCmdPosition.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetCmdPosition.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetCmdPositionTest(unittest2.TestCase): +class DerotatorGetCmdPositionTest(unittest.TestCase): """Test the derotatorGetCmdPosition command""" def test_setupcmd(self): @@ -23,4 +23,4 @@ class DerotatorGetCmdPositionTest(unittest2.TestCase): dp.command('derotatorPark') if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMaxLimit.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMaxLimit.py index d528f18dc..fad08263a 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMaxLimit.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMaxLimit.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetMaxLimitTest(unittest2.TestCase): +class DerotatorGetMaxLimitTest(unittest.TestCase): """Test the derotatorGetMaxLimit command""" def test_get_max_limit(self): @@ -15,4 +15,4 @@ class DerotatorGetMaxLimitTest(unittest2.TestCase): self.assertTrue(answer.endswith('d')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMinLimit.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMinLimit.py index 850cad6b9..247596f1f 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMinLimit.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetMinLimit.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetMinLimitTest(unittest2.TestCase): +class DerotatorGetMinLimitTest(unittest.TestCase): """Test the derotatorGetMinLimit command""" def test_get_min_limit(self): @@ -15,4 +15,4 @@ class DerotatorGetMinLimitTest(unittest2.TestCase): self.assertTrue(answer.endswith('d')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetRewindingStep.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetRewindingStep.py index 9e57d772f..dd7a484e9 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetRewindingStep.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetRewindingStep.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetRewindingStepTest(unittest2.TestCase): +class DerotatorGetRewindingStepTest(unittest.TestCase): """Test the derotoatrClearAutoRewindingSteps command""" def test_clearAutoRewindingSteps(self): @@ -19,4 +19,4 @@ class DerotatorGetRewindingStepTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetScanInfo.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetScanInfo.py index bb581ea5f..e1909cd51 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetScanInfo.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorGetScanInfo.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetScanInfo(unittest2.TestCase): +class DerotatorGetScanInfo(unittest.TestCase): def test_default(self): dp = DewarPositionerImpl() @@ -13,4 +13,4 @@ class DerotatorGetScanInfo(unittest2.TestCase): self.assertTrue('axis: MNG_NO_AXIS' in answer) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsReady.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsReady.py index ed0ee4b4f..c8d8154dd 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsReady.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsReady.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsReadyTest(unittest2.TestCase): +class DerotatorIsReadyTest(unittest.TestCase): """Test the derotatorIsReady command""" def test_IsReady(self): @@ -15,4 +15,4 @@ class DerotatorIsReadyTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'True')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsRewindingRequired.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsRewindingRequired.py index 1f0adc054..7246ac762 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsRewindingRequired.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsRewindingRequired.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsRewindingRequiredTest(unittest2.TestCase): +class DerotatorIsRewindingRequiredTest(unittest.TestCase): """Test the derotatorIsRewindingRequired command""" @@ -16,4 +16,4 @@ class DerotatorIsRewindingRequiredTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsUpdating.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsUpdating.py index 6d7f1ff0c..d66d84653 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsUpdating.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorIsUpdating.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsUpdatingTest(unittest2.TestCase): +class DerotatorIsUpdatingTest(unittest.TestCase): """Test the derotatorIsUpdating command""" def test_isUpdating(self): @@ -14,4 +14,4 @@ class DerotatorIsUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorPark.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorPark.py index bcf88b0b6..925b484fa 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorPark.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorPark.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorParkTest(unittest2.TestCase): +class DerotatorParkTest(unittest.TestCase): """Test the derotatorPark command""" def test_park(self): @@ -21,4 +21,4 @@ class DerotatorParkTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'False')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorRewind.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorRewind.py index 78f838631..6d4dbcc3b 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorRewind.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorRewind.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorRewindTest(unittest2.TestCase): +class DerotatorRewindTest(unittest.TestCase): """Test the derotatorRewind command""" @@ -19,4 +19,4 @@ class DerotatorRewindTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetConfiguration.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetConfiguration.py index ebdc710a8..59434a77f 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetConfiguration.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetConfiguration.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetConfigurationTest(unittest2.TestCase): +class DerotatorSetConfigurationTest(unittest.TestCase): """Test the derotatorSet[Get]Configuration commands""" def test_SetConfiguration(self): @@ -21,4 +21,4 @@ class DerotatorSetConfigurationTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'FIXED')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetup.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetup.py index 26bb48d32..230495b09 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetup.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorSetup.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetupCmdTest(unittest2.TestCase): +class DerotatorSetupCmdTest(unittest.TestCase): """Test the derotatorSetup and derotatorGetActualSetup commands""" def test_setupcmd(self): @@ -15,4 +15,4 @@ class DerotatorSetupCmdTest(unittest2.TestCase): self.assertRegexpMatches(answer, 'KKG') if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetAutoRewindingSteps.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetAutoRewindingSteps.py index 3b67281fa..881610a0f 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetAutoRewindingSteps.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetAutoRewindingSteps.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorXetAutoRewindingStepsTest(unittest2.TestCase): +class DerotatorXetAutoRewindingStepsTest(unittest.TestCase): """Test the derotoatr[Set/Get]AutoRewindingSteps commands""" def test_xetAutoRewindingSteps(self): @@ -24,4 +24,4 @@ class DerotatorXetAutoRewindingStepsTest(unittest2.TestCase): self.assertEqual(answer, steps) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetPosition.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetPosition.py index 6ccd42905..f0e8ee17d 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetPosition.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetPosition.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetPositionTest(unittest2.TestCase): +class DerotatorSetPositionTest(unittest.TestCase): """Test the Set[Get]Position commands""" def test_setupcmd(self): @@ -37,4 +37,4 @@ class DerotatorSetPositionTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetRewindingMode.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetRewindingMode.py index 5731a0b81..07ed8c198 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetRewindingMode.py +++ b/Common/Servers/PyDewarPositioner/test/functional/commands/test_derotatorXetRewindingMode.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorXetRewindingModeTest(unittest2.TestCase): +class DerotatorXetRewindingModeTest(unittest.TestCase): """Test the derotoatr[Set/Get]RewindingMode commands""" def test_xetRewindingMode(self): @@ -21,4 +21,4 @@ class DerotatorXetRewindingModeTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc.py index b2c506676..6473b4914 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class BSCTest(unittest2.TestCase): +class BSCTest(unittest.TestCase): """Test the BSC Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class BSCTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc_opt.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc_opt.py index 8449ba308..3d17ef0d3 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc_opt.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_bsc_opt.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class BSC_OPTTest(unittest2.TestCase): +class BSC_OPTTest(unittest.TestCase): """Test the BSC_OPT Configuration""" def setUp(self): @@ -26,4 +26,4 @@ class BSC_OPTTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom.py index 8b4653593..d2d1fc7c2 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx, NotAllowedEx from Acspy.Clients.SimpleClient import PySimpleClient -class CustomTest(unittest2.TestCase): +class CustomTest(unittest.TestCase): """Test the CUSTOM Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class CustomTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom_opt.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom_opt.py index f1005c952..75381a05e 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom_opt.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_custom_opt.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx, NotAllowedEx from Acspy.Clients.SimpleClient import PySimpleClient -class CustomOPTTest(unittest2.TestCase): +class CustomOPTTest(unittest.TestCase): """Test the CUSTOM_OPT Configuration""" def setUp(self): @@ -26,4 +26,4 @@ class CustomOPTTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_fixed.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_fixed.py index 49611cc89..badd32ce8 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_fixed.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_fixed.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx from Acspy.Clients.SimpleClient import PySimpleClient -class FixedTest(unittest2.TestCase): +class FixedTest(unittest.TestCase): """Test the FIXED Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class FixedTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_generic.py b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_generic.py index 8bc99c667..e0e4e890c 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/configurations/test_generic.py +++ b/Common/Servers/PyDewarPositioner/test/functional/configurations/test_generic.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class GenericTest(unittest2.TestCase): +class GenericTest(unittest.TestCase): """Test the generic configuration behavior""" def setUp(self): @@ -26,4 +26,4 @@ class GenericTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_get-setPosition.py b/Common/Servers/PyDewarPositioner/test/functional/test_get-setPosition.py index a04dde9ce..41b045403 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_get-setPosition.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_get-setPosition.py @@ -1,5 +1,5 @@ from __future__ import with_statement -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from maciErrType import CannotGetComponentEx @@ -8,7 +8,7 @@ from Antenna import ANT_NORTH from Management import MNG_TRACK -class GetSetPositionTest(unittest2.TestCase): +class GetSetPositionTest(unittest.TestCase): """Test the DewarPositioner.getPosition() method""" def setUp(self): client = PySimpleClient() @@ -44,4 +44,4 @@ class GetSetPositionTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_getManagementStatus.py b/Common/Servers/PyDewarPositioner/test/functional/test_getManagementStatus.py index 0cc900143..948ef9bcd 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_getManagementStatus.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_getManagementStatus.py @@ -1,5 +1,5 @@ import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient @@ -7,7 +7,7 @@ from DewarPositioner.cdbconf import CDBConf from Management import MNG_WARNING, MNG_FAILURE, MNG_OK -class MngStatusTest(unittest2.TestCase): +class MngStatusTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -25,4 +25,4 @@ class MngStatusTest(unittest2.TestCase): self.assertEqual(self.positioner.getManagementStatus(), MNG_OK) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_getPositionFromHistory.py b/Common/Servers/PyDewarPositioner/test/functional/test_getPositionFromHistory.py index abf18e285..525718623 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_getPositionFromHistory.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_getPositionFromHistory.py @@ -1,7 +1,7 @@ from __future__ import with_statement import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Common.TimeHelper import getTimeStamp @@ -10,7 +10,7 @@ from ComponentErrors import ComponentErrorsEx from DewarPositioner.cdbconf import CDBConf -class GetPositionFromHistoryTest(unittest2.TestCase): +class GetPositionFromHistoryTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -71,4 +71,4 @@ class GetPositionFromHistoryTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_getScanInfo.py b/Common/Servers/PyDewarPositioner/test/functional/test_getScanInfo.py index a0be97ddd..1ce516429 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_getScanInfo.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_getScanInfo.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import Management from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class TestGetScanInfo(unittest2.TestCase): +class TestGetScanInfo(unittest.TestCase): def setUp(self): client = PySimpleClient() self.positioner = client.getComponent('RECEIVERS/DewarPositioner') @@ -17,4 +17,4 @@ class TestGetScanInfo(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_isReady.py b/Common/Servers/PyDewarPositioner/test/functional/test_isReady.py index 40d46f296..f360311b9 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_isReady.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_isReady.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class IsReadyTest(unittest2.TestCase): +class IsReadyTest(unittest.TestCase): """Test all DewarPositioner.isSomething() methods""" def setUp(self): client = PySimpleClient() @@ -23,4 +23,4 @@ class IsReadyTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_isSlewing.py b/Common/Servers/PyDewarPositioner/test/functional/test_isSlewing.py index d6895293f..0041fc834 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_isSlewing.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_isSlewing.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class IsSlewingTest(unittest2.TestCase): +class IsSlewingTest(unittest.TestCase): """Test all DewarPositioner.isSomething() methods""" def setUp(self): client = PySimpleClient() @@ -27,4 +27,4 @@ class IsSlewingTest(unittest2.TestCase): self.assertEqual(self.positioner.isSlewing(), self.derotator.isSlewing()) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_nchannel.py b/Common/Servers/PyDewarPositioner/test/functional/test_nchannel.py index 3bb336ca5..4d04bd212 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_nchannel.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_nchannel.py @@ -1,6 +1,6 @@ import threading import time -import unittest2 +import unittest import mocker import Receivers @@ -10,7 +10,7 @@ from Acspy.Nc.Consumer import Consumer from DewarPositioner import DewarPositionerImpl -class NotificationChannelTest(unittest2.TestCase): +class NotificationChannelTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -79,4 +79,4 @@ class NotificationChannelTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_offset.py b/Common/Servers/PyDewarPositioner/test/functional/test_offset.py index fee8896a8..5d25c11f2 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_offset.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_offset.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import NotAllowedEx -class OffsetTest(unittest2.TestCase): +class OffsetTest(unittest.TestCase): """Test the DewarPositioner setOffset() and getOffset() methods""" def setUp(self): client = PySimpleClient() @@ -42,4 +42,4 @@ class OffsetTest(unittest2.TestCase): ) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_park.py b/Common/Servers/PyDewarPositioner/test/functional/test_park.py index 3e8722101..ad607f5cb 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_park.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_park.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient import time -class ParkTest(unittest2.TestCase): +class ParkTest(unittest.TestCase): """Test the DewarPositioner.park() method""" def setUp(self): client = PySimpleClient() @@ -29,4 +29,4 @@ class ParkTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_rewind.py b/Common/Servers/PyDewarPositioner/test/functional/test_rewind.py index 300c115f6..c9415f04d 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_rewind.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_rewind.py @@ -1,5 +1,5 @@ from __future__ import with_statement -import unittest2 +import unittest import time import math from DewarPositioner.posgenerator import PosGenerator @@ -10,7 +10,7 @@ from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import ComponentErrorsEx -class StartUpdatingTest(unittest2.TestCase): +class StartUpdatingTest(unittest.TestCase): """Test the DewarPositioner.startUpdating() end-to-end method""" def setUp(self): self.client = PySimpleClient() @@ -318,4 +318,4 @@ class StartUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_rewindingmodes.py b/Common/Servers/PyDewarPositioner/test/functional/test_rewindingmodes.py index 6e8893291..ff816496c 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_rewindingmodes.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_rewindingmodes.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class ModeTest(unittest2.TestCase): +class ModeTest(unittest.TestCase): """Test the DewarPositioner.*Mode() methods""" def setUp(self): @@ -22,4 +22,4 @@ class ModeTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_setup.py b/Common/Servers/PyDewarPositioner/test/functional/test_setup.py index cd6e2a8cd..a45640141 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_setup.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_setup.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx @@ -7,7 +7,7 @@ from Acspy.Clients.SimpleClient import PySimpleClient from DewarPositioner.cdbconf import CDBConf -class SetupTest(unittest2.TestCase): +class SetupTest(unittest.TestCase): def setUp(self): client = PySimpleClient() self.positioner = client.getComponent('RECEIVERS/DewarPositioner') @@ -39,4 +39,4 @@ class SetupTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/functional/test_status_property.py b/Common/Servers/PyDewarPositioner/test/functional/test_status_property.py index f24a21a4c..498e626e8 100644 --- a/Common/Servers/PyDewarPositioner/test/functional/test_status_property.py +++ b/Common/Servers/PyDewarPositioner/test/functional/test_status_property.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import NotAllowedEx -class StatusPropertyTest(unittest2.TestCase): +class StatusPropertyTest(unittest.TestCase): """...""" def setUp(self): client = PySimpleClient() @@ -29,4 +29,4 @@ class StatusPropertyTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_command.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_command.py index 57f264b40..442b11d89 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_command.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_command.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class CommandTest(unittest2.TestCase): +class CommandTest(unittest.TestCase): """Test the DewarPositioner.command() method""" def setUp(self): @@ -45,4 +45,4 @@ class CommandTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorClearAutoRewindingSteps.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorClearAutoRewindingSteps.py index 17e449853..cebbb2686 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorClearAutoRewindingSteps.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorClearAutoRewindingSteps.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorClearAutoRewindingStepsTest(unittest2.TestCase): +class DerotatorClearAutoRewindingStepsTest(unittest.TestCase): """Test the derotoatrClearAutoRewindingSteps command""" def test_clearAutoRewindingSteps(self): @@ -22,4 +22,4 @@ class DerotatorClearAutoRewindingStepsTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetCmdPosition.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetCmdPosition.py index e3771b64e..a8c843b11 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetCmdPosition.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetCmdPosition.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetCmdPositionTest(unittest2.TestCase): +class DerotatorGetCmdPositionTest(unittest.TestCase): """Test the derotatorGetCmdPosition command""" def test_setupcmd(self): @@ -23,4 +23,4 @@ class DerotatorGetCmdPositionTest(unittest2.TestCase): dp.command('derotatorPark') if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetRewindingStep.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetRewindingStep.py index 9e57d772f..dd7a484e9 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetRewindingStep.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetRewindingStep.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetRewindingStepTest(unittest2.TestCase): +class DerotatorGetRewindingStepTest(unittest.TestCase): """Test the derotoatrClearAutoRewindingSteps command""" def test_clearAutoRewindingSteps(self): @@ -19,4 +19,4 @@ class DerotatorGetRewindingStepTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetScanInfo.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetScanInfo.py index bb581ea5f..e1909cd51 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetScanInfo.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorGetScanInfo.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorGetScanInfo(unittest2.TestCase): +class DerotatorGetScanInfo(unittest.TestCase): def test_default(self): dp = DewarPositionerImpl() @@ -13,4 +13,4 @@ class DerotatorGetScanInfo(unittest2.TestCase): self.assertTrue('axis: MNG_NO_AXIS' in answer) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsReady.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsReady.py index ed0ee4b4f..c8d8154dd 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsReady.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsReady.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsReadyTest(unittest2.TestCase): +class DerotatorIsReadyTest(unittest.TestCase): """Test the derotatorIsReady command""" def test_IsReady(self): @@ -15,4 +15,4 @@ class DerotatorIsReadyTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'True')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsRewindingRequired.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsRewindingRequired.py index 1f0adc054..7246ac762 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsRewindingRequired.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsRewindingRequired.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsRewindingRequiredTest(unittest2.TestCase): +class DerotatorIsRewindingRequiredTest(unittest.TestCase): """Test the derotatorIsRewindingRequired command""" @@ -16,4 +16,4 @@ class DerotatorIsRewindingRequiredTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsUpdating.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsUpdating.py index 6d7f1ff0c..d66d84653 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsUpdating.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorIsUpdating.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorIsUpdatingTest(unittest2.TestCase): +class DerotatorIsUpdatingTest(unittest.TestCase): """Test the derotatorIsUpdating command""" def test_isUpdating(self): @@ -14,4 +14,4 @@ class DerotatorIsUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorPark.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorPark.py index bcf88b0b6..925b484fa 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorPark.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorPark.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorParkTest(unittest2.TestCase): +class DerotatorParkTest(unittest.TestCase): """Test the derotatorPark command""" def test_park(self): @@ -21,4 +21,4 @@ class DerotatorParkTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'False')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorRewind.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorRewind.py index 78f838631..6d4dbcc3b 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorRewind.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorRewind.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorRewindTest(unittest2.TestCase): +class DerotatorRewindTest(unittest.TestCase): """Test the derotatorRewind command""" @@ -19,4 +19,4 @@ class DerotatorRewindTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetConfiguration.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetConfiguration.py index ebdc710a8..59434a77f 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetConfiguration.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetConfiguration.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetConfigurationTest(unittest2.TestCase): +class DerotatorSetConfigurationTest(unittest.TestCase): """Test the derotatorSet[Get]Configuration commands""" def test_SetConfiguration(self): @@ -21,4 +21,4 @@ class DerotatorSetConfigurationTest(unittest2.TestCase): self.assertEqual((success, answer), (True, 'FIXED')) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetup.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetup.py index 26bb48d32..230495b09 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetup.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorSetup.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetupCmdTest(unittest2.TestCase): +class DerotatorSetupCmdTest(unittest.TestCase): """Test the derotatorSetup and derotatorGetActualSetup commands""" def test_setupcmd(self): @@ -15,4 +15,4 @@ class DerotatorSetupCmdTest(unittest2.TestCase): self.assertRegexpMatches(answer, 'KKG') if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetAutoRewindingSteps.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetAutoRewindingSteps.py index 3b67281fa..881610a0f 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetAutoRewindingSteps.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetAutoRewindingSteps.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorXetAutoRewindingStepsTest(unittest2.TestCase): +class DerotatorXetAutoRewindingStepsTest(unittest.TestCase): """Test the derotoatr[Set/Get]AutoRewindingSteps commands""" def test_xetAutoRewindingSteps(self): @@ -24,4 +24,4 @@ class DerotatorXetAutoRewindingStepsTest(unittest2.TestCase): self.assertEqual(answer, steps) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetPosition.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetPosition.py index 5440fca41..881738462 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetPosition.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetPosition.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorSetPositionTest(unittest2.TestCase): +class DerotatorSetPositionTest(unittest.TestCase): """Test the Set[Get]Position commands""" def test_setupcmd(self): @@ -29,4 +29,4 @@ class DerotatorSetPositionTest(unittest2.TestCase): self.assertRegexpMatches(answer, 'Error - wrong parameter usage') if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetRewindingMode.py b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetRewindingMode.py index 5731a0b81..07ed8c198 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetRewindingMode.py +++ b/Common/Servers/PyDewarPositioner/test/interface/commands/test_derotatorXetRewindingMode.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker import time from DewarPositioner.DewarPositionerImpl import DewarPositionerImpl -class DerotatorXetRewindingModeTest(unittest2.TestCase): +class DerotatorXetRewindingModeTest(unittest.TestCase): """Test the derotoatr[Set/Get]RewindingMode commands""" def test_xetRewindingMode(self): @@ -21,4 +21,4 @@ class DerotatorXetRewindingModeTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc.py index b2c506676..6473b4914 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class BSCTest(unittest2.TestCase): +class BSCTest(unittest.TestCase): """Test the BSC Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class BSCTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc_opt.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc_opt.py index 8449ba308..3d17ef0d3 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc_opt.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_bsc_opt.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class BSC_OPTTest(unittest2.TestCase): +class BSC_OPTTest(unittest.TestCase): """Test the BSC_OPT Configuration""" def setUp(self): @@ -26,4 +26,4 @@ class BSC_OPTTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom.py index 8b4653593..d2d1fc7c2 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx, NotAllowedEx from Acspy.Clients.SimpleClient import PySimpleClient -class CustomTest(unittest2.TestCase): +class CustomTest(unittest.TestCase): """Test the CUSTOM Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class CustomTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom_opt.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom_opt.py index f1005c952..75381a05e 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom_opt.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_custom_opt.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx, NotAllowedEx from Acspy.Clients.SimpleClient import PySimpleClient -class CustomOPTTest(unittest2.TestCase): +class CustomOPTTest(unittest.TestCase): """Test the CUSTOM_OPT Configuration""" def setUp(self): @@ -26,4 +26,4 @@ class CustomOPTTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_fixed.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_fixed.py index 49611cc89..badd32ce8 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_fixed.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_fixed.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx from Acspy.Clients.SimpleClient import PySimpleClient -class FixedTest(unittest2.TestCase): +class FixedTest(unittest.TestCase): """Test the FIXED Configuration""" def setUp(self): @@ -27,4 +27,4 @@ class FixedTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_generic.py b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_generic.py index 8bc99c667..e0e4e890c 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/configurations/test_generic.py +++ b/Common/Servers/PyDewarPositioner/test/interface/configurations/test_generic.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class GenericTest(unittest2.TestCase): +class GenericTest(unittest.TestCase): """Test the generic configuration behavior""" def setUp(self): @@ -26,4 +26,4 @@ class GenericTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_get-setPosition.py b/Common/Servers/PyDewarPositioner/test/interface/test_get-setPosition.py index bc3909446..d6c117b8d 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_get-setPosition.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_get-setPosition.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx from maciErrType import CannotGetComponentEx @@ -7,7 +7,7 @@ from Antenna import ANT_NORTH from Management import MNG_TRACK -class GetSetPositionTest(unittest2.TestCase): +class GetSetPositionTest(unittest.TestCase): """Test the DewarPositioner.getPosition() method""" def setUp(self): client = PySimpleClient() @@ -31,4 +31,4 @@ class GetSetPositionTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_getManagementStatus.py b/Common/Servers/PyDewarPositioner/test/interface/test_getManagementStatus.py index 0cc900143..948ef9bcd 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_getManagementStatus.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_getManagementStatus.py @@ -1,5 +1,5 @@ import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient @@ -7,7 +7,7 @@ from DewarPositioner.cdbconf import CDBConf from Management import MNG_WARNING, MNG_FAILURE, MNG_OK -class MngStatusTest(unittest2.TestCase): +class MngStatusTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -25,4 +25,4 @@ class MngStatusTest(unittest2.TestCase): self.assertEqual(self.positioner.getManagementStatus(), MNG_OK) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_getPositionFromHistory.py b/Common/Servers/PyDewarPositioner/test/interface/test_getPositionFromHistory.py index b881f3666..28a13545a 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_getPositionFromHistory.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_getPositionFromHistory.py @@ -1,7 +1,7 @@ from __future__ import with_statement import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Common.TimeHelper import getTimeStamp @@ -10,7 +10,7 @@ from ComponentErrors import ComponentErrorsEx from DewarPositioner.cdbconf import CDBConf -class GetPositionFromHistoryTest(unittest2.TestCase): +class GetPositionFromHistoryTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -69,4 +69,4 @@ class GetPositionFromHistoryTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_getScanInfo.py b/Common/Servers/PyDewarPositioner/test/interface/test_getScanInfo.py index a0be97ddd..1ce516429 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_getScanInfo.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_getScanInfo.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import Management from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class TestGetScanInfo(unittest2.TestCase): +class TestGetScanInfo(unittest.TestCase): def setUp(self): client = PySimpleClient() self.positioner = client.getComponent('RECEIVERS/DewarPositioner') @@ -17,4 +17,4 @@ class TestGetScanInfo(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_isReady.py b/Common/Servers/PyDewarPositioner/test/interface/test_isReady.py index 40d46f296..f360311b9 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_isReady.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_isReady.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class IsReadyTest(unittest2.TestCase): +class IsReadyTest(unittest.TestCase): """Test all DewarPositioner.isSomething() methods""" def setUp(self): client = PySimpleClient() @@ -23,4 +23,4 @@ class IsReadyTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_isSlewing.py b/Common/Servers/PyDewarPositioner/test/interface/test_isSlewing.py index d6895293f..0041fc834 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_isSlewing.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_isSlewing.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import time from ComponentErrors import ValidationErrorEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient -class IsSlewingTest(unittest2.TestCase): +class IsSlewingTest(unittest.TestCase): """Test all DewarPositioner.isSomething() methods""" def setUp(self): client = PySimpleClient() @@ -27,4 +27,4 @@ class IsSlewingTest(unittest2.TestCase): self.assertEqual(self.positioner.isSlewing(), self.derotator.isSlewing()) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_nchannel.py b/Common/Servers/PyDewarPositioner/test/interface/test_nchannel.py index 3bb336ca5..4d04bd212 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_nchannel.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_nchannel.py @@ -1,6 +1,6 @@ import threading import time -import unittest2 +import unittest import mocker import Receivers @@ -10,7 +10,7 @@ from Acspy.Nc.Consumer import Consumer from DewarPositioner import DewarPositionerImpl -class NotificationChannelTest(unittest2.TestCase): +class NotificationChannelTest(unittest.TestCase): def setUp(self): client = PySimpleClient() @@ -79,4 +79,4 @@ class NotificationChannelTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_offset.py b/Common/Servers/PyDewarPositioner/test/interface/test_offset.py index 41362f06f..7ab44bf31 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_offset.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_offset.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import NotAllowedEx -class OffsetTest(unittest2.TestCase): +class OffsetTest(unittest.TestCase): """Test the DewarPositioner setOffset() and getOffset() methods""" def setUp(self): client = PySimpleClient() @@ -42,4 +42,4 @@ class OffsetTest(unittest2.TestCase): ) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_park.py b/Common/Servers/PyDewarPositioner/test/interface/test_park.py index 3e8722101..ad607f5cb 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_park.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_park.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx from maciErrType import CannotGetComponentEx from Acspy.Clients.SimpleClient import PySimpleClient import time -class ParkTest(unittest2.TestCase): +class ParkTest(unittest.TestCase): """Test the DewarPositioner.park() method""" def setUp(self): client = PySimpleClient() @@ -29,4 +29,4 @@ class ParkTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_rewind.py b/Common/Servers/PyDewarPositioner/test/interface/test_rewind.py index f180b80b3..afe102950 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_rewind.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_rewind.py @@ -1,11 +1,11 @@ from __future__ import with_statement -import unittest2 +import unittest import time from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import ComponentErrorsEx -class RewindTest(unittest2.TestCase): +class RewindTest(unittest.TestCase): """Test the DewarPositioner.rewind() method""" def setUp(self): client = PySimpleClient() @@ -29,4 +29,4 @@ class RewindTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_rewindingmodes.py b/Common/Servers/PyDewarPositioner/test/interface/test_rewindingmodes.py index 6e8893291..ff816496c 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_rewindingmodes.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_rewindingmodes.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient -class ModeTest(unittest2.TestCase): +class ModeTest(unittest.TestCase): """Test the DewarPositioner.*Mode() methods""" def setUp(self): @@ -22,4 +22,4 @@ class ModeTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_setup.py b/Common/Servers/PyDewarPositioner/test/interface/test_setup.py index cd6e2a8cd..a45640141 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_setup.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_setup.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import time from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx @@ -7,7 +7,7 @@ from Acspy.Clients.SimpleClient import PySimpleClient from DewarPositioner.cdbconf import CDBConf -class SetupTest(unittest2.TestCase): +class SetupTest(unittest.TestCase): def setUp(self): client = PySimpleClient() self.positioner = client.getComponent('RECEIVERS/DewarPositioner') @@ -39,4 +39,4 @@ class SetupTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/interface/test_status_property.py b/Common/Servers/PyDewarPositioner/test/interface/test_status_property.py index f24a21a4c..498e626e8 100644 --- a/Common/Servers/PyDewarPositioner/test/interface/test_status_property.py +++ b/Common/Servers/PyDewarPositioner/test/interface/test_status_property.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import time from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import NotAllowedEx -class StatusPropertyTest(unittest2.TestCase): +class StatusPropertyTest(unittest.TestCase): """...""" def setUp(self): client = PySimpleClient() @@ -29,4 +29,4 @@ class StatusPropertyTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/no_auto/updatePositionValues.py b/Common/Servers/PyDewarPositioner/test/no_auto/updatePositionValues.py index 75144ebb1..825982ed3 100644 --- a/Common/Servers/PyDewarPositioner/test/no_auto/updatePositionValues.py +++ b/Common/Servers/PyDewarPositioner/test/no_auto/updatePositionValues.py @@ -1,5 +1,5 @@ from __future__ import with_statement -import unittest2 +import unittest import random import time from maciErrType import CannotGetComponentEx diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/cdbconf/test_cdbconf.py b/Common/Servers/PyDewarPositioner/test/pyunit/cdbconf/test_cdbconf.py index 6b932abdf..a9c10c333 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/cdbconf/test_cdbconf.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/cdbconf/test_cdbconf.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest from DewarPositioner.cdbconf import CDBConf from ComponentErrors import ValidationErrorEx from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Util import ACSCorba -class CDBConfTest(unittest2.TestCase): +class CDBConfTest(unittest.TestCase): def setUp(self): self.conf = CDBConf() self.dal = ACSCorba.cdb() @@ -98,4 +98,4 @@ class CDBConfTest(unittest2.TestCase): self.assertEqual(value, self.conf.getAttribute(name)) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/devios/test_status.py b/Common/Servers/PyDewarPositioner/test/pyunit/devios/test_status.py index 26063c465..80f657fba 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/devios/test_status.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/devios/test_status.py @@ -1,9 +1,9 @@ -import unittest2 +import unittest import mocker from DewarPositioner.devios import StatusDevIO -class StatusDevIOTest(unittest2.TestCase): +class StatusDevIOTest(unittest.TestCase): def setUp(self): self.m = mocker.Mocker() @@ -31,4 +31,4 @@ class StatusDevIOTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_galactic_parallactic.py b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_galactic_parallactic.py index bcef705b9..4d7699a14 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_galactic_parallactic.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_galactic_parallactic.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker from math import sin, cos, tan, atan, radians, degrees, pi, atan2 from DewarPositioner.posgenerator import PosGenerator, PosGeneratorError -class PosGeneratorGalacticParallacticTest(unittest2.TestCase): +class PosGeneratorGalacticParallacticTest(unittest.TestCase): def setUp(self): self.m = mocker.Mocker() @@ -50,4 +50,4 @@ class PosGeneratorGalacticParallacticTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_goto.py b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_goto.py index 2067e17ea..c1590b2dc 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_goto.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_goto.py @@ -1,8 +1,8 @@ -import unittest2 +import unittest from DewarPositioner.posgenerator import PosGenerator, PosGeneratorError -class PosGeneratorGoToTest(unittest2.TestCase): +class PosGeneratorGoToTest(unittest.TestCase): def test_goto(self): """The goto take a position and yield it""" @@ -12,4 +12,4 @@ class PosGeneratorGoToTest(unittest2.TestCase): self.assertEqual(pos, position) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_parallactic.py b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_parallactic.py index 7e0e17548..a7407ff3c 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_parallactic.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/posgen/test_parallactic.py @@ -1,10 +1,10 @@ -import unittest2 +import unittest import mocker from math import sin, cos, tan, atan, radians, degrees, pi, atan2 from DewarPositioner.posgenerator import PosGenerator, PosGeneratorError -class PosGeneratorParallacticTest(unittest2.TestCase): +class PosGeneratorParallacticTest(unittest.TestCase): def setUp(self): self.m = mocker.Mocker() @@ -61,4 +61,4 @@ class PosGeneratorParallacticTest(unittest2.TestCase): self.assertGreater(abs(parallactic), 90) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_dec2bin.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_dec2bin.py index f6b1e1ae7..67e8b8e27 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_dec2bin.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_dec2bin.py @@ -1,7 +1,7 @@ -import unittest2 +import unittest from DewarPositioner.positioner import Status -class Dec2BinTest(unittest2.TestCase): +class Dec2BinTest(unittest.TestCase): def test_return_the_required_length(self): """The lenght of the string must be as specified""" @@ -12,4 +12,4 @@ class Dec2BinTest(unittest2.TestCase): self.assertEqual(Status.dec2bin(0, 7), '0'*7) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_getScanInfo.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_getScanInfo.py index 5ebe354b5..45501810e 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_getScanInfo.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_getScanInfo.py @@ -1,5 +1,5 @@ from __future__ import with_statement -import unittest2 +import unittest import random import math import time @@ -13,7 +13,7 @@ from DewarPositionerMockers.mock_components import MockDevice, MockSource from DewarPositioner.cdbconf import CDBConf from DewarPositioner.posgenerator import PosGenerator -class PositionerStartUpdatingTest(unittest2.TestCase): +class PositionerStartUpdatingTest(unittest.TestCase): def setUp(self): self.device = MockDevice() @@ -79,4 +79,4 @@ class PositionerStartUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_goTo.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_goTo.py index 8b5328728..da8b03d24 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_goTo.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_goTo.py @@ -1,13 +1,13 @@ import random import time -import unittest2 +import unittest from maciErrType import CannotGetComponentEx from DewarPositioner.positioner import Positioner, NotAllowedError from DewarPositioner.cdbconf import CDBConf from Acspy.Clients.SimpleClient import PySimpleClient -class GoTo(unittest2.TestCase): +class GoTo(unittest.TestCase): def setUp(self): self.cdbconf = CDBConf() @@ -39,4 +39,4 @@ class GoTo(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_init.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_init.py index 275e9b1ce..b37d29686 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_init.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_init.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import random import time from DewarPositioner.positioner import Positioner, NotAllowedError from DewarPositioner.cdbconf import CDBConf -class PositionerInitTest(unittest2.TestCase): +class PositionerInitTest(unittest.TestCase): def test___init__(self): """Verify the right behavior of the initializer""" @@ -19,4 +19,4 @@ class PositionerInitTest(unittest2.TestCase): self.assertRaises(NotAllowedError, p.startUpdating, 'axis', 'sector', 1, 1, None, None) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_offset.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_offset.py index 01df8ce71..92a102ebd 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_offset.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_offset.py @@ -1,6 +1,6 @@ import random import time -import unittest2 +import unittest from math import radians from maciErrType import CannotGetComponentEx from DewarPositioner.positioner import Positioner, NotAllowedError @@ -9,7 +9,7 @@ from Acspy.Clients.SimpleClient import PySimpleClient from DewarPositionerMockers.mock_components import MockDevice, MockSource -class PositionerOffsetTest(unittest2.TestCase): +class PositionerOffsetTest(unittest.TestCase): def setUp(self): self.cdbconf = CDBConf() @@ -86,4 +86,4 @@ class PositionerOffsetTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_park.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_park.py index a3f937720..b2edc1653 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_park.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_park.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import random import time from maciErrType import CannotGetComponentEx @@ -7,7 +7,7 @@ from DewarPositioner.positioner import Positioner, NotAllowedError from DewarPositioner.cdbconf import CDBConf -class PositionerParkTest(unittest2.TestCase): +class PositionerParkTest(unittest.TestCase): def setUp(self): self.cdbconf = CDBConf() @@ -39,4 +39,4 @@ class PositionerParkTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_setup.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_setup.py index ad3185e98..37642fa7e 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_setup.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_setup.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import random import time from maciErrType import CannotGetComponentEx @@ -7,7 +7,7 @@ from DewarPositioner.cdbconf import CDBConf from Acspy.Clients.SimpleClient import PySimpleClient -class PositionerSetupTest(unittest2.TestCase): +class PositionerSetupTest(unittest.TestCase): def setUp(self): self.cdbconf = CDBConf() @@ -52,4 +52,4 @@ class PositionerSetupTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_startUpdating.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_startUpdating.py index d9fe49f81..12dc3e8eb 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_startUpdating.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_startUpdating.py @@ -1,5 +1,5 @@ from __future__ import with_statement -import unittest2 +import unittest import mocker import random import time @@ -12,7 +12,7 @@ from DewarPositionerMockers.mock_components import MockDevice, MockSource from DewarPositioner.cdbconf import CDBConf from DewarPositioner.posgenerator import PosGenerator -class PositionerStartUpdatingTest(unittest2.TestCase): +class PositionerStartUpdatingTest(unittest.TestCase): def setUp(self): self.device = MockDevice() @@ -303,4 +303,4 @@ class PositionerStartUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_status.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_status.py index f30c850ec..f5dcf9a9c 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_status.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_status.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import random import time from maciErrType import CannotGetComponentEx @@ -8,7 +8,7 @@ from DewarPositionerMockers.mock_components import MockDevice, Property, Complet import mocker -class PositionerStartUpdatingTest(unittest2.TestCase): +class PositionerStartUpdatingTest(unittest.TestCase): def setUp(self): self.m = mocker.Mocker() @@ -152,4 +152,4 @@ class PositionerStartUpdatingTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_stop.py b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_stop.py index 0801428c9..823340758 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_stop.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/positioner/test_stop.py @@ -1,4 +1,4 @@ -import unittest2 +import unittest import threading import random import time @@ -8,7 +8,7 @@ from DewarPositioner.positioner import Positioner, PositionerError from DewarPositioner.cdbconf import CDBConf -class PositionerStopTest(unittest2.TestCase): +class PositionerStopTest(unittest.TestCase): def test_stopped(self): try: @@ -42,4 +42,4 @@ class PositionerStopTest(unittest2.TestCase): self.assertEqual(p.isTerminated(), True) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/pyunit/publisher/test_publisher.py b/Common/Servers/PyDewarPositioner/test/pyunit/publisher/test_publisher.py index 4f5a8624b..f96d581f2 100644 --- a/Common/Servers/PyDewarPositioner/test/pyunit/publisher/test_publisher.py +++ b/Common/Servers/PyDewarPositioner/test/pyunit/publisher/test_publisher.py @@ -1,6 +1,6 @@ import threading import time -import unittest2 +import unittest import mocker import Receivers from Management import MNG_WARNING, MNG_FAILURE, MNG_OK @@ -9,7 +9,7 @@ from Acspy.Nc.Supplier import Supplier from DewarPositioner import DewarPositionerImpl -class PublisherTest(unittest2.TestCase): +class PublisherTest(unittest.TestCase): @classmethod def setUpClass(cls): @@ -233,4 +233,4 @@ class PublisherTest(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Servers/PyDewarPositioner/test/run_coverage b/Common/Servers/PyDewarPositioner/test/run_coverage index 91e7f07e8..56b6791fb 100755 --- a/Common/Servers/PyDewarPositioner/test/run_coverage +++ b/Common/Servers/PyDewarPositioner/test/run_coverage @@ -1,6 +1,6 @@ #!/bin/bash rm -f .coverage -coverage run -m unittest2 discover +coverage run -m unittest discover coverage report --include $INTROOT"/lib/python/site-packages/DewarPositioner/*" diff --git a/Common/Servers/PyLocalOscillator/test/test_commandline.py b/Common/Servers/PyLocalOscillator/test/test_commandline.py index 0b11ff188..18bccf500 100644 --- a/Common/Servers/PyLocalOscillator/test/test_commandline.py +++ b/Common/Servers/PyLocalOscillator/test/test_commandline.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import socket from LocalOscillatorImpl import CommandLine #ip,port ='192.168.200.143',5025 #simulator ip, port = "192.168.200.149", 5025 #real hw -class TestCommandLine(unittest2.TestCase): +class TestCommandLine(unittest.TestCase): def setUp(self): @@ -36,7 +36,7 @@ class TestCommandLine(unittest2.TestCase): val=0. msg,val=self.cl.getFrequency() self.assertEqual(2000,val) - @unittest2.skip("demonstrating skipping") + @unittest.skip("demonstrating skipping") def test_3_getFrequency_err(self): self.assertRaises(CommandLine.CommandLineError, self.cl.getFrequency) @@ -44,7 +44,7 @@ class TestCommandLine(unittest2.TestCase): msg,err=self.cl.setPower(13) self.assertEqual('0,\"No error\"\n',msg) - # @unittest2.skip("demonstrating skipping") + # @unittest.skip("demonstrating skipping") def test_4_sendPower(self): msg,err=self.cl.setPower(13) self.assertEqual('0,\"No error\"\n',msg) @@ -63,7 +63,7 @@ class TestCommandLine(unittest2.TestCase): msg=self.cl.readStatus() self.assertEqual('0,\"No error\"\n',msg) - @unittest2.skip("demonstrating skipping") + @unittest.skip("demonstrating skipping") def test_7_sendWrongCMD(self): # try: self.cl.sendCmd('WOWOW \n') #wrong msg @@ -73,5 +73,5 @@ class TestCommandLine(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() \ No newline at end of file diff --git a/Common/Servers/PyLocalOscillator/test/test_component.py b/Common/Servers/PyLocalOscillator/test/test_component.py index a9951ef4a..ff845f571 100644 --- a/Common/Servers/PyLocalOscillator/test/test_component.py +++ b/Common/Servers/PyLocalOscillator/test/test_component.py @@ -1,10 +1,10 @@ import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient from LocalOscillatorImpl import CommandLine -class TestCommandLine(unittest2.TestCase): +class TestCommandLine(unittest.TestCase): def setUp(self): @@ -22,4 +22,4 @@ class TestCommandLine(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Common/Tests/test/cdb/test_procedures.py b/Common/Tests/test/cdb/test_procedures.py index 9cf4f1189..fa6c6b3fd 100644 --- a/Common/Tests/test/cdb/test_procedures.py +++ b/Common/Tests/test/cdb/test_procedures.py @@ -1,8 +1,8 @@ -import unittest2 +import unittest from xml.etree import ElementTree from Acspy.Util import ACSCorba -class TestProcedures(unittest2.TestCase): +class TestProcedures(unittest.TestCase): def setUp(self): dal = ACSCorba.cdb() @@ -18,4 +18,4 @@ class TestProcedures(unittest2.TestCase): self.assertNotIn('antennaReset', commands) if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/Noto/Servers/LocalOscillator/test/test_commandline.py b/Noto/Servers/LocalOscillator/test/test_commandline.py index 2698e868a..9ed783632 100644 --- a/Noto/Servers/LocalOscillator/test/test_commandline.py +++ b/Noto/Servers/LocalOscillator/test/test_commandline.py @@ -1,11 +1,11 @@ -import unittest2 +import unittest import socket from LocalOscillatorImpl import CommandLine #ip,port ='192.168.200.143',5025 #simulator ip, port = "192.167.187.200", 1234 #real hw -class TestCommandLine(unittest2.TestCase): +class TestCommandLine(unittest.TestCase): def setUp(self): @@ -46,5 +46,5 @@ class TestCommandLine(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() \ No newline at end of file diff --git a/Noto/Servers/LocalOscillator/test/test_component.py b/Noto/Servers/LocalOscillator/test/test_component.py index a9951ef4a..ff845f571 100644 --- a/Noto/Servers/LocalOscillator/test/test_component.py +++ b/Noto/Servers/LocalOscillator/test/test_component.py @@ -1,10 +1,10 @@ import time -import unittest2 +import unittest from ComponentErrors import ComponentErrorsEx, ComponentErrorsEx from Acspy.Clients.SimpleClient import PySimpleClient from LocalOscillatorImpl import CommandLine -class TestCommandLine(unittest2.TestCase): +class TestCommandLine(unittest.TestCase): def setUp(self): @@ -22,4 +22,4 @@ class TestCommandLine(unittest2.TestCase): if __name__ == '__main__': - unittest2.main() + unittest.main() diff --git a/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py b/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py index d91bd88e5..5e21424e5 100644 --- a/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py +++ b/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py @@ -1,7 +1,7 @@ import os import sys import time -import unittest2 +import unittest import subprocess def run(test_case): @@ -14,11 +14,11 @@ def run(test_case): try: subprocess.Popen(['%s-sim' %server_name, 'start'], stdout=FNULL, stderr=FNULL) time.sleep(1) # Give the server the time to start - suite = unittest2.TestSuite() - tests = unittest2.TestLoader().loadTestsFromTestCase(test_case) + suite = unittest.TestSuite() + tests = unittest.TestLoader().loadTestsFromTestCase(test_case) suite.addTests(tests) print 'Running the tests using the antenna simulators...' - unittest2.TextTestRunner(verbosity=2).run(suite) + unittest.TextTestRunner(verbosity=2).run(suite) finally: subprocess.Popen(['%s-sim' % server_name, 'stop'], stdout=FNULL, stderr=FNULL) time.sleep(2) # Give the server the time to stop diff --git a/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py b/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py index 990a28123..10bb36ec1 100644 --- a/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py +++ b/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py @@ -3,14 +3,14 @@ from __future__ import with_statement import os from xml.etree import ElementTree -import unittest2 +import unittest from Acspy.Clients.SimpleClient import PySimpleClient from ComponentErrors import ComponentErrorsEx from ReceiversErrors import ReceiversErrorsEx from Acspy.Util import ACSCorba -class TestLO(unittest2.TestCase): +class TestLO(unittest.TestCase): telescope = os.getenv('STATION') @@ -199,7 +199,7 @@ class TestLO(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main(verbosity=2, failfast=True) # Real test using the antenna CDB + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: from PyLPBandTest import simunittest simunittest.run(TestLO) diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py index 1c9c15f3c..7740b49e9 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py @@ -5,7 +5,7 @@ import time import datetime import subprocess -import unittest2 +import unittest import Management import MinorServo @@ -17,7 +17,7 @@ __author__ = "Marco Buttu " FNULL = open(os.devnull, 'w') -class TestFailure(unittest2.TestCase): +class TestFailure(unittest.TestCase): telescope = os.getenv('STATION') @@ -81,7 +81,7 @@ class TestFailure(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main() # Real test using the antenna CDB + unittest.main() # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(TestFailure) diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py index e41c7e2a6..73c2388c0 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest2 # https://pypi.python.org/pypi/unittest2 +import unittest # https://pypi.python.org/pypi/unittest import Management import MinorServo import Antenna @@ -18,7 +18,7 @@ from Acspy.Util import ACSCorba __author__ = "Marco Buttu " -class SetupTest(unittest2.TestCase): +class SetupTest(unittest.TestCase): telescope = os.getenv('STATION') @@ -90,7 +90,7 @@ class SetupTest(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main(verbosity=2, failfast=True) # Real test using the antenna CDB + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(SetupTest) diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py index 62e1d8402..7644cc0aa 100755 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest2 # https://pypi.python.org/pypi/unittest2 +import unittest # https://pypi.python.org/pypi/unittest import Management import MinorServo import Antenna @@ -18,7 +18,7 @@ from Acspy.Util import ACSCorba __author__ = "Marco Buttu " -class CannotSetupTest(unittest2.TestCase): +class CannotSetupTest(unittest.TestCase): telescope = os.getenv('STATION') @@ -81,7 +81,7 @@ class CannotSetupTest(unittest2.TestCase): if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): - unittest2.main(verbosity=2, failfast=True) # Real test using the antenna CDB + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: from PyMinorServoTest import simunittest simunittest.run(CannotSetupTest) -- GitLab From dcb27add9300e6041f11a05591f67cada0ef7ca0 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 10:56:32 +0000 Subject: [PATCH 064/145] Remove URL to unittest2 (#145) --- .../MinorServoInterface/test/functional/test_position.py | 2 +- .../Interfaces/MinorServoInterface/test/functional/test_scan.py | 2 +- SRT/Servers/SRTMinorServo/test/functional/test_setup.py | 2 +- .../test/functional/test_setup_after_manual_movement.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py index ad4304267..704971e7b 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest # https://pypi.python.org/pypi/unittest +import unittest import Management import MinorServo import Antenna diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py index 367a251f9..b12b0d2c1 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest # https://pypi.python.org/pypi/unittest +import unittest import Management import MinorServo import Antenna diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py index 73c2388c0..0896d0ff8 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest # https://pypi.python.org/pypi/unittest +import unittest import Management import MinorServo import Antenna diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py index 7644cc0aa..0ea977b8a 100755 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py @@ -5,7 +5,7 @@ import time import os from datetime import datetime -import unittest # https://pypi.python.org/pypi/unittest +import unittest import Management import MinorServo import Antenna -- GitLab From 67abaceb81563c5a280cc03e6abc3ca57d46b679 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 6 Jun 2017 12:04:26 +0000 Subject: [PATCH 065/145] Test that reproduces the bug of #143 --- .../test/functional/test_container_crash.py | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py new file mode 100644 index 000000000..da8c205d6 --- /dev/null +++ b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py @@ -0,0 +1,38 @@ +"""Issue https://github.com/discos/discos/issues/143""" + +import os +import time +import unittest +from subprocess import Popen, PIPE +from Acspy.Clients.SimpleClient import PySimpleClient + + +__author__ = "Marco Buttu " + +class TestContainerCrash(unittest.TestCase): + + telescope = os.getenv('STATION') + + def test_get_and_release_component(self): + """The container must be alive after releasing the component""" + client = PySimpleClient() + srp = client.getComponent('MINORSERVO/SRP') + pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) + out, err = pipes.communicate() + expected_regex = 'MinorServoContainer container is running' + self.assertRegexpMatches(out, expected_regex) + + client.releaseComponent('MINORSERVO/SRP') + time.sleep(1) + pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) + out, err = pipes.communicate() + expected_regex = 'MinorServoContainer container is running' + self.assertRegexpMatches(out, expected_regex) + + +if __name__ == '__main__': + if 'Configuration' in os.getenv('ACS_CDB'): + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB + else: + from PyMinorServoTest import simunittest + simunittest.run(TestContainerCrash) -- GitLab From 7066c2d8c1df35913777011eb46ee3158c8322f3 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 8 Jun 2017 10:44:33 +0000 Subject: [PATCH 066/145] Regression test for issue #143 --- .../test/functional/test_container_crash.py | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py index da8c205d6..337a7bdd7 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py @@ -1,33 +1,47 @@ -"""Issue https://github.com/discos/discos/issues/143""" +"""Test issue https://github.com/discos/discos/issues/143""" import os import time import unittest from subprocess import Popen, PIPE from Acspy.Clients.SimpleClient import PySimpleClient +from testing.containers import Container __author__ = "Marco Buttu " + class TestContainerCrash(unittest.TestCase): telescope = os.getenv('STATION') + + @classmethod + def setUpClass(cls): + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + ] + + + def setUp(self): + self.client = PySimpleClient() + for container in self.containers: + container.start() + container.wait_until_running() + if not container.is_running(): + self.fail('cannot run %s' % container.name) + + def tearDown(self): + self.client.disconnect() + for container in self.containers: + container.stop() def test_get_and_release_component(self): """The container must be alive after releasing the component""" - client = PySimpleClient() - srp = client.getComponent('MINORSERVO/SRP') - pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) - out, err = pipes.communicate() - expected_regex = 'MinorServoContainer container is running' - self.assertRegexpMatches(out, expected_regex) - - client.releaseComponent('MINORSERVO/SRP') - time.sleep(1) - pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) - out, err = pipes.communicate() - expected_regex = 'MinorServoContainer container is running' - self.assertRegexpMatches(out, expected_regex) + srp = self.client.getComponent('MINORSERVO/SRP') + self.client.releaseComponent('MINORSERVO/SRP') + time.sleep(3) + for container in self.containers: + self.assertTrue(container.is_running()) if __name__ == '__main__': -- GitLab From 9971d04417b7761d1daeb0c25eb4fce384a5066a Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 8 Jun 2017 10:45:57 +0000 Subject: [PATCH 067/145] Python testing library described in issue #147 --- .../Libraries/PyTestingLibrary/src/Makefile | 34 +++++++++++++++ .../PyTestingLibrary/src/testing/__init__.py | 0 .../src/testing/containers.py | 41 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 Common/Libraries/PyTestingLibrary/src/Makefile create mode 100644 Common/Libraries/PyTestingLibrary/src/testing/__init__.py create mode 100755 Common/Libraries/PyTestingLibrary/src/testing/containers.py diff --git a/Common/Libraries/PyTestingLibrary/src/Makefile b/Common/Libraries/PyTestingLibrary/src/Makefile new file mode 100644 index 000000000..579a32947 --- /dev/null +++ b/Common/Libraries/PyTestingLibrary/src/Makefile @@ -0,0 +1,34 @@ +#***************************************** +#----------------------------------------- +# Marco Buttu +#----------------------------------------- +#***************************************** + +PY_PACKAGES = testing + +# ----------------- +# Include Standards +# ----------------- + +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + + +# TARGETS +all: do_all + @echo " . . . 'all' done" + +clean : clean_all + $(RM) *.pyc testing/*.pyc + $(RM) ../lib ../bin ../config ../doc ../idl ../include \ + ../object ../rtai ../test + $(RM) $(INTROOT)/lib/python/site-packages/testing* + @echo " . . . clean done" + +install : install_all + @echo " . . . installation done" + +#___oOo___ diff --git a/Common/Libraries/PyTestingLibrary/src/testing/__init__.py b/Common/Libraries/PyTestingLibrary/src/testing/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/Common/Libraries/PyTestingLibrary/src/testing/containers.py b/Common/Libraries/PyTestingLibrary/src/testing/containers.py new file mode 100755 index 000000000..c856a6081 --- /dev/null +++ b/Common/Libraries/PyTestingLibrary/src/testing/containers.py @@ -0,0 +1,41 @@ +import os +import time +import datetime +from subprocess import Popen, PIPE + +__author__ = "Marco Buttu " + + +ACSDATA = os.getenv('ACSDATA') +logfile = os.path.join(ACSDATA, 'logs', 'testing.log') + + +class Container(object): + + def __init__(self, name, lang): + self.name = name + self.lang = lang + + def start(self): + with open(logfile, 'a') as outfile: + Popen( + ['acsStartContainer', '-%s' % self.lang, self.name], + stdout=outfile) + + def stop(self): + with open(logfile, 'a') as outfile: + p = Popen(['acsStopContainer', self.name], stdout=outfile) + p.wait() # Block until acsStopContainer exits + + def wait_until_running(self, timeout=10): + t0 = datetime.datetime.now() + while (datetime.datetime.now() - t0).seconds < timeout: + if self.is_running(): + break + else: + time.sleep(0.5) + + def is_running(self): + pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) + out, err = pipes.communicate() + return ('%s container is running' % self.name) in out -- GitLab From 0f73b4a93f9656ef799620b58160caee0bb7ea5a Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 9 Jun 2017 07:52:23 +0000 Subject: [PATCH 068/145] Add PyTestingLibrary to SystemMake (issue #147) --- SystemMake/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/SystemMake/Makefile b/SystemMake/Makefile index f2d11dfbc..212b6c331 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -30,7 +30,7 @@ COMMON_INTERFACES:=CommonInterface ManagmentInterface AntennaInterface Receivers XBackendInterface COMMON_LIBRARIES:=SlaLibrary IRALibrary TextWindowLibrary ParserLibrary \ XarcosLibrary ModbusChannel ComponentProxy \ - DiscosBackendProtocol + DiscosBackendProtocol PyTestingLibrary \ COMMON_SERVERS:=AntennaBoss Observatory OTF PointingModel Refraction SkySource \ Moon FitsWriter Scheduler ReceiversBoss ExternalClients \ CalibrationTool TotalPower NoiseGenerator CustomLogger \ @@ -78,7 +78,7 @@ ifeq ($(STATION),SRT) SRTActiveSurfaceErrors \ CommonInterface ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface XBackendInterface \ SRTAntennaInterface SRTActiveSurfaceInterface SRTWeatherStationInterface SRTReceiversInterface \ - SlaLibrary IRALibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary ComponentProxy ModbusChannel\ + SlaLibrary IRALibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary ComponentProxy ModbusChannel PyTestingLibrary \ AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool TotalPower NoiseGenerator DBBC CustomLogger XBackend \ SRTMount SRTActiveSurfaceLanServer SRTActiveSurfaceUSDServer SRTActiveSurfaceBoss SRTMinorServo SRTKBandMFReceiver SRTWeatherStation SRT7GHzReceiver SRTLPBandReceiver PyDewarPositioner \ AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal CaltoolClient CustomLoggingClient SchedulerTextClient \ @@ -95,7 +95,7 @@ ifeq ($(STATION),SRT) Receivers_MODULES:=ReceiversInterface MinorServo_MODULES:=MinorServoInterface SRTActiveSurface_MODULES:=SRTActiveSurfaceInterface - Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary + Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary XarcosLibrary SRTMinorServoLibrary PyTestingLibrary AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss SRTMount ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend @@ -114,7 +114,8 @@ ifeq ($(STATION),Medicina) ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors XBackendErrors\ CommonInterface ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface XBackendInterface\ MedicinaAntennaInterface MedicinaWeatherStationInterface \ - SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel XarcosLibrary\ + SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel XarcosLibrary + PyTestingLibrary \ AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \ Metrology TotalPower NoiseGenerator MedicinaMount MedWeatherStation CustomLogger XBackend MedicinaMinorServo\ AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal CaltoolClient SchedulerTextClient MinorServoBossTextClient\ @@ -129,7 +130,7 @@ ifeq ($(STATION),Medicina) Backends_MODULES:=BackendsInterface XBackendInterface WeatherStation_MODULES:=WeatherStationInterface MedicinaWeatherStationInterface Receivers_MODULES:=ReceiversInterface - Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary + Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary PyTestingLibrary AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss MedicinaMount ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients BackendsImplementation_MODULES:=TotalPower NoiseGenerator XBackend @@ -145,7 +146,7 @@ ifeq ($(STATION),Noto) MODULES:= ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors \ ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface \ NotoAntennaInterface \ - SlaLibrary IRALibrary TextWindowLibrary ParserLibrary \ + SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyTestingLibrary \ AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \ TotalPower NotoMount CustomLogger \ AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal SchedulerTextClient \ @@ -158,7 +159,7 @@ ifeq ($(STATION),Noto) Antenna_MODULES:=AntennaInterface NotoAntennaInterface Backends_MODULES:=BackendsInterface Receivers_MODULES:=ReceiversInterface - Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary + Libraries_MODULES:=IRALibrary SlaLibrary TextWindowLibrary ParserLibrary PyTestingLibrary AntennaImplementation_MODULES:=Observatory SkySource OTF Moon PointingModel Refraction AntennaBoss NotoMount ManagementImplementation_MODULES:=Scheduler CalibrationTool FitsWriter ExternalClients BackendsImplementation_MODULES:=TotalPower -- GitLab From f61202eaa07b0b1259608b74758a02a1851f056f Mon Sep 17 00:00:00 2001 From: Andrea Orlati Date: Mon, 12 Jun 2017 12:18:52 +0000 Subject: [PATCH 069/145] fix #149: IRALibrary warnings --- Common/Libraries/IRALibrary/src/IRATools.cpp | 15 ++++++++++----- Common/Libraries/IRALibrary/src/Socket.cpp | 9 ++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Common/Libraries/IRALibrary/src/IRATools.cpp b/Common/Libraries/IRALibrary/src/IRATools.cpp index 654276b8c..8c3a113b6 100644 --- a/Common/Libraries/IRALibrary/src/IRATools.cpp +++ b/Common/Libraries/IRALibrary/src/IRATools.cpp @@ -798,7 +798,8 @@ bool CIRATools::radToAngle(const double& rad,IRA::CString& outString) bool CIRATools::longitudeToRad(const IRA::CString& lon,double& rad,bool complete,char delimiter) { - long len=lon.GetLength(); + //long len=lon.GetLength(); + int len=lon.GetLength(); bool res; if (len==0) return false; if (lon[len-1]=='d') { @@ -818,7 +819,8 @@ bool CIRATools::longitudeToRad(const IRA::CString& lon,double& rad,bool complete bool CIRATools::latitudeToRad(const IRA::CString& lat,double& rad,bool complete,char delimiter) { - long len=lat.GetLength(); + //long len=lat.GetLength(); + int len=lat.GetLength(); bool res; if (len==0) return false; if (lat[len-1]=='d') { @@ -837,7 +839,8 @@ bool CIRATools::latitudeToRad(const IRA::CString& lat,double& rad,bool complete, bool CIRATools::rightAscensionToRad(const IRA::CString& ra,double& rad,bool complete,char delimiter) { - long len=ra.GetLength(); + //long len=ra.GetLength(); + int len=ra.GetLength(); bool res; if (len==0) return false; if (ra[len-1]=='d') { @@ -865,7 +868,8 @@ bool CIRATools::declinationToRad(const IRA::CString& dec,double& rad,bool comple bool CIRATools::galLongitudeToRad(const IRA::CString& lon,double& rad,bool complete,char delimiter) { - long len=lon.GetLength(); + //long len=lon.GetLength(); + int len=lon.GetLength(); bool res; if (len==0) return false; if (lon[len-1]=='d') { @@ -909,7 +913,8 @@ bool CIRATools::elevationToRad(const IRA::CString& el,double& rad,bool complete) bool CIRATools::offsetToRad(const IRA::CString& offset,double& rad,char delimiter) { - long len=offset.GetLength(); + //long len=offset.GetLength(); + int len=offset.GetLength(); bool res; if (len==0) return false; if (offset[len-1]=='d') { diff --git a/Common/Libraries/IRALibrary/src/Socket.cpp b/Common/Libraries/IRALibrary/src/Socket.cpp index 01c308498..624c79466 100644 --- a/Common/Libraries/IRALibrary/src/Socket.cpp +++ b/Common/Libraries/IRALibrary/src/Socket.cpp @@ -169,7 +169,14 @@ CSocket::OperationResult CSocket::Connect(CError& Err,CString IPAddr,WORD Port) if (!connect(m_iSocket,(struct sockaddr *)&addr,sizeof(struct sockaddr))) { return SUCCESS; } - else if ((errno==EINPROGRESS) || (errno==EALREADY) && (getMode()==NONBLOCKING)) { + /* + migration to 64 bits. the older If statement was warned by the compiler. The suggestion was to add a parenthesis. + "else if ((errno==EINPROGRESS) || (errno==EALREADY) && (getMode()==NONBLOCKING)) {" + The general rule of operator precedence is && before !!. Tha new code cahnges this an so changes radically what this code is doing. + The new code reflects what I think it should do (evaluate || before &&). + + */ + else if (((errno==EINPROGRESS) || (errno==EALREADY)) && (getMode()==NONBLOCKING)) { if ((m_wAsyncFlag&E_CONNECT)==E_CONNECT) setStatus(CONNECTING); return WOULDBLOCK; } -- GitLab From 86174fe2bf268c456305bc5690cbb856c1d7b6cb Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 13 Jun 2017 09:35:25 +0000 Subject: [PATCH 070/145] Fix #143: delete the resource only once it has been released --- SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp b/SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp index 27caf0ae5..6ddcfbbe5 100644 --- a/SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp +++ b/SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp @@ -90,6 +90,8 @@ WPServoImpl::WPServoImpl( WPServoImpl::~WPServoImpl() { AUTO_TRACE("WPServoImpl::~WPServoImpl()"); + bool remove_instance_counter = false; + try { pthread_mutex_lock(&destr_mutex); if(m_instance_counter != NULL) { @@ -117,11 +119,13 @@ WPServoImpl::~WPServoImpl() { if(m_cmdPos_list != NULL) { delete m_cmdPos_list; } - if(m_instance_counter != NULL) { - delete m_instance_counter; - } + remove_instance_counter = true; } secure_ptr.Release(); + + if(remove_instance_counter) { + delete m_instance_counter; + } } if (m_cdb_ptr) { -- GitLab From 416cc908d2db92e5017cbace196268909d08faea Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 15 Jun 2017 11:09:20 +0000 Subject: [PATCH 071/145] Add start_containers() and stop_containers() to PyTestingLibrary (#147) --- .../src/testing/containers.py | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/Common/Libraries/PyTestingLibrary/src/testing/containers.py b/Common/Libraries/PyTestingLibrary/src/testing/containers.py index c856a6081..a83610816 100755 --- a/Common/Libraries/PyTestingLibrary/src/testing/containers.py +++ b/Common/Libraries/PyTestingLibrary/src/testing/containers.py @@ -17,14 +17,16 @@ class Container(object): self.lang = lang def start(self): - with open(logfile, 'a') as outfile: - Popen( - ['acsStartContainer', '-%s' % self.lang, self.name], - stdout=outfile) + if not self.is_running(): + with open(logfile, 'a') as outfile: + Popen( + ['acsStartContainer', '-%s' % self.lang, self.name], + stdout=outfile, stderr=outfile) def stop(self): with open(logfile, 'a') as outfile: - p = Popen(['acsStopContainer', self.name], stdout=outfile) + p = Popen(['acsStopContainer', self.name], + stdout=outfile, stderr=outfile) p.wait() # Block until acsStopContainer exits def wait_until_running(self, timeout=10): @@ -39,3 +41,20 @@ class Container(object): pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) out, err = pipes.communicate() return ('%s container is running' % self.name) in out + + +class ContainerError(RuntimeError): + pass + + +def start_containers(containers): + for container in containers: + container.start() + container.wait_until_running() + if not container.is_running(): + raise RuntimeError('cannot run %s' % container.name) + + +def stop_containers(containers): + for container in containers: + container.stop() -- GitLab From 203e66f161eced5da9c91f83f770659508d29678 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 15 Jun 2017 14:44:30 +0000 Subject: [PATCH 072/145] Fix #151: send two #stop commands to the server --- .../SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py b/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py index 9f755ab1e..aa25ec70a 100755 --- a/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py +++ b/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py @@ -56,8 +56,7 @@ class MSCU(object): connection.close() continue else: - # From here on, this is the child. - self.socket.close() # Close the parent's socket + # From now on, this is the child. try: buff = '' while True: @@ -77,7 +76,6 @@ class MSCU(object): try: if data.startswith('#stop'): stop_server.value = True - connection.close() break elif data.startswith('#setpos_NAK'): setpos_NAK[1].value = True # The SRP address @@ -132,7 +130,6 @@ class MSCU(object): except: raise - # Close the connection try: connection.close() except KeyboardInterrupt: @@ -140,9 +137,7 @@ class MSCU(object): except: traceback.print_exc() - # Done handling the connection. Child process *must* terminate - # and not go back to the top of the loop - sys.exit(0) + sys.exit(0) # The child process *must* terminate def _welcome(self): print "*"*43 @@ -167,10 +162,12 @@ class MSCU(object): @staticmethod def stop(server=('127.0.0.1', 10000)): - sockobj = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sockobj.settimeout(2) - sockobj.connect(server) - sockobj.sendall('#stop\r\n') + # The second stop is mandatory + for i in range(2): + sockobj = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sockobj.settimeout(2) + sockobj.connect(server) + sockobj.sendall('#stop\r\n') @staticmethod def setpos_NAK(server=('127.0.0.1', 10000)): -- GitLab From ed46a08dfd00337f21e341e49ac387232cc73c1d Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 15 Jun 2017 15:14:24 +0000 Subject: [PATCH 073/145] Fix #152: send a signal.SIGTERM I executed the process in the shell and used a process group to send a signal to all the process in the groups. I attached a session id to the parent process of the spawned/child processes, which is a shell in this case. This will make it the group leader of the processes. So now, when a signal is sent to the process group leader, it's transmitted to all of the child processes of this group. --- .../test/PyMinorServoTest/simunittest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py b/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py index 34642418c..e9a351761 100644 --- a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py +++ b/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py @@ -1,18 +1,22 @@ import os import sys import time +import signal import unittest import subprocess + def run(test_case): # Use the simulators and the testing CDB server_name = 'srt-mscu' if test_case.telescope == 'SRT' else '' if not server_name: sys.exit(0) - FNULL = open(os.devnull, 'w') try: - subprocess.Popen(['%s-sim' % server_name, 'start'], stdout=FNULL, stderr=FNULL) + FNULL = open(os.devnull, 'w') + process = subprocess.Popen( + '%s-sim start' % server_name, stdout=FNULL, stderr=FNULL, + shell=True, preexec_fn=os.setsid) time.sleep(1) # Give the server the time to start suite = unittest.TestSuite() tests = unittest.TestLoader().loadTestsFromTestCase(test_case) @@ -20,5 +24,6 @@ def run(test_case): print 'Running the tests using the antenna simulators...' unittest.TextTestRunner(verbosity=2).run(suite) finally: - subprocess.Popen(['%s-sim' % server_name, 'stop'], stdout=FNULL, stderr=FNULL) + os.killpg(os.getpgid(process.pid), signal.SIGTERM) time.sleep(2) # Give the server the time to stop + FNULL.close() -- GitLab From ba09f6fcae046b1cbe50314d91c539dfe6c9e718 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 20 Jun 2017 13:58:35 +0000 Subject: [PATCH 074/145] Implementation of issue #155 --- Common/Libraries/Makefile | 2 +- .../src/Makefile | 6 +- .../PyACSWrapper/src/acswrapper/__init__.py | 7 ++ .../PyACSWrapper/src/acswrapper/containers.py | 102 ++++++++++++++++++ .../PyACSWrapper/src/acswrapper/system.py | 73 +++++++++++++ .../PyTestingLibrary/src/testing/__init__.py | 0 .../src/testing/containers.py | 60 ----------- 7 files changed, 186 insertions(+), 64 deletions(-) rename Common/Libraries/{PyTestingLibrary => PyACSWrapper}/src/Makefile (86%) create mode 100644 Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py create mode 100755 Common/Libraries/PyACSWrapper/src/acswrapper/containers.py create mode 100644 Common/Libraries/PyACSWrapper/src/acswrapper/system.py delete mode 100644 Common/Libraries/PyTestingLibrary/src/testing/__init__.py delete mode 100755 Common/Libraries/PyTestingLibrary/src/testing/containers.py diff --git a/Common/Libraries/Makefile b/Common/Libraries/Makefile index 98c6a063e..52a5be329 100644 --- a/Common/Libraries/Makefile +++ b/Common/Libraries/Makefile @@ -29,7 +29,7 @@ SUBSYSTEM = Libraries -MODULES = SlaLibrary IRALibrary TextWindowLibrary ParserLibrary +MODULES = SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyACSWrapper MAKE_FLAGS = "-k" diff --git a/Common/Libraries/PyTestingLibrary/src/Makefile b/Common/Libraries/PyACSWrapper/src/Makefile similarity index 86% rename from Common/Libraries/PyTestingLibrary/src/Makefile rename to Common/Libraries/PyACSWrapper/src/Makefile index 579a32947..3ff43aa52 100644 --- a/Common/Libraries/PyTestingLibrary/src/Makefile +++ b/Common/Libraries/PyACSWrapper/src/Makefile @@ -4,7 +4,7 @@ #----------------------------------------- #***************************************** -PY_PACKAGES = testing +PY_PACKAGES = acswrapper # ----------------- # Include Standards @@ -22,10 +22,10 @@ all: do_all @echo " . . . 'all' done" clean : clean_all - $(RM) *.pyc testing/*.pyc + $(RM) *.pyc acswrapper/*.pyc $(RM) ../lib ../bin ../config ../doc ../idl ../include \ ../object ../rtai ../test - $(RM) $(INTROOT)/lib/python/site-packages/testing* + $(RM) $(INTROOT)/lib/python/site-packages/acswrapper* @echo " . . . clean done" install : install_all diff --git a/Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py b/Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py new file mode 100644 index 000000000..7e0120f0f --- /dev/null +++ b/Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py @@ -0,0 +1,7 @@ +import os + +__author__ = "Marco Buttu " + + +ACSDATA = os.getenv('ACSDATA') +logfile = os.path.join(ACSDATA, 'logs', '%s.log' % __name__) diff --git a/Common/Libraries/PyACSWrapper/src/acswrapper/containers.py b/Common/Libraries/PyACSWrapper/src/acswrapper/containers.py new file mode 100755 index 000000000..923f58982 --- /dev/null +++ b/Common/Libraries/PyACSWrapper/src/acswrapper/containers.py @@ -0,0 +1,102 @@ +import os +import time +import signal +import datetime + +from subprocess import Popen, PIPE +from acswrapper import logfile + + +class Container(object): + + def __init__(self, name, lang): + self.name = name + self.lang = lang + self.start_process = None + + def start(self): + """Start the container and do not wait for the process to finish. + + This is a non blocking call. The method calls the acsStartContainer + command and returns immediately without waiting for the process to + finish its job. To know if the container is already started, call + the Container.is_running() method.""" + with open(logfile, 'a') as outfile: + if not self.is_running(): + self.start_process = Popen( + 'acsStartContainer -%s %s' % (self.lang, self.name), + stdout=outfile, stderr=outfile, shell=True, + preexec_fn=os.setsid) + else: + outfile.write('Container %s already running' % self.name) + + def stop(self): + """Stop the container and do not wait for the process to finish. + + This is a non blocking call. The method calls the acsStopContainer + command and returns immediately without waiting for the process to + finish its job. To know if the container is already stopped, call + the Container.is_running() method.""" + with open(logfile, 'a') as outfile: + Popen( + 'acsStopContainer %s' % self.name, + stdout=outfile, stderr=outfile, shell=True) + if self.start_process is not None: + os.killpg(os.getpgid(self.start_process.pid), signal.SIGTERM) + self.start_process = None + + def wait_until_running(self, timeout=10): + """Wait until the container is running.""" + t0 = datetime.datetime.now() + while (datetime.datetime.now() - t0).seconds < timeout: + if self.is_running(): + break + else: + time.sleep(0.5) + + def wait_until_not_running(self, timeout=10): + """Wait until the container is not more running.""" + t0 = datetime.datetime.now() + while (datetime.datetime.now() - t0).seconds < timeout: + if not self.is_running(): + break + else: + time.sleep(0.5) + + def is_running(self): + """Return True if the container is running.""" + pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) + out, _ = pipes.communicate() + return ('%s container is running' % self.name) in out + + +class ContainerError(RuntimeError): + pass + + +def start_containers_and_wait(containers, timeout=10): + """Start the containers and wait until they are actually started. + + This is a blocking call. The method starts the containers and + waits until they are actually started. It raises RuntimeError + in case the timeout expires.""" + for container in containers: + container.start() + for container in containers: + container.wait_until_running(timeout) + if not container.is_running(): + raise RuntimeError('cannot run %s' % container.name) + + +def stop_containers_and_wait(containers, timeout=10): + """Stop the containers and wait until they are actually stopped. + + This is a blocking call. The method stops the containers and + waits until they are actually stopped. It raises RuntimeError + in case the timeout expires.""" + for container in containers: + container.stop() + for container in containers: + container.wait_until_not_running(timeout) + if container.is_running(): + raise RuntimeError('cannot stop %s' % container.name) diff --git a/Common/Libraries/PyACSWrapper/src/acswrapper/system.py b/Common/Libraries/PyACSWrapper/src/acswrapper/system.py new file mode 100644 index 000000000..ec8b5f9bb --- /dev/null +++ b/Common/Libraries/PyACSWrapper/src/acswrapper/system.py @@ -0,0 +1,73 @@ +__all__ = ['acs'] + +import os +import time +import signal +import datetime +from subprocess import Popen, call + +from Acspy.Util.ACSCorba import getManager +from acswrapper import logfile + + +class ACS(object): + + def __new__(cls, *args, **kwargs): + if not hasattr(cls, '_instance'): + cls._instance = object.__new__(cls, *args, **kwargs) + cls._start_process = None + return cls._instance + + def start(self): + """Start ACS and wait until it is running.""" + with open(logfile, 'a') as outfile: + if not self.is_running(): + self._start_process = Popen( + 'acsStart', stdout=outfile, stderr=outfile, + shell=True, preexec_fn=os.setsid) + self.wait_until_running() + else: + outfile.write('ACS is already running') + + def stop(self): + """Stop ACS and wait until killACS terminates.""" + with open(logfile, 'a') as outfile: + if self._start_process is not None: + os.killpg(os.getpgid(self._start_process.pid), signal.SIGTERM) + self._start_process = None + Popen('acsStop', stdout=outfile, stderr=outfile, shell=True) + self.wait_until_not_running() + if self.is_running(): + outfile.write('acsStop is not able to stop ACS') + call('killACS', stdout=outfile, stderr=outfile, shell=True) + if self.is_running(): + outfile.write('killACS is not able to stop ACS') + + def wait_until_running(self, timeout=180): + """Wait until ACS is running.""" + t0 = datetime.datetime.now() + while (datetime.datetime.now() - t0).seconds < timeout: + if self.is_running(): + break + else: + time.sleep(0.5) + + def wait_until_not_running(self, timeout=240): + """Wait until ACS is not more running.""" + t0 = datetime.datetime.now() + while (datetime.datetime.now() - t0).seconds < timeout: + if not self.is_running(): + break + else: + time.sleep(0.5) + + def is_running(self): + """Return True if ACS is running.""" + try: + mng = getManager() + return bool(mng and mng.ping()) + except Exception: + return False + + +acs = ACS() diff --git a/Common/Libraries/PyTestingLibrary/src/testing/__init__.py b/Common/Libraries/PyTestingLibrary/src/testing/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/Common/Libraries/PyTestingLibrary/src/testing/containers.py b/Common/Libraries/PyTestingLibrary/src/testing/containers.py deleted file mode 100755 index a83610816..000000000 --- a/Common/Libraries/PyTestingLibrary/src/testing/containers.py +++ /dev/null @@ -1,60 +0,0 @@ -import os -import time -import datetime -from subprocess import Popen, PIPE - -__author__ = "Marco Buttu " - - -ACSDATA = os.getenv('ACSDATA') -logfile = os.path.join(ACSDATA, 'logs', 'testing.log') - - -class Container(object): - - def __init__(self, name, lang): - self.name = name - self.lang = lang - - def start(self): - if not self.is_running(): - with open(logfile, 'a') as outfile: - Popen( - ['acsStartContainer', '-%s' % self.lang, self.name], - stdout=outfile, stderr=outfile) - - def stop(self): - with open(logfile, 'a') as outfile: - p = Popen(['acsStopContainer', self.name], - stdout=outfile, stderr=outfile) - p.wait() # Block until acsStopContainer exits - - def wait_until_running(self, timeout=10): - t0 = datetime.datetime.now() - while (datetime.datetime.now() - t0).seconds < timeout: - if self.is_running(): - break - else: - time.sleep(0.5) - - def is_running(self): - pipes = Popen(['acsContainersStatus'], stdout=PIPE, stderr=PIPE) - out, err = pipes.communicate() - return ('%s container is running' % self.name) in out - - -class ContainerError(RuntimeError): - pass - - -def start_containers(containers): - for container in containers: - container.start() - container.wait_until_running() - if not container.is_running(): - raise RuntimeError('cannot run %s' % container.name) - - -def stop_containers(containers): - for container in containers: - container.stop() -- GitLab From 0494a2f9e5388418fa38f282a87d0ab8e517680e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 20 Jun 2017 14:28:17 +0000 Subject: [PATCH 075/145] Fix #156: the SRTMinorServo tests have to setup the ACS environment --- .../test/functional/test_container_crash.py | 31 ++++++++++-------- .../test/functional/test_failure.py | 18 +++++++++++ .../test/functional/test_setup.py | 32 +++++++++++++++---- .../test_setup_after_manual_movement.py | 19 +++++++++++ 4 files changed, 79 insertions(+), 21 deletions(-) mode change 100755 => 100644 SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py index 337a7bdd7..605fbfd3f 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py @@ -3,10 +3,13 @@ import os import time import unittest -from subprocess import Popen, PIPE from Acspy.Clients.SimpleClient import PySimpleClient -from testing.containers import Container +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) __author__ = "Marco Buttu " @@ -17,27 +20,27 @@ class TestContainerCrash(unittest.TestCase): @classmethod def setUpClass(cls): - cls.containers = [ - Container('MinorServoContainer', 'cpp'), - ] + if not acs.is_running(): + acs.start() + cls.containers = [Container('MinorServoContainer', 'cpp')] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + @classmethod + def tearDownClass(cls): + stop_containers_and_wait(cls.containers) def setUp(self): self.client = PySimpleClient() - for container in self.containers: - container.start() - container.wait_until_running() - if not container.is_running(): - self.fail('cannot run %s' % container.name) def tearDown(self): self.client.disconnect() - for container in self.containers: - container.stop() - + def test_get_and_release_component(self): """The container must be alive after releasing the component""" - srp = self.client.getComponent('MINORSERVO/SRP') + self.client.getComponent('MINORSERVO/SRP') self.client.releaseComponent('MINORSERVO/SRP') time.sleep(3) for container in self.containers: diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py index 7740b49e9..601a82e55 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py @@ -11,9 +11,15 @@ import Management import MinorServo from Acspy.Clients.SimpleClient import PySimpleClient +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) __author__ = "Marco Buttu " + FNULL = open(os.devnull, 'w') @@ -23,6 +29,17 @@ class TestFailure(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') cls.srp = cls.client.getComponent('MINORSERVO/SRP') @@ -31,6 +48,7 @@ class TestFailure(unittest.TestCase): def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') cls.client.releaseComponent('MINORSERVO/SRP') + stop_containers_and_wait(cls.containers) def setUp(self): self.setup_code = "CCB" if self.telescope == "SRT" else "CCC" diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py index 0896d0ff8..ab3f70be4 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -4,6 +4,7 @@ import math import time import os from datetime import datetime +from subprocess import Popen, PIPE import unittest import Management @@ -13,7 +14,12 @@ import Antenna from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp from Acspy.Clients.SimpleClient import PySimpleClient -from Acspy.Util import ACSCorba + +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) __author__ = "Marco Buttu " @@ -21,20 +27,32 @@ __author__ = "Marco Buttu " class SetupTest(unittest.TestCase): telescope = os.getenv('STATION') - + @classmethod def setUpClass(cls): - cls.client = PySimpleClient() - cls.boss = cls.client.getComponent('MINORSERVO/Boss') - + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + @classmethod def tearDownClass(cls): - cls.client.releaseComponent('MINORSERVO/Boss') - cls.client.disconnect() + stop_containers_and_wait(cls.containers) + + def setUp(self): + self.client = PySimpleClient() + self.boss = self.client.getComponent('MINORSERVO/Boss') def tearDown(self): self.boss.park() self.wait_until_not_ready() + self.client.releaseComponent('MINORSERVO/Boss') def test_elevation_tracking_ON(self): """The setup turns the elevation tracking on""" diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py old mode 100755 new mode 100644 index 0ea977b8a..6694fd687 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py @@ -15,15 +15,33 @@ from Acspy.Common.TimeHelper import getTimeStamp from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Util import ACSCorba +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " + class CannotSetupTest(unittest.TestCase): telescope = os.getenv('STATION') @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') cls.pfp = cls.client.getComponent('MINORSERVO/PFP') @@ -33,6 +51,7 @@ class CannotSetupTest(unittest.TestCase): cls.client.releaseComponent('MINORSERVO/Boss') cls.client.releaseComponent('MINORSERVO/PFP') cls.client.disconnect() + stop_containers_and_wait(cls.containers) def test_setup_after_manual_movement(self): """Verify the setup completes after a manual movement""" -- GitLab From 57a4bd41ccc3f610ec5811ca52207c82dcab92a1 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 21 Jun 2017 15:35:38 +0000 Subject: [PATCH 076/145] Fix #147: python library for testing --- .../MinorServoInterface/test/Makefile | 3 -- Common/Libraries/Makefile | 3 +- Common/Libraries/PyTesting/src/Makefile | 34 +++++++++++++++++++ .../PyTesting/src/testing}/__init__.py | 0 .../PyTesting/src/testing/simulator.py} | 13 +++---- .../test/functional/test_container_crash.py | 6 ++-- .../test/functional/test_failure.py | 5 ++- .../test/functional/test_setup.py | 6 ++-- .../test_setup_after_manual_movement.py | 6 ++-- .../SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py | 30 ++++++++-------- 10 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 Common/Libraries/PyTesting/src/Makefile rename Common/{Interfaces/MinorServoInterface/test/PyMinorServoTest => Libraries/PyTesting/src/testing}/__init__.py (100%) rename Common/{Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py => Libraries/PyTesting/src/testing/simulator.py} (67%) diff --git a/Common/Interfaces/MinorServoInterface/test/Makefile b/Common/Interfaces/MinorServoInterface/test/Makefile index bcdd86c95..e70daa63e 100644 --- a/Common/Interfaces/MinorServoInterface/test/Makefile +++ b/Common/Interfaces/MinorServoInterface/test/Makefile @@ -1,5 +1,3 @@ -PY_PACKAGES = PyMinorServoTest - # CPP UNIT TESTING SETUP #-------------- # GTEST_HOME=/usr/local/include/gtest @@ -62,7 +60,6 @@ clean_test: rm -f pyunit/*.pyc rm -f external/*.pyc rm -rf ../lib/python/site-packages/* - rm -rf $(INTROOT)/lib/python/site-packages/PyMinorServoTest* unit: do_unit @echo " . . . 'unit' done" diff --git a/Common/Libraries/Makefile b/Common/Libraries/Makefile index 52a5be329..fb68f4546 100644 --- a/Common/Libraries/Makefile +++ b/Common/Libraries/Makefile @@ -16,6 +16,7 @@ # None #------------------------------------------------------------------------ + # # Modules in the various ACS sub-packages. # @@ -29,7 +30,7 @@ SUBSYSTEM = Libraries -MODULES = SlaLibrary IRALibrary TextWindowLibrary ParserLibrary PyACSWrapper +MODULES = PyACSWrapper PyTesting MAKE_FLAGS = "-k" diff --git a/Common/Libraries/PyTesting/src/Makefile b/Common/Libraries/PyTesting/src/Makefile new file mode 100644 index 000000000..579a32947 --- /dev/null +++ b/Common/Libraries/PyTesting/src/Makefile @@ -0,0 +1,34 @@ +#***************************************** +#----------------------------------------- +# Marco Buttu +#----------------------------------------- +#***************************************** + +PY_PACKAGES = testing + +# ----------------- +# Include Standards +# ----------------- + +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + + +# TARGETS +all: do_all + @echo " . . . 'all' done" + +clean : clean_all + $(RM) *.pyc testing/*.pyc + $(RM) ../lib ../bin ../config ../doc ../idl ../include \ + ../object ../rtai ../test + $(RM) $(INTROOT)/lib/python/site-packages/testing* + @echo " . . . clean done" + +install : install_all + @echo " . . . installation done" + +#___oOo___ diff --git a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/__init__.py b/Common/Libraries/PyTesting/src/testing/__init__.py similarity index 100% rename from Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/__init__.py rename to Common/Libraries/PyTesting/src/testing/__init__.py diff --git a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py b/Common/Libraries/PyTesting/src/testing/simulator.py similarity index 67% rename from Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py rename to Common/Libraries/PyTesting/src/testing/simulator.py index e9a351761..0e04bbce8 100644 --- a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py +++ b/Common/Libraries/PyTesting/src/testing/simulator.py @@ -6,16 +6,16 @@ import unittest import subprocess -def run(test_case): - # Use the simulators and the testing CDB - server_name = 'srt-mscu' if test_case.telescope == 'SRT' else '' - if not server_name: +def run(test_case, server_name='antenna'): + # In case of `server_name=='antenna'`, the simulator will not + # be run because we are exectuting the tests on the real hardware + if server_name == 'antenna': sys.exit(0) try: FNULL = open(os.devnull, 'w') process = subprocess.Popen( - '%s-sim start' % server_name, stdout=FNULL, stderr=FNULL, + '%s start' % server_name, stdout=FNULL, stderr=FNULL, shell=True, preexec_fn=os.setsid) time.sleep(1) # Give the server the time to start suite = unittest.TestSuite() @@ -24,6 +24,7 @@ def run(test_case): print 'Running the tests using the antenna simulators...' unittest.TextTestRunner(verbosity=2).run(suite) finally: - os.killpg(os.getpgid(process.pid), signal.SIGTERM) + subprocess.Popen('%s stop' % server_name, shell=True) time.sleep(2) # Give the server the time to stop + os.killpg(os.getpgid(process.pid), signal.SIGTERM) FNULL.close() diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py index 605fbfd3f..c9c4c36b5 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py @@ -16,8 +16,6 @@ __author__ = "Marco Buttu " class TestContainerCrash(unittest.TestCase): - telescope = os.getenv('STATION') - @classmethod def setUpClass(cls): if not acs.is_running(): @@ -51,5 +49,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestContainerCrash) + from testing import simulator + simulator.run(TestContainerCrash, 'srt-mscu-sim') diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py index 601a82e55..d3c79233a 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py @@ -101,6 +101,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestFailure) - + from testing import simulator + simulator.run(TestFailure, 'srt-mscu-sim') diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py index ab3f70be4..17a7cb508 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -26,8 +26,6 @@ __author__ = "Marco Buttu " class SetupTest(unittest.TestCase): - telescope = os.getenv('STATION') - @classmethod def setUpClass(cls): if not acs.is_running(): @@ -110,5 +108,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(SetupTest) + from testing import simulator + simulator.run(SetupTest, 'srt-mscu-sim') diff --git a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py index 6694fd687..aeaa66550 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup_after_manual_movement.py @@ -27,8 +27,6 @@ __author__ = "Marco Buttu " class CannotSetupTest(unittest.TestCase): - telescope = os.getenv('STATION') - @classmethod def setUpClass(cls): if not acs.is_running(): @@ -102,5 +100,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(CannotSetupTest) + from testing import simulator + simulator.run(CannotSetupTest, 'srt-mscu-sim') diff --git a/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py b/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py index aa25ec70a..fab94e917 100755 --- a/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py +++ b/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py @@ -21,6 +21,7 @@ class MSCU(object): def __init__(self, host='', port=10000): self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self.socket.settimeout(0.2) self.socket.bind((host, port)) self.servos = {} for address in app_nr: @@ -33,20 +34,21 @@ class MSCU(object): counter = 0 while True: if stop_server.value: + MSCU.reap() # Clean up old children + self.socket.close() sys.exit(0) try: connection, clientaddr = self.socket.accept() counter += 1 print "\n%d. Got connection from %s" %(counter, connection.getpeername()) + except socket.timeout: + continue except KeyboardInterrupt: raise except: traceback.print_exc() continue - # Clean up old children - MSCU.reap() - # Fork a process for this connection pid = os.fork() @@ -126,16 +128,16 @@ class MSCU(object): connection.send('%s' %answer) time.sleep(0.05) except (KeyboardInterrupt, SystemExit): - raise - except: - raise + stop_server.value = True + connection.close() + sys.exit(0) # The child process *must* terminate try: connection.close() except KeyboardInterrupt: - raise - except: - traceback.print_exc() + stop_server.value = True + connection.close() + sys.exit(0) # The child process *must* terminate sys.exit(0) # The child process *must* terminate @@ -162,12 +164,10 @@ class MSCU(object): @staticmethod def stop(server=('127.0.0.1', 10000)): - # The second stop is mandatory - for i in range(2): - sockobj = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - sockobj.settimeout(2) - sockobj.connect(server) - sockobj.sendall('#stop\r\n') + sockobj = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sockobj.settimeout(2) + sockobj.connect(server) + sockobj.sendall('#stop\r\n') @staticmethod def setpos_NAK(server=('127.0.0.1', 10000)): -- GitLab From 39a5a7487f42c28b73785708866b8f90a1fa4d7c Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 23 Jun 2017 13:47:41 +0000 Subject: [PATCH 077/145] Fix #156: The MinorServo tests have to setup the ACS environment --- .../test/functional/test_clearUserOffset.py | 24 +++++++++-- .../test/functional/test_getAxesInfo.py | 23 ++++++++++- .../test/functional/test_getAxesPosition.py | 21 +++++++++- .../functional/test_getCentralScanPosition.py | 27 +++++++++++- .../test/functional/test_position.py | 22 +++++++++- .../test/functional/test_scan.py | 41 +++++++++++++++---- .../functional/test_setASConfiguration.py | 24 +++++++++-- .../functional/test_setElevationTracking.py | 24 +++++++++-- .../test/functional/test_systemOffset.py | 23 +++++++++-- .../test/functional/test_userOffset.py | 23 +++++++++-- 10 files changed, 217 insertions(+), 35 deletions(-) diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py index fa5b373e6..98ab9110f 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py @@ -9,26 +9,41 @@ import MinorServo import Management import Antenna -from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " class TestClearUserOffset(unittest.TestCase): - telescope = os.getenv('STATION') - @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def test_wrong_servo_name(self): """Raise a MinorServoErrorsEx in case of wrong servo name""" @@ -39,4 +54,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - simunittest.run(TestClearUserOffset) + from testing import simulator + simulator.run(TestClearUserOffset, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py index 665dae329..ed2b37f2c 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesInfo.py @@ -15,6 +15,13 @@ from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp + +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " @@ -24,6 +31,17 @@ class TestGetAxesInfo(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @@ -31,6 +49,7 @@ class TestGetAxesInfo(unittest.TestCase): def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') cls.client.disconnect() + stop_containers_and_wait(cls.containers) def setUp(self): self.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -68,6 +87,6 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestGetAxesInfo) + from testing import simulator + simulator.run(TestGetAxesInfo, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py index c25f4511b..7a1f57511 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getAxesPosition.py @@ -15,6 +15,12 @@ from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " @@ -24,12 +30,23 @@ class TestGetAxesPosition(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def setUp(self): self.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -65,6 +82,6 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestGetAxesPosition) + from testing import simulator + simulator.run(TestGetAxesPosition, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py index 6bf4acfea..600c3ea58 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py @@ -4,16 +4,38 @@ import os import unittest -from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " class TestGetCentralScanPosition(unittest.TestCase): telescope = os.getenv('STATION') + @classmethod + def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) + + @classmethod + def tearDownClass(cls): + stop_containers_and_wait(cls.containers) + def setUp(self): self.client = PySimpleClient() self.boss = self.client.getComponent('MINORSERVO/Boss') @@ -31,5 +53,6 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - simunittest.run(TestGetCentralScanPosition) + from testing import simulator + simulator.run(TestGetCentralScanPosition, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py index 704971e7b..892aa9be6 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_position.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_position.py @@ -15,20 +15,38 @@ from Acspy.Common.TimeHelper import getTimeStamp from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Util import ACSCorba +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " + class PositionTest(unittest.TestCase): telescope = os.getenv('STATION') @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def setUp(self): self.axis_code='SRP_TZ' if self.telescope == 'SRT' else 'Z' @@ -104,5 +122,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(PositionTest) + from testing import simulator + simulator.run(PositionTest, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py index b12b0d2c1..1c0c266f8 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_scan.py @@ -15,16 +15,31 @@ from Acspy.Common.TimeHelper import getTimeStamp from Acspy.Clients.SimpleClient import PySimpleClient from Acspy.Util import ACSCorba - +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) __author__ = "Marco Buttu " + class ScanBaseTest(unittest.TestCase): telescope = os.getenv('STATION') @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @@ -32,6 +47,7 @@ class ScanBaseTest(unittest.TestCase): def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') cls.client.disconnect() + stop_containers_and_wait(cls.containers) def setUp(self): self.antennaInfo = Antenna.TRunTimeParameters( @@ -383,10 +399,14 @@ class ScanInterfaceTest(ScanBaseTest): def test_checkScan_not_empty_system_not_ready(self): """Raise a MinorServoErrorsEx in case the system is not ready""" - with self.assertRaises(MinorServoErrorsEx): - t = self.boss.checkScan(0, self.scan, self.antennaInfo) - - def test_checkScan_empty_scan_system_not_ready(self): + try: + with self.assertRaises(MinorServoErrorsEx): + t = self.boss.checkScan(0, self.scan, self.antennaInfo) + except: + with self.assertRaises(MinorServoErrorsEx): + t = self.boss.checkScan(0, self.scan, self.antennaInfo) + + def _test_checkScan_empty_scan_system_not_ready(self): """Do nothing in case of empty scan and system NOT ready""" self.scan.is_empty_scan = True self.assertFalse(self.boss.isReady()) @@ -395,13 +415,16 @@ class ScanInterfaceTest(ScanBaseTest): def test_closeScan_scan_not_active(self): """Do nothing in case no scan is active""" - self.boss.closeScan() + try: + self.boss.closeScan() + except: + self.boss.closeScan() if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(ScanTest) - simunittest.run(ScanInterfaceTest) + from testing import simulator + simulator.run(ScanTest, 'srt-mscu-sim') + simulator.run(ScanInterfaceTest, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py index fd122027c..b9cf28096 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py @@ -3,24 +3,39 @@ from __future__ import with_statement import os import unittest -from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " -class TestSetASConfiguration(unittest.TestCase): - telescope = os.getenv('STATION') +class TestSetASConfiguration(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def test_right_flag(self): """Set the AS configuration properly""" @@ -37,4 +52,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - simunittest.run(TestSetASConfiguration) + from testing import simulator + simulator.run(TestSetASConfiguration, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py index 59d30bdaa..8f24da6d3 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py @@ -3,24 +3,39 @@ from __future__ import with_statement import os import unittest -from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " -class TestSetElevationTracking(unittest.TestCase): - telescope = os.getenv('STATION') +class TestSetElevationTracking(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def test_right_flag(self): """Set the elevation tracking properly""" @@ -37,4 +52,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - simunittest.run(TestSetElevationTracking) + from testing import simulator + simulator.run(TestSetElevationTracking, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py index 4e0e9ea44..e25314614 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_systemOffset.py @@ -14,6 +14,12 @@ from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + __author__ = "Marco Buttu " @@ -23,12 +29,23 @@ class TestSystemOffset(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') - + @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') + stop_containers_and_wait(cls.containers) def setUp(self): self.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -74,5 +91,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestSystemOffset) + from testing import simulator + simulator.run(TestSystemOffset, 'srt-mscu-sim') diff --git a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py index 952050d7b..269c44ce6 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_userOffset.py @@ -14,6 +14,13 @@ from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx from Acspy.Common.TimeHelper import getTimeStamp +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) + + __author__ = "Marco Buttu " @@ -23,13 +30,23 @@ class TestUserOffset(unittest.TestCase): @classmethod def setUpClass(cls): + if not acs.is_running(): + acs.start() + cls.containers = [ + Container('MinorServoContainer', 'cpp'), + Container('MinorServoBossContainer', 'cpp'), + ] + try: + start_containers_and_wait(cls.containers) + except ContainerError, ex: + cls.fail(ex.message) cls.client = PySimpleClient() cls.boss = cls.client.getComponent('MINORSERVO/Boss') @classmethod def tearDownClass(cls): cls.client.releaseComponent('MINORSERVO/Boss') - + stop_containers_and_wait(cls.containers) def setUp(self): self.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -75,5 +92,5 @@ if __name__ == '__main__': if 'Configuration' in os.getenv('ACS_CDB'): unittest.main() # Real test using the antenna CDB else: - from PyMinorServoTest import simunittest - simunittest.run(TestUserOffset) + from testing import simulator + simulator.run(TestUserOffset, 'srt-mscu-sim') -- GitLab From c033af3fa87a5caf3d7395cfa72789525da3fd56 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Tue, 27 Jun 2017 11:28:15 +0000 Subject: [PATCH 078/145] acs.stop() must kill ACS also in case of lock (#159) --- Common/Libraries/PyACSWrapper/src/acswrapper/system.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Libraries/PyACSWrapper/src/acswrapper/system.py b/Common/Libraries/PyACSWrapper/src/acswrapper/system.py index ec8b5f9bb..8506c0565 100644 --- a/Common/Libraries/PyACSWrapper/src/acswrapper/system.py +++ b/Common/Libraries/PyACSWrapper/src/acswrapper/system.py @@ -39,6 +39,7 @@ class ACS(object): self.wait_until_not_running() if self.is_running(): outfile.write('acsStop is not able to stop ACS') + call('rm $ACSDATA/tmp/*.lock') call('killACS', stdout=outfile, stderr=outfile, shell=True) if self.is_running(): outfile.write('killACS is not able to stop ACS') -- GitLab From 6c925574a04c11ca75bfba94c6e2e34b91f32ffa Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Wed, 28 Jun 2017 10:53:13 +0000 Subject: [PATCH 079/145] Fix #148: catch the broken pipe by givin MSG_NOSIGNAL to the send() system call --- Common/Libraries/IRALibrary/src/Socket.cpp | 2 +- .../Libraries/IRALibrary/tests/Socket_test.i | 41 +++++++++++++++++++ .../Libraries/IRALibrary/tests/unittest.cpp | 7 ++-- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 Common/Libraries/IRALibrary/tests/Socket_test.i diff --git a/Common/Libraries/IRALibrary/src/Socket.cpp b/Common/Libraries/IRALibrary/src/Socket.cpp index 624c79466..cfdb38b67 100644 --- a/Common/Libraries/IRALibrary/src/Socket.cpp +++ b/Common/Libraries/IRALibrary/src/Socket.cpp @@ -339,7 +339,7 @@ int CSocket::Send(CError& Err,const void *Buff,WORD BuffLen,WORD Port,CString *A return FAIL; } if (getType()==STREAM) { // stream sockets - Res=send(m_iSocket,Buff,BuffLen,0); + Res=send(m_iSocket,Buff,BuffLen,MSG_NOSIGNAL); } else { // datagram sockets if ((Addr==NULL) || (Port==0)) { diff --git a/Common/Libraries/IRALibrary/tests/Socket_test.i b/Common/Libraries/IRALibrary/tests/Socket_test.i new file mode 100644 index 000000000..ec2504878 --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/Socket_test.i @@ -0,0 +1,41 @@ +#include + +#include + +namespace IRALibraryTest { + +class IRALibrary_Socket : public ::testing::Test { + +public: + + ::testing::AssertionResult sendWithoutConnection() { + + const BYTE *msg = (const BYTE *)("enniomorricone"); + size_t len = strlen((const char *)(msg)); + IRA::CError error; + IRA::CSocket socket; + socket.Create(error); + socket.setSockMode(error, IRA::CSocket::BLOCKINGTIMEO, 3000000, 3000000); + // Note: there is no call to socket.Connect() + if(socket.Send(error, (const void *)(msg), len) == IRA::CSocket::FAIL) + return ::testing::AssertionSuccess(); + else + return ::testing::AssertionFailure(); + } + +protected: + static void TearDownTestCase() { + } + + static void SetUpTestCase() { + } + + virtual void SetUp() { + } + + virtual void TearDown() { + } + +}; + +} diff --git a/Common/Libraries/IRALibrary/tests/unittest.cpp b/Common/Libraries/IRALibrary/tests/unittest.cpp index 3955805f9..436406cbb 100644 --- a/Common/Libraries/IRALibrary/tests/unittest.cpp +++ b/Common/Libraries/IRALibrary/tests/unittest.cpp @@ -2,6 +2,7 @@ #include "IRATools_test.i" #include "FastQueue_test.i" +#include "Socket_test.i" using namespace IRALibraryTest; @@ -58,6 +59,6 @@ TEST_F(IRALibrary_FastQueue,FastQueue_checkConsistency){ EXPECT_TRUE(FastQueue_checkConsistency()); } - - - +TEST_F(IRALibrary_Socket, sendWithoutConnection){ + EXPECT_TRUE(sendWithoutConnection()); +} -- GitLab From 97132b88057509e1d1545127e3c15655bd9402bb Mon Sep 17 00:00:00 2001 From: Marco Bartolini Date: Wed, 28 Jun 2017 14:38:22 +0000 Subject: [PATCH 080/145] Added stubs to Makefile related to issue #132 --- Medicina/Servers/MedicinaMinorServo/src/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Medicina/Servers/MedicinaMinorServo/src/Makefile b/Medicina/Servers/MedicinaMinorServo/src/Makefile index b1d512093..8a4046ad6 100644 --- a/Medicina/Servers/MedicinaMinorServo/src/Makefile +++ b/Medicina/Servers/MedicinaMinorServo/src/Makefile @@ -3,7 +3,9 @@ USER_LIB = -lbaci \ -lTAO_CosNotification \ -lTAO_CosNotification_MC_Ext \ -lRepeatGuard \ - -lacstime + -lacstime + +USER_CFLAGS = -D 'BOOST_SYSTEM_NO_DEPRECATED' # # Libraries (public and local) @@ -20,7 +22,7 @@ MedMinorServoControl_OBJECTS = MedMinorServoControl MedMinorServoGeometry \ MedMinorServoControl_LIBS = baci acsnc IRALibrary ModbusChannel ManagmentDefinitionsStubs \ ManagementErrors \ - ComponentErrors boost_thread + ComponentErrors boost_thread-mt boost_system MinorServoBossImpl_OBJECTS = MedMinorServoControl MedMinorServoGeometry \ MedMinorServoStatus MedMinorServoParameters \ @@ -36,7 +38,7 @@ MinorServoBossImpl_LIBS = MedMinorServoBossStubs MinorServoBossStubs \ IRALibrary ModbusChannel ComponentErrors MinorServoErrors \ acsnc ParserErrors AntennaDefinitionsStubs \ MountStubs AntennaBossStubs AntennaErrors \ - ActiveSurfaceBossStubs boost_thread acstime \ + ActiveSurfaceBossStubs boost_thread-mt boost_system acstime \ baci EXECUTABLES_L = real_to_virtual# testclient testgeometry testprimary testsecondary testpassive real_to_virtual @@ -55,7 +57,7 @@ real_to_virtual_LIBS = IRALibrary EXECUTABLES = scudisconnect scudisconnect_OBJECTS = scudisconnect MedMinorServoModbus MedMinorServoGeometry MedMinorServoTime MedMinorServoControl PositionQueue -scudisconnect_LIBS = IRALibrary ModbusChannel boost_thread +scudisconnect_LIBS = IRALibrary ModbusChannel boost_thread-mt boost_system # # Configuration Database Files @@ -71,6 +73,9 @@ IDL_FILES = MedMinorServoBoss TAO_IDLFLAGS = USER_IDL = +MedMinorServoBossStubs_LIBS = baciStubs ComponentErrorsStubs \ + ManagmentDefinitionsStubs MinorServoBossStubs MinorServoErrorsStubs + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ -- GitLab From 88aec3550827f874579e81c85d915fe01dbbbd08 Mon Sep 17 00:00:00 2001 From: Marco Bartolini Date: Thu, 29 Jun 2017 08:45:40 +0000 Subject: [PATCH 081/145] Removed warning from MedMinorServo headers --- .../MedicinaMinorServo/include/MedMinorServoConstants.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp b/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp index 6a91fb342..1abd618c4 100755 --- a/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp +++ b/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp @@ -4,7 +4,7 @@ typedef struct MedMinorServoAxis_tag { - char *name; + const char *name; double position_min; double position_max; double position_zero; -- GitLab From a8505860465e6dd354d194871316124a574162e5 Mon Sep 17 00:00:00 2001 From: Marco Bartolini Date: Thu, 29 Jun 2017 08:54:05 +0000 Subject: [PATCH 082/145] fixes #161: include correct boost libraries --- Medicina/Servers/MedicinaMinorServo/tests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Medicina/Servers/MedicinaMinorServo/tests/Makefile b/Medicina/Servers/MedicinaMinorServo/tests/Makefile index 70dbc6b7f..e4bc5220b 100644 --- a/Medicina/Servers/MedicinaMinorServo/tests/Makefile +++ b/Medicina/Servers/MedicinaMinorServo/tests/Makefile @@ -17,7 +17,7 @@ USER_LIBS=C++ pthread EXECUTABLES_L = unittest unittest_OBJECTS = unittest #MedMinorServoGeometry MedMinorServoTime PositionQueue -unittest_LIBS = $(GTEST_LIBS) MinorServoBossImpl IRALibrary boost_thread +unittest_LIBS = $(GTEST_LIBS) MinorServoBossImpl IRALibrary boost_thread-mt boost_system # END OF CUSTOMIZATION # do not edit below this line -- GitLab From 7a7531b7994a8f2563bea8c4a70b6d20003f0be0 Mon Sep 17 00:00:00 2001 From: Andrea Orlati Date: Tue, 4 Jul 2017 17:27:44 +0000 Subject: [PATCH 083/145] fix #162: solved all warnigs a part from the ones coming from ACS template code --- Common/Servers/AntennaBoss/src/BossCore_prepareScan.i | 10 +++++----- Common/Servers/AntennaBoss/src/Configuration.cpp | 2 +- Common/Servers/AntennaBoss/src/coordinateGrabber.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Common/Servers/AntennaBoss/src/BossCore_prepareScan.i b/Common/Servers/AntennaBoss/src/BossCore_prepareScan.i index 059cc731a..afa85a04a 100644 --- a/Common/Servers/AntennaBoss/src/BossCore_prepareScan.i +++ b/Common/Servers/AntennaBoss/src/BossCore_prepareScan.i @@ -156,7 +156,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( bool result; ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"OTF_ON_SECONDARY_TRACK")); currentGeneratorFlux=prepareOTFSecondary(useInternals,secondary,secSourceName,secRa,secDec,secLon,secLat,secVrad,secVelFrame,secVelDef,result); - ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %u",currentGeneratorFlux.in())); + ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %lu",(unsigned long)currentGeneratorFlux.in())); if (!result) { _EXCPT(AntennaErrors::SecondaryScanErrorExImpl,ex,"CBossCore::prepareScan()"); throw ex; @@ -194,7 +194,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( bool result; ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"OTF_ON_LAST_COMMANDED_TRACK")); currentGeneratorFlux=prepareOTFSecondary(useInternals,lastPar,secSourceName,secRa,secDec,secLon,secLat,secVrad,secVelFrame,secVelDef,result); - ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %u",currentGeneratorFlux.in())); + ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"GENERATORE %lu",(unsigned long)currentGeneratorFlux.in())); if (!result) { _EXCPT(AntennaErrors::SecondaryScanErrorExImpl,ex,"CBossCore::prepareScan()"); throw ex; @@ -240,12 +240,12 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( if (!useInternals) { ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"LOADING_REQUIRED_PRIMARY_GENERATOR")); currentGenerator=loadPrimaryGenerator(generatorType); - ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"PRIMARY_GENERATOR_IS: %x",currentGenerator.in())); + ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"PRIMARY_GENERATOR_IS: %lx",(unsigned long)currentGenerator.in())); } else { ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"LOADING_REQUIRED_INTERNAL_GENERATOR")); currentGenerator=loadInternalGenerator(generatorType); - ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"INTERNAL_GENERATOR_IS: %x",currentGenerator.in())); + ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"INTERNAL_GENERATOR_IS: %lx",(unsigned long)currentGenerator.in())); } } catch (ACSErr::ACSbaseExImpl& ex) { @@ -407,7 +407,7 @@ Antenna::EphemGenerator_ptr CBossCore::prepareScan( double roundAz=slaDranrm(m_lastEncoderAzimuth); section=tracker->setSubScan(primary.targetName,roundAz,m_lastAzimuthSection,m_lastEncoderElevation,m_lastEncoderRead,primary.otf.lon1,primary.otf.lat1,primary.otf.lon2,primary.otf.lat2,primary.otf.coordFrame, primary.otf.geometry,primary.otf.subScanFrame,primary.otf.description,primary.otf.direction,startUT,primary.otf.subScanDuration); - ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"SECTION_IS: %ld",section)); + ACS_LOG(LM_FULL_INFO,"CBossCore::prepareScan()",(LM_DEBUG,"SECTION_IS: %d",section)); if (secondaryActive) { copyTrack(lastPar,secondary); } diff --git a/Common/Servers/AntennaBoss/src/Configuration.cpp b/Common/Servers/AntennaBoss/src/Configuration.cpp index 19a47e930..c28508171 100644 --- a/Common/Servers/AntennaBoss/src/Configuration.cpp +++ b/Common/Servers/AntennaBoss/src/Configuration.cpp @@ -12,7 +12,7 @@ } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } diff --git a/Common/Servers/AntennaBoss/src/coordinateGrabber.cpp b/Common/Servers/AntennaBoss/src/coordinateGrabber.cpp index 7ed1f3442..179b70aa5 100644 --- a/Common/Servers/AntennaBoss/src/coordinateGrabber.cpp +++ b/Common/Servers/AntennaBoss/src/coordinateGrabber.cpp @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) throw Impl; } ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"GOT_COMPONENENT_ANTENNABOSS")); - ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %d",boss.ptr())); + ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %ld",(long int)boss.ptr())); try { info=client.manager()->get_default_component(client.handle(),"IDL:alma/Antenna/Observatory:1.0"); observatory=Antenna::Observatory::_narrow(info->reference); @@ -149,7 +149,7 @@ int main(int argc, char *argv[]) throw Impl; } ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"GOT_COMPONENENT_OBSERVATORY")); - ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %d",observatory.ptr())); + ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_DEBUG,"Reference is: %ld",(long int)observatory.ptr())); ACS_LOG(LM_FULL_INFO,"coordinateGrabber::main()",(LM_INFO,"ALL_COMPONENTS_RETRIEVED")); ACE_OS::sleep(1); try { -- GitLab From 99e4b736cbe9330ff65f93953d8ac6ca05020316 Mon Sep 17 00:00:00 2001 From: Carlo Migoni Date: Thu, 6 Jul 2017 14:04:07 +0000 Subject: [PATCH 084/145] Fix #163: Some warning related to active surface components --- .../include/SRTActiveSurfaceBossCore.h | 2 +- .../src/SRTActiveSurfaceBossCore.cpp | 20 +++++++++---------- .../src/SRTActiveSurfaceBossImpl.cpp | 2 +- .../SRTActiveSurfaceUSDServer/src/usdImpl.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h b/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h index b0fd5aaf3..22f220d1b 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h +++ b/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h @@ -160,7 +160,7 @@ public: */ void enableAutoUpdate(); - void checkASerrors(char* str, int circle, int actuator, ASErrors::ASErrorsEx Ex); + void checkASerrors(const char* str, int circle, int actuator, ASErrors::ASErrorsEx Ex); void checkAScompletionerrors (char *str, int circle, int actuator, CompletionImpl comp); diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp index 93b434447..920364cf3 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp @@ -1379,7 +1379,7 @@ void CSRTActiveSurfaceBossCore::sector1ActiveSurface() throw (ComponentErrors::C printf("sector1 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S1.txt\0"; @@ -1413,7 +1413,7 @@ void CSRTActiveSurfaceBossCore::sector2ActiveSurface() throw (ComponentErrors::C printf("sector2 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S2.txt\0"; @@ -1448,7 +1448,7 @@ void CSRTActiveSurfaceBossCore::sector3ActiveSurface() throw (ComponentErrors::C printf("sector3 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S3.txt\0"; @@ -1483,7 +1483,7 @@ void CSRTActiveSurfaceBossCore::sector4ActiveSurface() throw (ComponentErrors::C printf("sector4 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S4.txt\0"; @@ -1518,7 +1518,7 @@ void CSRTActiveSurfaceBossCore::sector5ActiveSurface() throw (ComponentErrors::C printf("sector5 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S5.txt\0"; @@ -1553,7 +1553,7 @@ void CSRTActiveSurfaceBossCore::sector6ActiveSurface() throw (ComponentErrors::C printf("sector6 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S6.txt\0"; @@ -1588,7 +1588,7 @@ void CSRTActiveSurfaceBossCore::sector7ActiveSurface() throw (ComponentErrors::C printf("sector7 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S7.txt\0"; @@ -1623,7 +1623,7 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C printf("sector8 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - char * value; + const char * value; int i; value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S8.txt\0"; @@ -1689,7 +1689,7 @@ void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::C void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newProfile) throw (ComponentErrors::ComponentErrorsExImpl) { int s, i, l; - char * value; + const char * value; if ((m_sector1 == true)&&(m_sector2 == true)&&(m_sector3 == true)&&(m_sector4 == true)&&(m_sector5 == true)&&(m_sector6 == true)&&(m_sector7 == true)&&(m_sector8 == true)) { //printf("setProfile corrections\n"); @@ -2092,7 +2092,7 @@ void CSRTActiveSurfaceBossCore::disableAutoUpdate() } } -void CSRTActiveSurfaceBossCore::checkASerrors(char* str, int circle, int actuator, ASErrors::ASErrorsEx Ex) +void CSRTActiveSurfaceBossCore::checkASerrors(const char* str, int circle, int actuator, ASErrors::ASErrorsEx Ex) { ASErrors::ASErrorsExImpl exImpl(Ex); diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp index 629069ce9..788d3f7cc 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp @@ -7,7 +7,7 @@ #include "DevIOProfile.h" #include "DevIOTracking.h" -static char *rcsId="@(#) $Id: SRTActiveSurfaceBossImpl.cpp,v 1.2 2010-07-26 12:37:07 c.migoni Exp $"; +static char const *rcsId="@(#) $Id: SRTActiveSurfaceBossImpl.cpp,v 1.2 2010-07-26 12:37:07 c.migoni Exp $"; static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId); using namespace SimpleParser; diff --git a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp index c5257253b..3c2d11bb4 100644 --- a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp +++ b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp @@ -346,7 +346,7 @@ void USDImpl::calibrate() throw (CORBA::SystemException,ASErrors::ASErrorsEx) } _GET_PROP(actPos,cammaBegin,"usdImpl::calibrate()") - ACS_DEBUG_PARAM("::usdImpl::calibrate","Camma begin at:%d",cammaBegin); + ACS_DEBUG_PARAM("::usdImpl::calibrate","Camma begin at:%ld",cammaBegin); //printf("cammaBegin = %ld\n", cammaBegin); action(HSTOP,0,1); // disable HW stop @@ -372,7 +372,7 @@ void USDImpl::calibrate() throw (CORBA::SystemException,ASErrors::ASErrorsEx) } _GET_PROP(actPos,cammaEnd,"usdImpl::calibrate()") - ACS_DEBUG_PARAM("::usdImpl::calibrate","Camma end at:%d",cammaEnd); + ACS_DEBUG_PARAM("::usdImpl::calibrate","Camma end at:%ld",cammaEnd); //printf("cammaEnd = %ld\n", cammaEnd); //m_cammaEnd = cammaEnd; -- GitLab From 1f6c31e1e364de942fa57d144c23d4f1c2f20f7b Mon Sep 17 00:00:00 2001 From: Andrea Orlati Date: Thu, 13 Jul 2017 08:54:26 +0000 Subject: [PATCH 085/145] fix #164: fixed all warnings a part from the ones coming from ACS templates code --- Common/Servers/TotalPower/src/CommandLine.cpp | 2 +- Common/Servers/TotalPower/src/Configuration.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/Servers/TotalPower/src/CommandLine.cpp b/Common/Servers/TotalPower/src/CommandLine.cpp index a3d52a6f1..5088a2a3c 100644 --- a/Common/Servers/TotalPower/src/CommandLine.cpp +++ b/Common/Servers/TotalPower/src/CommandLine.cpp @@ -571,7 +571,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const else { temp="RCP"; } - ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"SECTION_CONFIGURED %ld,FREQ=%lf,BW=%lf,FEED=%d,POL=%s,SR=%lf,BINS=%d",inputId,m_frequency[inputId],newBW,m_feedNumber[inputId], + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"SECTION_CONFIGURED %ld,FREQ=%lf,BW=%lf,FEED=%ld,POL=%s,SR=%lf,BINS=%ld",inputId,m_frequency[inputId],newBW,m_feedNumber[inputId], (const char *)temp,newSR,m_bins[inputId])); } else if (res==FAIL) { diff --git a/Common/Servers/TotalPower/src/Configuration.cpp b/Common/Servers/TotalPower/src/Configuration.cpp index b0671d6d9..bc911a4df 100644 --- a/Common/Servers/TotalPower/src/Configuration.cpp +++ b/Common/Servers/TotalPower/src/Configuration.cpp @@ -11,7 +11,7 @@ } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } @@ -178,7 +178,7 @@ bool CConfiguration::getSetupFromID(const IRA::CString setupID,TBackendSetup& se setup.feed[i]=ret.ToLong(); if (!IRA::CIRATools::getNextToken(ifs,start_ifs,' ',ret)) return false; setup.ifs[i]=ret.ToLong(); - ACS_LOG(LM_FULL_INFO,"CConfiguration::getSetupFromID()",(LM_DEBUG,"Sections: %d - Board: %d - Polarization: %d - Feed: %d - Ifs: %d",i,setup.section_boards[i],setup.polarizations[i],setup.feed[i],setup.ifs[i])); + ACS_LOG(LM_FULL_INFO,"CConfiguration::getSetupFromID()",(LM_DEBUG,"Sections: %d - Board: %ld - Polarization: %d - Feed: %ld - Ifs: %ld",i,setup.section_boards[i],setup.polarizations[i],setup.feed[i],setup.ifs[i])); } return true; } -- GitLab From 9f2b9b36980634e58f02a588a60ab88de12d0b40 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 11 Aug 2017 08:15:11 +0000 Subject: [PATCH 086/145] Fix #165: Create the AS testing configuration. --- SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml | 9 +++++---- SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml | 14 +++++--------- SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml | 20 +++++--------------- SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml | 7 ++++--- SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml | 7 ++++--- SRT/CDB/alma/AS/make_lan.py | 16 ++++++++++++++++ 97 files changed, 403 insertions(+), 307 deletions(-) create mode 100755 SRT/CDB/alma/AS/make_lan.py diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml index c6e78919b..b6fbe43e5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - - + + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml index ff2b9b85d..1b334a0fa 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml index a358ec0f7..91cdfe7d5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml index 0d991d553..efb60ef7f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml index 804316e03..1a8419940 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml index 83f4d1774..bcb69e43f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml index 5b7d6f9ef..d968e82a9 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml index 001f905be..ff0db82c6 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml index 8dc411b7d..31ffa7f95 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml index ed23e6c91..a19bbe92b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml index 4a7b01682..8636caa7c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml index 708660361..8fa8b7b4b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml index 6e9615e90..bc5ded739 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml index b5871b1f2..463e72c4a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml index c18bf5039..9f2733eb1 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml index 1daf83e9d..262379363 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml index 97ef8a2c8..6409b16d2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml index ce01ca44f..ca5dface0 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml index 51a9687e6..61aefaa52 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml index 4f0307c06..e76b7add3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml index 27540c408..923fda867 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml index 4aef189f3..d1db3bb05 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml index 6ce66dba9..7bda18efd 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml index cd565af4e..343fd97c8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml index 3c7f138e7..814dad5a5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml index 8550d3ede..1ce052daf 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml index 8e79d1a21..8cfad836c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml index 58a5dd914..61ef82add 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml index 5575a1ebb..6395b2c78 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml index 63d86d2e9..52ba70ea2 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml index 03f72847f..2a095afc4 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml index 422a4c1e5..a4a38120d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml index 1582453a3..0632947aa 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml index 724d91150..2453e073c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml index 8e684d85f..515a4ce0a 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml index fc94e064f..63bec5c01 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml index 2b24086e4..44a849520 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml index 8c613c6e1..d2d3347ba 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml index e4a570ada..26994b0a1 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml index ffcb24d77..b1f5677b6 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml index 76118cd8a..b2acc61e5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml index 6948d0b78..9f9c417f0 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml @@ -1,10 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml index f6b4b5498..47c499ccf 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml index d85fa01a9..1b28b0127 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml index 01f381a9d..dfbcc97e4 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml index ca9d116c4..ac8fcc6e0 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml index bae5f051b..2984d70ba 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml index a76e7617c..5bc2c3dfa 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml index c97190476..efa6493fe 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml index 27318bc27..3c82af50a 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml index 97f755a74..38106c2d1 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml index dbb5cc502..23e239b41 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml index e4b10b912..744eb3cdf 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml index ef2737428..66be54262 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml index 6fec9b29d..860588cc8 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml index 8259309e6..092e7e6a7 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml index a388fa369..7ee775d25 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml index 1aff7327d..4d8ab48c1 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml index 9dc770559..9b8774bb8 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml index 8b9ec1d2f..e25e8c35d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml index c0e5f1fc4..e1e2d030d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml index 086773390..7c066cf83 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml index 639b28b1e..2a31785fd 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml index 8278af8fa..0f4b8b079 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml index ba3995b1d..a532e474a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml index 7c3dce347..b14cffacb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml index fe63ce08f..9d5132803 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml index 58b779fb1..dc433e789 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml index 8750cd8d8..620455fca 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml index dd27bfd73..e997d2d61 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml index 39aad2adc..de95069c3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml index 12374d123..126630983 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml index 971b7a901..e13a89dac 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml index ade15d1c4..7ee59bfb4 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml index ef5ba9c1e..64c9560ff 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml index 5974d67e9..a13f1e62a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml index c39f891bd..1443fa833 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml index bb5c2419b..1f8fa317e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml index 801b8db5a..63114dd0a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml index 4473aa28b..731512eb1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml index 501284a20..169fc600f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml index ea14c5b30..9ac2398ba 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml index 1f01dc74d..c881a1bae 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml index 938aea292..dccb61c28 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml index e25cefb37..c517655ed 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml index be8a07fa3..e64cafab0 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml @@ -1,16 +1,6 @@ - - - - - + + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml index 8686c1de3..3123425f4 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml index f4917029f..35b97c495 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml index 78de4f955..b993f07be 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml index 3ab74e3ae..32ac1643f 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml index 5856b36ab..4bb566b29 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml index 0661903db..0050f8a7b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml index 8cc32b2e7..aa3fa6b8b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml index fefb3f071..625af5b23 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml index dbd752722..a11a99811 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml index 4bc6db52f..c3dcfbeec 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml @@ -1,5 +1,6 @@ - - - + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/make_lan.py b/SRT/CDB/alma/AS/make_lan.py new file mode 100755 index 000000000..42b27df15 --- /dev/null +++ b/SRT/CDB/alma/AS/make_lan.py @@ -0,0 +1,16 @@ +content = """ + + + + +""" + +port_offset = 0 +for sector in range(1, 9): + for lan in range(1, 13): + ip = '127.0.0.1' + port = 11000 + port_offset + port_offset += 1 + lan_file = 'SECTOR%02d/LAN%02d/LAN%02d.xml' % (sector, lan, lan) + with open(lan_file, 'w') as f: + f.write(content % (ip, port)) -- GitLab From e228166d106277aeb559a103f611dad7d0c11b1e Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 18 Aug 2017 14:16:20 +0200 Subject: [PATCH 087/145] Fix #167: add the XB configuration --- .../DataBlock/PointingModel/PointingModel.xml | 35 ++++++++++++++++++- .../alma/DataBlock/TotalPower/TotalPower.xml | 14 ++++++++ .../CDB/alma/MINORSERVO/Boss/Boss.xml | 29 +++++++++++---- .../StationProcedures/StationProcedures.xml | 12 +++---- .../config/CDB/schemas/MinorServo.xsd | 3 +- 5 files changed, 79 insertions(+), 14 deletions(-) diff --git a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 7ad2f0a03..f05570265 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -113,6 +113,39 @@ 0 0 + + XB + 90.0 + 1 -2.3029563427 + 0 0.0 + 1 -0.0102762356 + 1 -0.0050985431 + 1 -0.0008867322 + 1 -0.0019946923 + 1 0.0873332769 + 1 0.0871561393 + 0 0.0 + 0 0.0 + 1 0.0115426397 + 0 0 + 1 0.0020223276 + 1 0.0008122203 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + - diff --git a/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml b/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml index 98975c953..5197057b3 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml @@ -33,6 +33,20 @@ 0 1 + + XB + 1 + FALSE + BWG + 5 + 2350 + 1 + 13 + R + 0 + 0 + + LLP 2 diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml index bd5ec39c9..8a425b205 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -57,6 +57,29 @@ @ M3R: RZ(mm) = (286.67); " + XB_ASACTIVE=" + @ PFP: park; + @ GFR: park; + @ SRP: TX = (-1.5); + TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); + TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410); + RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053); + RY = (-0.036111111111111108); + RZ = (0); + @ M3R: RZ = (860.8); + " + XB=" + @ PFP: park; + @ GFR: park; + @ SRP: TX(mm) = (-1.5); + TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); + TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237); + RX(degree) = (-0.011392527142374848, -0.0001426193499425, 0.000039508844799, -0.000000131010010); + RY(degree) = (-0.03611111111111111); + RZ(degree) = (0); + @ M3R: RZ(mm) = (860.8); + " + KKG_ASACTIVE=" @ PFP: park; @ SRP: TX = (-1.5); @@ -119,12 +142,6 @@ @ M3R: RZ(mm) = (860); " - SSP=" - @ SRP: park; - @ PFP: RY(mm) = (-25.95); TX(mm) = (-223); TZ(mm) = (-67); - @ GFR: RZ(mm) = (-600); - @ M3R: RZ(mm) = (860); - " slaves="GFR, M3R, PFP, SRP" > diff --git a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 75a6e3a73..65398204c 100644 --- a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -77,18 +77,18 @@ - + - antennaSetup=LP - servoSetup=SSP + antennaSetup=XB + servoSetup=XB receiversSetup=CCB chooseBackend=TotalPower - initialize=PPP + initialize=XB device=0 - calOff restFrequency=0 + setLO=7500 antennaAzEl=0d,0d - + diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd index c1e733c31..efd84dbe7 100644 --- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd +++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd @@ -132,13 +132,14 @@ + + - -- GitLab From 128ebf2cd81240f678774c4d7857f8fbe58e69fb Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 18 Aug 2017 14:38:18 +0200 Subject: [PATCH 088/145] Fix #168: add the SSP configuration --- SRT/CDB/alma/MINORSERVO/Boss/Boss.xml | 23 +++++ .../StationProcedures/StationProcedures.xml | 94 +++++++++++++++++-- .../CDB/alma/MINORSERVO/Boss/Boss.xml | 6 ++ .../StationProcedures/StationProcedures.xml | 18 +++- .../config/CDB/schemas/MinorServo.xsd | 1 + 5 files changed, 131 insertions(+), 11 deletions(-) diff --git a/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml index bd5ec39c9..8d218cd08 100644 --- a/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -57,6 +57,29 @@ @ M3R: RZ(mm) = (286.67); " + XB_ASACTIVE=" + @ PFP: park; + @ GFR: park; + @ SRP: TX = (-1.5); + TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); + TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410); + RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053); + RY = (-0.036111111111111108); + RZ = (0); + @ M3R: RZ = (860.8); + " + XB=" + @ PFP: park; + @ GFR: park; + @ SRP: TX(mm) = (-1.5); + TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); + TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237); + RX(degree) = (-0.011392527142374848, -0.0001426193499425, 0.000039508844799, -0.000000131010010); + RY(degree) = (-0.03611111111111111); + RZ(degree) = (0); + @ M3R: RZ(mm) = (860.8); + " + KKG_ASACTIVE=" @ PFP: park; @ SRP: TX = (-1.5); diff --git a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 1794c26a8..13aeadb65 100644 --- a/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -3,43 +3,119 @@ - + - antennaReset antennaSetup=CCB servoSetup=CCB receiversSetup=CCB + chooseBackend=TotalPower initialize=CCB device=0 calOff restFrequency=0 - + antennaAzEl=0d,0d + - + - antennaReset antennaSetup=KKG servoSetup=KKG receiversSetup=KKG receiversMode=SINGLEDISH + chooseBackend=TotalPower initialize=KKG device=0 calOff restFrequency=0 + antennaAzEl=0d,0d + + + + + + antennaSetup=LP + servoSetup=LLP + receiversSetup=LLP + receiversMode=XXC4 + chooseBackend=TotalPower + initialize=LLP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d + + + + + + antennaSetup=LP + servoSetup=PPP + receiversSetup=PPP + receiversMode=C3XX + chooseBackend=TotalPower + initialize=PPP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d + + + + + + antennaSetup=LP + servoSetup=PLP + receiversSetup=PLP + receiversMode=C3C4 + chooseBackend=TotalPower + initialize=PLP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d + + + + + + antennaSetup=XB + servoSetup=XB + receiversSetup=CCB + chooseBackend=TotalPower + initialize=XB + device=0 + restFrequency=0 + setLO=7500 + antennaAzEl=0d,0d + + + + + + antennaSetup=LP + servoSetup=SSP + receiversSetup=CCB + chooseBackend=TotalPower + initialize=PPP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d - antennaReset goTo=180d,89.8d - receiversPark waitOnSource - servoPark + antennaStop + wait=1 antennaPark - asOff + receiversPark + servoPark asPark + logMessage=Telescope is now parked diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml index 8a425b205..8d218cd08 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -142,6 +142,12 @@ @ M3R: RZ(mm) = (860); " + SSP=" + @ SRP: park; + @ PFP: RY(mm) = (-25.95); TX(mm) = (-223); TZ(mm) = (-67); + @ GFR: RZ(mm) = (-600); + @ M3R: RZ(mm) = (860); + " slaves="GFR, M3R, PFP, SRP" > diff --git a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 65398204c..13aeadb65 100644 --- a/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml +++ b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml @@ -14,7 +14,7 @@ calOff restFrequency=0 antennaAzEl=0d,0d - + @@ -88,7 +88,21 @@ restFrequency=0 setLO=7500 antennaAzEl=0d,0d - + + + + + + antennaSetup=LP + servoSetup=SSP + receiversSetup=CCB + chooseBackend=TotalPower + initialize=PPP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d + diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd index efd84dbe7..e80803ce6 100644 --- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd +++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd @@ -141,6 +141,7 @@ + -- GitLab From 2ffc395aac19eb095cba4f7a0411d654c4670442 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Fri, 18 Aug 2017 14:49:56 +0200 Subject: [PATCH 089/145] Complete #167 adding the XB conf to the testing CDB --- .../DataBlock/PointingModel/PointingModel.xml | 124 ++++++++++++++---- .../alma/DataBlock/TotalPower/TotalPower.xml | 54 ++++++-- 2 files changed, 138 insertions(+), 40 deletions(-) diff --git a/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 9a3a7ce78..f05570265 100644 --- a/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -7,23 +7,24 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + - CCC + CCB 90.0 - 1 0 - 0 0 - 1 0 - 1 0 - 1 0 - 1 0 - 1 0 - 1 0 - 0 0 - 0 0 - 0 0 + 1 -2.3029563427 + 0 0.0 + 1 -0.0102762356 + 1 -0.0050985431 + 1 -0.0008867322 + 1 -0.0019946923 + 1 0.0873332769 + 1 0.0871561393 + 0 0.0 + 0 0.0 + 1 0.0115426397 0 0 - 0 0 - 0 0 + 1 0.0020223276 + 1 0.0008122203 0 0 0 0 0 0 @@ -43,22 +44,92 @@ - KKC + KKG + 90.0 + 1 -2.2964186668 + 1 0.0 + 1 -0.0061030770 + 1 -0.0035287447 + 1 -0.0014408963 + 1 -0.0017973853 + 1 0.0719125122 + 1 0.0925239921 + 0 0 + 0 0 + 1 0.0128885703 + 0 0.0 + 1 0.0006690503 + 1 0.0000107827 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + + + + LP 90.0 - 1 0 - 0 0 - 1 0 - 1 0 - 1 0 - 1 0 - 1 0 - 1 0 + 1 -2.2857789993 + 1 0.0 + 1 -0.0091895359 + 1 -0.0894266963 + 1 -0.0018128322 + 1 -0.0023823651 + 1 0.2023846656 + 1 -0.1307237744 0 0 0 0 - 1 0 + 1 -0.0199667234 + 1 -0.0015620823 + 1 -0.0016970964 + 1 -0.0043243342 + 1 0.0001897580 + 1 0.0001858544 + 1 0.0009959243 + 1 -0.0001986132 + 1 -0.0001294275 + 1 -0.0004546749 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + + + + XB + 90.0 + 1 -2.3029563427 + 0 0.0 + 1 -0.0102762356 + 1 -0.0050985431 + 1 -0.0008867322 + 1 -0.0019946923 + 1 0.0873332769 + 1 0.0871561393 + 0 0.0 + 0 0.0 + 1 0.0115426397 0 0 - 0 0 - 0 0 + 1 0.0020223276 + 1 0.0008122203 0 0 0 0 0 0 @@ -78,4 +149,3 @@ - diff --git a/SRT/CDB/alma/DataBlock/TotalPower/TotalPower.xml b/SRT/CDB/alma/DataBlock/TotalPower/TotalPower.xml index f582d499a..5197057b3 100644 --- a/SRT/CDB/alma/DataBlock/TotalPower/TotalPower.xml +++ b/SRT/CDB/alma/DataBlock/TotalPower/TotalPower.xml @@ -6,26 +6,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - KKC + KKG 14 TRUE GREGORIAN - 10 - 2350 + 7 + 2350 7 0 1 2 3 4 5 6 7 8 9 10 11 12 13 L R L R L R L R L R L R L R - 2 2 3 3 4 4 5 5 6 6 0 0 1 1 + 0 0 1 1 2 2 3 3 4 4 5 5 6 6 0 1 0 1 0 1 0 1 0 1 0 1 0 1 - CCC + CCB 2 TRUE - GREGORIAN - 10 - 1250 + BWG + 9 + 2350 1 0 1 L R @@ -33,15 +33,29 @@ 0 1 + + XB + 1 + FALSE + BWG + 5 + 2350 + 1 + 13 + R + 0 + 0 + + LLP 2 TRUE PRIMARY 10 - 2350 + 2350 1 - 0 1 + 2 3 L R 0 0 0 1 @@ -52,15 +66,29 @@ 2 TRUE PRIMARY - 10 - 2350 + 10 + 730 1 - 2 3 + 0 1 L R 0 0 0 1 + + PLP + 4 + TRUE + PRIMARY + 10 + 2350 + 2 + 0 1 2 3 + L R L R + 0 0 1 1 + 0 1 0 1 + + XKP 2 -- GitLab From 0af525c8ad000f3e664373ebd37ac6f24bd787a8 Mon Sep 17 00:00:00 2001 From: Marco Buttu Date: Thu, 24 Aug 2017 10:22:22 +0000 Subject: [PATCH 090/145] Fix #170: CustomLogger does not compile because of a strlen error --- Common/Servers/CustomLogger/include/expat_log_parsing.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/Servers/CustomLogger/include/expat_log_parsing.h b/Common/Servers/CustomLogger/include/expat_log_parsing.h index bad3131c2..efd049a93 100644 --- a/Common/Servers/CustomLogger/include/expat_log_parsing.h +++ b/Common/Servers/CustomLogger/include/expat_log_parsing.h @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include -- GitLab From 97a76eeae87ce3a2c054a66363eac15db7aec4a0 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 11 Sep 2017 13:58:12 +0000 Subject: [PATCH 091/145] Fix #171 --- SRT/CDB/MACI/Components/AS/Boss/Boss.xml | 4 +- .../Components/AS/SECTOR01/LAN01/LAN01.xml | 28 +- .../Components/AS/SECTOR01/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR01/LAN03/LAN03.xml | 32 +- .../Components/AS/SECTOR01/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR01/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR01/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR01/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR01/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR01/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR01/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR01/LAN11/LAN11.xml | 34 +- .../Components/AS/SECTOR01/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR02/LAN01/LAN01.xml | 30 +- .../Components/AS/SECTOR02/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR02/LAN03/LAN03.xml | 34 +- .../Components/AS/SECTOR02/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR02/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR02/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR02/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR02/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR02/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR02/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR02/LAN11/LAN11.xml | 32 +- .../Components/AS/SECTOR02/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR03/LAN01/LAN01.xml | 28 +- .../Components/AS/SECTOR03/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR03/LAN03/LAN03.xml | 32 +- .../Components/AS/SECTOR03/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR03/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR03/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR03/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR03/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR03/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR03/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR03/LAN11/LAN11.xml | 34 +- .../Components/AS/SECTOR03/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR04/LAN01/LAN01.xml | 30 +- .../Components/AS/SECTOR04/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR04/LAN03/LAN03.xml | 34 +- .../Components/AS/SECTOR04/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR04/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR04/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR04/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR04/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR04/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR04/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR04/LAN11/LAN11.xml | 32 +- .../Components/AS/SECTOR04/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR05/LAN01/LAN01.xml | 28 +- .../Components/AS/SECTOR05/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR05/LAN03/LAN03.xml | 32 +- .../Components/AS/SECTOR05/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR05/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR05/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR05/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR05/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR05/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR05/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR05/LAN11/LAN11.xml | 34 +- .../Components/AS/SECTOR05/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR06/LAN01/LAN01.xml | 30 +- .../Components/AS/SECTOR06/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR06/LAN03/LAN03.xml | 34 +- .../Components/AS/SECTOR06/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR06/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR06/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR06/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR06/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR06/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR06/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR06/LAN11/LAN11.xml | 32 +- .../Components/AS/SECTOR06/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR07/LAN01/LAN01.xml | 28 +- .../Components/AS/SECTOR07/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR07/LAN03/LAN03.xml | 32 +- .../Components/AS/SECTOR07/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR07/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR07/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR07/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR07/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR07/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR07/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR07/LAN11/LAN11.xml | 34 +- .../Components/AS/SECTOR07/LAN12/LAN12.xml | 20 +- .../Components/AS/SECTOR08/LAN01/LAN01.xml | 30 +- .../Components/AS/SECTOR08/LAN02/LAN02.xml | 20 +- .../Components/AS/SECTOR08/LAN03/LAN03.xml | 34 +- .../Components/AS/SECTOR08/LAN04/LAN04.xml | 20 +- .../Components/AS/SECTOR08/LAN05/LAN05.xml | 28 +- .../Components/AS/SECTOR08/LAN06/LAN06.xml | 20 +- .../Components/AS/SECTOR08/LAN07/LAN07.xml | 32 +- .../Components/AS/SECTOR08/LAN08/LAN08.xml | 20 +- .../Components/AS/SECTOR08/LAN09/LAN09.xml | 28 +- .../Components/AS/SECTOR08/LAN10/LAN10.xml | 20 +- .../Components/AS/SECTOR08/LAN11/LAN11.xml | 32 +- .../Components/AS/SECTOR08/LAN12/LAN12.xml | 20 +- SRT/CDB/alma/AS/Boss/Boss.xml | 381 +++++++++++++++++- .../alma/AS/SECTOR01/LAN01/USD03/USD03.xml | 18 +- .../alma/AS/SECTOR01/LAN01/USD04/USD04.xml | 8 +- .../alma/AS/SECTOR01/LAN01/USD05/USD05.xml | 8 +- .../alma/AS/SECTOR01/LAN01/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR01/LAN01/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR01/LAN01/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN01/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR01/LAN01/USD10/USD10.xml | 5 +- .../alma/AS/SECTOR01/LAN01/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR01/LAN01/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR01/LAN01/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR01/LAN01/USD14/USD14.xml | 4 +- .../alma/AS/SECTOR01/LAN01/USD15/USD15.xml | 3 +- .../alma/AS/SECTOR01/LAN02/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN02/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN02/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR01/LAN02/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR01/LAN02/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR01/LAN02/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN02/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR01/LAN02/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN02/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN03/USD01/USD01.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD02/USD02.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD03/USD03.xml | 4 +- .../alma/AS/SECTOR01/LAN03/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR01/LAN03/USD05/USD05.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR01/LAN03/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR01/LAN03/USD08/USD08.xml | 4 +- .../alma/AS/SECTOR01/LAN03/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN03/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR01/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN04/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR01/LAN04/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR01/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN04/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR01/LAN04/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR01/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR01/LAN11/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR01/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN01/USD03/USD03.xml | 4 +- .../alma/AS/SECTOR02/LAN01/USD04/USD04.xml | 4 +- .../alma/AS/SECTOR02/LAN01/USD05/USD05.xml | 5 +- .../alma/AS/SECTOR02/LAN01/USD06/USD06.xml | 4 +- .../alma/AS/SECTOR02/LAN01/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR02/LAN01/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR02/LAN01/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN01/USD10/USD10.xml | 4 +- .../alma/AS/SECTOR02/LAN01/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR02/LAN01/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN01/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR02/LAN01/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN01/USD15/USD15.xml | 3 +- .../alma/AS/SECTOR02/LAN01/USD17/USD17.xml | 3 +- .../alma/AS/SECTOR02/LAN02/USD07/USD07.xml | 4 +- .../alma/AS/SECTOR02/LAN02/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR02/LAN02/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR02/LAN02/USD10/USD10.xml | 5 +- .../alma/AS/SECTOR02/LAN02/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN02/USD12/USD12.xml | 5 +- .../alma/AS/SECTOR02/LAN02/USD13/USD13.xml | 4 +- .../alma/AS/SECTOR02/LAN02/USD14/USD14.xml | 5 +- .../alma/AS/SECTOR02/LAN02/USD15/USD15.xml | 6 +- .../alma/AS/SECTOR02/LAN03/USD01/USD01.xml | 5 +- .../alma/AS/SECTOR02/LAN03/USD02/USD02.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD03/USD03.xml | 4 +- .../alma/AS/SECTOR02/LAN03/USD04/USD04.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR02/LAN03/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN03/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN03/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD11/USD11.xml | 4 +- .../alma/AS/SECTOR02/LAN03/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD14/USD14.xml | 3 +- .../alma/AS/SECTOR02/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN03/USD16/USD16.xml | 3 +- .../alma/AS/SECTOR02/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR02/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN01/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN01/USD04/USD04.xml | 5 +- .../alma/AS/SECTOR03/LAN01/USD05/USD05.xml | 3 +- .../alma/AS/SECTOR03/LAN01/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR03/LAN01/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR03/LAN01/USD08/USD08.xml | 4 +- .../alma/AS/SECTOR03/LAN01/USD09/USD09.xml | 5 +- .../alma/AS/SECTOR03/LAN01/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR03/LAN01/USD11/USD11.xml | 4 +- .../alma/AS/SECTOR03/LAN01/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR03/LAN01/USD13/USD13.xml | 5 +- .../alma/AS/SECTOR03/LAN01/USD14/USD14.xml | 3 +- .../alma/AS/SECTOR03/LAN01/USD15/USD15.xml | 5 +- .../alma/AS/SECTOR03/LAN02/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR03/LAN02/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR03/LAN02/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR03/LAN02/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR03/LAN02/USD11/USD11.xml | 5 +- .../alma/AS/SECTOR03/LAN02/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR03/LAN02/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN02/USD14/USD14.xml | 5 +- .../alma/AS/SECTOR03/LAN02/USD15/USD15.xml | 6 +- .../alma/AS/SECTOR03/LAN03/USD01/USD01.xml | 4 +- .../alma/AS/SECTOR03/LAN03/USD02/USD02.xml | 5 +- .../alma/AS/SECTOR03/LAN03/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD04/USD04.xml | 4 +- .../alma/AS/SECTOR03/LAN03/USD05/USD05.xml | 5 +- .../alma/AS/SECTOR03/LAN03/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR03/LAN03/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR03/LAN03/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR03/LAN03/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR03/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR03/LAN04/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR03/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR03/LAN11/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR03/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN01/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR04/LAN01/USD04/USD04.xml | 3 +- .../alma/AS/SECTOR04/LAN01/USD05/USD05.xml | 4 +- .../alma/AS/SECTOR04/LAN01/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR04/LAN01/USD07/USD07.xml | 4 +- .../alma/AS/SECTOR04/LAN01/USD08/USD08.xml | 4 +- .../alma/AS/SECTOR04/LAN01/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR04/LAN01/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR04/LAN01/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR04/LAN01/USD12/USD12.xml | 5 +- .../alma/AS/SECTOR04/LAN01/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR04/LAN01/USD14/USD14.xml | 3 +- .../alma/AS/SECTOR04/LAN01/USD15/USD15.xml | 4 +- .../alma/AS/SECTOR04/LAN01/USD17/USD17.xml | 4 +- .../alma/AS/SECTOR04/LAN02/USD07/USD07.xml | 6 +- .../alma/AS/SECTOR04/LAN02/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR04/LAN02/USD09/USD09.xml | 5 +- .../alma/AS/SECTOR04/LAN02/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN02/USD11/USD11.xml | 6 +- .../alma/AS/SECTOR04/LAN02/USD12/USD12.xml | 5 +- .../alma/AS/SECTOR04/LAN02/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR04/LAN02/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN02/USD15/USD15.xml | 4 +- .../alma/AS/SECTOR04/LAN03/USD01/USD01.xml | 3 +- .../alma/AS/SECTOR04/LAN03/USD02/USD02.xml | 5 +- .../alma/AS/SECTOR04/LAN03/USD03/USD03.xml | 4 +- .../alma/AS/SECTOR04/LAN03/USD04/USD04.xml | 4 +- .../alma/AS/SECTOR04/LAN03/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR04/LAN03/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR04/LAN03/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR04/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN03/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR04/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN01/USD03/USD03.xml | 3 +- .../alma/AS/SECTOR05/LAN01/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN01/USD05/USD05.xml | 4 +- .../alma/AS/SECTOR05/LAN01/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR05/LAN01/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR05/LAN01/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN01/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN01/USD10/USD10.xml | 6 +- .../alma/AS/SECTOR05/LAN01/USD11/USD11.xml | 5 +- .../alma/AS/SECTOR05/LAN01/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR05/LAN01/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR05/LAN01/USD14/USD14.xml | 3 +- .../alma/AS/SECTOR05/LAN01/USD15/USD15.xml | 5 +- .../alma/AS/SECTOR05/LAN02/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN02/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR05/LAN02/USD09/USD09.xml | 5 +- .../alma/AS/SECTOR05/LAN02/USD10/USD10.xml | 4 +- .../alma/AS/SECTOR05/LAN02/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR05/LAN02/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN02/USD13/USD13.xml | 3 +- .../alma/AS/SECTOR05/LAN02/USD14/USD14.xml | 3 +- .../alma/AS/SECTOR05/LAN02/USD15/USD15.xml | 3 +- .../alma/AS/SECTOR05/LAN03/USD01/USD01.xml | 3 +- .../alma/AS/SECTOR05/LAN03/USD02/USD02.xml | 4 +- .../alma/AS/SECTOR05/LAN03/USD03/USD03.xml | 5 +- .../alma/AS/SECTOR05/LAN03/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR05/LAN03/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR05/LAN03/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR05/LAN03/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR05/LAN11/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR05/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN01/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR06/LAN01/USD04/USD04.xml | 5 +- .../alma/AS/SECTOR06/LAN01/USD05/USD05.xml | 6 +- .../alma/AS/SECTOR06/LAN01/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR06/LAN01/USD07/USD07.xml | 4 +- .../alma/AS/SECTOR06/LAN01/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR06/LAN01/USD09/USD09.xml | 5 +- .../alma/AS/SECTOR06/LAN01/USD10/USD10.xml | 5 +- .../alma/AS/SECTOR06/LAN01/USD11/USD11.xml | 4 +- .../alma/AS/SECTOR06/LAN01/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR06/LAN01/USD13/USD13.xml | 5 +- .../alma/AS/SECTOR06/LAN01/USD14/USD14.xml | 4 +- .../alma/AS/SECTOR06/LAN01/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN01/USD17/USD17.xml | 4 +- .../alma/AS/SECTOR06/LAN02/USD07/USD07.xml | 4 +- .../alma/AS/SECTOR06/LAN02/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR06/LAN02/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR06/LAN02/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR06/LAN02/USD11/USD11.xml | 3 +- .../alma/AS/SECTOR06/LAN02/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR06/LAN02/USD13/USD13.xml | 5 +- .../alma/AS/SECTOR06/LAN02/USD14/USD14.xml | 6 +- .../alma/AS/SECTOR06/LAN02/USD15/USD15.xml | 5 +- .../alma/AS/SECTOR06/LAN03/USD01/USD01.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD02/USD02.xml | 5 +- .../alma/AS/SECTOR06/LAN03/USD03/USD03.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD04/USD04.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD05/USD05.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD06/USD06.xml | 4 +- .../alma/AS/SECTOR06/LAN03/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR06/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN03/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR06/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN01/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR07/LAN01/USD04/USD04.xml | 5 +- .../alma/AS/SECTOR07/LAN01/USD05/USD05.xml | 3 +- .../alma/AS/SECTOR07/LAN01/USD06/USD06.xml | 6 +- .../alma/AS/SECTOR07/LAN01/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR07/LAN01/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR07/LAN01/USD09/USD09.xml | 4 +- .../alma/AS/SECTOR07/LAN01/USD10/USD10.xml | 3 +- .../alma/AS/SECTOR07/LAN01/USD11/USD11.xml | 6 +- .../alma/AS/SECTOR07/LAN01/USD12/USD12.xml | 4 +- .../alma/AS/SECTOR07/LAN01/USD13/USD13.xml | 4 +- .../alma/AS/SECTOR07/LAN01/USD14/USD14.xml | 6 +- .../alma/AS/SECTOR07/LAN01/USD15/USD15.xml | 6 +- .../alma/AS/SECTOR07/LAN02/USD07/USD07.xml | 3 +- .../alma/AS/SECTOR07/LAN02/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR07/LAN02/USD09/USD09.xml | 5 +- .../alma/AS/SECTOR07/LAN02/USD10/USD10.xml | 5 +- .../alma/AS/SECTOR07/LAN02/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN02/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR07/LAN02/USD13/USD13.xml | 4 +- .../alma/AS/SECTOR07/LAN02/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN02/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD01/USD01.xml | 5 +- .../alma/AS/SECTOR07/LAN03/USD02/USD02.xml | 4 +- .../alma/AS/SECTOR07/LAN03/USD03/USD03.xml | 5 +- .../alma/AS/SECTOR07/LAN03/USD04/USD04.xml | 4 +- .../alma/AS/SECTOR07/LAN03/USD05/USD05.xml | 5 +- .../alma/AS/SECTOR07/LAN03/USD06/USD06.xml | 5 +- .../alma/AS/SECTOR07/LAN03/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR07/LAN03/USD08/USD08.xml | 4 +- .../alma/AS/SECTOR07/LAN03/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR07/LAN11/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR07/LAN12/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN01/USD03/USD03.xml | 4 +- .../alma/AS/SECTOR08/LAN01/USD04/USD04.xml | 4 +- .../alma/AS/SECTOR08/LAN01/USD05/USD05.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR08/LAN01/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD08/USD08.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN01/USD10/USD10.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD11/USD11.xml | 4 +- .../alma/AS/SECTOR08/LAN01/USD12/USD12.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD13/USD13.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD14/USD14.xml | 4 +- .../alma/AS/SECTOR08/LAN01/USD15/USD15.xml | 5 +- .../alma/AS/SECTOR08/LAN01/USD17/USD17.xml | 5 +- .../alma/AS/SECTOR08/LAN02/USD07/USD07.xml | 5 +- .../alma/AS/SECTOR08/LAN02/USD08/USD08.xml | 3 +- .../alma/AS/SECTOR08/LAN02/USD09/USD09.xml | 3 +- .../alma/AS/SECTOR08/LAN02/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN02/USD11/USD11.xml | 4 +- .../alma/AS/SECTOR08/LAN02/USD12/USD12.xml | 3 +- .../alma/AS/SECTOR08/LAN02/USD13/USD13.xml | 6 +- .../alma/AS/SECTOR08/LAN02/USD14/USD14.xml | 4 +- .../alma/AS/SECTOR08/LAN02/USD15/USD15.xml | 4 +- .../alma/AS/SECTOR08/LAN03/USD01/USD01.xml | 4 +- .../alma/AS/SECTOR08/LAN03/USD02/USD02.xml | 5 +- .../alma/AS/SECTOR08/LAN03/USD03/USD03.xml | 6 +- .../alma/AS/SECTOR08/LAN03/USD04/USD04.xml | 5 +- .../alma/AS/SECTOR08/LAN03/USD05/USD05.xml | 4 +- .../alma/AS/SECTOR08/LAN03/USD06/USD06.xml | 3 +- .../alma/AS/SECTOR08/LAN03/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN03/USD16/USD16.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN04/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN05/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN06/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN07/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN08/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN09/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN10/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD01/USD01.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD02/USD02.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD03/USD03.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD04/USD04.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD05/USD05.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD06/USD06.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN11/USD15/USD15.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD07/USD07.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD08/USD08.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD09/USD09.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD10/USD10.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD11/USD11.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD12/USD12.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD13/USD13.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD14/USD14.xml | 2 +- .../alma/AS/SECTOR08/LAN12/USD15/USD15.xml | 2 +- SRT/CDB/alma/AS/set_calibrate.py | 24 ++ 1215 files changed, 3186 insertions(+), 2345 deletions(-) create mode 100644 SRT/CDB/alma/AS/set_calibrate.py diff --git a/SRT/CDB/MACI/Components/AS/Boss/Boss.xml b/SRT/CDB/MACI/Components/AS/Boss/Boss.xml index 43cfdfe93..5b2c6d078 100644 --- a/SRT/CDB/MACI/Components/AS/Boss/Boss.xml +++ b/SRT/CDB/MACI/Components/AS/Boss/Boss.xml @@ -10,8 +10,8 @@ Name="Boss" Code="SRTActiveSurfaceBossImpl" - Type="IDL:alma/SRTActiveSurface/SRTActiveSurfaceBoss:1.0" + Type="IDL:alma/ActiveSurface/SRTActiveSurfaceBoss:1.0" Container="SRTActiveSurfaceContainer" ImplLang="cpp" - Default="true" + Default="true" /> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml index 9b292c4aa..b8dbc9227 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml index 2170b472f..82f99db40 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml index 002fb668f..ba5ddb777 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml index 9e7ae1493..84caa1bfa 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml index 29be0c7ad..650338981 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml index a8a8791df..57de25eb3 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml index 762cedcbd..82ff950b4 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml index 79e6e7300..011386a54 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml index 5cc5cf030..43118cb25 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml index 00b765eeb..60351c5c7 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml index 1d9163f23..c0952684d 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml index cbb6a18c9..d6a8424b4 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer01" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml index daf087f56..a20521ca5 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml @@ -3,20 +3,20 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD17" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD17" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml index b888896ac..0c71d0ecf 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml index 3a84cf423..8324ddda5 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml index 476cb7d4d..214aba999 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml index c8c89a527..4de96dc34 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml index 7166e86ec..5e7d21604 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml index 1d5f7dd1f..6ac7b2ab8 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml index 390029905..fd232a448 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml index 3c154bfa1..d2030bc62 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml index 4b7c08ad8..9ebe4cde0 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml index 5ff727218..223d06038 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml index 636811771..ea4d0eee3 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer02" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml index 629aed9bf..6dfd82732 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml index 0df31f2f8..9d0ed32d8 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml index 77b0122ae..ae357d4b9 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml index 4852fc2dc..5d70b0780 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml index 185ac88c5..ac0effa59 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml index 67a77081d..9cd492df4 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml index c4d970c2d..be254e6dc 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml index 22d799c8b..41fbca03b 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml index 9e91af1a7..19137d61f 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml index a45497624..32905bf82 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml index a78b5ccfe..252d6e917 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml index dd28fd1fc..0ce612780 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer03" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml index 904199c5d..438930bfc 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml @@ -3,20 +3,20 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD17" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD17" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml index 483eb9e3b..c9f760e3c 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml index 1b6b153a0..cb936d990 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml index 2fdd6f0d8..1a6fabf02 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml index b51da2bac..4444e4836 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml index 0249a2565..af7b8e93d 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml index 374222207..e9a97e904 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml index 3b149ae3d..2a7ac65ce 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml index 93bb152f3..e0410eeab 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml index 7c85f39ac..d2fea9193 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml index e37cc193c..8c48edc84 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml index 5e008b6fb..1129fa37b 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer04" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN01/LAN01.xml index 308137181..7b992a8bc 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN01/LAN01.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN02/LAN02.xml index 72a29f5ec..1ececed81 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN03/LAN03.xml index 2e4acd1b7..941c3e8a7 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN03/LAN03.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN04/LAN04.xml index 0f3435a0d..44fd202f7 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN05/LAN05.xml index 28c739c2f..e94f743ed 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN06/LAN06.xml index f980bece3..a2190f6d5 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN07/LAN07.xml index 7adfc4829..e47703bf9 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN08/LAN08.xml index 96f46b6c1..c1436632d 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN09/LAN09.xml index 19c9dcf52..caa379a5c 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN10/LAN10.xml index 695bd1dbb..04fc3047f 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN11/LAN11.xml index 878dd03d0..001ad0233 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN11/LAN11.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN12/LAN12.xml index ee3261f39..2ba23b321 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR05/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR05/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer05" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN01/LAN01.xml index 146d3fb29..6ee5a5ed6 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN01/LAN01.xml @@ -3,20 +3,20 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD17" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD17" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN02/LAN02.xml index a41d3abb0..e9c99530f 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN03/LAN03.xml index 59b548924..b5c964e83 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN03/LAN03.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN04/LAN04.xml index d8920e77b..2f8b5a9bf 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN05/LAN05.xml index 54524d5cd..07db0cfe6 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN06/LAN06.xml index e987b2541..b276baab7 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN07/LAN07.xml index a692599d4..b34718139 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN08/LAN08.xml index d4f10ec24..7e8ba8edc 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN09/LAN09.xml index 528e4939f..b30681a67 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN10/LAN10.xml index 84fdd9381..4cb635c6f 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN11/LAN11.xml index 4701aa115..60533d14b 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN11/LAN11.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN12/LAN12.xml index 08cbbca1b..6457e0cf9 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR06/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR06/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer06" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN01/LAN01.xml index c76f60b5e..cb37f3a22 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN01/LAN01.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN02/LAN02.xml index 302f3f688..ea90e773f 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN03/LAN03.xml index ab6d21879..d686339e6 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN03/LAN03.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN04/LAN04.xml index f45f571aa..34ae7de8c 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN05/LAN05.xml index 54da12d09..ecb1b1672 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN06/LAN06.xml index e156d974e..d0ca118eb 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN07/LAN07.xml index 0db8d62e4..86d6f98fa 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN08/LAN08.xml index e2113f0a2..87bfb1b87 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN09/LAN09.xml index af329a7ff..401ebfe8c 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN10/LAN10.xml index 6140bb0ee..d836e476e 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN11/LAN11.xml index 0534ce28c..7ab1b8b44 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN11/LAN11.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN12/LAN12.xml index 98f489929..02cc96331 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR07/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR07/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer07" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN01/LAN01.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN01/LAN01.xml index e6fb58760..de67f1103 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN01/LAN01.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN01/LAN01.xml @@ -3,20 +3,20 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN01" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD17" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN01" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD17" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN02/LAN02.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN02/LAN02.xml index a4bb64c77..c02365ac2 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN02/LAN02.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN02/LAN02.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN02" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN02" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN03/LAN03.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN03/LAN03.xml index 64d9fd25b..b2a4b70a0 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN03/LAN03.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN03/LAN03.xml @@ -3,22 +3,22 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN03" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD16" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN03" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD16" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN04/LAN04.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN04/LAN04.xml index fc7545f21..6cdaf6e8d 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN04/LAN04.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN04/LAN04.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN04" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN04" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN05/LAN05.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN05/LAN05.xml index ccf10ce38..01b4138a8 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN05/LAN05.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN05/LAN05.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN05" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN05" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN06/LAN06.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN06/LAN06.xml index c7e49e7ee..6db7a0f41 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN06/LAN06.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN06/LAN06.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN06" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN06" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN07/LAN07.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN07/LAN07.xml index 9a7557dba..dc725c8ec 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN07/LAN07.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN07/LAN07.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN07" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN07" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN08/LAN08.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN08/LAN08.xml index c6aadea7c..d3dea0029 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN08/LAN08.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN08/LAN08.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN08" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN08" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN09/LAN09.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN09/LAN09.xml index 096c2c336..e61ac3152 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN09/LAN09.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN09/LAN09.xml @@ -3,19 +3,19 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN09" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN09" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN10/LAN10.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN10/LAN10.xml index 8eaab3093..696dd9859 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN10/LAN10.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN10/LAN10.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN10" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN10" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN11/LAN11.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN11/LAN11.xml index c23c3c694..73fee34f8 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN11/LAN11.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN11/LAN11.xml @@ -3,21 +3,21 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN11" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD01" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD02" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD03" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD04" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD05" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD06" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN11" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD01" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD02" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD03" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD04" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD05" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD06" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN12/LAN12.xml b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN12/LAN12.xml index aed4949bc..8d7ced638 100644 --- a/SRT/CDB/MACI/Components/AS/SECTOR08/LAN12/LAN12.xml +++ b/SRT/CDB/MACI/Components/AS/SECTOR08/LAN12/LAN12.xml @@ -3,15 +3,15 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="LAN12" Code="lanImpl" Type="IDL:alma/SRTActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> - <_ Name="USD07" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD08" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD09" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD10" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD11" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD12" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD13" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD14" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> - <_ Name="USD15" Code="usdImpl" Type="IDL:alma/SRTActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + Name="LAN12" Code="lanImpl" Type="IDL:alma/ActiveSurface/lan:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"> + <_ Name="USD07" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD08" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD09" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD10" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD11" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD12" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD13" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD14" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> + <_ Name="USD15" Code="usdImpl" Type="IDL:alma/ActiveSurface/USD:1.0" Container="SRTActiveSurfaceContainer08" ImplLang="cpp"/> diff --git a/SRT/CDB/alma/AS/Boss/Boss.xml b/SRT/CDB/alma/AS/Boss/Boss.xml index 4cf4f23e9..2a8627286 100644 --- a/SRT/CDB/alma/AS/Boss/Boss.xml +++ b/SRT/CDB/alma/AS/Boss/Boss.xml @@ -1,18 +1,371 @@ - - - - - - - + + + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD03/USD03.xml index 250c12cbd..9b124ce63 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD03/USD03.xml @@ -2,8 +2,22 @@ - + @@ -17,4 +31,4 @@ - + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD04/USD04.xml index 428b571cc..dc1978249 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD04/USD04.xml @@ -344,8 +344,14 @@ - Mon Oct 06 08:31:15 UTC 2008 modified by jDAL - Mon Oct 06 09:27:59 UTC 2008 modified by jDAL - Thu Oct 09 11:27:39 UTC 2008 modified by jDAL + - Mon Aug 28 09:09:38 UTC 2017 modified by jDAL + - Mon Aug 28 12:20:57 UTC 2017 modified by jDAL + - Mon Aug 28 12:36:25 UTC 2017 modified by jDAL + - Tue Aug 29 08:08:01 UTC 2017 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD05/USD05.xml index ca18d7796..c55b6df72 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD05/USD05.xml @@ -335,8 +335,14 @@ - Mon Oct 06 08:31:15 UTC 2008 modified by jDAL - Mon Oct 06 09:28:21 UTC 2008 modified by jDAL - Thu Oct 09 11:27:39 UTC 2008 modified by jDAL + - Mon Aug 28 12:21:16 UTC 2017 modified by jDAL + - Mon Aug 28 12:21:21 UTC 2017 modified by jDAL + - Tue Aug 29 09:08:04 UTC 2017 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:40 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:07 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD06/USD06.xml index a972f962f..f8fc9a884 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD06/USD06.xml @@ -328,8 +328,11 @@ - Mon Oct 06 08:31:16 UTC 2008 modified by jDAL - Mon Oct 06 09:28:48 UTC 2008 modified by jDAL - Thu Oct 09 11:27:40 UTC 2008 modified by jDAL + - Mon Aug 28 12:21:31 UTC 2017 modified by jDAL + - Tue Aug 29 09:29:43 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD07/USD07.xml index 424ab806c..6fe60d5c8 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD07/USD07.xml @@ -325,8 +325,9 @@ - Mon Oct 06 08:31:16 UTC 2008 modified by jDAL - Mon Oct 06 09:29:13 UTC 2008 modified by jDAL - Thu Oct 09 11:27:40 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:09 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD08/USD08.xml index 44b03e537..706aa210d 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD08/USD08.xml @@ -261,7 +261,7 @@ - Mon Oct 06 09:30:02 UTC 2008 modified by jDAL - Thu Oct 09 11:27:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD09/USD09.xml index 1af551361..6e7c0c70c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD09/USD09.xml @@ -270,8 +270,10 @@ - Mon Oct 06 08:31:17 UTC 2008 modified by jDAL - Mon Oct 06 09:30:56 UTC 2008 modified by jDAL - Thu Oct 09 11:27:41 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:48 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:44 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD10/USD10.xml index c6308c2a2..28a9226a6 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD10/USD10.xml @@ -268,8 +268,11 @@ - Mon Oct 06 08:31:17 UTC 2008 modified by jDAL - Mon Oct 06 09:31:43 UTC 2008 modified by jDAL - Thu Oct 09 11:27:42 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:45 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:13 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD11/USD11.xml index 452496b61..2ee48d19c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD11/USD11.xml @@ -261,8 +261,9 @@ - Mon Oct 06 08:31:18 UTC 2008 modified by jDAL - Mon Oct 06 09:32:30 UTC 2008 modified by jDAL - Thu Oct 09 11:27:42 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD12/USD12.xml index 2a7603c01..993dd216b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD12/USD12.xml @@ -263,8 +263,9 @@ - Mon Oct 06 08:31:18 UTC 2008 modified by jDAL - Mon Oct 06 09:33:18 UTC 2008 modified by jDAL - Thu Oct 09 11:27:43 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD13/USD13.xml index 738328385..8616d23f5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD13/USD13.xml @@ -259,8 +259,9 @@ - Mon Oct 06 08:31:19 UTC 2008 modified by jDAL - Mon Oct 06 09:34:13 UTC 2008 modified by jDAL - Thu Oct 09 11:27:43 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:16 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD14/USD14.xml index 5a56351d6..acbd3d0f4 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD14/USD14.xml @@ -255,8 +255,10 @@ - Mon Oct 06 08:31:19 UTC 2008 modified by jDAL - Mon Oct 06 09:35:01 UTC 2008 modified by jDAL - Thu Oct 09 11:27:43 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:47 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD15/USD15.xml index d05229321..ecedfb056 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD15/USD15.xml @@ -257,8 +257,9 @@ - Mon Oct 06 08:31:20 UTC 2008 modified by jDAL - Mon Oct 06 09:35:52 UTC 2008 modified by jDAL - Thu Oct 09 11:27:44 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD07/USD07.xml index 9db612b36..39e879672 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD07/USD07.xml @@ -246,7 +246,7 @@ - Thu Oct 09 09:22:09 UTC 2008 modified by jDAL - Thu Oct 09 11:27:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD08/USD08.xml index cac4e40e9..970dd0d27 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD08/USD08.xml @@ -243,7 +243,7 @@ - Thu Oct 09 09:23:10 UTC 2008 modified by jDAL - Thu Oct 09 11:27:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD09/USD09.xml index b11a85332..8b27d8a7c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD09/USD09.xml @@ -242,8 +242,9 @@ - Mon Oct 06 09:30:57 UTC 2008 modified by jDAL - Thu Oct 09 09:23:54 UTC 2008 modified by jDAL - Thu Oct 09 11:27:45 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD10/USD10.xml index e97a385ae..b9ab2be23 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD10/USD10.xml @@ -242,8 +242,9 @@ - Mon Oct 06 09:31:44 UTC 2008 modified by jDAL - Thu Oct 09 09:24:39 UTC 2008 modified by jDAL - Thu Oct 09 11:27:46 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD11/USD11.xml index e0bb95f8a..12501b4e8 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD11/USD11.xml @@ -241,8 +241,9 @@ - Mon Oct 06 09:32:31 UTC 2008 modified by jDAL - Thu Oct 09 09:25:26 UTC 2008 modified by jDAL - Thu Oct 09 11:27:46 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD12/USD12.xml index 7e7cfffba..e46898a46 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD12/USD12.xml @@ -243,7 +243,7 @@ - Thu Oct 09 09:26:14 UTC 2008 modified by jDAL - Thu Oct 09 11:27:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD13/USD13.xml index 7583625dd..b2211a26f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD13/USD13.xml @@ -238,8 +238,9 @@ - Mon Oct 06 09:34:14 UTC 2008 modified by jDAL - Thu Oct 09 09:27:02 UTC 2008 modified by jDAL - Thu Oct 09 11:27:47 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:58 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD14/USD14.xml index afd3e71ec..05bebff98 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD14/USD14.xml @@ -239,7 +239,7 @@ - Thu Oct 09 09:27:51 UTC 2008 modified by jDAL - Thu Oct 09 11:27:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD15/USD15.xml index 5ab31b86f..6684c8c25 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD15/USD15.xml @@ -238,7 +238,7 @@ - Thu Oct 09 09:28:41 UTC 2008 modified by jDAL - Thu Oct 09 11:27:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD01/USD01.xml index 9ca7789ab..25a9a4678 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD01/USD01.xml @@ -255,8 +255,9 @@ - Mon Oct 06 09:27:00 UTC 2008 modified by jDAL - Thu Oct 09 09:19:48 UTC 2008 modified by jDAL - Thu Oct 09 11:27:49 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:05 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD02/USD02.xml index 8c8e6bec7..7907cf16c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD02/USD02.xml @@ -238,8 +238,9 @@ - Mon Oct 06 09:27:14 UTC 2008 modified by jDAL - Thu Oct 09 09:20:08 UTC 2008 modified by jDAL - Thu Oct 09 11:27:49 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:30 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD03/USD03.xml index 58ddd0ccb..75b53090f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD03/USD03.xml @@ -238,8 +238,10 @@ - Mon Oct 06 09:27:31 UTC 2008 modified by jDAL - Thu Oct 09 09:20:19 UTC 2008 modified by jDAL - Thu Oct 09 11:27:50 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:10 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD04/USD04.xml index b45565f19..0d570f1bc 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD04/USD04.xml @@ -238,7 +238,7 @@ - Thu Oct 09 09:20:50 UTC 2008 modified by jDAL - Thu Oct 09 11:27:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD05/USD05.xml index 9d71893a1..7b45bcf5e 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD05/USD05.xml @@ -236,8 +236,9 @@ - Mon Oct 06 09:28:22 UTC 2008 modified by jDAL - Thu Oct 09 09:21:14 UTC 2008 modified by jDAL - Thu Oct 09 11:27:51 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:12 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD06/USD06.xml index 1324f614f..4f4c08e0e 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD06/USD06.xml @@ -235,8 +235,11 @@ - Mon Oct 06 09:28:48 UTC 2008 modified by jDAL - Thu Oct 09 09:21:45 UTC 2008 modified by jDAL - Thu Oct 09 11:27:51 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:14 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:34 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD07/USD07.xml index 1bece4b7d..f1b5f67fd 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD07/USD07.xml @@ -235,8 +235,11 @@ - Mon Oct 06 09:29:14 UTC 2008 modified by jDAL - Thu Oct 09 09:22:09 UTC 2008 modified by jDAL - Thu Oct 09 11:27:52 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:19 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:36 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:36 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD08/USD08.xml index c61a06474..b20fcc3ac 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD08/USD08.xml @@ -235,8 +235,10 @@ - Mon Oct 06 09:30:03 UTC 2008 modified by jDAL - Thu Oct 09 09:23:10 UTC 2008 modified by jDAL - Thu Oct 09 11:27:52 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:21 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:16 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD09/USD09.xml index 683f74077..4040478a3 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD09/USD09.xml @@ -235,7 +235,7 @@ - Thu Oct 09 09:23:55 UTC 2008 modified by jDAL - Thu Oct 09 11:27:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml index 80115aea5..cdefff549 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml @@ -232,8 +232,9 @@ - Mon Oct 06 09:31:44 UTC 2008 modified by jDAL - Thu Oct 09 09:24:39 UTC 2008 modified by jDAL - Thu Oct 09 11:27:53 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD11/USD11.xml index 3f01004e0..08892bd57 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD11/USD11.xml @@ -230,8 +230,9 @@ - Mon Oct 06 09:32:31 UTC 2008 modified by jDAL - Thu Oct 09 09:25:27 UTC 2008 modified by jDAL - Thu Oct 09 11:27:53 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:41 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD12/USD12.xml index 7bf9f8bd8..32904fb01 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD12/USD12.xml @@ -227,8 +227,9 @@ - Mon Oct 06 09:33:19 UTC 2008 modified by jDAL - Thu Oct 09 09:26:14 UTC 2008 modified by jDAL - Thu Oct 09 11:27:54 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:43 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD13/USD13.xml index f0bec5c94..468690975 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD13/USD13.xml @@ -224,7 +224,7 @@ - Thu Oct 09 09:27:03 UTC 2008 modified by jDAL - Thu Oct 09 11:27:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD14/USD14.xml index 1aeffca32..40872d90a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD14/USD14.xml @@ -223,7 +223,7 @@ - Thu Oct 09 09:27:52 UTC 2008 modified by jDAL - Thu Oct 09 11:27:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD15/USD15.xml index 229fd6cb1..5528ed99b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD15/USD15.xml @@ -223,7 +223,7 @@ - Thu Oct 09 09:28:42 UTC 2008 modified by jDAL - Thu Oct 09 11:27:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD07/USD07.xml index a3d648f2c..bccc057d5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD07/USD07.xml @@ -221,7 +221,7 @@ - Thu Oct 09 09:22:10 UTC 2008 modified by jDAL - Thu Oct 09 11:27:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD08/USD08.xml index 140a54678..e6746f13a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD08/USD08.xml @@ -221,8 +221,9 @@ - Mon Oct 06 09:30:03 UTC 2008 modified by jDAL - Thu Oct 09 09:23:11 UTC 2008 modified by jDAL - Thu Oct 09 11:27:56 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:49 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD09/USD09.xml index d04e8adcf..1723af6bb 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD09/USD09.xml @@ -217,8 +217,9 @@ - Mon Oct 06 09:30:58 UTC 2008 modified by jDAL - Thu Oct 09 09:23:55 UTC 2008 modified by jDAL - Thu Oct 09 11:27:57 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:50 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD10/USD10.xml index 12cb4ca6f..299ee8870 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD10/USD10.xml @@ -218,7 +218,7 @@ - Thu Oct 09 09:24:40 UTC 2008 modified by jDAL - Thu Oct 09 11:27:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD11/USD11.xml index 765a03f09..d324d1be7 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD11/USD11.xml @@ -219,7 +219,7 @@ - Thu Oct 09 09:25:27 UTC 2008 modified by jDAL - Thu Oct 09 11:27:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD12/USD12.xml index b5dbb97e0..a68f52939 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD12/USD12.xml @@ -216,8 +216,9 @@ - Mon Oct 06 09:33:20 UTC 2008 modified by jDAL - Thu Oct 09 09:26:14 UTC 2008 modified by jDAL - Thu Oct 09 11:27:58 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD13/USD13.xml index 4a6ad8c8c..16b66f5bc 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD13/USD13.xml @@ -214,8 +214,9 @@ - Mon Oct 06 09:34:15 UTC 2008 modified by jDAL - Thu Oct 09 09:27:03 UTC 2008 modified by jDAL - Thu Oct 09 11:27:59 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD14/USD14.xml index 66f610d98..91b827885 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD14/USD14.xml @@ -209,7 +209,7 @@ - Thu Oct 09 09:27:52 UTC 2008 modified by jDAL - Thu Oct 09 11:27:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD15/USD15.xml index 09d0f677b..cbbcb30ab 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD15/USD15.xml @@ -209,7 +209,7 @@ - Thu Oct 09 09:28:42 UTC 2008 modified by jDAL - Thu Oct 09 11:28:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD03/USD03.xml index 595211368..dd325d2d4 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD03/USD03.xml @@ -213,7 +213,7 @@ - Thu Oct 09 09:20:23 UTC 2008 modified by jDAL - Thu Oct 09 11:28:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD04/USD04.xml index 5ea7e7de2..d5cc38264 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD04/USD04.xml @@ -213,7 +213,7 @@ - Thu Oct 09 09:20:50 UTC 2008 modified by jDAL - Thu Oct 09 11:28:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD05/USD05.xml index d33b5760f..f0e0c9c68 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD05/USD05.xml @@ -210,7 +210,7 @@ - Thu Oct 09 09:21:14 UTC 2008 modified by jDAL - Thu Oct 09 11:28:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD06/USD06.xml index 93e3cea0d..80e126a6f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD06/USD06.xml @@ -208,7 +208,7 @@ - Thu Oct 09 09:21:45 UTC 2008 modified by jDAL - Thu Oct 09 11:28:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD07/USD07.xml index 0467d9b0a..94d08a6cb 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD07/USD07.xml @@ -208,7 +208,7 @@ - Thu Oct 09 09:22:10 UTC 2008 modified by jDAL - Thu Oct 09 11:28:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD08/USD08.xml index 99f99ebfd..10d787dca 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD08/USD08.xml @@ -208,7 +208,7 @@ - Thu Oct 09 09:23:11 UTC 2008 modified by jDAL - Thu Oct 09 11:28:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD09/USD09.xml index 60361a1f2..29163b762 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD09/USD09.xml @@ -206,7 +206,7 @@ - Thu Oct 09 09:23:56 UTC 2008 modified by jDAL - Thu Oct 09 11:28:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD10/USD10.xml index 29f21cfea..b4b3c3d43 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD10/USD10.xml @@ -205,7 +205,7 @@ - Thu Oct 09 09:24:40 UTC 2008 modified by jDAL - Thu Oct 09 11:28:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD11/USD11.xml index 1d80e52a8..40a2abadf 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD11/USD11.xml @@ -204,7 +204,7 @@ - Thu Oct 09 09:25:28 UTC 2008 modified by jDAL - Thu Oct 09 11:28:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD12/USD12.xml index eca54a343..b82f41a90 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD12/USD12.xml @@ -203,7 +203,7 @@ - Thu Oct 09 09:26:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD13/USD13.xml index 8127ab3b9..c9c7d6f00 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD13/USD13.xml @@ -203,7 +203,7 @@ - Thu Oct 09 09:27:04 UTC 2008 modified by jDAL - Thu Oct 09 11:28:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD14/USD14.xml index 1adb6a7d4..ba215ffa7 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD14/USD14.xml @@ -203,7 +203,7 @@ - Thu Oct 09 09:27:53 UTC 2008 modified by jDAL - Thu Oct 09 11:28:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD15/USD15.xml index 55cd006fa..8fdf87dda 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD15/USD15.xml @@ -203,7 +203,7 @@ - Thu Oct 09 09:28:43 UTC 2008 modified by jDAL - Thu Oct 09 11:28:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD07/USD07.xml index 07cf47d70..50482a308 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD07/USD07.xml @@ -205,7 +205,7 @@ - Thu Oct 09 09:22:11 UTC 2008 modified by jDAL - Thu Oct 09 11:28:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD08/USD08.xml index 8f4c0185b..64625be4e 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD08/USD08.xml @@ -204,7 +204,7 @@ - Thu Oct 09 09:23:12 UTC 2008 modified by jDAL - Thu Oct 09 11:28:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD09/USD09.xml index 244f6438d..954ead539 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD09/USD09.xml @@ -203,7 +203,7 @@ - Thu Oct 09 09:23:56 UTC 2008 modified by jDAL - Thu Oct 09 11:28:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD10/USD10.xml index 85fb3161c..e5e0d9e4c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD10/USD10.xml @@ -200,7 +200,7 @@ - Thu Oct 09 09:24:41 UTC 2008 modified by jDAL - Thu Oct 09 11:28:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD11/USD11.xml index 6da5a97ae..6aa023d7f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD11/USD11.xml @@ -200,7 +200,7 @@ - Thu Oct 09 09:25:28 UTC 2008 modified by jDAL - Thu Oct 09 11:28:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD12/USD12.xml index e369ab830..65603c365 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD12/USD12.xml @@ -199,7 +199,7 @@ - Thu Oct 09 09:26:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD13/USD13.xml index 6d80216e9..856616eda 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD13/USD13.xml @@ -198,7 +198,7 @@ - Thu Oct 09 09:27:05 UTC 2008 modified by jDAL - Thu Oct 09 11:28:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD14/USD14.xml index f115780fc..1d7f59883 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD14/USD14.xml @@ -197,7 +197,7 @@ - Thu Oct 09 09:27:53 UTC 2008 modified by jDAL - Thu Oct 09 11:28:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD15/USD15.xml index f6683e7cd..2bb87b056 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD15/USD15.xml @@ -196,7 +196,7 @@ - Thu Oct 09 09:28:44 UTC 2008 modified by jDAL - Thu Oct 09 11:28:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD01/USD01.xml index c7501330d..3281586c2 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD01/USD01.xml @@ -202,7 +202,7 @@ - Thu Oct 09 09:19:49 UTC 2008 modified by jDAL - Thu Oct 09 11:28:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD02/USD02.xml index 8ad7aaff7..b9b863d67 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD02/USD02.xml @@ -193,7 +193,7 @@ - Thu Oct 09 09:20:08 UTC 2008 modified by jDAL - Thu Oct 09 11:28:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD03/USD03.xml index 0398948fe..0a7c3afce 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD03/USD03.xml @@ -194,7 +194,7 @@ - Thu Oct 09 09:20:23 UTC 2008 modified by jDAL - Thu Oct 09 11:28:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD04/USD04.xml index 8bfcc830f..85527172a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD04/USD04.xml @@ -195,7 +195,7 @@ - Thu Oct 09 09:20:50 UTC 2008 modified by jDAL - Thu Oct 09 11:28:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD05/USD05.xml index c109563e3..88a3596ed 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD05/USD05.xml @@ -195,7 +195,7 @@ - Thu Oct 09 09:21:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD06/USD06.xml index 2824711e8..0ea327a9b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD06/USD06.xml @@ -193,7 +193,7 @@ - Thu Oct 09 09:21:46 UTC 2008 modified by jDAL - Thu Oct 09 11:28:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD07/USD07.xml index c86190c8d..7879f5191 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD07/USD07.xml @@ -192,7 +192,7 @@ - Thu Oct 09 09:22:11 UTC 2008 modified by jDAL - Thu Oct 09 11:28:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD08/USD08.xml index de0151af2..1dc3ea416 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD08/USD08.xml @@ -190,7 +190,7 @@ - Thu Oct 09 09:23:12 UTC 2008 modified by jDAL - Thu Oct 09 11:28:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD09/USD09.xml index ca3bb6915..e2ba2f3d1 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD09/USD09.xml @@ -189,7 +189,7 @@ - Thu Oct 09 09:23:57 UTC 2008 modified by jDAL - Thu Oct 09 11:28:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD10/USD10.xml index 717590e83..c2a405f49 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD10/USD10.xml @@ -188,7 +188,7 @@ - Thu Oct 09 09:24:41 UTC 2008 modified by jDAL - Thu Oct 09 11:28:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD11/USD11.xml index 7000bf905..d46a6cda3 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD11/USD11.xml @@ -189,7 +189,7 @@ - Thu Oct 09 09:25:29 UTC 2008 modified by jDAL - Thu Oct 09 11:28:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD12/USD12.xml index a83ec9e2f..53992a2d0 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD12/USD12.xml @@ -189,7 +189,7 @@ - Thu Oct 09 09:26:16 UTC 2008 modified by jDAL - Thu Oct 09 11:28:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD13/USD13.xml index 25279cc89..0ac2bfbf0 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD13/USD13.xml @@ -190,7 +190,7 @@ - Thu Oct 09 09:27:05 UTC 2008 modified by jDAL - Thu Oct 09 11:28:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD14/USD14.xml index 12de12f33..62cd8cf5f 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD14/USD14.xml @@ -187,7 +187,7 @@ - Thu Oct 09 09:27:54 UTC 2008 modified by jDAL - Thu Oct 09 11:28:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD15/USD15.xml index d886ea909..16202f395 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD15/USD15.xml @@ -186,7 +186,7 @@ - Thu Oct 09 09:28:44 UTC 2008 modified by jDAL - Thu Oct 09 11:28:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD07/USD07.xml index c533d1440..04c14b796 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD07/USD07.xml @@ -188,7 +188,7 @@ - Thu Oct 09 09:22:12 UTC 2008 modified by jDAL - Thu Oct 09 11:28:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD08/USD08.xml index d06ef0653..c04559b69 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD08/USD08.xml @@ -187,7 +187,7 @@ - Thu Oct 09 09:23:13 UTC 2008 modified by jDAL - Thu Oct 09 11:28:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD09/USD09.xml index d839a20bf..3375323b0 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD09/USD09.xml @@ -187,7 +187,7 @@ - Thu Oct 09 09:23:57 UTC 2008 modified by jDAL - Thu Oct 09 11:28:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD10/USD10.xml index cbb3fe0d8..411ff34ec 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD10/USD10.xml @@ -185,7 +185,7 @@ - Thu Oct 09 09:24:42 UTC 2008 modified by jDAL - Thu Oct 09 11:28:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD11/USD11.xml index 8cfcb2489..9d2eb7641 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD11/USD11.xml @@ -185,7 +185,7 @@ - Thu Oct 09 09:25:29 UTC 2008 modified by jDAL - Thu Oct 09 11:28:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD12/USD12.xml index 7b3a51035..a3150f0ee 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD12/USD12.xml @@ -187,7 +187,7 @@ - Thu Oct 09 09:26:16 UTC 2008 modified by jDAL - Thu Oct 09 11:28:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD13/USD13.xml index 43565ef04..b349b715b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD13/USD13.xml @@ -184,7 +184,7 @@ - Thu Oct 09 09:27:06 UTC 2008 modified by jDAL - Thu Oct 09 11:28:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD14/USD14.xml index f0580646c..55055fb00 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD14/USD14.xml @@ -182,7 +182,7 @@ - Thu Oct 09 09:27:54 UTC 2008 modified by jDAL - Thu Oct 09 11:28:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD15/USD15.xml index 5653207fd..27600d427 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD15/USD15.xml @@ -183,7 +183,7 @@ - Thu Oct 09 09:28:45 UTC 2008 modified by jDAL - Thu Oct 09 11:28:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD03/USD03.xml index 4f8f824d6..8e5652999 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD03/USD03.xml @@ -183,7 +183,7 @@ - Thu Oct 09 09:20:24 UTC 2008 modified by jDAL - Thu Oct 09 11:28:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD04/USD04.xml index 337a6ac1e..d767de925 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD04/USD04.xml @@ -185,7 +185,7 @@ - Thu Oct 09 09:20:51 UTC 2008 modified by jDAL - Thu Oct 09 11:28:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD05/USD05.xml index 6de8079a4..78b59ffa3 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD05/USD05.xml @@ -183,7 +183,7 @@ - Thu Oct 09 09:21:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD06/USD06.xml index 1a03dbbf9..b85b54ead 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD06/USD06.xml @@ -183,7 +183,7 @@ - Thu Oct 09 09:21:46 UTC 2008 modified by jDAL - Thu Oct 09 11:28:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD07/USD07.xml index c9fe3e78f..deae534da 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD07/USD07.xml @@ -180,7 +180,7 @@ - Thu Oct 09 09:22:13 UTC 2008 modified by jDAL - Thu Oct 09 11:28:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD08/USD08.xml index f18b65c79..fdecd3808 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD08/USD08.xml @@ -180,7 +180,7 @@ - Thu Oct 09 09:23:13 UTC 2008 modified by jDAL - Thu Oct 09 11:28:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD09/USD09.xml index e19324a63..a006e79b3 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD09/USD09.xml @@ -180,7 +180,7 @@ - Thu Oct 09 09:23:58 UTC 2008 modified by jDAL - Thu Oct 09 11:28:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD10/USD10.xml index bbd081ce4..6c8c8de7e 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD10/USD10.xml @@ -180,7 +180,7 @@ - Thu Oct 09 09:24:42 UTC 2008 modified by jDAL - Thu Oct 09 11:28:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD11/USD11.xml index b2d5f95c2..44a745472 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD11/USD11.xml @@ -179,7 +179,7 @@ - Thu Oct 09 09:25:30 UTC 2008 modified by jDAL - Thu Oct 09 11:28:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD12/USD12.xml index 5599e2b39..bf28cc6da 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD12/USD12.xml @@ -180,7 +180,7 @@ - Thu Oct 09 09:26:17 UTC 2008 modified by jDAL - Thu Oct 09 11:28:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD13/USD13.xml index 4aecc3d2e..707c3d18a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD13/USD13.xml @@ -179,7 +179,7 @@ - Thu Oct 09 09:27:06 UTC 2008 modified by jDAL - Thu Oct 09 11:28:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD14/USD14.xml index b04caab5c..2f806de04 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD14/USD14.xml @@ -178,7 +178,7 @@ - Thu Oct 09 09:27:55 UTC 2008 modified by jDAL - Thu Oct 09 11:28:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD15/USD15.xml index b5b6b5fa0..df2d453cc 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD15/USD15.xml @@ -179,7 +179,7 @@ - Thu Oct 09 09:28:45 UTC 2008 modified by jDAL - Thu Oct 09 11:28:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD07/USD07.xml index 267a481ad..b3a404049 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD07/USD07.xml @@ -178,7 +178,7 @@ - Thu Oct 09 09:22:13 UTC 2008 modified by jDAL - Thu Oct 09 11:28:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD08/USD08.xml index 6defbdf6e..a72c3bee1 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD08/USD08.xml @@ -179,7 +179,7 @@ - Thu Oct 09 09:23:13 UTC 2008 modified by jDAL - Thu Oct 09 11:28:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD09/USD09.xml index bd4e98ffc..a5bcf5b9c 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD09/USD09.xml @@ -178,7 +178,7 @@ - Thu Oct 09 09:23:58 UTC 2008 modified by jDAL - Thu Oct 09 11:28:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD10/USD10.xml index 5fa22c228..17cb86e3a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD10/USD10.xml @@ -177,7 +177,7 @@ - Thu Oct 09 09:24:42 UTC 2008 modified by jDAL - Thu Oct 09 11:28:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD11/USD11.xml index 43f902810..fc9a141f3 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD11/USD11.xml @@ -177,7 +177,7 @@ - Thu Oct 09 09:25:30 UTC 2008 modified by jDAL - Thu Oct 09 11:28:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD12/USD12.xml index 8ef9207a0..2ec3686da 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD12/USD12.xml @@ -177,7 +177,7 @@ - Thu Oct 09 09:26:17 UTC 2008 modified by jDAL - Thu Oct 09 11:28:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD13/USD13.xml index e40745cb2..7985a7531 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD13/USD13.xml @@ -177,7 +177,7 @@ - Thu Oct 09 09:27:07 UTC 2008 modified by jDAL - Thu Oct 09 11:28:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD14/USD14.xml index 54ab9d788..285d8bccb 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD14/USD14.xml @@ -175,7 +175,7 @@ - Thu Oct 09 09:27:55 UTC 2008 modified by jDAL - Thu Oct 09 11:28:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD15/USD15.xml index 00b590d4d..417a3b6b5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD15/USD15.xml @@ -176,7 +176,7 @@ - Thu Oct 09 09:28:46 UTC 2008 modified by jDAL - Thu Oct 09 11:28:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD01/USD01.xml index 8b0013ee4..3f7ac913d 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD01/USD01.xml @@ -167,7 +167,7 @@ - Thu Oct 09 09:19:50 UTC 2008 modified by jDAL - Thu Oct 09 11:28:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD02/USD02.xml index 2a1006912..9fb72b402 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD02/USD02.xml @@ -178,7 +178,7 @@ - Thu Oct 09 09:20:09 UTC 2008 modified by jDAL - Thu Oct 09 11:28:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD03/USD03.xml index 8f2512059..bd2c668ff 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD03/USD03.xml @@ -178,7 +178,7 @@ - Thu Oct 09 09:20:24 UTC 2008 modified by jDAL - Thu Oct 09 11:28:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD04/USD04.xml index 671414c9d..22ae97905 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD04/USD04.xml @@ -177,7 +177,7 @@ - Thu Oct 09 09:20:51 UTC 2008 modified by jDAL - Thu Oct 09 11:28:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD05/USD05.xml index 62f1b205b..cb150a957 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD05/USD05.xml @@ -175,7 +175,7 @@ - Thu Oct 09 09:21:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD06/USD06.xml index ad1167866..c54cdec23 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD06/USD06.xml @@ -173,7 +173,7 @@ - Thu Oct 09 09:21:47 UTC 2008 modified by jDAL - Thu Oct 09 11:28:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD07/USD07.xml index 3183c2db5..3c00aa5fe 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD07/USD07.xml @@ -172,7 +172,7 @@ - Thu Oct 09 09:22:14 UTC 2008 modified by jDAL - Thu Oct 09 11:28:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD08/USD08.xml index b9f241c18..037da69bf 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD08/USD08.xml @@ -173,7 +173,7 @@ - Thu Oct 09 09:23:14 UTC 2008 modified by jDAL - Thu Oct 09 11:28:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD09/USD09.xml index 117fe408b..1d4aadfd8 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD09/USD09.xml @@ -170,7 +170,7 @@ - Thu Oct 09 09:23:58 UTC 2008 modified by jDAL - Thu Oct 09 11:28:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD10/USD10.xml index f9376c4a0..5008b63d7 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD10/USD10.xml @@ -170,7 +170,7 @@ - Thu Oct 09 09:24:43 UTC 2008 modified by jDAL - Thu Oct 09 11:28:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD11/USD11.xml index dfd501982..badcba83b 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD11/USD11.xml @@ -167,7 +167,7 @@ - Thu Oct 09 09:25:31 UTC 2008 modified by jDAL - Thu Oct 09 11:28:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD12/USD12.xml index 49d7bb16f..befc75c12 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD12/USD12.xml @@ -167,7 +167,7 @@ - Thu Oct 09 09:26:18 UTC 2008 modified by jDAL - Thu Oct 09 11:28:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD13/USD13.xml index f95f4115f..b031c5956 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD13/USD13.xml @@ -164,7 +164,7 @@ - Thu Oct 09 09:27:07 UTC 2008 modified by jDAL - Thu Oct 09 11:28:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD14/USD14.xml index 211fd1e7b..c25fbe706 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD14/USD14.xml @@ -163,7 +163,7 @@ - Thu Oct 09 09:27:56 UTC 2008 modified by jDAL - Thu Oct 09 11:28:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml index 826d59d37..77436f227 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml @@ -162,7 +162,7 @@ - Thu Oct 09 09:28:47 UTC 2008 modified by jDAL - Thu Oct 09 11:28:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD16/USD16.xml index 32bb96a63..7e121fff4 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN11/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD16/USD16.xml @@ -169,7 +169,7 @@ - Thu Oct 09 09:29:38 UTC 2008 modified by jDAL - Thu Oct 09 11:28:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD07/USD07.xml index 784a7eaf4..7562eec43 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD07/USD07.xml @@ -161,7 +161,7 @@ - Thu Oct 09 09:22:14 UTC 2008 modified by jDAL - Thu Oct 09 11:28:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD08/USD08.xml index 429a2e578..8726f7d25 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD08/USD08.xml @@ -158,7 +158,7 @@ - Thu Oct 09 09:23:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD09/USD09.xml index 553bcc791..1a9ba009a 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD09/USD09.xml @@ -156,7 +156,7 @@ - Thu Oct 09 09:23:59 UTC 2008 modified by jDAL - Thu Oct 09 11:28:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD10/USD10.xml index 1a5372671..092301af5 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD10/USD10.xml @@ -156,7 +156,7 @@ - Thu Oct 09 09:24:44 UTC 2008 modified by jDAL - Thu Oct 09 11:28:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD11/USD11.xml index 47d283dac..44c1dc5a9 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD11/USD11.xml @@ -155,7 +155,7 @@ - Thu Oct 09 09:25:31 UTC 2008 modified by jDAL - Thu Oct 09 11:28:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD12/USD12.xml index 92da9f88e..16243bd41 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD12/USD12.xml @@ -156,7 +156,7 @@ - Thu Oct 09 09:26:18 UTC 2008 modified by jDAL - Thu Oct 09 11:28:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD13/USD13.xml index 2b8669799..0098300e6 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD13/USD13.xml @@ -155,7 +155,7 @@ - Thu Oct 09 09:27:08 UTC 2008 modified by jDAL - Thu Oct 09 11:28:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD14/USD14.xml index 51391a386..ee463ac91 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD14/USD14.xml @@ -153,7 +153,7 @@ - Thu Oct 09 09:27:56 UTC 2008 modified by jDAL - Thu Oct 09 11:28:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD15/USD15.xml index ad818510e..78cc9fc92 100644 --- a/SRT/CDB/alma/AS/SECTOR01/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD15/USD15.xml @@ -155,7 +155,7 @@ - Thu Oct 09 09:28:47 UTC 2008 modified by jDAL - Thu Oct 09 11:28:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD03/USD03.xml index 71d4eca4a..dc0d06587 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD03/USD03.xml @@ -119,8 +119,10 @@ - Mon Oct 06 09:27:34 UTC 2008 modified by jDAL - Thu Oct 09 09:20:25 UTC 2008 modified by jDAL - Thu Oct 09 11:28:48 UTC 2008 modified by jDAL + - Fri Aug 25 10:18:10 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD04/USD04.xml index eac1a94e3..68dedc357 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD04/USD04.xml @@ -121,8 +121,10 @@ - Mon Oct 06 09:28:01 UTC 2008 modified by jDAL - Thu Oct 09 09:20:52 UTC 2008 modified by jDAL - Thu Oct 09 11:28:49 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:06 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD05/USD05.xml index ca9f95886..3c19fb1e9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD05/USD05.xml @@ -119,8 +119,11 @@ - Mon Oct 06 09:28:24 UTC 2008 modified by jDAL - Thu Oct 09 09:21:16 UTC 2008 modified by jDAL - Thu Oct 09 11:28:49 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:07 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD06/USD06.xml index 0c1ef01c5..b0a4f7133 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD06/USD06.xml @@ -118,8 +118,10 @@ - Mon Oct 06 09:28:50 UTC 2008 modified by jDAL - Thu Oct 09 09:21:47 UTC 2008 modified by jDAL - Thu Oct 09 11:28:50 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:08 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:21 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD07/USD07.xml index cbf5b8bb0..d57af061a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD07/USD07.xml @@ -115,8 +115,9 @@ - Mon Oct 06 09:29:19 UTC 2008 modified by jDAL - Thu Oct 09 09:22:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:50 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:45 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD08/USD08.xml index fcd257ce6..3f88addf2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD08/USD08.xml @@ -113,8 +113,11 @@ - Mon Oct 06 09:30:07 UTC 2008 modified by jDAL - Thu Oct 09 09:23:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:50 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:46 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:11 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:22 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD09/USD09.xml index 03051d838..d4682a5c4 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD09/USD09.xml @@ -115,7 +115,7 @@ - Thu Oct 09 09:23:59 UTC 2008 modified by jDAL - Thu Oct 09 11:28:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD10/USD10.xml index d17fe968a..32880d091 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD10/USD10.xml @@ -110,8 +110,10 @@ - Mon Oct 06 09:31:49 UTC 2008 modified by jDAL - Thu Oct 09 09:24:44 UTC 2008 modified by jDAL - Thu Oct 09 11:28:51 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:12 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD11/USD11.xml index 724797368..9f9a0c972 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD11/USD11.xml @@ -110,8 +110,9 @@ - Mon Oct 06 09:32:36 UTC 2008 modified by jDAL - Thu Oct 09 09:25:32 UTC 2008 modified by jDAL - Thu Oct 09 11:28:52 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:14 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD12/USD12.xml index 7492e7436..8ebe99b32 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD12/USD12.xml @@ -112,7 +112,7 @@ - Thu Oct 09 09:26:19 UTC 2008 modified by jDAL - Thu Oct 09 11:28:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD13/USD13.xml index 4cdca52e4..bced4f4b7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD13/USD13.xml @@ -106,8 +106,9 @@ - Mon Oct 06 09:34:19 UTC 2008 modified by jDAL - Thu Oct 09 09:27:08 UTC 2008 modified by jDAL - Thu Oct 09 11:28:53 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD14/USD14.xml index 250bf2c65..87eef4fe6 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD14/USD14.xml @@ -107,7 +107,7 @@ - Thu Oct 09 09:27:57 UTC 2008 modified by jDAL - Thu Oct 09 11:28:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD15/USD15.xml index 00f43c568..c25170053 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD15/USD15.xml @@ -106,8 +106,9 @@ - Mon Oct 06 09:35:58 UTC 2008 modified by jDAL - Thu Oct 09 09:28:48 UTC 2008 modified by jDAL - Thu Oct 09 11:28:57 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:57 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD17/USD17.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD17/USD17.xml index 0b85bc8c7..7309338f7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN01/USD17/USD17.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD17/USD17.xml @@ -110,8 +110,9 @@ - Mon Oct 06 09:36:54 UTC 2008 modified by jDAL - Thu Oct 09 09:29:42 UTC 2008 modified by jDAL - Thu Oct 09 11:28:52 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD07/USD07.xml index fc78333c1..2d2d52f2d 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD07/USD07.xml @@ -107,8 +107,10 @@ - Mon Oct 06 09:29:20 UTC 2008 modified by jDAL - Thu Oct 09 09:22:16 UTC 2008 modified by jDAL - Thu Oct 09 11:28:58 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:49 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:29 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD08/USD08.xml index 63e2b3c16..fe8cce91d 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD08/USD08.xml @@ -106,8 +106,11 @@ - Mon Oct 06 09:30:08 UTC 2008 modified by jDAL - Thu Oct 09 09:23:15 UTC 2008 modified by jDAL - Thu Oct 09 11:28:58 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:59 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:21 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:31 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD09/USD09.xml index 9dc7fbdc8..9fe81b854 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD09/USD09.xml @@ -107,8 +107,10 @@ - Mon Oct 06 09:31:05 UTC 2008 modified by jDAL - Thu Oct 09 09:24:00 UTC 2008 modified by jDAL - Thu Oct 09 11:28:59 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:01 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:23 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD10/USD10.xml index 011801821..8556fd451 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD10/USD10.xml @@ -106,8 +106,11 @@ - Mon Oct 06 09:31:49 UTC 2008 modified by jDAL - Thu Oct 09 09:24:44 UTC 2008 modified by jDAL - Thu Oct 09 11:28:59 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:03 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:34 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD11/USD11.xml index d6318221c..d58075bfa 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD11/USD11.xml @@ -106,7 +106,7 @@ - Thu Oct 09 09:25:33 UTC 2008 modified by jDAL - Thu Oct 09 11:28:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD12/USD12.xml index 3da119142..cdc8fccf7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD12/USD12.xml @@ -105,8 +105,11 @@ - Mon Oct 06 09:33:25 UTC 2008 modified by jDAL - Thu Oct 09 09:26:19 UTC 2008 modified by jDAL - Thu Oct 09 11:29:00 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:05 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:54 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:27 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD13/USD13.xml index 83d000804..6a28ede24 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD13/USD13.xml @@ -103,8 +103,10 @@ - Mon Oct 06 09:34:20 UTC 2008 modified by jDAL - Thu Oct 09 09:27:09 UTC 2008 modified by jDAL - Thu Oct 09 11:29:00 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:07 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:29 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD14/USD14.xml index ba84557c7..c9b3feea7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD14/USD14.xml @@ -103,8 +103,11 @@ - Mon Oct 06 09:35:08 UTC 2008 modified by jDAL - Thu Oct 09 09:27:57 UTC 2008 modified by jDAL - Thu Oct 09 11:29:01 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:09 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:56 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:36 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD15/USD15.xml index c86e86058..a25fc4eba 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD15/USD15.xml @@ -103,8 +103,12 @@ - Mon Oct 06 09:35:59 UTC 2008 modified by jDAL - Thu Oct 09 09:28:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:01 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:12 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:57 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:32 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:38 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD01/USD01.xml index 8ed8e9832..93b7f6fea 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD01/USD01.xml @@ -109,8 +109,11 @@ - Mon Oct 06 09:27:01 UTC 2008 modified by jDAL - Thu Oct 09 09:19:51 UTC 2008 modified by jDAL - Thu Oct 09 11:29:02 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:59 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:34 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD02/USD02.xml index aca99932a..81e6710fd 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD02/USD02.xml @@ -107,8 +107,9 @@ - Mon Oct 06 09:27:15 UTC 2008 modified by jDAL - Thu Oct 09 09:20:09 UTC 2008 modified by jDAL - Thu Oct 09 11:29:02 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:41 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD03/USD03.xml index 16da21217..0abd24288 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD03/USD03.xml @@ -106,8 +106,10 @@ - Mon Oct 06 09:27:34 UTC 2008 modified by jDAL - Thu Oct 09 09:20:25 UTC 2008 modified by jDAL - Thu Oct 09 11:29:03 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:03 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD04/USD04.xml index e12232e7a..96233bfcc 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD04/USD04.xml @@ -106,8 +106,9 @@ - Mon Oct 06 09:28:01 UTC 2008 modified by jDAL - Thu Oct 09 09:20:52 UTC 2008 modified by jDAL - Thu Oct 09 11:29:03 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:44 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD05/USD05.xml index 34241f084..73d20c8d2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD05/USD05.xml @@ -106,7 +106,7 @@ - Thu Oct 09 09:21:16 UTC 2008 modified by jDAL - Thu Oct 09 11:29:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD06/USD06.xml index 135fe7ebe..df934178f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD06/USD06.xml @@ -105,8 +105,9 @@ - Mon Oct 06 09:28:51 UTC 2008 modified by jDAL - Thu Oct 09 09:21:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:04 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:06 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD07/USD07.xml index 35c5a38c1..1936f8997 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD07/USD07.xml @@ -103,8 +103,9 @@ - Mon Oct 06 09:29:20 UTC 2008 modified by jDAL - Thu Oct 09 09:22:16 UTC 2008 modified by jDAL - Thu Oct 09 11:29:05 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD08/USD08.xml index beb5f0518..13f3a8673 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD08/USD08.xml @@ -102,7 +102,7 @@ - Thu Oct 09 09:23:16 UTC 2008 modified by jDAL - Thu Oct 09 11:29:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD09/USD09.xml index d8dcda3e3..2246145d9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD09/USD09.xml @@ -102,7 +102,7 @@ - Thu Oct 09 09:24:00 UTC 2008 modified by jDAL - Thu Oct 09 11:29:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD10/USD10.xml index d02d7cb8f..9f500c4b0 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD10/USD10.xml @@ -101,8 +101,9 @@ - Mon Oct 06 09:31:50 UTC 2008 modified by jDAL - Thu Oct 09 09:24:45 UTC 2008 modified by jDAL - Thu Oct 09 11:29:07 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:13 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD11/USD11.xml index c425ac337..3ea23e27c 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD11/USD11.xml @@ -101,8 +101,10 @@ - Mon Oct 06 09:32:37 UTC 2008 modified by jDAL - Thu Oct 09 09:25:33 UTC 2008 modified by jDAL - Thu Oct 09 11:29:07 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:15 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD12/USD12.xml index dddb9d20a..85c61751f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD12/USD12.xml @@ -99,8 +99,9 @@ - Mon Oct 06 09:33:25 UTC 2008 modified by jDAL - Thu Oct 09 09:26:21 UTC 2008 modified by jDAL - Thu Oct 09 11:29:08 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD13/USD13.xml index 91958db43..edcdf100e 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD13/USD13.xml @@ -96,8 +96,9 @@ - Mon Oct 06 09:34:20 UTC 2008 modified by jDAL - Thu Oct 09 09:27:09 UTC 2008 modified by jDAL - Thu Oct 09 11:29:08 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD14/USD14.xml index 5080486c7..beed2f1ce 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD14/USD14.xml @@ -96,8 +96,9 @@ - Mon Oct 06 09:35:08 UTC 2008 modified by jDAL - Thu Oct 09 09:27:58 UTC 2008 modified by jDAL - Thu Oct 09 11:29:08 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD15/USD15.xml index 0bad36dd9..468812fa5 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD15/USD15.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:28:49 UTC 2008 modified by jDAL - Thu Oct 09 11:29:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD16/USD16.xml index 1da9a853a..0aaa7cd73 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN03/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD16/USD16.xml @@ -100,8 +100,9 @@ - Mon Oct 06 09:36:51 UTC 2008 modified by jDAL - Thu Oct 09 09:29:38 UTC 2008 modified by jDAL - Thu Oct 09 11:29:06 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:49 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD07/USD07.xml index 793081878..956b961c0 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD07/USD07.xml @@ -98,7 +98,7 @@ - Thu Oct 09 09:22:17 UTC 2008 modified by jDAL - Thu Oct 09 11:29:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD08/USD08.xml index 71f8921a8..085efcc3e 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD08/USD08.xml @@ -97,7 +97,7 @@ - Thu Oct 09 09:23:16 UTC 2008 modified by jDAL - Thu Oct 09 11:29:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD09/USD09.xml index 993cf48a5..bb1ff34d8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD09/USD09.xml @@ -96,7 +96,7 @@ - Thu Oct 09 09:24:01 UTC 2008 modified by jDAL - Thu Oct 09 11:29:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD10/USD10.xml index 5e54ed59e..edd5e4209 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD10/USD10.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:24:45 UTC 2008 modified by jDAL - Thu Oct 09 11:29:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD11/USD11.xml index 84bc0f744..fb3879290 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD11/USD11.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:25:34 UTC 2008 modified by jDAL - Thu Oct 09 11:29:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD12/USD12.xml index 80e33cba8..d0e360d8b 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD12/USD12.xml @@ -96,7 +96,7 @@ - Thu Oct 09 09:26:21 UTC 2008 modified by jDAL - Thu Oct 09 11:29:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD13/USD13.xml index 43d5adc82..ec72741a9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD13/USD13.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:27:10 UTC 2008 modified by jDAL - Thu Oct 09 11:29:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD14/USD14.xml index 224805ce5..e1dc1bc72 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD14/USD14.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:27:58 UTC 2008 modified by jDAL - Thu Oct 09 11:29:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD15/USD15.xml index a8ac65578..a980d26ce 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD15/USD15.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:28:49 UTC 2008 modified by jDAL - Thu Oct 09 11:29:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD03/USD03.xml index cc35b1d55..68920591a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD03/USD03.xml @@ -98,7 +98,7 @@ - Thu Oct 09 09:20:26 UTC 2008 modified by jDAL - Thu Oct 09 11:29:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD04/USD04.xml index 0ea35ceae..e7e38c553 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD04/USD04.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:20:53 UTC 2008 modified by jDAL - Thu Oct 09 11:29:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD05/USD05.xml index 9fabe6b71..5696f9668 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD05/USD05.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:21:17 UTC 2008 modified by jDAL - Thu Oct 09 11:29:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD06/USD06.xml index 99d6aa713..6af48565e 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD06/USD06.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:21:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD07/USD07.xml index e5257abd0..dd645bfac 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD07/USD07.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:22:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD08/USD08.xml index e337d9129..99db19b0d 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD08/USD08.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:23:17 UTC 2008 modified by jDAL - Thu Oct 09 11:29:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD09/USD09.xml index 034c287aa..9444007a8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD09/USD09.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:24:01 UTC 2008 modified by jDAL - Thu Oct 09 11:29:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD10/USD10.xml index 20be4a6dd..a324162cb 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD10/USD10.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:24:46 UTC 2008 modified by jDAL - Thu Oct 09 11:29:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD11/USD11.xml index 2693c5032..4113bb304 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD11/USD11.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:25:34 UTC 2008 modified by jDAL - Thu Oct 09 11:29:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD12/USD12.xml index 17a14459d..6ec172439 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD12/USD12.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:26:22 UTC 2008 modified by jDAL - Thu Oct 09 11:29:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD13/USD13.xml index 0c85063a6..fe7fae492 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD13/USD13.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:27:10 UTC 2008 modified by jDAL - Thu Oct 09 11:29:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD14/USD14.xml index 3001e010d..ce12b214a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD14/USD14.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:27:59 UTC 2008 modified by jDAL - Thu Oct 09 11:29:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD15/USD15.xml index 84288da29..30148e55e 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD15/USD15.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:28:50 UTC 2008 modified by jDAL - Thu Oct 09 11:29:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD07/USD07.xml index ea1ffb9f4..3aba09663 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD07/USD07.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:22:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD08/USD08.xml index 7850f4a66..76875cdee 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD08/USD08.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:23:17 UTC 2008 modified by jDAL - Thu Oct 09 11:29:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD09/USD09.xml index 55ddea99c..2c1830d90 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD09/USD09.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:24:02 UTC 2008 modified by jDAL - Thu Oct 09 11:29:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD10/USD10.xml index 483460a3e..34d0f3c5b 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD10/USD10.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:24:46 UTC 2008 modified by jDAL - Thu Oct 09 11:29:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD11/USD11.xml index fc303c6b5..25b5134a9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD11/USD11.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:25:35 UTC 2008 modified by jDAL - Thu Oct 09 11:29:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD12/USD12.xml index 4af491c5a..52c2531dd 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD12/USD12.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:26:22 UTC 2008 modified by jDAL - Thu Oct 09 11:29:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD13/USD13.xml index 77bdad829..32ff4cdd4 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD13/USD13.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:27:11 UTC 2008 modified by jDAL - Thu Oct 09 11:29:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD14/USD14.xml index dabe902e1..70d4d7681 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD14/USD14.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:27:59 UTC 2008 modified by jDAL - Thu Oct 09 11:29:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD15/USD15.xml index f6c987042..b6410ec9c 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD15/USD15.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:28:51 UTC 2008 modified by jDAL - Thu Oct 09 11:29:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD01/USD01.xml index b4eaf3750..0cc2a8838 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD01/USD01.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:19:51 UTC 2008 modified by jDAL - Thu Oct 09 11:29:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD02/USD02.xml index 5eae755e7..0fd47c80d 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD02/USD02.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:20:10 UTC 2008 modified by jDAL - Thu Oct 09 11:29:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD03/USD03.xml index 5eb84f9b2..638130950 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD03/USD03.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:20:27 UTC 2008 modified by jDAL - Thu Oct 09 11:29:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD04/USD04.xml index b406e5bd9..ab4c087f1 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD04/USD04.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:20:53 UTC 2008 modified by jDAL - Thu Oct 09 11:29:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD05/USD05.xml index ec238d079..25ef662fd 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD05/USD05.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:21:17 UTC 2008 modified by jDAL - Thu Oct 09 11:29:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD06/USD06.xml index 15f753498..553c571a0 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD06/USD06.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:21:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD07/USD07.xml index b61ab4650..994d39554 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD07/USD07.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:22:19 UTC 2008 modified by jDAL - Thu Oct 09 11:29:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD08/USD08.xml index 4c4d5a07b..d66090999 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD08/USD08.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:23:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD09/USD09.xml index 436664476..731693b78 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD09/USD09.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:24:02 UTC 2008 modified by jDAL - Thu Oct 09 11:29:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD10/USD10.xml index 4cb99cabc..4e95a0283 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD10/USD10.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:24:47 UTC 2008 modified by jDAL - Thu Oct 09 11:29:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD11/USD11.xml index 3ac184686..e218a81b0 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD11/USD11.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:25:36 UTC 2008 modified by jDAL - Thu Oct 09 11:29:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD12/USD12.xml index 4139cf8c2..022fae27f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD12/USD12.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:26:23 UTC 2008 modified by jDAL - Thu Oct 09 11:29:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD13/USD13.xml index 93ee24aef..9b9860f87 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD13/USD13.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:27:11 UTC 2008 modified by jDAL - Thu Oct 09 11:29:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD14/USD14.xml index 61ff7842b..dfa4497ef 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD14/USD14.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:28:00 UTC 2008 modified by jDAL - Thu Oct 09 11:29:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD15/USD15.xml index c9d5c2ea6..3ce52f6f2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD15/USD15.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:28:51 UTC 2008 modified by jDAL - Thu Oct 09 11:29:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD07/USD07.xml index c91316174..41e24086f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD07/USD07.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:22:20 UTC 2008 modified by jDAL - Thu Oct 09 11:29:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD08/USD08.xml index d7ae5b84b..579b4455c 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD08/USD08.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:23:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD09/USD09.xml index e80f5c3c8..a790018a3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD09/USD09.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:24:03 UTC 2008 modified by jDAL - Thu Oct 09 11:29:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD10/USD10.xml index 2945a9b07..7cf20449a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD10/USD10.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:24:47 UTC 2008 modified by jDAL - Thu Oct 09 11:29:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD11/USD11.xml index 28985fb54..8c54c6ff5 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD11/USD11.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:25:36 UTC 2008 modified by jDAL - Thu Oct 09 11:29:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD12/USD12.xml index 7e75b2888..b4adffa58 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD12/USD12.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:26:23 UTC 2008 modified by jDAL - Thu Oct 09 11:29:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD13/USD13.xml index c7f5203d2..040b1225b 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD13/USD13.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:27:12 UTC 2008 modified by jDAL - Thu Oct 09 11:29:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD14/USD14.xml index d23b2d460..19c9116eb 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD14/USD14.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:28:00 UTC 2008 modified by jDAL - Thu Oct 09 11:29:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD15/USD15.xml index 3c7855ccf..8e8706fb1 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD15/USD15.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:28:52 UTC 2008 modified by jDAL - Thu Oct 09 11:29:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD03/USD03.xml index b3297e2bb..1226125a7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD03/USD03.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:20:27 UTC 2008 modified by jDAL - Thu Oct 09 11:29:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD04/USD04.xml index 38981ab18..3a3b0e0d8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD04/USD04.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:20:54 UTC 2008 modified by jDAL - Thu Oct 09 11:29:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD05/USD05.xml index 1b8f0e43e..5d0baf598 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD05/USD05.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:21:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD06/USD06.xml index b4ed291d2..0aa049075 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD06/USD06.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:21:49 UTC 2008 modified by jDAL - Thu Oct 09 11:29:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD07/USD07.xml index 8418be206..7cebc3481 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD07/USD07.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:22:20 UTC 2008 modified by jDAL - Thu Oct 09 11:29:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD08/USD08.xml index c002cdb4b..34ece3502 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD08/USD08.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:23:19 UTC 2008 modified by jDAL - Thu Oct 09 11:29:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD09/USD09.xml index 8fcd520f2..effb102f8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD09/USD09.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:24:03 UTC 2008 modified by jDAL - Thu Oct 09 11:29:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD10/USD10.xml index dd27d0914..859eb114e 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD10/USD10.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:24:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD11/USD11.xml index 426c4f63e..092e20ac8 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD11/USD11.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:25:36 UTC 2008 modified by jDAL - Thu Oct 09 11:29:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD12/USD12.xml index 3b02278b6..066783b0f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD12/USD12.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:26:24 UTC 2008 modified by jDAL - Thu Oct 09 11:29:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD13/USD13.xml index 317cc687a..ad48094f3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD13/USD13.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:27:12 UTC 2008 modified by jDAL - Thu Oct 09 11:29:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD14/USD14.xml index 2905e2078..636c7710a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD14/USD14.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:28:01 UTC 2008 modified by jDAL - Thu Oct 09 11:29:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD15/USD15.xml index 20289c4b6..aa7d2b816 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD15/USD15.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:28:52 UTC 2008 modified by jDAL - Thu Oct 09 11:29:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD07/USD07.xml index ae54d88d3..ceb990cb3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD07/USD07.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:22:21 UTC 2008 modified by jDAL - Thu Oct 09 11:29:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD08/USD08.xml index 993671cac..4dc1c88b7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD08/USD08.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:23:19 UTC 2008 modified by jDAL - Thu Oct 09 11:29:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD09/USD09.xml index e32c60bdf..c30b45908 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD09/USD09.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:24:04 UTC 2008 modified by jDAL - Thu Oct 09 11:29:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD10/USD10.xml index 6a83a8536..50184a05d 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD10/USD10.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:24:48 UTC 2008 modified by jDAL - Thu Oct 09 11:29:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD11/USD11.xml index 870bb411b..49f87fd1f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD11/USD11.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:25:37 UTC 2008 modified by jDAL - Thu Oct 09 11:29:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD12/USD12.xml index f7ea1e98f..d9783fe61 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD12/USD12.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:26:24 UTC 2008 modified by jDAL - Thu Oct 09 11:29:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD13/USD13.xml index 384fdb27c..5fe447501 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD13/USD13.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:27:13 UTC 2008 modified by jDAL - Thu Oct 09 11:29:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD14/USD14.xml index 1d4e022d7..dc13b0d79 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD14/USD14.xml @@ -82,7 +82,7 @@ - Thu Oct 09 09:28:02 UTC 2008 modified by jDAL - Thu Oct 09 11:29:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD15/USD15.xml index 1a4ada2c8..8223c139a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD15/USD15.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:28:53 UTC 2008 modified by jDAL - Thu Oct 09 11:29:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD01/USD01.xml index b3899e45e..c83cedea7 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD01/USD01.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:19:52 UTC 2008 modified by jDAL - Thu Oct 09 11:29:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD02/USD02.xml index d4f260160..8a9952f3f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD02/USD02.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:20:10 UTC 2008 modified by jDAL - Thu Oct 09 11:29:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD03/USD03.xml index 63dc3cb61..3ec439539 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD03/USD03.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:20:28 UTC 2008 modified by jDAL - Thu Oct 09 11:29:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD04/USD04.xml index e0f8e85b3..a7396f3d2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD04/USD04.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:20:54 UTC 2008 modified by jDAL - Thu Oct 09 11:29:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD05/USD05.xml index 5975bd111..edc35651b 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD05/USD05.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:21:18 UTC 2008 modified by jDAL - Thu Oct 09 11:29:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD06/USD06.xml index e5c996e7f..efbe90931 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD06/USD06.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:21:49 UTC 2008 modified by jDAL - Thu Oct 09 11:29:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD07/USD07.xml index facd7d052..7ebb043a1 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD07/USD07.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:22:21 UTC 2008 modified by jDAL - Thu Oct 09 11:29:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD08/USD08.xml index 1991d3170..33ebe2bb9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD08/USD08.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:23:20 UTC 2008 modified by jDAL - Thu Oct 09 11:29:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD09/USD09.xml index 616aa6f2b..8c5d36a40 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD09/USD09.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:24:04 UTC 2008 modified by jDAL - Thu Oct 09 11:29:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD10/USD10.xml index 6872123ab..32c82f89f 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD10/USD10.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:24:49 UTC 2008 modified by jDAL - Thu Oct 09 11:29:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD11/USD11.xml index 8c6fb324d..f67881e10 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD11/USD11.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:25:38 UTC 2008 modified by jDAL - Thu Oct 09 11:29:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD12/USD12.xml index 2eec847d6..3f2883710 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD12/USD12.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:26:25 UTC 2008 modified by jDAL - Thu Oct 09 11:29:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD13/USD13.xml index 878b82a19..21dc5f823 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD13/USD13.xml @@ -80,7 +80,7 @@ - Thu Oct 09 09:27:14 UTC 2008 modified by jDAL - Thu Oct 09 11:30:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD14/USD14.xml index 0a5d282c7..7ce1daa5a 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD14/USD14.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:28:02 UTC 2008 modified by jDAL - Thu Oct 09 11:30:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD15/USD15.xml index 1d05c7d5c..bb1fa90fb 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD15/USD15.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:28:53 UTC 2008 modified by jDAL - Thu Oct 09 11:30:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD07/USD07.xml index 7d828953e..c5d18d68c 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD07/USD07.xml @@ -76,7 +76,7 @@ - Thu Oct 09 09:22:22 UTC 2008 modified by jDAL - Thu Oct 09 11:30:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD08/USD08.xml index ccd5a8a6a..97d3694a3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD08/USD08.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:23:20 UTC 2008 modified by jDAL - Thu Oct 09 11:30:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD09/USD09.xml index 7c8d38c24..c312ce4f4 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD09/USD09.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:24:04 UTC 2008 modified by jDAL - Thu Oct 09 11:30:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD10/USD10.xml index 006d1063e..dc8589ed2 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD10/USD10.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:24:49 UTC 2008 modified by jDAL - Thu Oct 09 11:30:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD11/USD11.xml index 12819012a..2ef13ae12 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD11/USD11.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:25:38 UTC 2008 modified by jDAL - Thu Oct 09 11:30:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD12/USD12.xml index 145025abb..5dbad2676 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD12/USD12.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:26:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD13/USD13.xml index c47c01697..99f2c03b3 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD13/USD13.xml @@ -73,7 +73,7 @@ - Thu Oct 09 09:27:14 UTC 2008 modified by jDAL - Thu Oct 09 11:30:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD14/USD14.xml index 704ab86a9..f5e8e4cb9 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD14/USD14.xml @@ -73,7 +73,7 @@ - Thu Oct 09 09:28:03 UTC 2008 modified by jDAL - Thu Oct 09 11:30:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD15/USD15.xml index a7f2d4e86..79e863747 100644 --- a/SRT/CDB/alma/AS/SECTOR02/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD15/USD15.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:28:54 UTC 2008 modified by jDAL - Thu Oct 09 11:30:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD03/USD03.xml index 6d7b7af79..8a7888f81 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD03/USD03.xml @@ -106,7 +106,7 @@ - Thu Oct 09 09:20:29 UTC 2008 modified by jDAL - Thu Oct 09 11:30:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD04/USD04.xml index eceee8f17..b18ef1433 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD04/USD04.xml @@ -105,8 +105,11 @@ - Mon Oct 06 09:28:04 UTC 2008 modified by jDAL - Thu Oct 09 09:20:55 UTC 2008 modified by jDAL - Thu Oct 09 11:30:07 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:39 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:05 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD05/USD05.xml index 49d348a0e..41990ed94 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD05/USD05.xml @@ -102,8 +102,9 @@ - Mon Oct 06 09:28:27 UTC 2008 modified by jDAL - Thu Oct 09 09:21:19 UTC 2008 modified by jDAL - Thu Oct 09 11:30:07 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:06 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD06/USD06.xml index bb4d1cdc8..6ff83d3df 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD06/USD06.xml @@ -102,8 +102,11 @@ - Mon Oct 06 09:28:53 UTC 2008 modified by jDAL - Thu Oct 09 09:21:50 UTC 2008 modified by jDAL - Thu Oct 09 11:30:08 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:43 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD07/USD07.xml index 330bde58a..f25c7f531 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD07/USD07.xml @@ -101,8 +101,9 @@ - Mon Oct 06 09:29:25 UTC 2008 modified by jDAL - Thu Oct 09 09:22:23 UTC 2008 modified by jDAL - Thu Oct 09 11:30:08 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:45 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD08/USD08.xml index 8a92ef97f..6e9b859cb 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD08/USD08.xml @@ -102,8 +102,10 @@ - Mon Oct 06 09:30:13 UTC 2008 modified by jDAL - Thu Oct 09 09:23:21 UTC 2008 modified by jDAL - Thu Oct 09 11:30:09 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:46 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:10 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD09/USD09.xml index 3908f846b..539cfec9f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD09/USD09.xml @@ -102,8 +102,11 @@ - Mon Oct 06 09:31:10 UTC 2008 modified by jDAL - Thu Oct 09 09:24:05 UTC 2008 modified by jDAL - Thu Oct 09 11:30:09 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:48 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:42 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:11 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD10/USD10.xml index ab000082c..8f2030c02 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD10/USD10.xml @@ -102,8 +102,9 @@ - Mon Oct 06 09:31:54 UTC 2008 modified by jDAL - Thu Oct 09 09:24:50 UTC 2008 modified by jDAL - Thu Oct 09 11:30:10 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:12 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD11/USD11.xml index 39f907fe7..d6db5af94 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD11/USD11.xml @@ -102,8 +102,10 @@ - Mon Oct 06 09:32:42 UTC 2008 modified by jDAL - Thu Oct 09 09:25:39 UTC 2008 modified by jDAL - Thu Oct 09 11:30:10 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:13 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD12/USD12.xml index 05c15e30c..254fac679 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD12/USD12.xml @@ -101,8 +101,9 @@ - Mon Oct 06 09:33:30 UTC 2008 modified by jDAL - Thu Oct 09 09:26:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:11 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:45 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD13/USD13.xml index 55dd7604f..30ed47db2 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD13/USD13.xml @@ -97,8 +97,11 @@ - Mon Oct 06 09:34:25 UTC 2008 modified by jDAL - Thu Oct 09 09:27:15 UTC 2008 modified by jDAL - Thu Oct 09 11:30:11 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:53 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:47 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD14/USD14.xml index 7fd754e56..70a1d6fe5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD14/USD14.xml @@ -98,8 +98,9 @@ - Mon Oct 06 09:35:13 UTC 2008 modified by jDAL - Thu Oct 09 09:28:03 UTC 2008 modified by jDAL - Thu Oct 09 11:30:11 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD15/USD15.xml index 8b7e1eba6..0dea9b37f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD15/USD15.xml @@ -99,8 +99,11 @@ - Mon Oct 06 09:36:06 UTC 2008 modified by jDAL - Thu Oct 09 09:28:54 UTC 2008 modified by jDAL - Thu Oct 09 11:30:12 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:57 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:48 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD07/USD07.xml index dc459d2a7..99dd3070f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD07/USD07.xml @@ -98,8 +98,9 @@ - Mon Oct 06 08:33:29 UTC 2008 modified by jDAL - Mon Oct 06 09:29:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:13 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:00 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD08/USD08.xml index cd8b5efd4..b3d7692e8 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD08/USD08.xml @@ -96,8 +96,11 @@ - Mon Oct 06 08:33:29 UTC 2008 modified by jDAL - Mon Oct 06 09:30:13 UTC 2008 modified by jDAL - Thu Oct 09 11:30:13 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:02 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD09/USD09.xml index 6baa22387..3e0a8b4dd 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD09/USD09.xml @@ -96,8 +96,10 @@ - Mon Oct 06 08:33:30 UTC 2008 modified by jDAL - Mon Oct 06 09:31:11 UTC 2008 modified by jDAL - Thu Oct 09 11:30:14 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:52 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:26 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD10/USD10.xml index 734879951..b3de98504 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD10/USD10.xml @@ -96,8 +96,9 @@ - Mon Oct 06 08:33:30 UTC 2008 modified by jDAL - Mon Oct 06 09:31:55 UTC 2008 modified by jDAL - Thu Oct 09 11:30:14 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:04 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD11/USD11.xml index 3beeb2a26..d06760052 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD11/USD11.xml @@ -96,8 +96,11 @@ - Mon Oct 06 08:33:30 UTC 2008 modified by jDAL - Mon Oct 06 09:32:42 UTC 2008 modified by jDAL - Thu Oct 09 11:30:15 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:06 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:23 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:27 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD12/USD12.xml index f4f1896ca..38d83911e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD12/USD12.xml @@ -96,8 +96,9 @@ - Mon Oct 06 08:33:31 UTC 2008 modified by jDAL - Mon Oct 06 09:33:31 UTC 2008 modified by jDAL - Thu Oct 09 11:30:15 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:28 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD13/USD13.xml index 7d3bbca80..e5defe05e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD13/USD13.xml @@ -95,7 +95,7 @@ - Mon Oct 06 09:34:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD14/USD14.xml index 5ce4c2a59..0c3d8bd77 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD14/USD14.xml @@ -94,8 +94,11 @@ - Mon Oct 06 08:33:32 UTC 2008 modified by jDAL - Mon Oct 06 09:35:14 UTC 2008 modified by jDAL - Thu Oct 09 11:30:16 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:11 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:58 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:27 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD15/USD15.xml index 64c3fb126..0c80352e9 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD15/USD15.xml @@ -94,8 +94,12 @@ - Mon Oct 06 08:33:32 UTC 2008 modified by jDAL - Mon Oct 06 09:36:07 UTC 2008 modified by jDAL - Thu Oct 09 11:30:16 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:13 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:01 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:29 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:33 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD01/USD01.xml index ab93309a6..82377a9f1 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD01/USD01.xml @@ -99,8 +99,10 @@ - Mon Oct 06 09:27:03 UTC 2008 modified by jDAL - Thu Oct 09 09:19:53 UTC 2008 modified by jDAL - Thu Oct 09 11:30:18 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:03 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:31 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD02/USD02.xml index d11698dfe..795eb8612 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD02/USD02.xml @@ -96,8 +96,11 @@ - Mon Oct 06 09:27:18 UTC 2008 modified by jDAL - Thu Oct 09 09:20:11 UTC 2008 modified by jDAL - Thu Oct 09 11:30:18 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:05 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:33 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD03/USD03.xml index f22251b80..02ed9ee72 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD03/USD03.xml @@ -97,7 +97,7 @@ - Thu Oct 09 09:20:29 UTC 2008 modified by jDAL - Thu Oct 09 11:30:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD04/USD04.xml index 2a6fd2fe4..b5f6c323f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD04/USD04.xml @@ -96,8 +96,10 @@ - Mon Oct 06 09:28:04 UTC 2008 modified by jDAL - Thu Oct 09 09:20:55 UTC 2008 modified by jDAL - Thu Oct 09 11:30:20 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:08 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:35 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD05/USD05.xml index 0fab99be8..08480e30d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD05/USD05.xml @@ -96,8 +96,11 @@ - Mon Oct 06 09:28:27 UTC 2008 modified by jDAL - Thu Oct 09 09:21:19 UTC 2008 modified by jDAL - Thu Oct 09 11:30:20 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:21 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:37 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD06/USD06.xml index 080f38aeb..00db6861e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD06/USD06.xml @@ -96,8 +96,9 @@ - Mon Oct 06 09:28:53 UTC 2008 modified by jDAL - Thu Oct 09 09:21:50 UTC 2008 modified by jDAL - Thu Oct 09 11:30:21 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:11 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD07/USD07.xml index 4a5229ab4..02996598d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD07/USD07.xml @@ -95,8 +95,9 @@ - Mon Oct 06 09:29:26 UTC 2008 modified by jDAL - Thu Oct 09 09:22:24 UTC 2008 modified by jDAL - Thu Oct 09 11:30:21 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:13 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD08/USD08.xml index 20914c787..5370bf587 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD08/USD08.xml @@ -95,8 +95,9 @@ - Mon Oct 06 09:30:14 UTC 2008 modified by jDAL - Thu Oct 09 09:23:21 UTC 2008 modified by jDAL - Thu Oct 09 11:30:22 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD09/USD09.xml index c57710024..b6283e21b 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD09/USD09.xml @@ -95,8 +95,9 @@ - Mon Oct 06 09:31:11 UTC 2008 modified by jDAL - Thu Oct 09 09:24:06 UTC 2008 modified by jDAL - Thu Oct 09 11:30:22 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD10/USD10.xml index 684353a33..3fbda4a0b 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD10/USD10.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:24:50 UTC 2008 modified by jDAL - Thu Oct 09 11:30:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD11/USD11.xml index a174fe617..d9ec9be64 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD11/USD11.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:25:39 UTC 2008 modified by jDAL - Thu Oct 09 11:30:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD12/USD12.xml index 0cc30373c..1547d2a53 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD12/USD12.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:26:27 UTC 2008 modified by jDAL - Thu Oct 09 11:30:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD13/USD13.xml index 9cc8f61ee..c0b9fbd7a 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD13/USD13.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:27:15 UTC 2008 modified by jDAL - Thu Oct 09 11:30:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD14/USD14.xml index 34b9d951f..a2acd3654 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD14/USD14.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:28:04 UTC 2008 modified by jDAL - Thu Oct 09 11:30:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD15/USD15.xml index a642537cd..082331a2c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD15/USD15.xml @@ -92,7 +92,7 @@ - Thu Oct 09 09:28:55 UTC 2008 modified by jDAL - Thu Oct 09 11:30:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD07/USD07.xml index f13a50edb..59bf78698 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD07/USD07.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:22:24 UTC 2008 modified by jDAL - Thu Oct 09 11:30:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD08/USD08.xml index bc7e5ee9e..8ee040c96 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD08/USD08.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:23:22 UTC 2008 modified by jDAL - Thu Oct 09 11:30:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD09/USD09.xml index 0d8ec6a49..cf9c641ef 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD09/USD09.xml @@ -95,7 +95,7 @@ - Thu Oct 09 09:24:06 UTC 2008 modified by jDAL - Thu Oct 09 11:30:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD10/USD10.xml index 2c8e151c9..f65b4f03e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD10/USD10.xml @@ -94,7 +94,7 @@ - Thu Oct 09 09:24:51 UTC 2008 modified by jDAL - Thu Oct 09 11:30:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD11/USD11.xml index da0ff91c4..b6eb4e389 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD11/USD11.xml @@ -93,8 +93,9 @@ - Mon Oct 06 09:32:43 UTC 2008 modified by jDAL - Thu Oct 09 09:25:40 UTC 2008 modified by jDAL - Thu Oct 09 11:30:27 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD12/USD12.xml index 8a7c7de56..14318b753 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD12/USD12.xml @@ -93,8 +93,9 @@ - Mon Oct 06 09:33:32 UTC 2008 modified by jDAL - Thu Oct 09 09:26:27 UTC 2008 modified by jDAL - Thu Oct 09 11:30:28 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD13/USD13.xml index 93e3ff367..5b8673bb1 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD13/USD13.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:27:16 UTC 2008 modified by jDAL - Thu Oct 09 11:30:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD14/USD14.xml index a2fbeb675..dd8878f22 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD14/USD14.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:28:04 UTC 2008 modified by jDAL - Thu Oct 09 11:30:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD15/USD15.xml index 0dbd9de9f..7684e7491 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD15/USD15.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:28:55 UTC 2008 modified by jDAL - Thu Oct 09 11:30:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD03/USD03.xml index 69c415717..856b45aae 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD03/USD03.xml @@ -93,7 +93,7 @@ - Thu Oct 09 09:20:30 UTC 2008 modified by jDAL - Thu Oct 09 11:30:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD04/USD04.xml index c01dad7e3..5afc2acf0 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD04/USD04.xml @@ -92,7 +92,7 @@ - Thu Oct 09 09:20:56 UTC 2008 modified by jDAL - Thu Oct 09 11:30:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD05/USD05.xml index 5c4d35759..290ce49e5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD05/USD05.xml @@ -92,7 +92,7 @@ - Thu Oct 09 09:21:19 UTC 2008 modified by jDAL - Thu Oct 09 11:30:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD06/USD06.xml index 86e1099d5..70a88362c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD06/USD06.xml @@ -91,7 +91,7 @@ - Thu Oct 09 09:21:51 UTC 2008 modified by jDAL - Thu Oct 09 11:30:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD07/USD07.xml index b1beb7cd6..0d191a52d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD07/USD07.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:22:25 UTC 2008 modified by jDAL - Thu Oct 09 11:30:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD08/USD08.xml index 9fe35321e..9aac0f88e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD08/USD08.xml @@ -90,7 +90,7 @@ - Thu Oct 09 09:23:22 UTC 2008 modified by jDAL - Thu Oct 09 11:30:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD09/USD09.xml index 927a81a29..7d4a8cc88 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD09/USD09.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:24:07 UTC 2008 modified by jDAL - Thu Oct 09 11:30:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD10/USD10.xml index dfc7d2082..20247b3e5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD10/USD10.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:24:51 UTC 2008 modified by jDAL - Thu Oct 09 11:30:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD11/USD11.xml index 40fb6f149..6bb1bbef5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD11/USD11.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:25:40 UTC 2008 modified by jDAL - Thu Oct 09 11:30:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD12/USD12.xml index 4a6ffd840..259c33096 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD12/USD12.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:26:28 UTC 2008 modified by jDAL - Thu Oct 09 11:30:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD13/USD13.xml index 8935b4101..e3b435423 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD13/USD13.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:27:16 UTC 2008 modified by jDAL - Thu Oct 09 11:30:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD14/USD14.xml index 7a96940d7..a5372ab25 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD14/USD14.xml @@ -87,7 +87,7 @@ - Thu Oct 09 09:28:05 UTC 2008 modified by jDAL - Thu Oct 09 11:30:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD15/USD15.xml index 1386a1aef..3461af442 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD15/USD15.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:28:56 UTC 2008 modified by jDAL - Thu Oct 09 11:30:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD07/USD07.xml index f20aeb7b0..69ec4cb8f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD07/USD07.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:22:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD08/USD08.xml index 55ab75c49..bfcc8c6f8 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD08/USD08.xml @@ -89,7 +89,7 @@ - Thu Oct 09 09:23:23 UTC 2008 modified by jDAL - Thu Oct 09 11:30:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD09/USD09.xml index 9cf5cb292..a2713e199 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD09/USD09.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:24:07 UTC 2008 modified by jDAL - Thu Oct 09 11:30:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD10/USD10.xml index 57c31e760..5786a169d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD10/USD10.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:24:52 UTC 2008 modified by jDAL - Thu Oct 09 11:30:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD11/USD11.xml index e19860424..1a93c9f21 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD11/USD11.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:25:41 UTC 2008 modified by jDAL - Thu Oct 09 11:30:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD12/USD12.xml index 403763418..4f79cb847 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD12/USD12.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:26:28 UTC 2008 modified by jDAL - Thu Oct 09 11:30:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD13/USD13.xml index 2501bd6f1..3237e5119 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD13/USD13.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:27:17 UTC 2008 modified by jDAL - Thu Oct 09 11:30:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD14/USD14.xml index 9d4e2d574..9b7cc7929 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD14/USD14.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:28:05 UTC 2008 modified by jDAL - Thu Oct 09 11:30:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD15/USD15.xml index 1f3e56d6c..0f1bf58f2 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD15/USD15.xml @@ -84,7 +84,7 @@ - Thu Oct 09 09:28:57 UTC 2008 modified by jDAL - Thu Oct 09 11:30:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD01/USD01.xml index c67593944..914e76157 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD01/USD01.xml @@ -88,7 +88,7 @@ - Thu Oct 09 09:19:54 UTC 2008 modified by jDAL - Thu Oct 09 11:30:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD02/USD02.xml index a83b2e7c7..ca6bfd6d4 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD02/USD02.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:20:11 UTC 2008 modified by jDAL - Thu Oct 09 11:30:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD03/USD03.xml index e5a2e5a88..2fed7ee57 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD03/USD03.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:20:31 UTC 2008 modified by jDAL - Thu Oct 09 11:30:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD04/USD04.xml index 00b412e37..4286be079 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD04/USD04.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:20:56 UTC 2008 modified by jDAL - Thu Oct 09 11:30:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD05/USD05.xml index 6bed861be..77fd18630 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD05/USD05.xml @@ -86,7 +86,7 @@ - Thu Oct 09 09:21:20 UTC 2008 modified by jDAL - Thu Oct 09 11:30:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD06/USD06.xml index c65f33ae6..bee466598 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD06/USD06.xml @@ -85,7 +85,7 @@ - Thu Oct 09 09:21:51 UTC 2008 modified by jDAL - Thu Oct 09 11:30:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD07/USD07.xml index b59acb1f7..c0606e4c6 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD07/USD07.xml @@ -82,7 +82,7 @@ - Thu Oct 09 09:22:26 UTC 2008 modified by jDAL - Thu Oct 09 11:30:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD08/USD08.xml index a6723d5b8..4420429e2 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD08/USD08.xml @@ -82,7 +82,7 @@ - Thu Oct 09 09:23:23 UTC 2008 modified by jDAL - Thu Oct 09 11:30:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD09/USD09.xml index 12bf8609c..0c73242c4 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD09/USD09.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:24:08 UTC 2008 modified by jDAL - Thu Oct 09 11:30:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD10/USD10.xml index b997582ea..d7d4d5ef6 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD10/USD10.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:24:52 UTC 2008 modified by jDAL - Thu Oct 09 11:30:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD11/USD11.xml index bd2076493..b74ff5a74 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD11/USD11.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:25:41 UTC 2008 modified by jDAL - Thu Oct 09 11:30:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD12/USD12.xml index d420477d9..bb91cd266 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD12/USD12.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:26:29 UTC 2008 modified by jDAL - Thu Oct 09 11:30:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD13/USD13.xml index b19a1d458..8bcfc5f99 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD13/USD13.xml @@ -79,7 +79,7 @@ - Thu Oct 09 09:27:17 UTC 2008 modified by jDAL - Thu Oct 09 11:30:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD14/USD14.xml index 0680915a8..24d125ae3 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD14/USD14.xml @@ -79,7 +79,7 @@ - Thu Oct 09 09:28:06 UTC 2008 modified by jDAL - Thu Oct 09 11:30:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD15/USD15.xml index 003e4f523..c65c99f99 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD15/USD15.xml @@ -78,7 +78,7 @@ - Thu Oct 09 09:28:57 UTC 2008 modified by jDAL - Thu Oct 09 11:30:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD07/USD07.xml index c2a53271a..9cb30eff0 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD07/USD07.xml @@ -81,7 +81,7 @@ - Thu Oct 09 09:22:27 UTC 2008 modified by jDAL - Thu Oct 09 11:30:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD08/USD08.xml index e42e66562..0f9af3f51 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD08/USD08.xml @@ -79,7 +79,7 @@ - Thu Oct 09 09:23:23 UTC 2008 modified by jDAL - Thu Oct 09 11:30:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD09/USD09.xml index 3d8b7d31d..fcf75d855 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD09/USD09.xml @@ -78,7 +78,7 @@ - Thu Oct 09 09:24:08 UTC 2008 modified by jDAL - Thu Oct 09 11:30:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD10/USD10.xml index 6e16d441a..4dd112676 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD10/USD10.xml @@ -77,7 +77,7 @@ - Thu Oct 09 09:24:53 UTC 2008 modified by jDAL - Thu Oct 09 11:30:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD11/USD11.xml index 1a272c2d9..2468372d6 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD11/USD11.xml @@ -77,7 +77,7 @@ - Thu Oct 09 09:25:42 UTC 2008 modified by jDAL - Thu Oct 09 11:30:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD12/USD12.xml index d205b737f..c8b7dcfed 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD12/USD12.xml @@ -77,7 +77,7 @@ - Thu Oct 09 09:26:30 UTC 2008 modified by jDAL - Thu Oct 09 11:30:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD13/USD13.xml index c5baed2dc..46dd40936 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD13/USD13.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:27:18 UTC 2008 modified by jDAL - Thu Oct 09 11:30:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD14/USD14.xml index 009f1371b..710108d90 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD14/USD14.xml @@ -73,7 +73,7 @@ - Thu Oct 09 09:28:06 UTC 2008 modified by jDAL - Thu Oct 09 11:30:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD15/USD15.xml index 2bf63784d..ff1f0f91c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD15/USD15.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:28:58 UTC 2008 modified by jDAL - Thu Oct 09 11:30:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD03/USD03.xml index 6c9248234..ef8211ecc 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD03/USD03.xml @@ -79,7 +79,7 @@ - Thu Oct 09 09:20:31 UTC 2008 modified by jDAL - Thu Oct 09 11:30:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD04/USD04.xml index 025d96e3a..d3704dc69 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD04/USD04.xml @@ -76,7 +76,7 @@ - Thu Oct 09 09:20:56 UTC 2008 modified by jDAL - Thu Oct 09 11:30:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD05/USD05.xml index ab26f4eaf..d56d63cfd 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD05/USD05.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:21:20 UTC 2008 modified by jDAL - Thu Oct 09 11:30:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD06/USD06.xml index 4d4925f57..29fbbca16 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD06/USD06.xml @@ -75,7 +75,7 @@ - Thu Oct 09 09:21:52 UTC 2008 modified by jDAL - Thu Oct 09 11:30:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD07/USD07.xml index 0a7e1b7e6..0622fc712 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD07/USD07.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:22:27 UTC 2008 modified by jDAL - Thu Oct 09 11:30:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD08/USD08.xml index 682c42269..574d3d3e7 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD08/USD08.xml @@ -73,7 +73,7 @@ - Thu Oct 09 09:23:24 UTC 2008 modified by jDAL - Thu Oct 09 11:30:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD09/USD09.xml index 0c615cfbe..ac0e93c75 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD09/USD09.xml @@ -73,7 +73,7 @@ - Thu Oct 09 09:24:09 UTC 2008 modified by jDAL - Thu Oct 09 11:30:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD10/USD10.xml index c2a52bb9f..f88c929b4 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD10/USD10.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:24:53 UTC 2008 modified by jDAL - Thu Oct 09 11:30:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD11/USD11.xml index 906b8d8ad..02d469cc5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD11/USD11.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:25:42 UTC 2008 modified by jDAL - Thu Oct 09 11:30:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD12/USD12.xml index fd9ff3fe9..1dcff7168 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD12/USD12.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:26:30 UTC 2008 modified by jDAL - Thu Oct 09 11:30:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD13/USD13.xml index b16f0b80c..af386507e 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD13/USD13.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:27:18 UTC 2008 modified by jDAL - Thu Oct 09 11:30:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD14/USD14.xml index b44bb7eaa..4b35548fe 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD14/USD14.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:28:07 UTC 2008 modified by jDAL - Thu Oct 09 11:30:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD15/USD15.xml index 1e89836e9..94257c4a5 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD15/USD15.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:28:58 UTC 2008 modified by jDAL - Thu Oct 09 11:30:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD07/USD07.xml index 9d9d29498..88cdb027b 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD07/USD07.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:22:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD08/USD08.xml index d1b988621..4cc86742b 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD08/USD08.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:23:24 UTC 2008 modified by jDAL - Thu Oct 09 11:31:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD09/USD09.xml index e4e1f7ad7..f81f633a6 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD09/USD09.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:24:09 UTC 2008 modified by jDAL - Thu Oct 09 11:31:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD10/USD10.xml index c0e101c9c..9003300f0 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD10/USD10.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:24:54 UTC 2008 modified by jDAL - Thu Oct 09 11:31:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD11/USD11.xml index f2ce64769..9c72432ed 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD11/USD11.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:25:43 UTC 2008 modified by jDAL - Thu Oct 09 11:31:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD12/USD12.xml index f749c9fa3..001a6d975 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD12/USD12.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:26:31 UTC 2008 modified by jDAL - Thu Oct 09 11:31:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD13/USD13.xml index a12d06a3f..81aeb9029 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD13/USD13.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:27:19 UTC 2008 modified by jDAL - Thu Oct 09 11:31:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD14/USD14.xml index 807299aa0..242fae620 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD14/USD14.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:28:07 UTC 2008 modified by jDAL - Thu Oct 09 11:31:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD15/USD15.xml index 672d0d409..6c31c0e25 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD15/USD15.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:28:59 UTC 2008 modified by jDAL - Thu Oct 09 11:31:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD01/USD01.xml index c5959bc8a..c32142242 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD01/USD01.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:19:55 UTC 2008 modified by jDAL - Thu Oct 09 11:31:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD02/USD02.xml index 8be562a0b..25aa9cc88 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD02/USD02.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:20:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD03/USD03.xml index 27d067cd7..41ba6b9e7 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD03/USD03.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:20:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD04/USD04.xml index e20f63d6d..51c9b085d 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD04/USD04.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:20:57 UTC 2008 modified by jDAL - Thu Oct 09 11:31:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD05/USD05.xml index 47513e7f9..21058170f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD05/USD05.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:21:21 UTC 2008 modified by jDAL - Thu Oct 09 11:31:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD06/USD06.xml index 77d5855a1..c57e7dd22 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD06/USD06.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:21:52 UTC 2008 modified by jDAL - Thu Oct 09 11:31:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD07/USD07.xml index ced36243c..a3afe165c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD07/USD07.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:22:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD08/USD08.xml index fb21e265c..77752c31f 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD08/USD08.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:23:25 UTC 2008 modified by jDAL - Thu Oct 09 11:31:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD09/USD09.xml index ccfc71a2b..0063d2660 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD09/USD09.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:24:10 UTC 2008 modified by jDAL - Thu Oct 09 11:31:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD10/USD10.xml index cd28089e4..16b0ea085 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD10/USD10.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:24:54 UTC 2008 modified by jDAL - Thu Oct 09 11:31:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD11/USD11.xml index e796755b7..a912622cb 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD11/USD11.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:25:43 UTC 2008 modified by jDAL - Thu Oct 09 11:31:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD12/USD12.xml index 73bd57e0f..4e0094704 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD12/USD12.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:26:31 UTC 2008 modified by jDAL - Thu Oct 09 11:31:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD13/USD13.xml index 72ed5a9f8..5e680aab7 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD13/USD13.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:27:19 UTC 2008 modified by jDAL - Thu Oct 09 11:31:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD14/USD14.xml index 224815c46..8666c4bd1 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD14/USD14.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:28:08 UTC 2008 modified by jDAL - Thu Oct 09 11:31:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD15/USD15.xml index 189c33fa9..758cefa55 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD15/USD15.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:28:59 UTC 2008 modified by jDAL - Thu Oct 09 11:31:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD16/USD16.xml index 1b2fb7d51..67753effa 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN11/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD16/USD16.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:29:39 UTC 2008 modified by jDAL - Thu Oct 09 11:31:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD07/USD07.xml index 082129bce..19058ffa9 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD07/USD07.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:22:33 UTC 2008 modified by jDAL - Thu Oct 09 11:31:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD08/USD08.xml index a60b453cc..d7cadc2f4 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD08/USD08.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:23:25 UTC 2008 modified by jDAL - Thu Oct 09 11:31:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD09/USD09.xml index 114a5c1ed..b43682b80 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD09/USD09.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:10 UTC 2008 modified by jDAL - Thu Oct 09 11:31:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD10/USD10.xml index e6fc8f40b..0f26a8b5c 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD10/USD10.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:55 UTC 2008 modified by jDAL - Thu Oct 09 11:31:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD11/USD11.xml index 57f0ab3ba..209b400d6 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD11/USD11.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:44 UTC 2008 modified by jDAL - Thu Oct 09 11:31:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD12/USD12.xml index 555fe4d31..b8073b0ba 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD12/USD12.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:26:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD13/USD13.xml index e46ea8799..761743e05 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD13/USD13.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:27:20 UTC 2008 modified by jDAL - Thu Oct 09 11:31:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD14/USD14.xml index df38f34c7..0612bb052 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD14/USD14.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:28:08 UTC 2008 modified by jDAL - Thu Oct 09 11:31:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD15/USD15.xml index af26529f1..7939a0c61 100644 --- a/SRT/CDB/alma/AS/SECTOR03/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD15/USD15.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:29:00 UTC 2008 modified by jDAL - Thu Oct 09 11:31:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD03/USD03.xml index c8af52fb4..b16ef361e 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD03/USD03.xml @@ -83,7 +83,7 @@ - Thu Oct 09 09:20:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD04/USD04.xml index 8319aa901..dfedf4190 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD04/USD04.xml @@ -78,8 +78,9 @@ - Mon Oct 06 09:28:06 UTC 2008 modified by jDAL - Thu Oct 09 09:20:57 UTC 2008 modified by jDAL - Thu Oct 09 11:31:19 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD05/USD05.xml index 81582b199..8e3e064bf 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD05/USD05.xml @@ -78,8 +78,10 @@ - Mon Oct 06 09:28:32 UTC 2008 modified by jDAL - Thu Oct 09 09:21:21 UTC 2008 modified by jDAL - Thu Oct 09 11:31:20 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:18 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD06/USD06.xml index 7a85c05f7..801554d53 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD06/USD06.xml @@ -78,8 +78,11 @@ - Mon Oct 06 09:28:56 UTC 2008 modified by jDAL - Thu Oct 09 09:21:52 UTC 2008 modified by jDAL - Thu Oct 09 11:31:20 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:08 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD07/USD07.xml index e15ae111a..d546ec544 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD07/USD07.xml @@ -77,8 +77,10 @@ - Mon Oct 06 09:29:31 UTC 2008 modified by jDAL - Thu Oct 09 09:22:34 UTC 2008 modified by jDAL - Thu Oct 09 11:31:21 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:42 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:09 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD08/USD08.xml index 52c34aae3..1f272d594 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD08/USD08.xml @@ -76,8 +76,10 @@ - Mon Oct 06 09:30:21 UTC 2008 modified by jDAL - Thu Oct 09 09:23:26 UTC 2008 modified by jDAL - Thu Oct 09 11:31:21 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:10 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:20 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD09/USD09.xml index 887f23bc5..d6e25432a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD09/USD09.xml @@ -75,8 +75,10 @@ - Mon Oct 06 09:31:16 UTC 2008 modified by jDAL - Thu Oct 09 09:24:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:22 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:45 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:21 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD10/USD10.xml index d23dcaafc..23d360eb5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD10/USD10.xml @@ -75,8 +75,9 @@ - Mon Oct 06 09:32:00 UTC 2008 modified by jDAL - Thu Oct 09 09:24:55 UTC 2008 modified by jDAL - Thu Oct 09 11:31:22 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:22 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD11/USD11.xml index 2954123e2..a04809122 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD11/USD11.xml @@ -73,8 +73,9 @@ - Mon Oct 06 09:32:47 UTC 2008 modified by jDAL - Thu Oct 09 09:25:44 UTC 2008 modified by jDAL - Thu Oct 09 11:31:22 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:13 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD12/USD12.xml index 1ef9196ed..6f124c44d 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD12/USD12.xml @@ -72,8 +72,11 @@ - Mon Oct 06 09:33:37 UTC 2008 modified by jDAL - Thu Oct 09 09:26:32 UTC 2008 modified by jDAL - Thu Oct 09 11:31:23 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:48 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:26 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD13/USD13.xml index d1599d34d..2f4d67b8b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD13/USD13.xml @@ -71,8 +71,9 @@ - Mon Oct 06 09:34:32 UTC 2008 modified by jDAL - Thu Oct 09 09:27:20 UTC 2008 modified by jDAL - Thu Oct 09 11:31:24 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD14/USD14.xml index f2ff8f11b..e415bcbd8 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD14/USD14.xml @@ -71,8 +71,9 @@ - Mon Oct 06 09:35:19 UTC 2008 modified by jDAL - Thu Oct 09 09:28:09 UTC 2008 modified by jDAL - Thu Oct 09 11:31:24 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD15/USD15.xml index 63060f8c1..65a0c1261 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD15/USD15.xml @@ -71,8 +71,10 @@ - Mon Oct 06 09:36:12 UTC 2008 modified by jDAL - Thu Oct 09 09:29:01 UTC 2008 modified by jDAL - Thu Oct 09 11:31:25 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:54 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD17/USD17.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD17/USD17.xml index 15f27f787..3b912740a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN01/USD17/USD17.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD17/USD17.xml @@ -72,8 +72,10 @@ - Mon Oct 06 09:36:54 UTC 2008 modified by jDAL - Thu Oct 09 09:29:42 UTC 2008 modified by jDAL - Thu Oct 09 11:31:23 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD07/USD07.xml index db3f27789..9a41d329b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD07/USD07.xml @@ -73,8 +73,12 @@ - Mon Oct 06 09:29:32 UTC 2008 modified by jDAL - Thu Oct 09 09:22:34 UTC 2008 modified by jDAL - Thu Oct 09 11:31:28 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:57 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:54 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:21 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:30 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD08/USD08.xml index 390f899e4..92b9cfb94 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD08/USD08.xml @@ -73,8 +73,11 @@ - Mon Oct 06 09:30:23 UTC 2008 modified by jDAL - Thu Oct 09 09:23:26 UTC 2008 modified by jDAL - Thu Oct 09 11:31:29 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:58 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:23 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:32 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD09/USD09.xml index 8bc42d498..550d29731 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD09/USD09.xml @@ -73,8 +73,11 @@ - Mon Oct 06 09:31:16 UTC 2008 modified by jDAL - Thu Oct 09 09:24:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:29 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:01 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:57 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:34 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD10/USD10.xml index ef15ea990..1c84cb0be 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD10/USD10.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:24:56 UTC 2008 modified by jDAL - Thu Oct 09 11:31:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD11/USD11.xml index 0ae4e71f4..0f06d01f4 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD11/USD11.xml @@ -73,8 +73,12 @@ - Mon Oct 06 09:32:48 UTC 2008 modified by jDAL - Thu Oct 09 09:25:45 UTC 2008 modified by jDAL - Thu Oct 09 11:31:30 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:04 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:01 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:26 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:37 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD12/USD12.xml index 75e6a1f3c..45567b30f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD12/USD12.xml @@ -72,8 +72,11 @@ - Mon Oct 06 09:33:38 UTC 2008 modified by jDAL - Thu Oct 09 09:26:33 UTC 2008 modified by jDAL - Thu Oct 09 11:31:31 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:06 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:03 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:38 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD13/USD13.xml index bcf571841..b4404ca97 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD13/USD13.xml @@ -69,8 +69,9 @@ - Mon Oct 06 09:34:32 UTC 2008 modified by jDAL - Thu Oct 09 09:27:21 UTC 2008 modified by jDAL - Thu Oct 09 11:31:31 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD14/USD14.xml index 7c7aa44ad..a9b9f09d5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD14/USD14.xml @@ -71,7 +71,7 @@ - Thu Oct 09 09:28:10 UTC 2008 modified by jDAL - Thu Oct 09 11:31:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD15/USD15.xml index f5ecac669..997cfbf9a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD15/USD15.xml @@ -71,8 +71,10 @@ - Mon Oct 06 09:36:13 UTC 2008 modified by jDAL - Thu Oct 09 09:29:01 UTC 2008 modified by jDAL - Thu Oct 09 11:31:32 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:11 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD01/USD01.xml index d8b222794..3b3c249bb 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD01/USD01.xml @@ -76,8 +76,9 @@ - Mon Oct 06 09:27:05 UTC 2008 modified by jDAL - Thu Oct 09 09:19:56 UTC 2008 modified by jDAL - Thu Oct 09 11:31:36 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:14 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD02/USD02.xml index 23b851c83..4ec3121a7 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD02/USD02.xml @@ -73,8 +73,11 @@ - Mon Oct 06 09:27:19 UTC 2008 modified by jDAL - Thu Oct 09 09:20:12 UTC 2008 modified by jDAL - Thu Oct 09 11:31:36 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:37 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:44 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD03/USD03.xml index 46da23c85..1b842582b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD03/USD03.xml @@ -72,8 +72,10 @@ - Mon Oct 06 09:27:40 UTC 2008 modified by jDAL - Thu Oct 09 09:20:33 UTC 2008 modified by jDAL - Thu Oct 09 11:31:37 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:19 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:45 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD04/USD04.xml index 59c01cb3f..6c510d8cf 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD04/USD04.xml @@ -73,8 +73,10 @@ - Mon Oct 06 09:28:07 UTC 2008 modified by jDAL - Thu Oct 09 09:20:58 UTC 2008 modified by jDAL - Thu Oct 09 11:31:37 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:20 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:47 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD05/USD05.xml index 5049520a5..f37478190 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD05/USD05.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:21:22 UTC 2008 modified by jDAL - Thu Oct 09 11:31:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD06/USD06.xml index aa5b7a30a..4e88b31a6 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD06/USD06.xml @@ -69,8 +69,9 @@ - Mon Oct 06 09:28:56 UTC 2008 modified by jDAL - Thu Oct 09 09:21:53 UTC 2008 modified by jDAL - Thu Oct 09 11:31:38 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:50 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD07/USD07.xml index 5cd650be3..f75608d73 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD07/USD07.xml @@ -69,8 +69,9 @@ - Mon Oct 06 09:29:33 UTC 2008 modified by jDAL - Thu Oct 09 09:22:35 UTC 2008 modified by jDAL - Thu Oct 09 11:31:38 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD08/USD08.xml index 6eb20e52c..cdbe8bee8 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD08/USD08.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:23:27 UTC 2008 modified by jDAL - Thu Oct 09 11:31:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD09/USD09.xml index 57ad9afd2..a48c21910 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD09/USD09.xml @@ -69,8 +69,9 @@ - Mon Oct 06 09:31:17 UTC 2008 modified by jDAL - Thu Oct 09 09:24:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:39 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:55 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD10/USD10.xml index dd45be637..4099c0e0e 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD10/USD10.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:24:56 UTC 2008 modified by jDAL - Thu Oct 09 11:31:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD11/USD11.xml index bd8429a50..ad318c144 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD11/USD11.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:25:45 UTC 2008 modified by jDAL - Thu Oct 09 11:31:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml index fc5d316d5..ed56a34f2 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:26:33 UTC 2008 modified by jDAL - Thu Oct 09 11:31:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD13/USD13.xml index 59ffcd8e0..5d4d40da2 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD13/USD13.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:27:21 UTC 2008 modified by jDAL - Thu Oct 09 11:31:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD14/USD14.xml index 49f1ad57f..6b88506a4 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD14/USD14.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:28:10 UTC 2008 modified by jDAL - Thu Oct 09 11:31:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD15/USD15.xml index 1d9609f13..e12411081 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD15/USD15.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:29:02 UTC 2008 modified by jDAL - Thu Oct 09 11:31:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD16/USD16.xml index 380e97abd..70bd86bd5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN03/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD16/USD16.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:29:39 UTC 2008 modified by jDAL - Thu Oct 09 11:31:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD07/USD07.xml index b6625a7f5..6a02c6261 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD07/USD07.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:22:35 UTC 2008 modified by jDAL - Thu Oct 09 11:31:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD08/USD08.xml index efdceab50..1afb66c30 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD08/USD08.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:23:27 UTC 2008 modified by jDAL - Thu Oct 09 11:31:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD09/USD09.xml index 67b1ca7f5..afd110a20 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD09/USD09.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:24:12 UTC 2008 modified by jDAL - Thu Oct 09 11:31:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD10/USD10.xml index 779f29e7f..aa79877ad 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD10/USD10.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:24:56 UTC 2008 modified by jDAL - Thu Oct 09 11:31:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD11/USD11.xml index efa135f3b..a69d76d83 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD11/USD11.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:25:46 UTC 2008 modified by jDAL - Thu Oct 09 11:31:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD12/USD12.xml index 9aab8809e..08253727a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD12/USD12.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:26:34 UTC 2008 modified by jDAL - Thu Oct 09 11:31:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD13/USD13.xml index 979e62492..87ac38b70 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD13/USD13.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:27:22 UTC 2008 modified by jDAL - Thu Oct 09 11:31:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD14/USD14.xml index a921cb866..ee2ffb668 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD14/USD14.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:28:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD15/USD15.xml index b02e4e984..18d16053b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD15/USD15.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:29:03 UTC 2008 modified by jDAL - Thu Oct 09 11:31:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD03/USD03.xml index c1b643ba4..812ad25f5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD03/USD03.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:20:34 UTC 2008 modified by jDAL - Thu Oct 09 11:31:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD04/USD04.xml index 07a134014..a237b2b16 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD04/USD04.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:20:58 UTC 2008 modified by jDAL - Thu Oct 09 11:31:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD05/USD05.xml index 35f4a8769..85c192d62 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD05/USD05.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:21:22 UTC 2008 modified by jDAL - Thu Oct 09 11:31:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD06/USD06.xml index 2cad0463f..6531220bc 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD06/USD06.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:21:53 UTC 2008 modified by jDAL - Thu Oct 09 11:31:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD07/USD07.xml index 947ab2821..44af15709 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD07/USD07.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:22:36 UTC 2008 modified by jDAL - Thu Oct 09 11:31:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD08/USD08.xml index f6ebdbbfb..397987045 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD08/USD08.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:23:28 UTC 2008 modified by jDAL - Thu Oct 09 11:31:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD09/USD09.xml index 8813c6ac8..69d587483 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD09/USD09.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:24:13 UTC 2008 modified by jDAL - Thu Oct 09 11:31:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD10/USD10.xml index a21c1c0f8..8175034cc 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD10/USD10.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:57 UTC 2008 modified by jDAL - Thu Oct 09 11:31:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD11/USD11.xml index b5af29595..336d9d598 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD11/USD11.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:46 UTC 2008 modified by jDAL - Thu Oct 09 11:31:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD12/USD12.xml index 12941a9ec..2a0dd62ad 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD12/USD12.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:26:34 UTC 2008 modified by jDAL - Thu Oct 09 11:31:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD13/USD13.xml index c1f8daeb0..559e0c620 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD13/USD13.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:27:22 UTC 2008 modified by jDAL - Thu Oct 09 11:31:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD14/USD14.xml index 0df8f5fed..22cf16757 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD14/USD14.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:28:11 UTC 2008 modified by jDAL - Thu Oct 09 11:31:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD15/USD15.xml index c875e0675..c67171395 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD15/USD15.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:29:03 UTC 2008 modified by jDAL - Thu Oct 09 11:31:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD07/USD07.xml index 5ddd669f7..70f9181f9 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD07/USD07.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:22:37 UTC 2008 modified by jDAL - Thu Oct 09 11:31:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD08/USD08.xml index 28ba9fd00..c5d754fba 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD08/USD08.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:23:28 UTC 2008 modified by jDAL - Thu Oct 09 11:31:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD09/USD09.xml index a11c704ac..b608a567c 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD09/USD09.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:24:13 UTC 2008 modified by jDAL - Thu Oct 09 11:31:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD10/USD10.xml index 054c569fa..e63f873a9 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD10/USD10.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:57 UTC 2008 modified by jDAL - Thu Oct 09 11:31:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD11/USD11.xml index 752fb03f9..be0ceabc1 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD11/USD11.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:25:47 UTC 2008 modified by jDAL - Thu Oct 09 11:31:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD12/USD12.xml index a56a2c56c..8a768ba73 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD12/USD12.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:26:35 UTC 2008 modified by jDAL - Thu Oct 09 11:31:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD13/USD13.xml index f90e7e602..785ca3cf8 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD13/USD13.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:27:23 UTC 2008 modified by jDAL - Thu Oct 09 11:31:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD14/USD14.xml index febffa4c2..38ce1866a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD14/USD14.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:28:12 UTC 2008 modified by jDAL - Thu Oct 09 11:31:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD15/USD15.xml index 6363b1803..2bba8b555 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD15/USD15.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:29:04 UTC 2008 modified by jDAL - Thu Oct 09 11:31:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD01/USD01.xml index b139030bc..31e690afa 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD01/USD01.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:19:56 UTC 2008 modified by jDAL - Thu Oct 09 11:32:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD02/USD02.xml index 3dccda768..04d68d791 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD02/USD02.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:20:12 UTC 2008 modified by jDAL - Thu Oct 09 11:32:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD03/USD03.xml index 5488d37ce..f8f37767f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD03/USD03.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:20:35 UTC 2008 modified by jDAL - Thu Oct 09 11:32:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD04/USD04.xml index b7c19207f..1debdd6cc 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD04/USD04.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:20:59 UTC 2008 modified by jDAL - Thu Oct 09 11:32:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD05/USD05.xml index 2c908a3fd..cf4701d17 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD05/USD05.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:21:22 UTC 2008 modified by jDAL - Thu Oct 09 11:32:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD06/USD06.xml index 909a001f3..1f81d63d8 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD06/USD06.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:21:54 UTC 2008 modified by jDAL - Thu Oct 09 11:32:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD07/USD07.xml index 7e52d8c7f..d668e43f7 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD07/USD07.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:22:37 UTC 2008 modified by jDAL - Thu Oct 09 11:32:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD08/USD08.xml index a81b58184..e1408dd2e 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD08/USD08.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:23:29 UTC 2008 modified by jDAL - Thu Oct 09 11:32:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD09/USD09.xml index 12ecdb2d9..d408353d0 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD09/USD09.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:14 UTC 2008 modified by jDAL - Thu Oct 09 11:32:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD10/USD10.xml index 2eaf3c373..1bfa906e0 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD10/USD10.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:58 UTC 2008 modified by jDAL - Thu Oct 09 11:32:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD11/USD11.xml index 150ac8d5d..35217483d 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD11/USD11.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:48 UTC 2008 modified by jDAL - Thu Oct 09 11:32:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD12/USD12.xml index ca41c62c0..c1754291f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD12/USD12.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:26:35 UTC 2008 modified by jDAL - Thu Oct 09 11:32:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD13/USD13.xml index 39e94412a..e545be6bf 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD13/USD13.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:27:23 UTC 2008 modified by jDAL - Thu Oct 09 11:32:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD14/USD14.xml index 75cf96445..f88ca0c4a 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD14/USD14.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:28:12 UTC 2008 modified by jDAL - Thu Oct 09 11:32:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD15/USD15.xml index 38700e74e..e03ccaace 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD15/USD15.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:29:04 UTC 2008 modified by jDAL - Thu Oct 09 11:32:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD07/USD07.xml index 0d395cfdc..9570076f5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD07/USD07.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:22:38 UTC 2008 modified by jDAL - Thu Oct 09 11:32:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD08/USD08.xml index f83cfd11b..b04086f52 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD08/USD08.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:23:29 UTC 2008 modified by jDAL - Thu Oct 09 11:32:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD09/USD09.xml index f5a0fa669..91451d205 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD09/USD09.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:14 UTC 2008 modified by jDAL - Thu Oct 09 11:32:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD10/USD10.xml index fea0f7f88..b714bef00 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD10/USD10.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:58 UTC 2008 modified by jDAL - Thu Oct 09 11:32:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD11/USD11.xml index b22f05dec..469dc26f4 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD11/USD11.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:25:48 UTC 2008 modified by jDAL - Thu Oct 09 11:32:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD12/USD12.xml index 477db0546..4f5cef55c 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD12/USD12.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:26:36 UTC 2008 modified by jDAL - Thu Oct 09 11:32:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD13/USD13.xml index d254ca190..2819c1463 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD13/USD13.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:27:24 UTC 2008 modified by jDAL - Thu Oct 09 11:32:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD14/USD14.xml index 9028c00ac..279397a7f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD14/USD14.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:28:13 UTC 2008 modified by jDAL - Thu Oct 09 11:32:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD15/USD15.xml index abdbbf1a2..de157f2f5 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD15/USD15.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:29:05 UTC 2008 modified by jDAL - Thu Oct 09 11:32:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD03/USD03.xml index cca8fb8ce..8c374e001 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD03/USD03.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:20:35 UTC 2008 modified by jDAL - Thu Oct 09 11:32:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD04/USD04.xml index ff6e61960..c02010ac9 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD04/USD04.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:20:59 UTC 2008 modified by jDAL - Thu Oct 09 11:32:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD05/USD05.xml index b1869b711..028a578da 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD05/USD05.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:21:23 UTC 2008 modified by jDAL - Thu Oct 09 11:32:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD06/USD06.xml index 4cf010cf2..72a9a97e2 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD06/USD06.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:21:54 UTC 2008 modified by jDAL - Thu Oct 09 11:32:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD07/USD07.xml index 7b5b6c38b..2f59dbdec 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD07/USD07.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:22:39 UTC 2008 modified by jDAL - Thu Oct 09 11:32:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD08/USD08.xml index 38fc9c74b..b9f4d1609 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD08/USD08.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:23:30 UTC 2008 modified by jDAL - Thu Oct 09 11:32:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD09/USD09.xml index 8e91ea48e..ec546c022 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD09/USD09.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:24:14 UTC 2008 modified by jDAL - Thu Oct 09 11:32:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD10/USD10.xml index 26ded8d0f..897bca775 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD10/USD10.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:24:59 UTC 2008 modified by jDAL - Thu Oct 09 11:32:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD11/USD11.xml index 23e3dec93..6aaef7116 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD11/USD11.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:25:48 UTC 2008 modified by jDAL - Thu Oct 09 11:32:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD12/USD12.xml index 2767cb263..47401dc47 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD12/USD12.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:26:36 UTC 2008 modified by jDAL - Thu Oct 09 11:32:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD13/USD13.xml index 91451e801..f5de231f3 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD13/USD13.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:27:24 UTC 2008 modified by jDAL - Thu Oct 09 11:32:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD14/USD14.xml index eebf68c9d..9679d184f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD14/USD14.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:28:13 UTC 2008 modified by jDAL - Thu Oct 09 11:32:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD15/USD15.xml index 6bf60d726..ad6c2b5b6 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD15/USD15.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:29:05 UTC 2008 modified by jDAL - Thu Oct 09 11:32:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD07/USD07.xml index bad7a9172..d33f17fb8 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD07/USD07.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:22:40 UTC 2008 modified by jDAL - Thu Oct 09 11:32:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD08/USD08.xml index 1f46c0a8e..65f40f45b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD08/USD08.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:23:31 UTC 2008 modified by jDAL - Thu Oct 09 11:32:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD09/USD09.xml index df920bbd9..4f808de4b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD09/USD09.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:24:15 UTC 2008 modified by jDAL - Thu Oct 09 11:32:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD10/USD10.xml index 1fd1972fa..c6305dc44 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD10/USD10.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:24:59 UTC 2008 modified by jDAL - Thu Oct 09 11:32:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD11/USD11.xml index 41048ca52..2a58a27f6 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD11/USD11.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:25:49 UTC 2008 modified by jDAL - Thu Oct 09 11:32:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD12/USD12.xml index 99a53e8f7..5580cbabe 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD12/USD12.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:26:37 UTC 2008 modified by jDAL - Thu Oct 09 11:32:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD13/USD13.xml index 1bbb74b07..847d40c94 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD13/USD13.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:27:25 UTC 2008 modified by jDAL - Thu Oct 09 11:32:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD14/USD14.xml index efc77264d..131585025 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD14/USD14.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:28:14 UTC 2008 modified by jDAL - Thu Oct 09 11:32:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD15/USD15.xml index df5dcda08..057bb192b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD15/USD15.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:29:06 UTC 2008 modified by jDAL - Thu Oct 09 11:32:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD01/USD01.xml index 502e6aefd..20269143b 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD01/USD01.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:19:57 UTC 2008 modified by jDAL - Thu Oct 09 11:32:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD02/USD02.xml index 4fead851a..0b3865f27 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD02/USD02.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:20:13 UTC 2008 modified by jDAL - Thu Oct 09 11:32:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD03/USD03.xml index 10917d923..bc5304925 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD03/USD03.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:20:36 UTC 2008 modified by jDAL - Thu Oct 09 11:32:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD04/USD04.xml index 3f06ef0fe..2fbe458de 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD04/USD04.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:21:00 UTC 2008 modified by jDAL - Thu Oct 09 11:32:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD05/USD05.xml index c0c727696..1bf6938bb 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD05/USD05.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:21:24 UTC 2008 modified by jDAL - Thu Oct 09 11:32:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD06/USD06.xml index 9780f9e25..f094814db 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD06/USD06.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:21:55 UTC 2008 modified by jDAL - Thu Oct 09 11:32:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD07/USD07.xml index 9c624883b..440f1ac47 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD07/USD07.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:22:40 UTC 2008 modified by jDAL - Thu Oct 09 11:32:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD08/USD08.xml index 8c23b06fa..291dc8239 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD08/USD08.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:23:31 UTC 2008 modified by jDAL - Thu Oct 09 11:32:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD09/USD09.xml index a6cf4d6cb..877773f8f 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD09/USD09.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:24:16 UTC 2008 modified by jDAL - Thu Oct 09 11:32:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD10/USD10.xml index 5c7d8a0e5..310a8a6b3 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD10/USD10.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:25:00 UTC 2008 modified by jDAL - Thu Oct 09 11:32:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD11/USD11.xml index 102dd5b4d..f5989f625 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD11/USD11.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:25:49 UTC 2008 modified by jDAL - Thu Oct 09 11:32:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD12/USD12.xml index cb94e2082..be73aeec1 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD12/USD12.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:26:37 UTC 2008 modified by jDAL - Thu Oct 09 11:32:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD13/USD13.xml index 0633ab639..3683cb304 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD13/USD13.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:27:25 UTC 2008 modified by jDAL - Thu Oct 09 11:32:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD14/USD14.xml index f884d7410..698263a89 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD14/USD14.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:28:14 UTC 2008 modified by jDAL - Thu Oct 09 11:32:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD15/USD15.xml index a0f12fc2d..d6775efc1 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD15/USD15.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:29:07 UTC 2008 modified by jDAL - Thu Oct 09 11:32:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD07/USD07.xml index df2383373..4366025f0 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD07/USD07.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:22:41 UTC 2008 modified by jDAL - Thu Oct 09 11:32:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD08/USD08.xml index e8eee7bab..98385bbce 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD08/USD08.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:23:31 UTC 2008 modified by jDAL - Thu Oct 09 11:32:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD09/USD09.xml index 71fbc2488..c76b5cd8d 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD09/USD09.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:24:16 UTC 2008 modified by jDAL - Thu Oct 09 11:32:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD10/USD10.xml index 3c18d9d47..6292aa4c3 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD10/USD10.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:25:00 UTC 2008 modified by jDAL - Thu Oct 09 11:32:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml index 823d3e603..88321e110 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:25:50 UTC 2008 modified by jDAL - Thu Oct 09 11:32:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD12/USD12.xml index a35df4168..d4238772e 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD12/USD12.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:26:38 UTC 2008 modified by jDAL - Thu Oct 09 11:32:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD13/USD13.xml index 4acb38a94..e5b06b1ce 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD13/USD13.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:27:26 UTC 2008 modified by jDAL - Thu Oct 09 11:32:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD14/USD14.xml index bd3853f09..dcd7b7a0e 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD14/USD14.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:28:15 UTC 2008 modified by jDAL - Thu Oct 09 11:32:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD15/USD15.xml index 4ed2472a3..f6a3c6972 100644 --- a/SRT/CDB/alma/AS/SECTOR04/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD15/USD15.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:29:07 UTC 2008 modified by jDAL - Thu Oct 09 11:32:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD03/USD03.xml index b74a0f240..a222c2bce 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD03/USD03.xml @@ -71,8 +71,9 @@ - Mon Oct 06 09:27:45 UTC 2008 modified by jDAL - Thu Oct 09 09:20:36 UTC 2008 modified by jDAL - Thu Oct 09 11:32:42 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:16 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD04/USD04.xml index 8d99fea09..b4395fca5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD04/USD04.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:21:00 UTC 2008 modified by jDAL - Thu Oct 09 11:32:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD05/USD05.xml index b7aa2182a..605427a7d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD05/USD05.xml @@ -68,8 +68,10 @@ - Mon Oct 06 09:28:35 UTC 2008 modified by jDAL - Thu Oct 09 09:21:24 UTC 2008 modified by jDAL - Thu Oct 09 11:32:43 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:40 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD06/USD06.xml index 8fd0c3172..c6f779569 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD06/USD06.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:28:59 UTC 2008 modified by jDAL - Thu Oct 09 09:21:55 UTC 2008 modified by jDAL - Thu Oct 09 11:32:44 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:20 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD07/USD07.xml index d98728352..46c45c76f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD07/USD07.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:29:38 UTC 2008 modified by jDAL - Thu Oct 09 09:22:41 UTC 2008 modified by jDAL - Thu Oct 09 11:32:44 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:44 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:42 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:09 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD08/USD08.xml index f1ca60d09..0ef77977a 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD08/USD08.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:23:32 UTC 2008 modified by jDAL - Thu Oct 09 11:32:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD09/USD09.xml index 3cc03a379..5d4ed3da9 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD09/USD09.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:24:16 UTC 2008 modified by jDAL - Thu Oct 09 11:32:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD10/USD10.xml index 33ae10371..435df5a02 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD10/USD10.xml @@ -67,8 +67,12 @@ - Mon Oct 06 09:32:05 UTC 2008 modified by jDAL - Thu Oct 09 09:25:01 UTC 2008 modified by jDAL - Thu Oct 09 11:32:45 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:48 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:45 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:12 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD11/USD11.xml index 95090b22f..873077238 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD11/USD11.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:32:57 UTC 2008 modified by jDAL - Thu Oct 09 09:25:51 UTC 2008 modified by jDAL - Thu Oct 09 11:32:46 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:47 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:26 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD12/USD12.xml index 32360a320..273c72dd2 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD12/USD12.xml @@ -66,8 +66,9 @@ - Mon Oct 06 09:33:45 UTC 2008 modified by jDAL - Thu Oct 09 09:26:38 UTC 2008 modified by jDAL - Thu Oct 09 11:32:46 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:27 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD13/USD13.xml index ba031b43b..2b4791a11 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD13/USD13.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:34:38 UTC 2008 modified by jDAL - Thu Oct 09 09:27:26 UTC 2008 modified by jDAL - Thu Oct 09 11:32:47 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD14/USD14.xml index 59c8eb04b..72680a987 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD14/USD14.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:35:25 UTC 2008 modified by jDAL - Thu Oct 09 09:28:15 UTC 2008 modified by jDAL - Thu Oct 09 11:32:47 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:50 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD15/USD15.xml index 6253a97f0..1cc0e6b2b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD15/USD15.xml @@ -66,8 +66,11 @@ - Mon Oct 06 09:36:19 UTC 2008 modified by jDAL - Thu Oct 09 09:29:08 UTC 2008 modified by jDAL - Thu Oct 09 11:32:48 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:55 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:30 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD07/USD07.xml index f6b50a72d..ef54fe45d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD07/USD07.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:22:42 UTC 2008 modified by jDAL - Thu Oct 09 11:32:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD08/USD08.xml index c688bbd04..8438f1e06 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD08/USD08.xml @@ -67,8 +67,9 @@ - Mon Oct 06 09:30:29 UTC 2008 modified by jDAL - Thu Oct 09 09:23:32 UTC 2008 modified by jDAL - Thu Oct 09 11:32:49 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:34 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD09/USD09.xml index 703816630..6a39cd940 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD09/USD09.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:31:22 UTC 2008 modified by jDAL - Thu Oct 09 09:24:17 UTC 2008 modified by jDAL - Thu Oct 09 11:32:50 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:54 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:22 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:35 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD10/USD10.xml index 4a4be821e..0e42e3546 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD10/USD10.xml @@ -67,8 +67,10 @@ - Mon Oct 06 09:32:06 UTC 2008 modified by jDAL - Thu Oct 09 09:25:01 UTC 2008 modified by jDAL - Thu Oct 09 11:32:50 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:56 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:37 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD11/USD11.xml index 8e0e7d454..017608d70 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD11/USD11.xml @@ -67,8 +67,9 @@ - Mon Oct 06 09:32:57 UTC 2008 modified by jDAL - Thu Oct 09 09:25:51 UTC 2008 modified by jDAL - Thu Oct 09 11:32:51 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD12/USD12.xml index 7feefb631..ca6cdb43d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD12/USD12.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:26:39 UTC 2008 modified by jDAL - Thu Oct 09 11:32:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD13/USD13.xml index 8c7039801..5d0cf07d3 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD13/USD13.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:34:38 UTC 2008 modified by jDAL - Thu Oct 09 09:27:27 UTC 2008 modified by jDAL - Thu Oct 09 11:32:52 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:41 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD14/USD14.xml index 2d26e4755..e77a4bee7 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD14/USD14.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:35:26 UTC 2008 modified by jDAL - Thu Oct 09 09:28:16 UTC 2008 modified by jDAL - Thu Oct 09 11:32:52 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:00 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD15/USD15.xml index 7d0e19580..2cdc6ef21 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD15/USD15.xml @@ -66,8 +66,9 @@ - Mon Oct 06 09:36:19 UTC 2008 modified by jDAL - Thu Oct 09 09:29:08 UTC 2008 modified by jDAL - Thu Oct 09 11:32:53 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:02 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD01/USD01.xml index 7460607ed..88c2e4703 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD01/USD01.xml @@ -71,8 +71,9 @@ - Mon Oct 06 09:27:07 UTC 2008 modified by jDAL - Thu Oct 09 09:19:58 UTC 2008 modified by jDAL - Thu Oct 09 11:32:53 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:33 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD02/USD02.xml index 09e0b486d..e5e64d142 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD02/USD02.xml @@ -68,8 +68,10 @@ - Mon Oct 06 09:27:21 UTC 2008 modified by jDAL - Thu Oct 09 09:20:13 UTC 2008 modified by jDAL - Thu Oct 09 11:32:54 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:35 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:46 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD03/USD03.xml index 7530f005c..fd55d989c 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD03/USD03.xml @@ -68,8 +68,11 @@ - Mon Oct 06 09:27:45 UTC 2008 modified by jDAL - Thu Oct 09 09:20:37 UTC 2008 modified by jDAL - Thu Oct 09 11:32:54 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:12 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:36 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD04/USD04.xml index 6db2653a8..2cf1ee6b5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD04/USD04.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:21:01 UTC 2008 modified by jDAL - Thu Oct 09 11:32:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD05/USD05.xml index 41922997e..753ee66c5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD05/USD05.xml @@ -69,7 +69,7 @@ - Thu Oct 09 09:21:25 UTC 2008 modified by jDAL - Thu Oct 09 11:32:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD06/USD06.xml index 8a8bd470b..1ad5d4d5f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD06/USD06.xml @@ -67,8 +67,9 @@ - Mon Oct 06 09:29:00 UTC 2008 modified by jDAL - Thu Oct 09 09:21:56 UTC 2008 modified by jDAL - Thu Oct 09 11:32:56 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD07/USD07.xml index 54035a171..0e2a24936 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD07/USD07.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:29:39 UTC 2008 modified by jDAL - Thu Oct 09 09:22:42 UTC 2008 modified by jDAL - Thu Oct 09 11:32:56 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:21 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:13 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD08/USD08.xml index 833415613..10da369bd 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD08/USD08.xml @@ -67,8 +67,9 @@ - Mon Oct 06 09:30:30 UTC 2008 modified by jDAL - Thu Oct 09 09:23:33 UTC 2008 modified by jDAL - Thu Oct 09 11:32:57 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD09/USD09.xml index 8215cf321..08d9b9cfb 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD09/USD09.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:24:18 UTC 2008 modified by jDAL - Thu Oct 09 11:32:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD10/USD10.xml index 88f2ae252..b028df313 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD10/USD10.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:25:02 UTC 2008 modified by jDAL - Thu Oct 09 11:32:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD11/USD11.xml index c9a9d3be3..f99926fc0 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD11/USD11.xml @@ -67,7 +67,7 @@ - Thu Oct 09 09:25:52 UTC 2008 modified by jDAL - Thu Oct 09 11:32:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD12/USD12.xml index 3b95d90af..74b1afc2e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD12/USD12.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:26:39 UTC 2008 modified by jDAL - Thu Oct 09 11:32:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD13/USD13.xml index d03300a8c..5f97b40d4 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD13/USD13.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:27:27 UTC 2008 modified by jDAL - Thu Oct 09 11:32:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD14/USD14.xml index 0b31db9be..5a8b9e80a 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD14/USD14.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:28:16 UTC 2008 modified by jDAL - Thu Oct 09 11:33:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD15/USD15.xml index 1929d477f..d21715468 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD15/USD15.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:29:09 UTC 2008 modified by jDAL - Thu Oct 09 11:33:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD07/USD07.xml index 9fd604f18..70e3d7703 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD07/USD07.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:22:43 UTC 2008 modified by jDAL - Thu Oct 09 11:33:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD08/USD08.xml index fc96b95fc..5223be83f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD08/USD08.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:23:33 UTC 2008 modified by jDAL - Thu Oct 09 11:33:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD09/USD09.xml index fcfa99730..3dce914a5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD09/USD09.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:19 UTC 2008 modified by jDAL - Thu Oct 09 11:33:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD10/USD10.xml index ef1ae03bb..c5e10028c 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD10/USD10.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:02 UTC 2008 modified by jDAL - Thu Oct 09 11:33:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD11/USD11.xml index f11cd1b10..99e8ddedd 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD11/USD11.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:52 UTC 2008 modified by jDAL - Thu Oct 09 11:33:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD12/USD12.xml index 04a715364..ee7f63617 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD12/USD12.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:26:40 UTC 2008 modified by jDAL - Thu Oct 09 11:33:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD13/USD13.xml index b2febde88..6f90c4e08 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD13/USD13.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:27:28 UTC 2008 modified by jDAL - Thu Oct 09 11:33:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD14/USD14.xml index 53689661a..502563878 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD14/USD14.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:28:17 UTC 2008 modified by jDAL - Thu Oct 09 11:33:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD15/USD15.xml index 6cecad02f..fada36e5f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD15/USD15.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:29:09 UTC 2008 modified by jDAL - Thu Oct 09 11:33:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD03/USD03.xml index 37866c1c6..12e919f75 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD03/USD03.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:20:37 UTC 2008 modified by jDAL - Thu Oct 09 11:33:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD04/USD04.xml index cd24f47f2..f01fdb6b4 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD04/USD04.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:21:01 UTC 2008 modified by jDAL - Thu Oct 09 11:33:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD05/USD05.xml index 69407944e..79fb2991e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD05/USD05.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:21:25 UTC 2008 modified by jDAL - Thu Oct 09 11:33:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD06/USD06.xml index b8164c242..80062efea 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD06/USD06.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:21:56 UTC 2008 modified by jDAL - Thu Oct 09 11:33:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD07/USD07.xml index eddf85a23..8de029aac 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD07/USD07.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:22:44 UTC 2008 modified by jDAL - Thu Oct 09 11:33:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD08/USD08.xml index 62f640743..4a7ab0c22 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD08/USD08.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:23:34 UTC 2008 modified by jDAL - Thu Oct 09 11:33:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD09/USD09.xml index eb1c8b1a1..a24e7af68 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD09/USD09.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:24:19 UTC 2008 modified by jDAL - Thu Oct 09 11:33:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD10/USD10.xml index 91cab2e9c..ccf8f250e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD10/USD10.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:25:03 UTC 2008 modified by jDAL - Thu Oct 09 11:33:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD11/USD11.xml index 42ac6148a..e1664e200 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD11/USD11.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:25:53 UTC 2008 modified by jDAL - Thu Oct 09 11:33:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD12/USD12.xml index f1d4550ef..8a5c4d731 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD12/USD12.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:26:41 UTC 2008 modified by jDAL - Thu Oct 09 11:33:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD13/USD13.xml index d5d0b330d..2e1e03d09 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD13/USD13.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:27:28 UTC 2008 modified by jDAL - Thu Oct 09 11:33:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD14/USD14.xml index 64125fb20..47c34e8ce 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD14/USD14.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:28:18 UTC 2008 modified by jDAL - Thu Oct 09 11:33:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD15/USD15.xml index a5e3d2a9e..59e13d297 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD15/USD15.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:29:10 UTC 2008 modified by jDAL - Thu Oct 09 11:33:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD07/USD07.xml index c1034367d..d0d297f16 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD07/USD07.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:22:44 UTC 2008 modified by jDAL - Thu Oct 09 11:33:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD08/USD08.xml index 768700e10..37f638541 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD08/USD08.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:23:35 UTC 2008 modified by jDAL - Thu Oct 09 11:33:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD09/USD09.xml index 035dd68fa..f35bbc369 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD09/USD09.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:24:20 UTC 2008 modified by jDAL - Thu Oct 09 11:33:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD10/USD10.xml index a286e8aec..b5f7def56 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD10/USD10.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:25:03 UTC 2008 modified by jDAL - Thu Oct 09 11:33:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD11/USD11.xml index a0a6e95bc..d7460aeb4 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD11/USD11.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:25:53 UTC 2008 modified by jDAL - Thu Oct 09 11:33:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD12/USD12.xml index c7809fa48..3433c6818 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD12/USD12.xml @@ -60,7 +60,7 @@ - Thu Oct 09 09:26:41 UTC 2008 modified by jDAL - Thu Oct 09 11:33:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD13/USD13.xml index 0488a9b95..c6a8a74d9 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD13/USD13.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:27:29 UTC 2008 modified by jDAL - Thu Oct 09 11:33:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD14/USD14.xml index da89d55e0..8840ce33b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD14/USD14.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:28:18 UTC 2008 modified by jDAL - Thu Oct 09 11:33:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD15/USD15.xml index 5d654f392..c00a0b0ec 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD15/USD15.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:29:10 UTC 2008 modified by jDAL - Thu Oct 09 11:33:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD01/USD01.xml index e992723a7..3bb5a4d17 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD01/USD01.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:19:59 UTC 2008 modified by jDAL - Thu Oct 09 11:33:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD02/USD02.xml index 5b57ba2c5..bc45afa35 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD02/USD02.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:20:14 UTC 2008 modified by jDAL - Thu Oct 09 11:33:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD03/USD03.xml index 16ba42781..68252f11e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD03/USD03.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:20:38 UTC 2008 modified by jDAL - Thu Oct 09 11:33:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD04/USD04.xml index 89ffb06e1..ec3d2e322 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD04/USD04.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:21:01 UTC 2008 modified by jDAL - Thu Oct 09 11:33:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD05/USD05.xml index d75d0870f..8b4717b7b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD05/USD05.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:21:25 UTC 2008 modified by jDAL - Thu Oct 09 11:33:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD06/USD06.xml index 28760b560..5f3edcfec 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD06/USD06.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:21:56 UTC 2008 modified by jDAL - Thu Oct 09 11:33:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD07/USD07.xml index dd37ebaec..b34cc34a7 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD07/USD07.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:22:45 UTC 2008 modified by jDAL - Thu Oct 09 11:33:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD08/USD08.xml index 92a437214..1abc9b273 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD08/USD08.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:23:35 UTC 2008 modified by jDAL - Thu Oct 09 11:33:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD09/USD09.xml index da53cc623..3ce8552c0 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD09/USD09.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:24:20 UTC 2008 modified by jDAL - Thu Oct 09 11:33:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD10/USD10.xml index cf3fae680..172c8a8c5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD10/USD10.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:25:04 UTC 2008 modified by jDAL - Thu Oct 09 11:33:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD11/USD11.xml index f77dc4f2e..27d776098 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD11/USD11.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:25:54 UTC 2008 modified by jDAL - Thu Oct 09 11:33:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD12/USD12.xml index 41844759b..05deac4d8 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD12/USD12.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:26:42 UTC 2008 modified by jDAL - Thu Oct 09 11:33:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD13/USD13.xml index 8c269cf2e..98ae59eba 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD13/USD13.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:27:29 UTC 2008 modified by jDAL - Thu Oct 09 11:33:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD14/USD14.xml index 490511e86..17fce05bb 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD14/USD14.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:28:19 UTC 2008 modified by jDAL - Thu Oct 09 11:33:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD15/USD15.xml index e00d4bf75..622e93d83 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD15/USD15.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:29:11 UTC 2008 modified by jDAL - Thu Oct 09 11:33:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD07/USD07.xml index 679ac5e35..b79dfa5d7 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD07/USD07.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:22:45 UTC 2008 modified by jDAL - Thu Oct 09 11:33:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD08/USD08.xml index 51f7b214e..29403944e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD08/USD08.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:23:36 UTC 2008 modified by jDAL - Thu Oct 09 11:33:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD09/USD09.xml index 8c8b8007b..dd9847124 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD09/USD09.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:24:21 UTC 2008 modified by jDAL - Thu Oct 09 11:33:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD10/USD10.xml index 1d64a692b..e18e8a0d6 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD10/USD10.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:25:04 UTC 2008 modified by jDAL - Thu Oct 09 11:33:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD11/USD11.xml index 172075590..18584e6b3 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD11/USD11.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:25:54 UTC 2008 modified by jDAL - Thu Oct 09 11:33:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD12/USD12.xml index c705f373c..435afa948 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD12/USD12.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:26:42 UTC 2008 modified by jDAL - Thu Oct 09 11:33:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD13/USD13.xml index 36c3150d9..3895f3794 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD13/USD13.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:30 UTC 2008 modified by jDAL - Thu Oct 09 11:33:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD14/USD14.xml index a9e671cfa..bf1752c95 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD14/USD14.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:28:19 UTC 2008 modified by jDAL - Thu Oct 09 11:33:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD15/USD15.xml index 3f8ced166..4c0bcf3b5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD15/USD15.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:29:11 UTC 2008 modified by jDAL - Thu Oct 09 11:33:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD03/USD03.xml index 88a6dba69..94daf080d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD03/USD03.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:20:39 UTC 2008 modified by jDAL - Thu Oct 09 11:33:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD04/USD04.xml index e139e4710..26a534be1 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD04/USD04.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:21:02 UTC 2008 modified by jDAL - Thu Oct 09 11:33:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD05/USD05.xml index 13b19e0f8..f70b0e883 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD05/USD05.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:21:26 UTC 2008 modified by jDAL - Thu Oct 09 11:33:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD06/USD06.xml index 343f96f1e..03897fac4 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD06/USD06.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:21:57 UTC 2008 modified by jDAL - Thu Oct 09 11:33:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD07/USD07.xml index e2c6809cf..1a7e033b5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD07/USD07.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:22:46 UTC 2008 modified by jDAL - Thu Oct 09 11:33:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD08/USD08.xml index 1a4cc5387..0b10e21c5 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD08/USD08.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:23:36 UTC 2008 modified by jDAL - Thu Oct 09 11:33:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD09/USD09.xml index 24392a13d..1eb6f5dfa 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD09/USD09.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:24:21 UTC 2008 modified by jDAL - Thu Oct 09 11:33:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD10/USD10.xml index 5c75a37b2..84ed443b3 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD10/USD10.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:25:05 UTC 2008 modified by jDAL - Thu Oct 09 11:33:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD11/USD11.xml index 47573867a..d103e619d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD11/USD11.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:25:55 UTC 2008 modified by jDAL - Thu Oct 09 11:33:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD12/USD12.xml index 898a76101..ffbdb9336 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD12/USD12.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:26:43 UTC 2008 modified by jDAL - Thu Oct 09 11:33:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD13/USD13.xml index 1e70c3db1..f150c391f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD13/USD13.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:27:30 UTC 2008 modified by jDAL - Thu Oct 09 11:33:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD14/USD14.xml index 6fe69f7af..050d9ae4d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD14/USD14.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:28:20 UTC 2008 modified by jDAL - Thu Oct 09 11:33:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD15/USD15.xml index 6e1f2c8f1..6ad30fc07 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD15/USD15.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:29:12 UTC 2008 modified by jDAL - Thu Oct 09 11:33:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD07/USD07.xml index ebafac2ca..85960e9dd 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD07/USD07.xml @@ -51,7 +51,7 @@ - Mon Oct 06 09:29:42 UTC 2008 modified by jDAL - Thu Oct 09 11:33:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD08/USD08.xml index ab7f068a3..02059dbea 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD08/USD08.xml @@ -55,7 +55,7 @@ - Mon Oct 06 09:30:33 UTC 2008 modified by jDAL - Thu Oct 09 11:33:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD09/USD09.xml index 81481fd0f..dab194cf9 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD09/USD09.xml @@ -56,7 +56,7 @@ - Mon Oct 06 09:31:26 UTC 2008 modified by jDAL - Thu Oct 09 11:33:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD10/USD10.xml index abb56e4f8..71a028433 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD10/USD10.xml @@ -56,7 +56,7 @@ - Mon Oct 06 09:32:10 UTC 2008 modified by jDAL - Thu Oct 09 11:33:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD11/USD11.xml index 5994e715f..ef170de3c 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD11/USD11.xml @@ -56,7 +56,7 @@ - Mon Oct 06 09:33:01 UTC 2008 modified by jDAL - Thu Oct 09 11:33:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD12/USD12.xml index 5797150b2..d22a97fac 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD12/USD12.xml @@ -55,7 +55,7 @@ - Mon Oct 06 09:33:49 UTC 2008 modified by jDAL - Thu Oct 09 11:33:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD13/USD13.xml index 457cf2ab4..974fd5b3e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD13/USD13.xml @@ -54,7 +54,7 @@ - Mon Oct 06 09:34:42 UTC 2008 modified by jDAL - Thu Oct 09 11:33:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD14/USD14.xml index f8f2ba011..4d32de7af 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD14/USD14.xml @@ -54,7 +54,7 @@ - Mon Oct 06 09:35:33 UTC 2008 modified by jDAL - Thu Oct 09 11:33:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD15/USD15.xml index 4cecb89e1..3dc1b7b6b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD15/USD15.xml @@ -55,7 +55,7 @@ - Mon Oct 06 09:36:23 UTC 2008 modified by jDAL - Thu Oct 09 11:33:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD01/USD01.xml index 72176fca1..0cc8f8553 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD01/USD01.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:19:59 UTC 2008 modified by jDAL - Thu Oct 09 11:33:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD02/USD02.xml index bc8602d80..e87fdf9a9 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD02/USD02.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:20:14 UTC 2008 modified by jDAL - Thu Oct 09 11:33:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD03/USD03.xml index a8cd19f93..e9559e936 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD03/USD03.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:20:39 UTC 2008 modified by jDAL - Thu Oct 09 11:33:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD04/USD04.xml index 5ab04165a..38910f3f3 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD04/USD04.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:21:02 UTC 2008 modified by jDAL - Thu Oct 09 11:33:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD05/USD05.xml index 83ba8762d..a7b13be58 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD05/USD05.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:21:26 UTC 2008 modified by jDAL - Thu Oct 09 11:33:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD06/USD06.xml index 3d3755dcb..e2bece010 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD06/USD06.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:21:58 UTC 2008 modified by jDAL - Thu Oct 09 11:33:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD07/USD07.xml index dd413ff9e..6db44e814 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD07/USD07.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:22:47 UTC 2008 modified by jDAL - Thu Oct 09 11:33:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD08/USD08.xml index 8432fda6b..5281b8379 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD08/USD08.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:23:37 UTC 2008 modified by jDAL - Thu Oct 09 11:33:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD09/USD09.xml index 54c1792ab..b14e7afe7 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD09/USD09.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:24:22 UTC 2008 modified by jDAL - Thu Oct 09 11:33:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD10/USD10.xml index cc6c96b68..f0ceefd78 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD10/USD10.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:25:05 UTC 2008 modified by jDAL - Thu Oct 09 11:33:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD11/USD11.xml index a06b063d8..c0d30d62a 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD11/USD11.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:25:56 UTC 2008 modified by jDAL - Thu Oct 09 11:33:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD12/USD12.xml index f8a1353ca..3d81393b6 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD12/USD12.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:26:43 UTC 2008 modified by jDAL - Thu Oct 09 11:33:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD13/USD13.xml index 8e1904fdb..ed5f0463b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD13/USD13.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:31 UTC 2008 modified by jDAL - Thu Oct 09 11:33:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD14/USD14.xml index b654b4ab7..307a075b3 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD14/USD14.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:28:20 UTC 2008 modified by jDAL - Thu Oct 09 11:33:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD15/USD15.xml index 6346ffb89..af7bb315e 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD15/USD15.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:29:13 UTC 2008 modified by jDAL - Thu Oct 09 11:33:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD16/USD16.xml index 597c8f1db..96f6e0542 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN11/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD16/USD16.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:29:40 UTC 2008 modified by jDAL - Thu Oct 09 11:33:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD07/USD07.xml index 1d37d2a35..3e6e8da53 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD07/USD07.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:22:47 UTC 2008 modified by jDAL - Thu Oct 09 11:33:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD08/USD08.xml index 6ff1a4075..fd6e7eafe 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD08/USD08.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:23:37 UTC 2008 modified by jDAL - Thu Oct 09 11:33:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD09/USD09.xml index 348c0c9da..041419c1f 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD09/USD09.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:24:22 UTC 2008 modified by jDAL - Thu Oct 09 11:33:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD10/USD10.xml index a1728fb6f..b2cca04de 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD10/USD10.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:25:06 UTC 2008 modified by jDAL - Thu Oct 09 11:33:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD11/USD11.xml index 7ef9dad7d..2ca857e79 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD11/USD11.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:25:56 UTC 2008 modified by jDAL - Thu Oct 09 11:33:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD12/USD12.xml index b21114575..b2f43b13d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD12/USD12.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:26:44 UTC 2008 modified by jDAL - Thu Oct 09 11:33:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD13/USD13.xml index b0e0ab424..d47119e1b 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD13/USD13.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:27:32 UTC 2008 modified by jDAL - Thu Oct 09 11:33:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD14/USD14.xml index 86d2e360f..8af742d2d 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD14/USD14.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:28:21 UTC 2008 modified by jDAL - Thu Oct 09 11:33:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD15/USD15.xml index 42ee6bcbc..3b2532fb0 100644 --- a/SRT/CDB/alma/AS/SECTOR05/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD15/USD15.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:29:13 UTC 2008 modified by jDAL - Thu Oct 09 11:33:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD03/USD03.xml index 75159f283..e6ee8bf93 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD03/USD03.xml @@ -74,7 +74,7 @@ - Thu Oct 09 09:20:40 UTC 2008 modified by jDAL - Thu Oct 09 11:33:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD04/USD04.xml index 84e59f1c6..152415fb4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD04/USD04.xml @@ -70,8 +70,11 @@ - Mon Oct 06 09:28:11 UTC 2008 modified by jDAL - Thu Oct 09 09:21:03 UTC 2008 modified by jDAL - Thu Oct 09 11:33:58 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:39 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:05 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD05/USD05.xml index 0d1870096..86032e9c6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD05/USD05.xml @@ -72,8 +72,12 @@ - Mon Oct 06 09:28:37 UTC 2008 modified by jDAL - Thu Oct 09 09:21:27 UTC 2008 modified by jDAL - Thu Oct 09 11:33:58 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:40 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:06 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:18 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD06/USD06.xml index d036a4f71..d5173c3fe 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD06/USD06.xml @@ -71,8 +71,11 @@ - Mon Oct 06 09:29:02 UTC 2008 modified by jDAL - Thu Oct 09 09:21:58 UTC 2008 modified by jDAL - Thu Oct 09 11:33:59 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:43 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD07/USD07.xml index ef650def8..92144dd6e 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD07/USD07.xml @@ -71,8 +71,10 @@ - Mon Oct 06 09:29:44 UTC 2008 modified by jDAL - Thu Oct 09 09:22:48 UTC 2008 modified by jDAL - Thu Oct 09 11:33:59 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:42 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:20 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD08/USD08.xml index a865226ad..d22e01271 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD08/USD08.xml @@ -71,8 +71,9 @@ - Mon Oct 06 09:30:36 UTC 2008 modified by jDAL - Thu Oct 09 09:23:37 UTC 2008 modified by jDAL - Thu Oct 09 11:34:00 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:46 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD09/USD09.xml index 4ea1994ca..663fc2fc6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD09/USD09.xml @@ -71,8 +71,11 @@ - Mon Oct 06 09:31:27 UTC 2008 modified by jDAL - Thu Oct 09 09:24:23 UTC 2008 modified by jDAL - Thu Oct 09 11:34:00 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:48 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:44 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:09 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD10/USD10.xml index 0f70d4d7b..880919724 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD10/USD10.xml @@ -71,8 +71,11 @@ - Mon Oct 06 09:32:11 UTC 2008 modified by jDAL - Thu Oct 09 09:25:06 UTC 2008 modified by jDAL - Thu Oct 09 11:34:01 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:45 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:24 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD11/USD11.xml index 1c33adcab..eb9af50a3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD11/USD11.xml @@ -71,8 +71,10 @@ - Mon Oct 06 09:33:02 UTC 2008 modified by jDAL - Thu Oct 09 09:25:57 UTC 2008 modified by jDAL - Thu Oct 09 11:34:01 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:51 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:10 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD12/USD12.xml index 5dd7b1ddc..d77c961b4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD12/USD12.xml @@ -69,8 +69,9 @@ - Mon Oct 06 09:33:53 UTC 2008 modified by jDAL - Thu Oct 09 09:26:44 UTC 2008 modified by jDAL - Thu Oct 09 11:34:02 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD13/USD13.xml index 1116b6e7e..9a401be72 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD13/USD13.xml @@ -67,8 +67,11 @@ - Mon Oct 06 09:34:44 UTC 2008 modified by jDAL - Thu Oct 09 09:27:32 UTC 2008 modified by jDAL - Thu Oct 09 11:34:03 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:14 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:28 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD14/USD14.xml index c0d9e23e1..513245cbb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD14/USD14.xml @@ -67,8 +67,10 @@ - Mon Oct 06 09:35:35 UTC 2008 modified by jDAL - Thu Oct 09 09:28:21 UTC 2008 modified by jDAL - Thu Oct 09 11:34:03 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:30 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD15/USD15.xml index 3d817791c..86624ef6a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD15/USD15.xml @@ -68,7 +68,7 @@ - Thu Oct 09 09:29:14 UTC 2008 modified by jDAL - Thu Oct 09 11:34:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD17/USD17.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD17/USD17.xml index 1c5b3f5b2..0ee54d20f 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN01/USD17/USD17.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD17/USD17.xml @@ -66,8 +66,10 @@ - Mon Oct 06 08:36:50 UTC 2008 modified by jDAL - Thu Oct 09 09:29:43 UTC 2008 modified by jDAL - Thu Oct 09 11:34:02 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:53 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:11 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD07/USD07.xml index d7171d7a0..2eea2fa0a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD07/USD07.xml @@ -68,8 +68,10 @@ - Mon Oct 06 09:29:45 UTC 2008 modified by jDAL - Thu Oct 09 09:22:50 UTC 2008 modified by jDAL - Thu Oct 09 11:34:05 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:00 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:33 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD08/USD08.xml index f4d52708d..df448d1da 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD08/USD08.xml @@ -68,8 +68,9 @@ - Mon Oct 06 09:30:36 UTC 2008 modified by jDAL - Thu Oct 09 09:23:38 UTC 2008 modified by jDAL - Thu Oct 09 11:34:05 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:02 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD09/USD09.xml index 73fc1be7d..ee4c88ff3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD09/USD09.xml @@ -69,8 +69,10 @@ - Mon Oct 06 09:31:28 UTC 2008 modified by jDAL - Thu Oct 09 09:24:23 UTC 2008 modified by jDAL - Thu Oct 09 11:34:06 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:21 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:36 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD10/USD10.xml index 6ba059275..e7db88ce8 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD10/USD10.xml @@ -68,8 +68,9 @@ - Mon Oct 06 09:32:14 UTC 2008 modified by jDAL - Thu Oct 09 09:25:07 UTC 2008 modified by jDAL - Thu Oct 09 11:34:06 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:38 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD11/USD11.xml index 72e71df47..886795027 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD11/USD11.xml @@ -68,8 +68,9 @@ - Mon Oct 06 09:33:03 UTC 2008 modified by jDAL - Thu Oct 09 09:25:57 UTC 2008 modified by jDAL - Thu Oct 09 11:34:07 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD12/USD12.xml index 1a5fdd045..89454925c 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD12/USD12.xml @@ -67,8 +67,9 @@ - Mon Oct 06 09:33:54 UTC 2008 modified by jDAL - Thu Oct 09 09:26:45 UTC 2008 modified by jDAL - Thu Oct 09 11:34:07 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD13/USD13.xml index c72bb1174..7bbf62d61 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD13/USD13.xml @@ -65,8 +65,11 @@ - Mon Oct 06 09:34:44 UTC 2008 modified by jDAL - Thu Oct 09 09:27:33 UTC 2008 modified by jDAL - Thu Oct 09 11:34:08 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:01 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:27 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:41 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD14/USD14.xml index a19ad1ee9..4bb2eadcd 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD14/USD14.xml @@ -65,8 +65,12 @@ - Mon Oct 06 09:35:35 UTC 2008 modified by jDAL - Thu Oct 09 09:28:22 UTC 2008 modified by jDAL - Thu Oct 09 11:34:08 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:12 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:03 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:28 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:43 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD15/USD15.xml index 7c89a3ec8..48b969b05 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD15/USD15.xml @@ -66,8 +66,11 @@ - Mon Oct 06 09:36:25 UTC 2008 modified by jDAL - Thu Oct 09 09:29:14 UTC 2008 modified by jDAL - Thu Oct 09 11:34:09 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:15 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:30 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:45 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD01/USD01.xml index cef1d88c2..c5821ae4d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD01/USD01.xml @@ -72,8 +72,9 @@ - Mon Oct 06 09:27:09 UTC 2008 modified by jDAL - Thu Oct 09 09:20:00 UTC 2008 modified by jDAL - Thu Oct 09 11:34:10 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:18 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD02/USD02.xml index 6a8588d71..a4880b1b1 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD02/USD02.xml @@ -66,8 +66,11 @@ - Mon Oct 06 09:27:22 UTC 2008 modified by jDAL - Thu Oct 09 09:20:14 UTC 2008 modified by jDAL - Thu Oct 09 11:34:10 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:20 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:49 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD03/USD03.xml index 67ce062a8..ceb9fa5a2 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD03/USD03.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:27:50 UTC 2008 modified by jDAL - Thu Oct 09 09:20:40 UTC 2008 modified by jDAL - Thu Oct 09 11:34:11 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:11 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD04/USD04.xml index c04aa2925..70ca1d6a4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD04/USD04.xml @@ -66,8 +66,9 @@ - Mon Oct 06 09:28:12 UTC 2008 modified by jDAL - Thu Oct 09 09:21:03 UTC 2008 modified by jDAL - Thu Oct 09 11:34:11 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:22 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD05/USD05.xml index 5c34486ae..3c48a68d0 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD05/USD05.xml @@ -66,8 +66,9 @@ - Mon Oct 06 09:28:38 UTC 2008 modified by jDAL - Thu Oct 09 09:21:28 UTC 2008 modified by jDAL - Thu Oct 09 11:34:12 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD06/USD06.xml index 19de7530f..4ce19e582 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD06/USD06.xml @@ -65,8 +65,10 @@ - Mon Oct 06 09:29:03 UTC 2008 modified by jDAL - Thu Oct 09 09:21:58 UTC 2008 modified by jDAL - Thu Oct 09 11:34:12 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:15 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD07/USD07.xml index 4381a0f6c..ffc675c54 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD07/USD07.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:22:50 UTC 2008 modified by jDAL - Thu Oct 09 11:34:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD08/USD08.xml index 0a503b117..2c8e5ab73 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD08/USD08.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:30:37 UTC 2008 modified by jDAL - Thu Oct 09 09:23:38 UTC 2008 modified by jDAL - Thu Oct 09 11:34:13 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD09/USD09.xml index f9ddbef45..cdf074c55 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD09/USD09.xml @@ -65,8 +65,9 @@ - Mon Oct 06 09:31:28 UTC 2008 modified by jDAL - Thu Oct 09 09:24:24 UTC 2008 modified by jDAL - Thu Oct 09 11:34:14 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD10/USD10.xml index 15bd77e2e..474924aae 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD10/USD10.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:25:07 UTC 2008 modified by jDAL - Thu Oct 09 11:34:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD11/USD11.xml index 039d5b148..c73b29431 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD11/USD11.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:25:58 UTC 2008 modified by jDAL - Thu Oct 09 11:34:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD12/USD12.xml index aad35ff52..dfd9b7c4d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD12/USD12.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:26:45 UTC 2008 modified by jDAL - Thu Oct 09 11:34:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD13/USD13.xml index 57c3bd3ba..bec90d405 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD13/USD13.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:27:34 UTC 2008 modified by jDAL - Thu Oct 09 11:34:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD14/USD14.xml index d234f3b35..b06144805 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD14/USD14.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:28:22 UTC 2008 modified by jDAL - Thu Oct 09 11:34:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD15/USD15.xml index 8452594c4..6eef28ac1 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD15/USD15.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:29:15 UTC 2008 modified by jDAL - Thu Oct 09 11:34:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD16/USD16.xml index 0af2ecffb..523ad67bc 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN03/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD16/USD16.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:29:40 UTC 2008 modified by jDAL - Thu Oct 09 11:34:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD07/USD07.xml index 1ad4fd062..ee5c97f2c 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD07/USD07.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:22:51 UTC 2008 modified by jDAL - Thu Oct 09 11:34:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD08/USD08.xml index bd50e65e5..bfd9151d7 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD08/USD08.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:23:39 UTC 2008 modified by jDAL - Thu Oct 09 11:34:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD09/USD09.xml index b5dcb4cc1..854801aee 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD09/USD09.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:24 UTC 2008 modified by jDAL - Thu Oct 09 11:34:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD10/USD10.xml index 173e0edb9..b0cc41d49 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD10/USD10.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:08 UTC 2008 modified by jDAL - Thu Oct 09 11:34:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD11/USD11.xml index 1634922da..7d2ba78fb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD11/USD11.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:58 UTC 2008 modified by jDAL - Thu Oct 09 11:34:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD12/USD12.xml index 98e2a4de8..5e0c44536 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD12/USD12.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:26:46 UTC 2008 modified by jDAL - Thu Oct 09 11:34:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD13/USD13.xml index 39980d9a2..80bbcc889 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD13/USD13.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:27:34 UTC 2008 modified by jDAL - Thu Oct 09 11:34:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD14/USD14.xml index eb46d8631..cc041ec3e 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD14/USD14.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:28:23 UTC 2008 modified by jDAL - Thu Oct 09 11:34:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD15/USD15.xml index 4b10bc054..4bc2722e6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD15/USD15.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:29:16 UTC 2008 modified by jDAL - Thu Oct 09 11:34:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD03/USD03.xml index 8fded99c1..88a353750 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD03/USD03.xml @@ -66,7 +66,7 @@ - Thu Oct 09 09:20:41 UTC 2008 modified by jDAL - Thu Oct 09 11:34:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD04/USD04.xml index 79fd99309..786fea4fe 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD04/USD04.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:21:04 UTC 2008 modified by jDAL - Thu Oct 09 11:34:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD05/USD05.xml index ef39150b2..123235216 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD05/USD05.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:21:28 UTC 2008 modified by jDAL - Thu Oct 09 11:34:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD06/USD06.xml index e0d7e596c..fbc5717a1 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD06/USD06.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:21:59 UTC 2008 modified by jDAL - Thu Oct 09 11:34:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD07/USD07.xml index 6512136f5..704653f6a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD07/USD07.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:22:51 UTC 2008 modified by jDAL - Thu Oct 09 11:34:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD08/USD08.xml index e6d979fbb..2f6cee4c5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD08/USD08.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:23:39 UTC 2008 modified by jDAL - Thu Oct 09 11:34:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD09/USD09.xml index 6597bf311..79eacfcfe 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD09/USD09.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:24:25 UTC 2008 modified by jDAL - Thu Oct 09 11:34:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD10/USD10.xml index 5d517242b..08e1cc4b0 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD10/USD10.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:08 UTC 2008 modified by jDAL - Thu Oct 09 11:34:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD11/USD11.xml index c06ee7c26..6346581e3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD11/USD11.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:59 UTC 2008 modified by jDAL - Thu Oct 09 11:34:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD12/USD12.xml index ef89e3bf0..1cf6d94aa 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD12/USD12.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:26:46 UTC 2008 modified by jDAL - Thu Oct 09 11:34:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD13/USD13.xml index 7b6971a65..9b3fb09f9 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD13/USD13.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:27:35 UTC 2008 modified by jDAL - Thu Oct 09 11:34:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD14/USD14.xml index fc0a0dc68..12cb144ee 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD14/USD14.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:28:24 UTC 2008 modified by jDAL - Thu Oct 09 11:34:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD15/USD15.xml index 3c8de5b27..06d0dc9d5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD15/USD15.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:29:16 UTC 2008 modified by jDAL - Thu Oct 09 11:34:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD07/USD07.xml index 312e6759e..b5c2d8130 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD07/USD07.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:22:52 UTC 2008 modified by jDAL - Thu Oct 09 11:34:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD08/USD08.xml index 05c6f9328..b78925bb1 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD08/USD08.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:23:40 UTC 2008 modified by jDAL - Thu Oct 09 11:34:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD09/USD09.xml index 5a503915d..cb4d268ec 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD09/USD09.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:24:25 UTC 2008 modified by jDAL - Thu Oct 09 11:34:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD10/USD10.xml index 55cde54f4..4596c329c 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD10/USD10.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:09 UTC 2008 modified by jDAL - Thu Oct 09 11:34:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD11/USD11.xml index d8276a2ea..a8022fb75 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD11/USD11.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:25:59 UTC 2008 modified by jDAL - Thu Oct 09 11:34:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD12/USD12.xml index 69f264359..78a58af33 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD12/USD12.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:26:47 UTC 2008 modified by jDAL - Thu Oct 09 11:34:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD13/USD13.xml index 862083923..6277f2ce5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD13/USD13.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:27:35 UTC 2008 modified by jDAL - Thu Oct 09 11:34:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD14/USD14.xml index e2cb92aa9..77f2738b7 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD14/USD14.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:28:24 UTC 2008 modified by jDAL - Thu Oct 09 11:34:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD15/USD15.xml index db240b50c..c4bca8153 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD15/USD15.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:29:17 UTC 2008 modified by jDAL - Thu Oct 09 11:34:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD01/USD01.xml index 7c491b4c3..73321a583 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD01/USD01.xml @@ -70,7 +70,7 @@ - Thu Oct 09 09:20:01 UTC 2008 modified by jDAL - Thu Oct 09 11:34:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD02/USD02.xml index 1a7a3785e..b61a22f40 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD02/USD02.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:20:15 UTC 2008 modified by jDAL - Thu Oct 09 11:34:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD03/USD03.xml index cddf76783..b0a3a2b4d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD03/USD03.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:20:41 UTC 2008 modified by jDAL - Thu Oct 09 11:34:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD04/USD04.xml index e0fd5c495..67d065ea7 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD04/USD04.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:21:04 UTC 2008 modified by jDAL - Thu Oct 09 11:34:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD05/USD05.xml index dc19eeb8e..68326e6fa 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD05/USD05.xml @@ -65,7 +65,7 @@ - Thu Oct 09 09:21:28 UTC 2008 modified by jDAL - Thu Oct 09 11:34:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD06/USD06.xml index 221b7f262..c6b87e5a7 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD06/USD06.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:21:59 UTC 2008 modified by jDAL - Thu Oct 09 11:34:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD07/USD07.xml index aa777f2bd..277a386fb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD07/USD07.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:22:52 UTC 2008 modified by jDAL - Thu Oct 09 11:34:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD08/USD08.xml index a603673f3..b0b662f5d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD08/USD08.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:23:40 UTC 2008 modified by jDAL - Thu Oct 09 11:34:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD09/USD09.xml index 10e6edd48..f297dc38b 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD09/USD09.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:26 UTC 2008 modified by jDAL - Thu Oct 09 11:34:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD10/USD10.xml index 3a63bd1c1..67e775f03 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD10/USD10.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:25:09 UTC 2008 modified by jDAL - Thu Oct 09 11:34:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD11/USD11.xml index 690a021a4..9c55d064f 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD11/USD11.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:26:00 UTC 2008 modified by jDAL - Thu Oct 09 11:34:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD12/USD12.xml index 36f4f4773..07a6ea8f6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD12/USD12.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:26:48 UTC 2008 modified by jDAL - Thu Oct 09 11:34:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD13/USD13.xml index 3a90d427b..fdb1400c6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD13/USD13.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:27:36 UTC 2008 modified by jDAL - Thu Oct 09 11:34:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD14/USD14.xml index f90411d60..cdff90e9b 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD14/USD14.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:28:25 UTC 2008 modified by jDAL - Thu Oct 09 11:34:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD15/USD15.xml index 79eeec2a7..ffc540361 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD15/USD15.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:29:17 UTC 2008 modified by jDAL - Thu Oct 09 11:34:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD07/USD07.xml index cda55261e..0d2d7f715 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD07/USD07.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:22:53 UTC 2008 modified by jDAL - Thu Oct 09 11:34:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD08/USD08.xml index 38336683a..67d742f3b 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD08/USD08.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:23:41 UTC 2008 modified by jDAL - Thu Oct 09 11:34:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD09/USD09.xml index 194b2d44f..d5de282a5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD09/USD09.xml @@ -63,7 +63,7 @@ - Thu Oct 09 09:24:26 UTC 2008 modified by jDAL - Thu Oct 09 11:34:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD10/USD10.xml index a21f4f0cb..812e1dd5d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD10/USD10.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:25:10 UTC 2008 modified by jDAL - Thu Oct 09 11:34:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD11/USD11.xml index dfc23f931..3f180d436 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD11/USD11.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:26:00 UTC 2008 modified by jDAL - Thu Oct 09 11:34:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD12/USD12.xml index cf649e6d6..d415491fe 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD12/USD12.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:26:48 UTC 2008 modified by jDAL - Thu Oct 09 11:34:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD13/USD13.xml index b51ec490f..1cc3022a4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD13/USD13.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:27:36 UTC 2008 modified by jDAL - Thu Oct 09 11:34:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD14/USD14.xml index 5ccf00279..9a80185db 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD14/USD14.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:28:25 UTC 2008 modified by jDAL - Thu Oct 09 11:34:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD15/USD15.xml index 2f89dcdbd..9487c9fbc 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD15/USD15.xml @@ -1,5 +1,5 @@ - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD03/USD03.xml index ac2f2998f..422182d87 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD03/USD03.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:20:42 UTC 2008 modified by jDAL - Thu Oct 09 11:34:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD04/USD04.xml index 261817f1f..38634a43f 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD04/USD04.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:05 UTC 2008 modified by jDAL - Thu Oct 09 11:34:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD05/USD05.xml index d22b57440..f171fca7b 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD05/USD05.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD06/USD06.xml index c5857412b..c8326e883 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD06/USD06.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:22:00 UTC 2008 modified by jDAL - Thu Oct 09 11:35:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD07/USD07.xml index 9f98946cf..318677190 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD07/USD07.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:22:54 UTC 2008 modified by jDAL - Thu Oct 09 11:35:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD08/USD08.xml index 9be58f671..65a4e3ccb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD08/USD08.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:41 UTC 2008 modified by jDAL - Thu Oct 09 11:35:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD09/USD09.xml index 09c930c6b..a9ee3f1e3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD09/USD09.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:24:27 UTC 2008 modified by jDAL - Thu Oct 09 11:35:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD10/USD10.xml index e3ab842e2..4284992ce 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD10/USD10.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:25:10 UTC 2008 modified by jDAL - Thu Oct 09 11:35:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD11/USD11.xml index 68fc0d59d..22d58a7c4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD11/USD11.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:26:01 UTC 2008 modified by jDAL - Thu Oct 09 11:35:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD12/USD12.xml index cf4649dfa..e21ee2c01 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD12/USD12.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:49 UTC 2008 modified by jDAL - Thu Oct 09 11:35:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD13/USD13.xml index 85d424c39..25f35f660 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD13/USD13.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:37 UTC 2008 modified by jDAL - Thu Oct 09 11:35:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD14/USD14.xml index 8a89d60c8..42d088987 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:26 UTC 2008 modified by jDAL - Thu Oct 09 11:35:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD15/USD15.xml index 5f72904db..d75745a9f 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD15/USD15.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:29:23 UTC 2008 modified by jDAL - Thu Oct 09 11:35:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD07/USD07.xml index 738665e51..4c23860ed 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD07/USD07.xml @@ -50,7 +50,7 @@ - Mon Oct 06 09:29:48 UTC 2008 modified by jDAL - Thu Oct 09 09:22:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD08/USD08.xml index fcf769c59..118869939 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD08/USD08.xml @@ -49,7 +49,7 @@ - Mon Oct 06 09:30:40 UTC 2008 modified by jDAL - Thu Oct 09 09:23:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD09/USD09.xml index f6e4a5098..18a1d75cb 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD09/USD09.xml @@ -48,7 +48,7 @@ - Mon Oct 06 09:31:31 UTC 2008 modified by jDAL - Thu Oct 09 09:24:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD10/USD10.xml index 1c41a12de..ce761160c 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD10/USD10.xml @@ -49,7 +49,7 @@ - Mon Oct 06 09:32:18 UTC 2008 modified by jDAL - Thu Oct 09 09:25:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD11/USD11.xml index 4e94076b7..fc1451e99 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD11/USD11.xml @@ -49,7 +49,7 @@ - Mon Oct 06 09:33:06 UTC 2008 modified by jDAL - Thu Oct 09 09:26:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD12/USD12.xml index cd9bc2a37..dd7571da1 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD12/USD12.xml @@ -48,7 +48,7 @@ - Mon Oct 06 09:34:00 UTC 2008 modified by jDAL - Thu Oct 09 09:26:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD13/USD13.xml index 28a3fcb58..f540805cf 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD13/USD13.xml @@ -47,7 +47,7 @@ - Mon Oct 06 09:34:48 UTC 2008 modified by jDAL - Thu Oct 09 09:27:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD14/USD14.xml index 7498b520e..79542f744 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD14/USD14.xml @@ -47,7 +47,7 @@ - Mon Oct 06 09:35:39 UTC 2008 modified by jDAL - Thu Oct 09 09:28:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD15/USD15.xml index 3706e1419..0de4989e3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD15/USD15.xml @@ -45,7 +45,7 @@ - Mon Oct 06 08:37:53 UTC 2008 modified by jDAL - Thu Oct 09 09:29:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD01/USD01.xml index 27337638e..3fec40260 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD01/USD01.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:20:02 UTC 2008 modified by jDAL - Thu Oct 09 11:35:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD02/USD02.xml index 4321a85f7..261459d97 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD02/USD02.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:15 UTC 2008 modified by jDAL - Thu Oct 09 11:35:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD03/USD03.xml index 07c37215e..7ebfd60d3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD03/USD03.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:42 UTC 2008 modified by jDAL - Thu Oct 09 11:35:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD04/USD04.xml index 1d6e8d466..518c9dc7a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD04/USD04.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:05 UTC 2008 modified by jDAL - Thu Oct 09 11:35:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD05/USD05.xml index 05b2f1df4..bbd6d79e0 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD05/USD05.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD06/USD06.xml index b9a5addad..b695ee06b 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD06/USD06.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:22:00 UTC 2008 modified by jDAL - Thu Oct 09 11:35:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD07/USD07.xml index 4ed778831..74f91cbb2 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD07/USD07.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:22:55 UTC 2008 modified by jDAL - Thu Oct 09 11:35:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD08/USD08.xml index ec1f1c40e..385aec85c 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD08/USD08.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:42 UTC 2008 modified by jDAL - Thu Oct 09 11:35:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD09/USD09.xml index 040e3700b..39c0e96f6 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD09/USD09.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:24:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD10/USD10.xml index d878c5df8..61d7385d7 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD10/USD10.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:25:11 UTC 2008 modified by jDAL - Thu Oct 09 11:35:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD11/USD11.xml index 97da6c984..0ab6ba194 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD11/USD11.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:26:02 UTC 2008 modified by jDAL - Thu Oct 09 11:35:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD12/USD12.xml index 7d31d838d..083c90cb5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD12/USD12.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:50 UTC 2008 modified by jDAL - Thu Oct 09 11:35:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD13/USD13.xml index e139c4251..f2aae916d 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD13/USD13.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:38 UTC 2008 modified by jDAL - Thu Oct 09 11:35:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD14/USD14.xml index d85446e02..cc726197a 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:27 UTC 2008 modified by jDAL - Thu Oct 09 11:35:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD15/USD15.xml index c99df61eb..6013be8d5 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD15/USD15.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:29:24 UTC 2008 modified by jDAL - Thu Oct 09 11:35:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD07/USD07.xml index 43ff0ca78..7dfe2d439 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD07/USD07.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:22:55 UTC 2008 modified by jDAL - Thu Oct 09 11:35:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD08/USD08.xml index ef57e7ad3..b7b65ebc4 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD08/USD08.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:23:43 UTC 2008 modified by jDAL - Thu Oct 09 11:35:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD09/USD09.xml index 6a6beae43..32139e771 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD09/USD09.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:24:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD10/USD10.xml index 48bdd0c18..21747c810 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD10/USD10.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:25:12 UTC 2008 modified by jDAL - Thu Oct 09 11:35:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD11/USD11.xml index 2a5a9cdeb..ed863c625 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD11/USD11.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:26:02 UTC 2008 modified by jDAL - Thu Oct 09 11:35:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD12/USD12.xml index 0f8be62ca..677329cdd 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD12/USD12.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:26:51 UTC 2008 modified by jDAL - Thu Oct 09 11:35:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD13/USD13.xml index 638f48b73..1a99107b3 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD13/USD13.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:27:38 UTC 2008 modified by jDAL - Thu Oct 09 11:35:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD14/USD14.xml index 2921aed15..028903053 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD14/USD14.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:28:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD15/USD15.xml index cdde5a37a..bcdf67b17 100644 --- a/SRT/CDB/alma/AS/SECTOR06/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD15/USD15.xml @@ -43,7 +43,7 @@ - Thu Oct 09 09:29:25 UTC 2008 modified by jDAL - Thu Oct 09 11:35:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD03/USD03.xml index f8f17d0a3..f0fa1f810 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD03/USD03.xml @@ -64,7 +64,7 @@ - Thu Oct 09 09:20:43 UTC 2008 modified by jDAL - Thu Oct 09 11:35:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD04/USD04.xml index fe268789f..df88ca076 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD04/USD04.xml @@ -61,8 +61,11 @@ - Mon Oct 06 09:28:14 UTC 2008 modified by jDAL - Thu Oct 09 09:21:06 UTC 2008 modified by jDAL - Thu Oct 09 11:35:21 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:40 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:39 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:05 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD05/USD05.xml index b68398bd9..43aa047f9 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD05/USD05.xml @@ -61,8 +61,9 @@ - Mon Oct 06 09:28:40 UTC 2008 modified by jDAL - Thu Oct 09 09:21:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:21 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:07 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD06/USD06.xml index 6287c818c..fab9a30d6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD06/USD06.xml @@ -60,8 +60,12 @@ - Mon Oct 06 09:29:05 UTC 2008 modified by jDAL - Thu Oct 09 09:22:01 UTC 2008 modified by jDAL - Thu Oct 09 11:35:22 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:07 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD07/USD07.xml index 7b77f4e0b..efd3088c0 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD07/USD07.xml @@ -60,8 +60,9 @@ - Mon Oct 06 09:29:50 UTC 2008 modified by jDAL - Thu Oct 09 09:22:56 UTC 2008 modified by jDAL - Thu Oct 09 11:35:22 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:43 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD08/USD08.xml index 33b67e010..b6c681ebe 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD08/USD08.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:30:41 UTC 2008 modified by jDAL - Thu Oct 09 09:23:44 UTC 2008 modified by jDAL - Thu Oct 09 11:35:23 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:44 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:44 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:21 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD09/USD09.xml index d16449900..021d96604 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD09/USD09.xml @@ -60,8 +60,10 @@ - Mon Oct 06 09:31:33 UTC 2008 modified by jDAL - Thu Oct 09 09:24:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:23 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:10 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:22 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD10/USD10.xml index 80768c156..abb2aae97 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD10/USD10.xml @@ -60,8 +60,9 @@ - Mon Oct 06 09:32:19 UTC 2008 modified by jDAL - Thu Oct 09 09:25:12 UTC 2008 modified by jDAL - Thu Oct 09 11:35:24 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:24 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD11/USD11.xml index f77961076..b43dc67eb 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD11/USD11.xml @@ -60,8 +60,12 @@ - Mon Oct 06 09:33:08 UTC 2008 modified by jDAL - Thu Oct 09 09:26:03 UTC 2008 modified by jDAL - Thu Oct 09 11:35:24 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:46 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:47 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:12 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD12/USD12.xml index 8d2dd0508..f8032e3f2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD12/USD12.xml @@ -59,8 +59,10 @@ - Mon Oct 06 09:34:02 UTC 2008 modified by jDAL - Thu Oct 09 09:26:51 UTC 2008 modified by jDAL - Thu Oct 09 11:35:25 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:14 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:26 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD13/USD13.xml index 4fafce45a..d8a61acde 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD13/USD13.xml @@ -58,8 +58,10 @@ - Mon Oct 06 09:34:50 UTC 2008 modified by jDAL - Thu Oct 09 09:27:39 UTC 2008 modified by jDAL - Thu Oct 09 11:35:25 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:48 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD14/USD14.xml index b74bafb4c..e1167fafd 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD14/USD14.xml @@ -58,8 +58,12 @@ - Mon Oct 06 09:35:41 UTC 2008 modified by jDAL - Thu Oct 09 09:28:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:26 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:51 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:16 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:28 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD15/USD15.xml index 86a341591..be48373ec 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD15/USD15.xml @@ -59,8 +59,12 @@ - Mon Oct 06 09:36:39 UTC 2008 modified by jDAL - Thu Oct 09 09:29:26 UTC 2008 modified by jDAL - Thu Oct 09 11:35:26 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:51 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:52 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:17 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:29 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD07/USD07.xml index fca2e0c3d..791bce064 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD07/USD07.xml @@ -61,8 +61,9 @@ - Mon Oct 06 09:29:51 UTC 2008 modified by jDAL - Thu Oct 09 09:22:57 UTC 2008 modified by jDAL - Thu Oct 09 11:35:27 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD08/USD08.xml index 856634d71..ccfdd6c05 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD08/USD08.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:30:42 UTC 2008 modified by jDAL - Thu Oct 09 09:23:44 UTC 2008 modified by jDAL - Thu Oct 09 11:35:28 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:54 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:21 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:32 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD09/USD09.xml index 648e746a7..f38abb01c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD09/USD09.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:31:33 UTC 2008 modified by jDAL - Thu Oct 09 09:24:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:28 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:56 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:22 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:34 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD10/USD10.xml index bc9dc434c..2c6eced38 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD10/USD10.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:32:20 UTC 2008 modified by jDAL - Thu Oct 09 09:25:13 UTC 2008 modified by jDAL - Thu Oct 09 11:35:29 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:58 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:23 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:35 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD11/USD11.xml index 90b8c99f7..def55e86f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD11/USD11.xml @@ -61,7 +61,7 @@ - Thu Oct 09 09:26:03 UTC 2008 modified by jDAL - Thu Oct 09 11:35:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD12/USD12.xml index 181476094..f267c233c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD12/USD12.xml @@ -58,8 +58,9 @@ - Mon Oct 06 09:34:02 UTC 2008 modified by jDAL - Thu Oct 09 09:26:52 UTC 2008 modified by jDAL - Thu Oct 09 11:35:30 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:37 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD13/USD13.xml index 97b11fdd0..4e0cb9577 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD13/USD13.xml @@ -57,8 +57,10 @@ - Mon Oct 06 09:34:50 UTC 2008 modified by jDAL - Thu Oct 09 09:27:39 UTC 2008 modified by jDAL - Thu Oct 09 11:35:30 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:02 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:38 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD14/USD14.xml index 0eaaaa348..ea158e298 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD14/USD14.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:28:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD15/USD15.xml index 1d29c9e3c..faaed24cc 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD15/USD15.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:29:26 UTC 2008 modified by jDAL - Thu Oct 09 11:35:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD01/USD01.xml index d37524d1a..6a1fce5a8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD01/USD01.xml @@ -62,8 +62,11 @@ - Mon Oct 06 09:27:10 UTC 2008 modified by jDAL - Thu Oct 09 09:20:03 UTC 2008 modified by jDAL - Thu Oct 09 11:35:33 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:04 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:29 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:44 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD02/USD02.xml index 897c44cd5..c6f1fe576 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD02/USD02.xml @@ -58,8 +58,10 @@ - Mon Oct 06 09:27:25 UTC 2008 modified by jDAL - Thu Oct 09 09:20:16 UTC 2008 modified by jDAL - Thu Oct 09 11:35:34 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:06 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:30 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD03/USD03.xml index afad2a9a6..ebf91042e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD03/USD03.xml @@ -58,8 +58,11 @@ - Mon Oct 06 09:27:53 UTC 2008 modified by jDAL - Thu Oct 09 09:20:44 UTC 2008 modified by jDAL - Thu Oct 09 11:35:34 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:10 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:32 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:48 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD04/USD04.xml index 3dad368a4..27112ca13 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD04/USD04.xml @@ -58,8 +58,10 @@ - Mon Oct 06 09:28:14 UTC 2008 modified by jDAL - Thu Oct 09 09:21:06 UTC 2008 modified by jDAL - Thu Oct 09 11:35:35 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:12 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:08 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD05/USD05.xml index 18090d8cb..ed33ae8b6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD05/USD05.xml @@ -58,8 +58,11 @@ - Mon Oct 06 09:28:40 UTC 2008 modified by jDAL - Thu Oct 09 09:21:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:35 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:15 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:51 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD06/USD06.xml index 7dab977f0..37b12cac4 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD06/USD06.xml @@ -57,8 +57,11 @@ - Mon Oct 06 09:29:05 UTC 2008 modified by jDAL - Thu Oct 09 09:22:01 UTC 2008 modified by jDAL - Thu Oct 09 11:35:36 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:12 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:53 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD07/USD07.xml index 34ed512d8..cbcc82af8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD07/USD07.xml @@ -57,8 +57,11 @@ - Mon Oct 06 09:29:51 UTC 2008 modified by jDAL - Thu Oct 09 09:22:57 UTC 2008 modified by jDAL - Thu Oct 09 11:35:36 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:19 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:14 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:54 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD08/USD08.xml index 1079f8f73..5e14057b1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD08/USD08.xml @@ -57,8 +57,10 @@ - Mon Oct 06 09:30:42 UTC 2008 modified by jDAL - Thu Oct 09 09:23:45 UTC 2008 modified by jDAL - Thu Oct 09 11:35:37 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:20 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:16 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD09/USD09.xml index 51d79fbc4..1fa1e107c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD09/USD09.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:24:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD10/USD10.xml index 110917b9b..45e9687e7 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD10/USD10.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:25:13 UTC 2008 modified by jDAL - Thu Oct 09 11:35:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD11/USD11.xml index 3c7d1c1f3..0a9bb0835 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD11/USD11.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:26:04 UTC 2008 modified by jDAL - Thu Oct 09 11:35:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD12/USD12.xml index 475c0c98e..705e709dd 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD12/USD12.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:26:52 UTC 2008 modified by jDAL - Thu Oct 09 11:35:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD13/USD13.xml index 6e804d956..61992997c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD13/USD13.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:27:40 UTC 2008 modified by jDAL - Thu Oct 09 11:35:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD14/USD14.xml index 61a37be6e..0fce1d99d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD14/USD14.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:28:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD15/USD15.xml index ef629585b..714b3ad24 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD15/USD15.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:29:27 UTC 2008 modified by jDAL - Thu Oct 09 11:35:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD07/USD07.xml index 9847c5002..a1fe3718c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD07/USD07.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:22:58 UTC 2008 modified by jDAL - Thu Oct 09 11:35:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD08/USD08.xml index 2fc9ad944..4afa0fbe6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD08/USD08.xml @@ -56,7 +56,7 @@ - Thu Oct 09 09:23:45 UTC 2008 modified by jDAL - Thu Oct 09 11:35:41 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD09/USD09.xml index f83ee364c..ef5bd78a2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD09/USD09.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:24:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD10/USD10.xml index dfabc1fdb..207ba482a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD10/USD10.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:25:14 UTC 2008 modified by jDAL - Thu Oct 09 11:35:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD11/USD11.xml index c0a565dfe..ec7a1679d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD11/USD11.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:26:04 UTC 2008 modified by jDAL - Thu Oct 09 11:35:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD12/USD12.xml index b0bf723b6..f166aa1b6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD12/USD12.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:26:53 UTC 2008 modified by jDAL - Thu Oct 09 11:35:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD13/USD13.xml index a9eda1a00..f28319560 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD13/USD13.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:41 UTC 2008 modified by jDAL - Thu Oct 09 11:35:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD14/USD14.xml index 9f8e0796e..d40eb0646 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD14/USD14.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:28:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD15/USD15.xml index 05b49a39b..1f191288e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD15/USD15.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:29:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD03/USD03.xml index f1ab30b11..67780bce8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD03/USD03.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:20:44 UTC 2008 modified by jDAL - Thu Oct 09 11:35:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD04/USD04.xml index 5cd478c69..92e681882 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD04/USD04.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:21:07 UTC 2008 modified by jDAL - Thu Oct 09 11:35:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD05/USD05.xml index ea8cde7c2..252841fcd 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD05/USD05.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:21:31 UTC 2008 modified by jDAL - Thu Oct 09 11:35:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD06/USD06.xml index c953d8115..7b2ed890f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD06/USD06.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:22:01 UTC 2008 modified by jDAL - Thu Oct 09 11:35:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD07/USD07.xml index 3eff8c11c..6921548aa 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD07/USD07.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:22:58 UTC 2008 modified by jDAL - Thu Oct 09 11:35:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD08/USD08.xml index d0d7d3224..adb8a7135 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD08/USD08.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:23:46 UTC 2008 modified by jDAL - Thu Oct 09 11:35:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD09/USD09.xml index 4fe36d290..c3fecdaa8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD09/USD09.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:24:30 UTC 2008 modified by jDAL - Thu Oct 09 11:35:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD10/USD10.xml index e8b40dc35..c8040c08d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD10/USD10.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:25:14 UTC 2008 modified by jDAL - Thu Oct 09 11:35:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD11/USD11.xml index 1badf2248..de8cb7c8f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD11/USD11.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:26:05 UTC 2008 modified by jDAL - Thu Oct 09 11:35:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD12/USD12.xml index fb01c7214..5ceb0bbe1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD12/USD12.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:26:53 UTC 2008 modified by jDAL - Thu Oct 09 11:35:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD13/USD13.xml index b9c9fa4fe..4cc84cc86 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD13/USD13.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:41 UTC 2008 modified by jDAL - Thu Oct 09 11:35:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD14/USD14.xml index cccab0dab..80653ea47 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD14/USD14.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:28:31 UTC 2008 modified by jDAL - Thu Oct 09 11:35:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD15/USD15.xml index 748fb7509..7a5da4db1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD15/USD15.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:29:28 UTC 2008 modified by jDAL - Thu Oct 09 11:35:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD07/USD07.xml index d4dadd9df..e9c7ec2c8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD07/USD07.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:22:59 UTC 2008 modified by jDAL - Thu Oct 09 11:35:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD08/USD08.xml index 4f04a2f53..96869c1d3 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD08/USD08.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:23:46 UTC 2008 modified by jDAL - Thu Oct 09 11:35:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD09/USD09.xml index 57689a170..175adbc9f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD09/USD09.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:24:31 UTC 2008 modified by jDAL - Thu Oct 09 11:35:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD10/USD10.xml index afdd730d2..81e278c0d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD10/USD10.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:25:15 UTC 2008 modified by jDAL - Thu Oct 09 11:35:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD11/USD11.xml index 63211eb27..414fbf6e4 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD11/USD11.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:26:05 UTC 2008 modified by jDAL - Thu Oct 09 11:35:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD12/USD12.xml index 0e3279180..b336ba62a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD12/USD12.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:26:54 UTC 2008 modified by jDAL - Thu Oct 09 11:35:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD13/USD13.xml index dd1dcb752..b4e6f7858 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD13/USD13.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:42 UTC 2008 modified by jDAL - Thu Oct 09 11:35:55 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD14/USD14.xml index 695cf8d58..d0b61df38 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:31 UTC 2008 modified by jDAL - Thu Oct 09 11:35:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD15/USD15.xml index c981fd568..1f1b26bc2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD15/USD15.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:29:29 UTC 2008 modified by jDAL - Thu Oct 09 11:35:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD01/USD01.xml index 70960be30..ba3a46fd6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD01/USD01.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:20:04 UTC 2008 modified by jDAL - Thu Oct 09 11:35:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD02/USD02.xml index 0d4946433..409dc2ca0 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD02/USD02.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:16 UTC 2008 modified by jDAL - Thu Oct 09 11:35:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD03/USD03.xml index 6fe44f608..826414173 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD03/USD03.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:45 UTC 2008 modified by jDAL - Thu Oct 09 11:35:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD04/USD04.xml index 45b9c745a..a61931f0f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD04/USD04.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:07 UTC 2008 modified by jDAL - Thu Oct 09 11:35:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD05/USD05.xml index 24ce70f1e..969dac10d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD05/USD05.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:21:31 UTC 2008 modified by jDAL - Thu Oct 09 11:36:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD06/USD06.xml index 0f7786c68..658bd2747 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD06/USD06.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:22:02 UTC 2008 modified by jDAL - Thu Oct 09 11:36:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD07/USD07.xml index 568c05b01..70f94723e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD07/USD07.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:22:59 UTC 2008 modified by jDAL - Thu Oct 09 11:36:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD08/USD08.xml index 2246fe6ab..90bb931fc 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD08/USD08.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:47 UTC 2008 modified by jDAL - Thu Oct 09 11:36:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD09/USD09.xml index bcda93208..07ff45672 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD09/USD09.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:24:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD10/USD10.xml index af844f3fd..8e3fb928c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD10/USD10.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:25:15 UTC 2008 modified by jDAL - Thu Oct 09 11:36:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD11/USD11.xml index 7864e3e7c..c4af3cab1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD11/USD11.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:26:06 UTC 2008 modified by jDAL - Thu Oct 09 11:36:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD12/USD12.xml index 38c74e4dd..611a2c2f4 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD12/USD12.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:54 UTC 2008 modified by jDAL - Thu Oct 09 11:36:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD13/USD13.xml index 2c8f69074..2b231a7d6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD13/USD13.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:42 UTC 2008 modified by jDAL - Thu Oct 09 11:36:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD14/USD14.xml index 3d7adb68f..611db079b 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD15/USD15.xml index da6fb595d..f0b9f3dfa 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD15/USD15.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:29:29 UTC 2008 modified by jDAL - Thu Oct 09 11:36:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD07/USD07.xml index eff4ffa79..cd36f2518 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD07/USD07.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:00 UTC 2008 modified by jDAL - Thu Oct 09 11:36:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD08/USD08.xml index 9cea45b6c..62f4f7b45 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD08/USD08.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:47 UTC 2008 modified by jDAL - Thu Oct 09 11:36:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD09/USD09.xml index b2c1a3f32..1e63fc52b 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD09/USD09.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:24:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD10/USD10.xml index 757442b4c..a03dbd297 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD10/USD10.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:25:16 UTC 2008 modified by jDAL - Thu Oct 09 11:36:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD11/USD11.xml index 758ec81d0..d9ee5cd8e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD11/USD11.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:06 UTC 2008 modified by jDAL - Thu Oct 09 11:36:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD12/USD12.xml index dbfd41c82..0d9e166fc 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD12/USD12.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:26:55 UTC 2008 modified by jDAL - Thu Oct 09 11:36:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD13/USD13.xml index 6e090b777..b759cc771 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD13/USD13.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:27:43 UTC 2008 modified by jDAL - Thu Oct 09 11:36:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD14/USD14.xml index 14a91d307..97b09142f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD14/USD14.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:28:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD15/USD15.xml index 94cd48328..9ec8500a8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD15/USD15.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:29:30 UTC 2008 modified by jDAL - Thu Oct 09 11:36:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD03/USD03.xml index ba0274fdc..159d9ab61 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD03/USD03.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:45 UTC 2008 modified by jDAL - Thu Oct 09 11:36:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD04/USD04.xml index e6a26fad8..901f41c95 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD04/USD04.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:21:07 UTC 2008 modified by jDAL - Thu Oct 09 11:36:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD05/USD05.xml index 1d65725a7..b97efd898 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD05/USD05.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:21:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD06/USD06.xml index 64eb6d7fd..2a6462373 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD06/USD06.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:22:02 UTC 2008 modified by jDAL - Thu Oct 09 11:36:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD07/USD07.xml index b67d5241c..cb1ce998c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD07/USD07.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:23:00 UTC 2008 modified by jDAL - Thu Oct 09 11:36:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD08/USD08.xml index 8d1bce2ba..d20476f93 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD08/USD08.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:48 UTC 2008 modified by jDAL - Thu Oct 09 11:36:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD09/USD09.xml index a3078d702..68df4d5ed 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD09/USD09.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:24:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD10/USD10.xml index 433819520..66b6140ff 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD10/USD10.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:25:16 UTC 2008 modified by jDAL - Thu Oct 09 11:36:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD11/USD11.xml index 788b57d4f..97357ab36 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD11/USD11.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:07 UTC 2008 modified by jDAL - Thu Oct 09 11:36:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD12/USD12.xml index 70e510605..523d6c801 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD12/USD12.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:26:55 UTC 2008 modified by jDAL - Thu Oct 09 11:36:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD13/USD13.xml index 316e6f55f..897d3b72b 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD13/USD13.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:27:43 UTC 2008 modified by jDAL - Thu Oct 09 11:36:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD14/USD14.xml index 837063b8d..ee0e5d8d2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD14/USD14.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:28:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD15/USD15.xml index b88844029..d1fbb2dd5 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD15/USD15.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:29:30 UTC 2008 modified by jDAL - Thu Oct 09 11:36:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD07/USD07.xml index 80be25c50..623fe4444 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD07/USD07.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:01 UTC 2008 modified by jDAL - Thu Oct 09 11:36:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD08/USD08.xml index 84ca6bf9e..96814cae6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD08/USD08.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:48 UTC 2008 modified by jDAL - Thu Oct 09 11:36:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD09/USD09.xml index 9efda0b30..b0c37ad9a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD09/USD09.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:24:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD10/USD10.xml index c9bae4aa1..936d6a84b 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD10/USD10.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:25:17 UTC 2008 modified by jDAL - Thu Oct 09 11:36:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD11/USD11.xml index 53c77b487..5318c0b5e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD11/USD11.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:26:07 UTC 2008 modified by jDAL - Thu Oct 09 11:36:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD12/USD12.xml index e06c44246..e4ec29861 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD12/USD12.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:26:56 UTC 2008 modified by jDAL - Thu Oct 09 11:36:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD13/USD13.xml index 9650d13d3..3f011fca5 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD13/USD13.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:27:44 UTC 2008 modified by jDAL - Thu Oct 09 11:36:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD14/USD14.xml index bf9bab240..f65c5cab6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD14/USD14.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:28:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD15/USD15.xml index 28cc343c1..ad714dc8c 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD15/USD15.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:29:31 UTC 2008 modified by jDAL - Thu Oct 09 11:36:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD01/USD01.xml index a4e57242f..f6aaf3f1d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD01/USD01.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:20:05 UTC 2008 modified by jDAL - Thu Oct 09 11:36:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD02/USD02.xml index f2083adaa..080beaea6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD02/USD02.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:20:16 UTC 2008 modified by jDAL - Thu Oct 09 11:36:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD03/USD03.xml index a43904a8d..cb82652d8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD03/USD03.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:20:46 UTC 2008 modified by jDAL - Thu Oct 09 11:36:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD04/USD04.xml index b158de700..10e50aea8 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD04/USD04.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:21:08 UTC 2008 modified by jDAL - Thu Oct 09 11:36:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD05/USD05.xml index f70aec411..8fe883537 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD05/USD05.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:21:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD06/USD06.xml index 5569e5baa..13f3f2792 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD06/USD06.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:22:03 UTC 2008 modified by jDAL - Thu Oct 09 11:36:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD07/USD07.xml index 275fa3f3a..7dc1b961e 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD07/USD07.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:23:02 UTC 2008 modified by jDAL - Thu Oct 09 11:36:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD08/USD08.xml index a00c8148d..72ba5d050 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD08/USD08.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:23:49 UTC 2008 modified by jDAL - Thu Oct 09 11:36:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD09/USD09.xml index 5955f5b39..574f242c1 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD09/USD09.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:24:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD10/USD10.xml index 47258525b..c0b1497d3 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD10/USD10.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:25:17 UTC 2008 modified by jDAL - Thu Oct 09 11:36:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD11/USD11.xml index 80358aba5..b1dbd847d 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD11/USD11.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:26:08 UTC 2008 modified by jDAL - Thu Oct 09 11:36:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD12/USD12.xml index 8f2b7cb9b..9020b28eb 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD12/USD12.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:26:56 UTC 2008 modified by jDAL - Thu Oct 09 11:36:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD13/USD13.xml index c7dbdcafd..dcc82e178 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD13/USD13.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:27:44 UTC 2008 modified by jDAL - Thu Oct 09 11:36:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD14/USD14.xml index 0e6c346b0..b2959f87f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD14/USD14.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:28:34 UTC 2008 modified by jDAL - Thu Oct 09 11:36:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD15/USD15.xml index 334203380..cfc12bf8a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD15/USD15.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:29:31 UTC 2008 modified by jDAL - Thu Oct 09 11:36:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD16/USD16.xml index c6ab9b326..ea3fe4c71 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN11/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD16/USD16.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:29:41 UTC 2008 modified by jDAL - Thu Oct 09 11:36:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD07/USD07.xml index 3335a683b..496df9c58 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD07/USD07.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:23:03 UTC 2008 modified by jDAL - Thu Oct 09 11:36:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD08/USD08.xml index bdd5750d9..ab354e14f 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD08/USD08.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:23:49 UTC 2008 modified by jDAL - Thu Oct 09 11:36:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD09/USD09.xml index 01fb88bcb..6a72afbdb 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD09/USD09.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:24:34 UTC 2008 modified by jDAL - Thu Oct 09 11:36:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD10/USD10.xml index 61538f14c..8b8c7586a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD10/USD10.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:25:18 UTC 2008 modified by jDAL - Thu Oct 09 11:36:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD11/USD11.xml index e7c6c7dcd..aac53e92a 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD11/USD11.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:26:08 UTC 2008 modified by jDAL - Thu Oct 09 11:36:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD12/USD12.xml index 35a68608e..9a36e3ff6 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD12/USD12.xml @@ -45,7 +45,7 @@ - Thu Oct 09 09:26:57 UTC 2008 modified by jDAL - Thu Oct 09 11:36:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD13/USD13.xml index f3be2c400..b1aecfca2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD13/USD13.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:27:45 UTC 2008 modified by jDAL - Thu Oct 09 11:36:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD14/USD14.xml index d1acb01b2..17f6a8849 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD14/USD14.xml @@ -44,7 +44,7 @@ - Thu Oct 09 09:28:34 UTC 2008 modified by jDAL - Thu Oct 09 11:36:39 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD15/USD15.xml index c17933bb6..be709bea2 100644 --- a/SRT/CDB/alma/AS/SECTOR07/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD15/USD15.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:29:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:40 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD03/USD03.xml index 4cf698bfb..6faa4ac44 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD03/USD03.xml @@ -65,8 +65,10 @@ - Mon Oct 06 09:27:56 UTC 2008 modified by jDAL - Thu Oct 09 09:20:47 UTC 2008 modified by jDAL - Thu Oct 09 11:36:41 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:04 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:15 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD04/USD04.xml index 486b0985a..0a4619130 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD04/USD04.xml @@ -61,8 +61,10 @@ - Mon Oct 06 09:28:16 UTC 2008 modified by jDAL - Thu Oct 09 09:21:08 UTC 2008 modified by jDAL - Thu Oct 09 11:36:41 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:39 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:05 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD05/USD05.xml index f8990f635..ef33a0539 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD05/USD05.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:28:43 UTC 2008 modified by jDAL - Thu Oct 09 09:21:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:42 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:42 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:40 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:17 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD06/USD06.xml index 119aaadaf..c9d920b67 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD06/USD06.xml @@ -54,8 +54,9 @@ - Mon Oct 06 09:29:08 UTC 2008 modified by jDAL - Thu Oct 09 09:22:03 UTC 2008 modified by jDAL - Thu Oct 09 11:36:42 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:41 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD07/USD07.xml index c145fa82d..55f2bf733 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD07/USD07.xml @@ -57,8 +57,11 @@ - Mon Oct 06 09:29:56 UTC 2008 modified by jDAL - Thu Oct 09 09:23:03 UTC 2008 modified by jDAL - Thu Oct 09 11:36:43 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:45 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:43 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD08/USD08.xml index 23bb4a3b1..fd83c90aa 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD08/USD08.xml @@ -55,8 +55,11 @@ - Mon Oct 06 09:30:52 UTC 2008 modified by jDAL - Thu Oct 09 09:23:50 UTC 2008 modified by jDAL - Thu Oct 09 11:36:43 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:44 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:09 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:20 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD09/USD09.xml index 353357915..8c26c12c7 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD09/USD09.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:24:34 UTC 2008 modified by jDAL - Thu Oct 09 11:36:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD10/USD10.xml index a40e0ac93..a6ed74c8d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD10/USD10.xml @@ -59,8 +59,11 @@ - Mon Oct 06 09:32:25 UTC 2008 modified by jDAL - Thu Oct 09 09:25:18 UTC 2008 modified by jDAL - Thu Oct 09 11:36:44 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:50 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:47 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:22 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD11/USD11.xml index 8a69097dc..bff0335a3 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD11/USD11.xml @@ -55,8 +55,10 @@ - Mon Oct 06 09:33:13 UTC 2008 modified by jDAL - Thu Oct 09 09:26:09 UTC 2008 modified by jDAL - Thu Oct 09 11:36:45 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:49 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:12 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD12/USD12.xml index aa2a03b19..4ffae8717 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD12/USD12.xml @@ -53,8 +53,11 @@ - Mon Oct 06 09:34:08 UTC 2008 modified by jDAL - Thu Oct 09 09:26:57 UTC 2008 modified by jDAL - Thu Oct 09 11:36:46 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:52 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:15 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:26 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD13/USD13.xml index 21eb91265..a0df0fd07 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD13/USD13.xml @@ -52,8 +52,11 @@ - Mon Oct 06 09:34:56 UTC 2008 modified by jDAL - Thu Oct 09 09:27:45 UTC 2008 modified by jDAL - Thu Oct 09 11:36:47 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:53 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:16 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:27 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD14/USD14.xml index ac9b0f5dd..82645b55a 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD14/USD14.xml @@ -51,8 +51,10 @@ - Mon Oct 06 09:35:47 UTC 2008 modified by jDAL - Thu Oct 09 09:28:35 UTC 2008 modified by jDAL - Thu Oct 09 11:36:47 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:55 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:16 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD15/USD15.xml index 17bd246b7..0d1386bb1 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD15/USD15.xml @@ -52,8 +52,11 @@ - Mon Oct 06 09:36:45 UTC 2008 modified by jDAL - Thu Oct 09 09:29:32 UTC 2008 modified by jDAL - Thu Oct 09 11:36:48 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:54 UTC 2017 modified by jDAL + - Tue Aug 29 10:19:57 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:29 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD17/USD17.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD17/USD17.xml index f75415b08..000efea65 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN01/USD17/USD17.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD17/USD17.xml @@ -52,8 +52,11 @@ - Mon Oct 06 09:36:55 UTC 2008 modified by jDAL - Thu Oct 09 09:29:44 UTC 2008 modified by jDAL - Thu Oct 09 11:36:45 UTC 2008 modified by jDAL + - Tue Aug 29 10:19:50 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:14 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:25 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD07/USD07.xml index 24fdecc63..cf2d82be7 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD07/USD07.xml @@ -60,8 +60,11 @@ - Mon Oct 06 09:29:57 UTC 2008 modified by jDAL - Thu Oct 09 09:23:04 UTC 2008 modified by jDAL - Thu Oct 09 11:36:49 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:57 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:21 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:31 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD08/USD08.xml index 335bb9934..8091876b5 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD08/USD08.xml @@ -57,8 +57,9 @@ - Mon Oct 06 09:30:52 UTC 2008 modified by jDAL - Thu Oct 09 09:23:50 UTC 2008 modified by jDAL - Thu Oct 09 11:36:49 UTC 2008 modified by jDAL + - Tue Aug 29 09:29:58 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD09/USD09.xml index 558aa70f0..95386ceea 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD09/USD09.xml @@ -56,8 +56,9 @@ - Mon Oct 06 09:31:39 UTC 2008 modified by jDAL - Thu Oct 09 09:24:35 UTC 2008 modified by jDAL - Thu Oct 09 11:36:50 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:00 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD10/USD10.xml index 137905e31..3cdb810f4 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD10/USD10.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:25:19 UTC 2008 modified by jDAL - Thu Oct 09 11:36:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD11/USD11.xml index f778f1f1a..fcc7feed7 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD11/USD11.xml @@ -58,8 +58,10 @@ - Mon Oct 06 09:33:14 UTC 2008 modified by jDAL - Thu Oct 09 09:26:09 UTC 2008 modified by jDAL - Thu Oct 09 11:36:51 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:04 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:01 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD12/USD12.xml index 5bfe37a26..60d648126 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD12/USD12.xml @@ -57,8 +57,9 @@ - Mon Oct 06 09:34:08 UTC 2008 modified by jDAL - Thu Oct 09 09:26:58 UTC 2008 modified by jDAL - Thu Oct 09 11:36:51 UTC 2008 modified by jDAL + - Wed Aug 30 12:53:37 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD13/USD13.xml index d417c472d..01f7f23f1 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD13/USD13.xml @@ -54,8 +54,12 @@ - Mon Oct 06 09:34:56 UTC 2008 modified by jDAL - Thu Oct 09 09:27:46 UTC 2008 modified by jDAL - Thu Oct 09 11:36:52 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:09 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:05 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:25 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:39 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD14/USD14.xml index ae2ed88e2..24da77483 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD14/USD14.xml @@ -56,8 +56,10 @@ - Mon Oct 06 09:35:47 UTC 2008 modified by jDAL - Thu Oct 09 09:28:36 UTC 2008 modified by jDAL - Thu Oct 09 11:36:52 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:27 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:40 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD15/USD15.xml index 2adf5ff5e..7fa793c73 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN02/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD15/USD15.xml @@ -56,8 +56,10 @@ - Mon Oct 06 09:36:45 UTC 2008 modified by jDAL - Thu Oct 09 09:29:33 UTC 2008 modified by jDAL - Thu Oct 09 11:36:53 UTC 2008 modified by jDAL + - Tue Aug 29 10:20:09 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:29 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD01/USD01.xml index 8b9f0eebd..12b7a4432 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD01/USD01.xml @@ -70,8 +70,10 @@ - Mon Oct 06 09:27:12 UTC 2008 modified by jDAL - Thu Oct 09 09:20:06 UTC 2008 modified by jDAL - Thu Oct 09 11:36:54 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:31 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:42 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD02/USD02.xml index 58af38dc3..35d79c39b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD02/USD02.xml @@ -56,8 +56,11 @@ - Mon Oct 06 09:27:26 UTC 2008 modified by jDAL - Thu Oct 09 09:20:17 UTC 2008 modified by jDAL - Thu Oct 09 11:36:55 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:12 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:12 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:33 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD03/USD03.xml index a5670e079..58a465767 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD03/USD03.xml @@ -56,8 +56,12 @@ - Mon Oct 06 09:27:56 UTC 2008 modified by jDAL - Thu Oct 09 09:20:47 UTC 2008 modified by jDAL - Thu Oct 09 11:36:55 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:14 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:14 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:34 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:46 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD04/USD04.xml index 9775efa36..3df696165 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD04/USD04.xml @@ -55,8 +55,11 @@ - Mon Oct 06 09:28:17 UTC 2008 modified by jDAL - Thu Oct 09 09:21:09 UTC 2008 modified by jDAL - Thu Oct 09 11:36:56 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:17 UTC 2017 modified by jDAL + - Tue Aug 29 10:20:16 UTC 2017 modified by jDAL + - Tue Aug 29 12:18:36 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD05/USD05.xml index 389fb8d59..08b3af604 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD05/USD05.xml @@ -54,8 +54,10 @@ - Mon Oct 06 09:28:43 UTC 2008 modified by jDAL - Thu Oct 09 09:21:34 UTC 2008 modified by jDAL - Thu Oct 09 11:36:56 UTC 2008 modified by jDAL + - Tue Aug 29 12:18:38 UTC 2017 modified by jDAL + - Wed Aug 30 12:53:50 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD06/USD06.xml index d73802be6..76bb670d5 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD06/USD06.xml @@ -54,8 +54,9 @@ - Mon Oct 06 09:29:08 UTC 2008 modified by jDAL - Thu Oct 09 09:22:04 UTC 2008 modified by jDAL - Thu Oct 09 11:36:57 UTC 2008 modified by jDAL + - Tue Aug 29 09:30:19 UTC 2017 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD07/USD07.xml index e0b117692..6f90b7420 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD07/USD07.xml @@ -57,7 +57,7 @@ - Thu Oct 09 09:23:04 UTC 2008 modified by jDAL - Thu Oct 09 11:36:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD08/USD08.xml index bfc90ae50..16da98808 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD08/USD08.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:23:51 UTC 2008 modified by jDAL - Thu Oct 09 11:36:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD09/USD09.xml index be163d50c..bf3143c88 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD09/USD09.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:24:35 UTC 2008 modified by jDAL - Thu Oct 09 11:36:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD10/USD10.xml index 9b0b85616..e71d27fa9 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD10/USD10.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:25:19 UTC 2008 modified by jDAL - Thu Oct 09 11:36:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD11/USD11.xml index 7d34d17c3..803e8fbbc 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD11/USD11.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:26:10 UTC 2008 modified by jDAL - Thu Oct 09 11:37:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD12/USD12.xml index 7fb23b2e7..9f7a50105 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD12/USD12.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:26:59 UTC 2008 modified by jDAL - Thu Oct 09 11:37:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD13/USD13.xml index d18af5d9a..d812b11fb 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD13/USD13.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:46 UTC 2008 modified by jDAL - Thu Oct 09 11:37:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD14/USD14.xml index 17f585610..560fc85e3 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD14/USD14.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:28:37 UTC 2008 modified by jDAL - Thu Oct 09 11:37:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD15/USD15.xml index ea202f675..6d5642dd5 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD15/USD15.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:29:33 UTC 2008 modified by jDAL - Thu Oct 09 11:37:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD16/USD16.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD16/USD16.xml index 82c16649b..a44b60d3c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN03/USD16/USD16.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD16/USD16.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:29:41 UTC 2008 modified by jDAL - Thu Oct 09 11:36:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD07/USD07.xml index 8a2679e3d..2b11a56ce 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD07/USD07.xml @@ -59,7 +59,7 @@ - Thu Oct 09 09:23:05 UTC 2008 modified by jDAL - Thu Oct 09 11:37:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD08/USD08.xml index ebbd5f21d..c2b484d04 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD08/USD08.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:23:51 UTC 2008 modified by jDAL - Thu Oct 09 11:37:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD09/USD09.xml index f85b9f6a4..a554bf4ee 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD09/USD09.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:24:36 UTC 2008 modified by jDAL - Thu Oct 09 11:37:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD10/USD10.xml index ca8c55fed..d5c786848 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD10/USD10.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:25:20 UTC 2008 modified by jDAL - Thu Oct 09 11:37:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD11/USD11.xml index be2f075ca..d1b4d826b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD11/USD11.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:26:10 UTC 2008 modified by jDAL - Thu Oct 09 11:37:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD12/USD12.xml index e315e58aa..3aeace2f3 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD12/USD12.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:26:59 UTC 2008 modified by jDAL - Thu Oct 09 11:37:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD13/USD13.xml index c1508634d..b685fed3b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD13/USD13.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:27:47 UTC 2008 modified by jDAL - Thu Oct 09 11:37:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD14/USD14.xml index 9dfbc3492..e32a58120 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD14/USD14.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:28:37 UTC 2008 modified by jDAL - Thu Oct 09 11:37:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD15/USD15.xml index e11fc29ae..a5c1d55f9 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN04/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD15/USD15.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:29:34 UTC 2008 modified by jDAL - Thu Oct 09 11:37:11 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD03/USD03.xml index 56de32ca7..57d16c2cd 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD03/USD03.xml @@ -58,7 +58,7 @@ - Thu Oct 09 09:20:48 UTC 2008 modified by jDAL - Thu Oct 09 11:37:12 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD04/USD04.xml index 2a26af719..3cb3bdc1d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD04/USD04.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:21:09 UTC 2008 modified by jDAL - Thu Oct 09 11:37:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD05/USD05.xml index 8e8fab31e..c4ff15a9f 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD05/USD05.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:21:34 UTC 2008 modified by jDAL - Thu Oct 09 11:37:13 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD06/USD06.xml index a7f0d83d6..385008433 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD06/USD06.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:22:04 UTC 2008 modified by jDAL - Thu Oct 09 11:37:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD07/USD07.xml index 9750ec1a0..d5e4b05c2 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD07/USD07.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:23:05 UTC 2008 modified by jDAL - Thu Oct 09 11:37:14 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD08/USD08.xml index 23d1f03c0..98e3b8795 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD08/USD08.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:23:51 UTC 2008 modified by jDAL - Thu Oct 09 11:37:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD09/USD09.xml index 420701e22..13bda2046 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD09/USD09.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:24:36 UTC 2008 modified by jDAL - Thu Oct 09 11:37:15 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD10/USD10.xml index 88dc9ee89..c8e928c55 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD10/USD10.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:25:20 UTC 2008 modified by jDAL - Thu Oct 09 11:37:16 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD11/USD11.xml index 5da33b6ad..333d370f4 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD11/USD11.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:26:11 UTC 2008 modified by jDAL - Thu Oct 09 11:37:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD12/USD12.xml index 3167b81fb..f8310b7bf 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD12/USD12.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:27:00 UTC 2008 modified by jDAL - Thu Oct 09 11:37:17 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD13/USD13.xml index 6ba63ea4f..7b984ff10 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD13/USD13.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:27:47 UTC 2008 modified by jDAL - Thu Oct 09 11:37:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD14/USD14.xml index b4da0c127..4a589bba6 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:38 UTC 2008 modified by jDAL - Thu Oct 09 11:37:18 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD15/USD15.xml index 232640644..2fee93438 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN05/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD15/USD15.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:29:34 UTC 2008 modified by jDAL - Thu Oct 09 11:37:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD07/USD07.xml index c983408c1..6d639c20c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD07/USD07.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:23:06 UTC 2008 modified by jDAL - Thu Oct 09 11:37:19 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD08/USD08.xml index f5820d6ab..072e31dce 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD08/USD08.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:23:52 UTC 2008 modified by jDAL - Thu Oct 09 11:37:20 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD09/USD09.xml index c14984f2f..50fee485d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD09/USD09.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:24:37 UTC 2008 modified by jDAL - Thu Oct 09 11:37:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD10/USD10.xml index d7fa62be7..8ccb95ac7 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD10/USD10.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:25:21 UTC 2008 modified by jDAL - Thu Oct 09 11:37:21 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD11/USD11.xml index 376848f12..5749721ed 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD11/USD11.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:26:11 UTC 2008 modified by jDAL - Thu Oct 09 11:37:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD12/USD12.xml index bf8bc7980..f2b1418ba 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD12/USD12.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:27:00 UTC 2008 modified by jDAL - Thu Oct 09 11:37:22 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD13/USD13.xml index 8be701192..478c10e47 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD13/USD13.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:27:48 UTC 2008 modified by jDAL - Thu Oct 09 11:37:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD14/USD14.xml index dd8b9b76b..138122e3b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD14/USD14.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:28:38 UTC 2008 modified by jDAL - Thu Oct 09 11:37:23 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD15/USD15.xml index 0d3c1e568..05e5d5b23 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN06/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD15/USD15.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:29:35 UTC 2008 modified by jDAL - Thu Oct 09 11:37:24 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD01/USD01.xml index 4a6028ac1..12e6deb3d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD01/USD01.xml @@ -62,7 +62,7 @@ - Thu Oct 09 09:20:06 UTC 2008 modified by jDAL - Thu Oct 09 11:37:25 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD02/USD02.xml index 5bf6fe2c0..df860fd94 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD02/USD02.xml @@ -55,7 +55,7 @@ - Thu Oct 09 09:20:17 UTC 2008 modified by jDAL - Thu Oct 09 11:37:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD03/USD03.xml index 6c64d1c30..b40dddb68 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD03/USD03.xml @@ -42,7 +42,7 @@ - Mon Oct 06 08:40:01 UTC 2008 modified by jDAL - Thu Oct 09 11:37:26 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD04/USD04.xml index e324b5310..07bae3bfe 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD04/USD04.xml @@ -41,7 +41,7 @@ - Mon Oct 06 08:40:02 UTC 2008 modified by jDAL - Thu Oct 09 11:37:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD05/USD05.xml index c156d83e6..4b779139a 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD05/USD05.xml @@ -41,7 +41,7 @@ - Mon Oct 06 08:40:02 UTC 2008 modified by jDAL - Thu Oct 09 11:37:27 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD06/USD06.xml index 15684a5ee..8198c4dee 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD06/USD06.xml @@ -40,7 +40,7 @@ - Mon Oct 06 08:40:03 UTC 2008 modified by jDAL - Thu Oct 09 11:37:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD07/USD07.xml index c762c13cb..a58adbe15 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD07/USD07.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:03 UTC 2008 modified by jDAL - Thu Oct 09 11:37:28 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD08/USD08.xml index 23cc796ec..cf63df429 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD08/USD08.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:04 UTC 2008 modified by jDAL - Thu Oct 09 11:37:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD09/USD09.xml index 3e9312b18..17f568519 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD09/USD09.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:04 UTC 2008 modified by jDAL - Thu Oct 09 11:37:29 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD10/USD10.xml index ef37cd087..35f92f1cd 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD10/USD10.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:05 UTC 2008 modified by jDAL - Thu Oct 09 11:37:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD11/USD11.xml index 64deafa04..2cfff2045 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD11/USD11.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:05 UTC 2008 modified by jDAL - Thu Oct 09 11:37:30 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD12/USD12.xml index d636f777a..474722756 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD12/USD12.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:06 UTC 2008 modified by jDAL - Thu Oct 09 11:37:31 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD13/USD13.xml index fc129ae28..097d39a92 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD13/USD13.xml @@ -35,7 +35,7 @@ - Mon Oct 06 08:40:06 UTC 2008 modified by jDAL - Thu Oct 09 11:37:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD14/USD14.xml index daacce835..2f7f0db97 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD14/USD14.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:07 UTC 2008 modified by jDAL - Thu Oct 09 11:37:32 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD15/USD15.xml index 328cae2eb..5ad868bac 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN07/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD15/USD15.xml @@ -36,7 +36,7 @@ - Mon Oct 06 08:40:07 UTC 2008 modified by jDAL - Thu Oct 09 11:37:33 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD07/USD07.xml index dc25a85d5..1b83d5a8d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD07/USD07.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:23:07 UTC 2008 modified by jDAL - Thu Oct 09 11:37:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD08/USD08.xml index ef4c51e4d..d31efd392 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD08/USD08.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:23:52 UTC 2008 modified by jDAL - Thu Oct 09 11:37:34 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD09/USD09.xml index f0c32117b..cc9c1f514 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD09/USD09.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:24:37 UTC 2008 modified by jDAL - Thu Oct 09 11:37:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD10/USD10.xml index ff9c70d7b..621d1ad2b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD10/USD10.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:25:24 UTC 2008 modified by jDAL - Thu Oct 09 11:37:35 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD11/USD11.xml index 1a75c4baa..825b20655 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD11/USD11.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:26:12 UTC 2008 modified by jDAL - Thu Oct 09 11:37:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD12/USD12.xml index 5b6bed66b..b12c7202a 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD12/USD12.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:27:01 UTC 2008 modified by jDAL - Thu Oct 09 11:37:36 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD13/USD13.xml index beb59d4fb..7ebfbc7f7 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD13/USD13.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:27:49 UTC 2008 modified by jDAL - Thu Oct 09 11:37:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD14/USD14.xml index 4f8c5b6a1..d100bbe54 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD14/USD14.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:28:39 UTC 2008 modified by jDAL - Thu Oct 09 11:37:37 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD15/USD15.xml index 70afcfea0..265a53a76 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN08/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD15/USD15.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:29:36 UTC 2008 modified by jDAL - Thu Oct 09 11:37:38 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD03/USD03.xml index 0fa4dd8de..edd8ebb43 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD03/USD03.xml @@ -54,7 +54,7 @@ - Thu Oct 09 09:20:49 UTC 2008 modified by jDAL - Thu Oct 09 11:37:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD04/USD04.xml index ed7faf112..68777d970 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD04/USD04.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:21:13 UTC 2008 modified by jDAL - Thu Oct 09 11:37:42 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD05/USD05.xml index 50877b1e0..780634856 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD05/USD05.xml @@ -52,7 +52,7 @@ - Thu Oct 09 09:21:44 UTC 2008 modified by jDAL - Thu Oct 09 11:37:43 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD06/USD06.xml index 0b70b6f08..94d1e6a37 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD06/USD06.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:22:08 UTC 2008 modified by jDAL - Thu Oct 09 11:37:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD07/USD07.xml index 189eccda1..119948b22 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD07/USD07.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:23:08 UTC 2008 modified by jDAL - Thu Oct 09 11:37:44 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD08/USD08.xml index e102196bb..1e617fa2d 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD08/USD08.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:53 UTC 2008 modified by jDAL - Thu Oct 09 11:37:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD09/USD09.xml index 5c3e1aa3c..5f2ec2c3f 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD09/USD09.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:24:38 UTC 2008 modified by jDAL - Thu Oct 09 11:37:45 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD10/USD10.xml index ba9fcee27..acf6f04a6 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD10/USD10.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:25:25 UTC 2008 modified by jDAL - Thu Oct 09 11:37:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD11/USD11.xml index 4cd0e8266..8b9128350 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD11/USD11.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:26:12 UTC 2008 modified by jDAL - Thu Oct 09 11:37:46 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml index c90af7bc6..832e677d4 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:27:01 UTC 2008 modified by jDAL - Thu Oct 09 11:37:47 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD13/USD13.xml index e0c4c9ba7..d2cdaf8a6 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD13/USD13.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:49 UTC 2008 modified by jDAL - Thu Oct 09 11:37:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD14/USD14.xml index 5135c71b1..f134a6590 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD14/USD14.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:28:40 UTC 2008 modified by jDAL - Thu Oct 09 11:37:48 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD15/USD15.xml index 720c80032..2935c7b04 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN09/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD15/USD15.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:29:36 UTC 2008 modified by jDAL - Thu Oct 09 11:37:49 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD07/USD07.xml index 977cfa641..232814e40 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD07/USD07.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:23:08 UTC 2008 modified by jDAL - Thu Oct 09 11:37:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD08/USD08.xml index e2eb0df32..0256ff8a2 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD08/USD08.xml @@ -35,7 +35,7 @@ - Mon Oct 06 08:40:22 UTC 2008 modified by jDAL - Thu Oct 09 11:37:50 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD09/USD09.xml index 73d467247..b9cf4ae3e 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD09/USD09.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:23 UTC 2008 modified by jDAL - Thu Oct 09 11:37:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD10/USD10.xml index e36a40e8d..e4a71e21f 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD10/USD10.xml @@ -35,7 +35,7 @@ - Mon Oct 06 08:40:23 UTC 2008 modified by jDAL - Thu Oct 09 11:37:51 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD11/USD11.xml index 34d7d246f..b72e07cce 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD11/USD11.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:24 UTC 2008 modified by jDAL - Thu Oct 09 11:37:52 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD12/USD12.xml index 7d65941c4..29d8c8e7c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD12/USD12.xml @@ -33,7 +33,7 @@ - Mon Oct 06 08:40:24 UTC 2008 modified by jDAL - Thu Oct 09 11:37:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD13/USD13.xml index 309b1f979..7447d542b 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD13/USD13.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:25 UTC 2008 modified by jDAL - Thu Oct 09 11:37:53 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD14/USD14.xml index e01585347..5d98a78c8 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD14/USD14.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:25 UTC 2008 modified by jDAL - Thu Oct 09 11:37:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD15/USD15.xml index c0aacfa04..0adf6697c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN10/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD15/USD15.xml @@ -34,7 +34,7 @@ - Mon Oct 06 08:40:26 UTC 2008 modified by jDAL - Thu Oct 09 11:37:54 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD01/USD01.xml index 5cfee8afc..733b21506 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD01/USD01.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD01/USD01.xml @@ -53,7 +53,7 @@ - Thu Oct 09 09:20:07 UTC 2008 modified by jDAL - Thu Oct 09 11:37:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD02/USD02.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD02/USD02.xml index 4abb6818a..a2014e898 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD02/USD02.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD02/USD02.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:20:18 UTC 2008 modified by jDAL - Thu Oct 09 11:37:56 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD03/USD03.xml index cbe61ad69..cd2b63539 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD03/USD03.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD03/USD03.xml @@ -51,7 +51,7 @@ - Thu Oct 09 09:20:49 UTC 2008 modified by jDAL - Thu Oct 09 11:37:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD04/USD04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD04/USD04.xml index 98f82cc23..573fb9be8 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD04/USD04.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD04/USD04.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:21:13 UTC 2008 modified by jDAL - Thu Oct 09 11:37:57 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD05/USD05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD05/USD05.xml index 886ed8171..4506b2956 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD05/USD05.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD05/USD05.xml @@ -50,7 +50,7 @@ - Thu Oct 09 09:21:44 UTC 2008 modified by jDAL - Thu Oct 09 11:37:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD06/USD06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD06/USD06.xml index d632863b6..e7332ac84 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD06/USD06.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD06/USD06.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:22:08 UTC 2008 modified by jDAL - Thu Oct 09 11:37:58 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD07/USD07.xml index 274f0bf34..7a77c88b4 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD07/USD07.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:09 UTC 2008 modified by jDAL - Thu Oct 09 11:37:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD08/USD08.xml index d2ea11c87..f9e3d08c2 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD08/USD08.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:23:53 UTC 2008 modified by jDAL - Thu Oct 09 11:37:59 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD09/USD09.xml index 92c16b206..32b239485 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD09/USD09.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:24:38 UTC 2008 modified by jDAL - Thu Oct 09 11:38:00 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD10/USD10.xml index eede3fb88..f96829e6c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD10/USD10.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:25:26 UTC 2008 modified by jDAL - Thu Oct 09 11:38:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD11/USD11.xml index cc1c97b3a..deae2f667 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD11/USD11.xml @@ -49,7 +49,7 @@ - Thu Oct 09 09:26:13 UTC 2008 modified by jDAL - Thu Oct 09 11:38:01 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD12/USD12.xml index 3ff4d9bbe..64b9a5185 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD12/USD12.xml @@ -48,7 +48,7 @@ - Thu Oct 09 09:27:02 UTC 2008 modified by jDAL - Thu Oct 09 11:38:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD13/USD13.xml index 2a1d80343..025c5536c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD13/USD13.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:27:50 UTC 2008 modified by jDAL - Thu Oct 09 11:38:02 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD14/USD14.xml index 7a082459f..200b0bcc0 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD14/USD14.xml @@ -46,7 +46,7 @@ - Thu Oct 09 09:28:40 UTC 2008 modified by jDAL - Thu Oct 09 11:38:03 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD15/USD15.xml index c0252cf79..d52a2e2e0 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN11/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD15/USD15.xml @@ -47,7 +47,7 @@ - Thu Oct 09 09:29:37 UTC 2008 modified by jDAL - Thu Oct 09 11:38:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD07/USD07.xml index efe40f4d5..98ea4bb8c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD07/USD07.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD07/USD07.xml @@ -45,7 +45,7 @@ - Mon Oct 06 09:30:02 UTC 2008 modified by jDAL - Thu Oct 09 11:38:04 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD08/USD08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD08/USD08.xml index 0aec43224..0faba50f2 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD08/USD08.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD08/USD08.xml @@ -45,7 +45,7 @@ - Mon Oct 06 09:30:56 UTC 2008 modified by jDAL - Thu Oct 09 11:38:05 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD09/USD09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD09/USD09.xml index 08bd8c3f4..a8f16bb3f 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD09/USD09.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD09/USD09.xml @@ -44,7 +44,7 @@ - Mon Oct 06 09:31:43 UTC 2008 modified by jDAL - Thu Oct 09 11:38:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD10/USD10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD10/USD10.xml index 86c561232..515360c6e 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD10/USD10.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD10/USD10.xml @@ -44,7 +44,7 @@ - Mon Oct 06 09:32:29 UTC 2008 modified by jDAL - Thu Oct 09 11:38:06 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD11/USD11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD11/USD11.xml index 6594dda96..5754242d0 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD11/USD11.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD11/USD11.xml @@ -44,7 +44,7 @@ - Mon Oct 06 09:33:18 UTC 2008 modified by jDAL - Thu Oct 09 11:38:07 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD12/USD12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD12/USD12.xml index b7b10056f..b38dc70f5 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD12/USD12.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD12/USD12.xml @@ -43,7 +43,7 @@ - Mon Oct 06 09:34:13 UTC 2008 modified by jDAL - Thu Oct 09 11:38:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD13/USD13.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD13/USD13.xml index 48f6eecf6..667fa9c18 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD13/USD13.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD13/USD13.xml @@ -42,7 +42,7 @@ - Mon Oct 06 09:35:01 UTC 2008 modified by jDAL - Thu Oct 09 11:38:08 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD14/USD14.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD14/USD14.xml index 46997138f..96f572f5a 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD14/USD14.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD14/USD14.xml @@ -42,7 +42,7 @@ - Mon Oct 06 09:35:52 UTC 2008 modified by jDAL - Thu Oct 09 11:38:09 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD15/USD15.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD15/USD15.xml index 705059c85..fbb4ff37c 100644 --- a/SRT/CDB/alma/AS/SECTOR08/LAN12/USD15/USD15.xml +++ b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD15/USD15.xml @@ -44,7 +44,7 @@ - Mon Oct 06 09:36:50 UTC 2008 modified by jDAL - Thu Oct 09 11:38:10 UTC 2008 modified by jDAL --> - + diff --git a/SRT/CDB/alma/AS/set_calibrate.py b/SRT/CDB/alma/AS/set_calibrate.py new file mode 100644 index 000000000..1bcddca13 --- /dev/null +++ b/SRT/CDB/alma/AS/set_calibrate.py @@ -0,0 +1,24 @@ +import os, fnmatch + +path = os.path.dirname(os.path.abspath(__file__)) + +result = [] +for root, dirs, files in os.walk(path): + for name in files: + if fnmatch.fnmatch(name, 'USD*.xml'): + result.append(os.path.join(root, name)) + +counter = 0 + +for filename in result: + counter += 1 + os.rename(filename, filename + '.bak') + original = open(filename + '.bak', 'r') + new = open(filename, 'w') + for fileline in original: + new.write(fileline.replace('calibrate="0"', 'calibrate="1"')) + original.close() + os.remove(filename + '.bak') + new.close() + +print(str(counter) + " files edited.") -- GitLab From bded55888786c7f0cfa56ab8ee77266149fc7777 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Tue, 12 Sep 2017 12:41:19 +0000 Subject: [PATCH 092/145] Fix 172 --- .../include/SRTActiveSurfaceBossCore.h | 35 +++++---- .../src/SRTActiveSurfaceBossCore.cpp | 78 +++++++++---------- 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h b/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h index 22f220d1b..50ff15143 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h +++ b/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h @@ -32,8 +32,9 @@ #define firstUSD 1 #define lastUSD 1116 #define LOOPTIME 100000 // 0,10 sec -#define USDTABLE "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD.txt\0" -#define USDTABLECORRECTIONS "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/act_rev02.txt\0" +#define CDBPATH (std::string(getenv("ACS_CDB")) + "/CDB/").c_str() +#define USDTABLE (std::string(CDBPATH) + "alma/AS/tab_convUSD.txt\0").c_str() +#define USDTABLECORRECTIONS (std::string(CDBPATH) + "alma/AS/act_rev02.txt\0").c_str() #define MM2HSTEP 350 //(10500 HSTEP / 30 MM) #define MM2STEP 1400 //(42000 STEP / 30 MM) #define WARNINGUSDPERCENT 0.95 @@ -42,7 +43,7 @@ #define NPOSITIONS 7 #define DELTAEL 15.0 -// mask pattern for status +// mask pattern for status #define MRUN 0x000080 #define CAMM 0x000100 #define ENBL 0x002000 @@ -67,10 +68,10 @@ class CSRTActiveSurfaceBossWatchingThread; class CSRTActiveSurfaceBossWorkingThread; /** - * This class models the SRTActiveSurfaceBoss datasets and functionalities. + * This class models the SRTActiveSurfaceBoss datasets and functionalities. * @author Migoni Carlo * Osservatorio Astronomico di Cagliari, Italia - *
+ *
*/ class CSRTActiveSurfaceBossCore { friend class SRTActiveSurfaceBossImpl; @@ -84,11 +85,11 @@ public: */ CSRTActiveSurfaceBossCore(ContainerServices *service,acscomponent::ACSComponentImpl *me); - /** + /** * Destructor. - */ + */ virtual ~CSRTActiveSurfaceBossCore(); - + /** * This function initializes the boss core, all preliminary operation are performed here. */ @@ -100,7 +101,7 @@ public: * @throw ComponentErrors::CORBAProblemExImpl */ virtual void execute() throw (ComponentErrors::CouldntGetComponentExImpl); - + /** * This function performs all the clean up operation required to free al the resources allocated by the class */ @@ -135,7 +136,7 @@ public: /** * This function returns the status of the Active Surface subsystem; this indicates if the system is working correctly or there are some - * possible problems or a failure has been encoutered. This flag takes also into consideration the status of the Boss. + * possible problems or a failure has been encoutered. This flag takes also into consideration the status of the Boss. */ inline const Management::TSystemStatus& getStatus() const { return m_status; }; @@ -151,13 +152,13 @@ public: inline bool getTracking() const { return m_tracking; } /** - * Sets the AutoUpdate flag to false, i.e. the component will not update automatically the surface. + * Sets the AutoUpdate flag to false, i.e. the component will not update automatically the surface. */ void disableAutoUpdate(); - + /** - * Sets the AutoUpdate flag to true, i.e. the component will update automatically the surface. - */ + * Sets the AutoUpdate flag to true, i.e. the component will update automatically the surface. + */ void enableAutoUpdate(); void checkASerrors(const char* str, int circle, int actuator, ASErrors::ASErrorsEx Ex); @@ -202,14 +203,14 @@ private: acscomponent::ACSComponentImpl *m_thisIsMe; /** - * This represents the status of the whole Active Surface subsystem, it also includes and sammerizes the status of the boss component + * This represents the status of the whole Active Surface subsystem, it also includes and sammerizes the status of the boss component */ Management::TSystemStatus m_status; /** * if this flag is false the active surface isn't active during * observations - */ + */ bool m_enable; bool AutoUpdate; @@ -231,7 +232,7 @@ private: bool m_sector1, m_sector2, m_sector3, m_sector4, m_sector5, m_sector6, m_sector7, m_sector8; bool m_profileSetted; - + bool m_ASup; }; diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp index 920364cf3..d4844d5da 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp @@ -4,7 +4,7 @@ int actuatorsInCircle[] = {0,24,24,48,48,48,48,96,96,96,96,96,96,96,96,96,8,4}; -CSRTActiveSurfaceBossCore::CSRTActiveSurfaceBossCore(ContainerServices *service, acscomponent::ACSComponentImpl *me) : +CSRTActiveSurfaceBossCore::CSRTActiveSurfaceBossCore(ContainerServices *service, acscomponent::ACSComponentImpl *me) : m_services(service), m_thisIsMe(me) { @@ -17,7 +17,7 @@ CSRTActiveSurfaceBossCore::~CSRTActiveSurfaceBossCore() void CSRTActiveSurfaceBossCore::initialize() { ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::initialize()",(LM_INFO,"CSRTActiveSurfaceBossCore::initialize")); - + m_enable = false; m_tracking = false; m_status = Management::MNG_WARNING; @@ -86,7 +86,7 @@ void CSRTActiveSurfaceBossCore::execute() throw (ComponentErrors::CouldntGetComp } } ACS_LOG(LM_FULL_INFO, "CSRTActiveSurfaceBossCore::execute()", (LM_INFO,"CSRTActiveSurfaceBossCore::LAN_LOCATED")); -*/ +*/ // Get reference to usd components /* for (i = firstUSD; i <= lastUSD; i++) { usdTable >> lanIndex >> circleIndex >> usdCircleIndex >> serial_usd >> graf >> mecc; @@ -219,12 +219,12 @@ void CSRTActiveSurfaceBossCore::cleanUp() void CSRTActiveSurfaceBossCore::reset (int circle, int actuator, int radius) throw (ComponentErrors::UnexpectedExImpl, ComponentErrors::CouldntCallOperationExImpl, ComponentErrors::CORBAProblemExImpl, ComponentErrors::ComponentNotActiveExImpl) { - if (circle == 0 && actuator == 0 &&radius == 0) // ALL + if (circle == 0 && actuator == 0 &&radius == 0) // ALL { int i, l; for (i = 1; i <= CIRCLES; i++) { - for (l = 1; l <= actuatorsInCircle[i]; l++) + for (l = 1; l <= actuatorsInCircle[i]; l++) { if (!CORBA::is_nil(usd[i][l])) { @@ -249,7 +249,7 @@ void CSRTActiveSurfaceBossCore::reset (int circle, int actuator, int radius) thr impl.log(); } } - else { + else { _EXCPT(ComponentErrors::ComponentNotActiveExImpl,impl,"CSRTActiveSurfaceBossCore::reset()"); impl.log(); } @@ -528,7 +528,7 @@ void CSRTActiveSurfaceBossCore::calibrate (int circle, int actuator, int radius) } } ACE_OS::sleep (1);*/ - + printf("calibration.....\n"); for (l = 1; l <= actuatorsInCircle[circle]; l++) { if (!CORBA::is_nil(usd[circle][l])) { @@ -653,7 +653,7 @@ void CSRTActiveSurfaceBossCore::calibrate (int circle, int actuator, int radius) } } ACE_OS::sleep (1);*/ - + printf("calibration.....\n"); for (l = 1; l <= actuatorsradius; l++) { if ((radius == 13 || radius == 37 || radius == 61 || radius == 85) && l == 14) @@ -802,7 +802,7 @@ void CSRTActiveSurfaceBossCore::calibrate (int circle, int actuator, int radius) ACE_OS::sleep (1); } } -/* +/* if (circle == 0 && actuator == 0 && radius == 0) { // ALL int i, l; for (i = 1; i <= CIRCLES; i++) { @@ -993,7 +993,7 @@ void CSRTActiveSurfaceBossCore::onewayAction(ActiveSurface::TASOneWayAction onew int i, l; int counter = 0; ACSErr::Completion_var completion; - ACS::ROlong_var actPos_var; + ACS::ROlong_var actPos_var; ACS::RWlong_var cmdPos_var; time_t start; time_t stop; @@ -1001,7 +1001,7 @@ void CSRTActiveSurfaceBossCore::onewayAction(ActiveSurface::TASOneWayAction onew time(&start); for (i = 1; i <= CIRCLES; i++) { - for (l = 1; l <= actuatorsInCircle[i]; l++) + for (l = 1; l <= actuatorsInCircle[i]; l++) { if (!CORBA::is_nil(usd[i][l])) { @@ -1345,9 +1345,9 @@ void CSRTActiveSurfaceBossCore::watchingActiveSurfaceStatus() throw (ComponentEr m_status=Management::MNG_FAILURE; } } - else + else notActivEx = true; - + //printf("component %d_%d: ",i,l); totalactuators++; @@ -1379,10 +1379,10 @@ void CSRTActiveSurfaceBossCore::sector1ActiveSurface() throw (ComponentErrors::C printf("sector1 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S1.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S1.txt\0"; ifstream usdTableS1(value); if (!usdTableS1) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1413,10 +1413,10 @@ void CSRTActiveSurfaceBossCore::sector2ActiveSurface() throw (ComponentErrors::C printf("sector2 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S2.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S2.txt\0"; ifstream usdTableS2(value); if (!usdTableS2) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1448,10 +1448,10 @@ void CSRTActiveSurfaceBossCore::sector3ActiveSurface() throw (ComponentErrors::C printf("sector3 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S3.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S3.txt\0"; ifstream usdTableS3(value); if (!usdTableS3) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1483,10 +1483,10 @@ void CSRTActiveSurfaceBossCore::sector4ActiveSurface() throw (ComponentErrors::C printf("sector4 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S4.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S4.txt\0"; ifstream usdTableS4(value); if (!usdTableS4) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1518,10 +1518,10 @@ void CSRTActiveSurfaceBossCore::sector5ActiveSurface() throw (ComponentErrors::C printf("sector5 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S5.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S5.txt\0"; ifstream usdTableS5(value); if (!usdTableS5) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1553,10 +1553,10 @@ void CSRTActiveSurfaceBossCore::sector6ActiveSurface() throw (ComponentErrors::C printf("sector6 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S6.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S6.txt\0"; ifstream usdTableS6(value); if (!usdTableS6) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1588,10 +1588,10 @@ void CSRTActiveSurfaceBossCore::sector7ActiveSurface() throw (ComponentErrors::C printf("sector7 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S7.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S7.txt\0"; ifstream usdTableS7(value); if (!usdTableS7) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1623,10 +1623,10 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C printf("sector8 start\n"); char serial_usd[23]; char graf[5], mecc[4]; - const char * value; + char* value = (char*)CDBPATH; + strcat(value, "alma/AS/tab_convUSD_S8.txt\0"); int i; - value = "/home/gavino/Nuraghe/ACS/trunk/SRT/Configuration/CDB/alma/AS/tab_convUSD_S8.txt\0"; ifstream usdTableS8(value); if (!usdTableS8) { ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); @@ -1665,7 +1665,7 @@ void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::C if (!CORBA::is_nil(m_antennaBoss)) { try { m_antennaBoss->getRawCoordinates(now.value().value, azimuth, elevation); - } + } catch (CORBA::SystemException& ex) { _EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CSRTActiveSurfaceBossCore::workingActiveSurface()"); impl.setName(ex._name()); @@ -1689,14 +1689,12 @@ void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::C void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newProfile) throw (ComponentErrors::ComponentErrorsExImpl) { int s, i, l; - const char * value; if ((m_sector1 == true)&&(m_sector2 == true)&&(m_sector3 == true)&&(m_sector4 == true)&&(m_sector5 == true)&&(m_sector6 == true)&&(m_sector7 == true)&&(m_sector8 == true)) { //printf("setProfile corrections\n"); - value = USDTABLECORRECTIONS; - ifstream usdCorrections (value); + ifstream usdCorrections (USDTABLECORRECTIONS); if (!usdCorrections) { - ACS_SHORT_LOG ((LM_INFO, "File %s not found", value)); + ACS_SHORT_LOG ((LM_INFO, "File %s not found", USDTABLECORRECTIONS)); exit(-1); } actuatorsCorrections.length(NPOSITIONS); @@ -1723,7 +1721,7 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP m_sector7 = false; m_sector8 = false; usdCounter = usdCounterS1 + usdCounterS2 + usdCounterS3 + usdCounterS4 + usdCounterS5 + usdCounterS6 + usdCounterS7 + usdCounterS8; - + m_ASup=true; m_status=Management::MNG_OK; @@ -1735,7 +1733,7 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP m_ASup=false; } //printf("usdCounter = %d\n", usdCounter); - } + } if (m_ASup == true) { CIRATools::Wait(1000000); @@ -1830,7 +1828,7 @@ void CSRTActiveSurfaceBossCore::setActuator(int circle, int actuator, long int& { if (!CORBA::is_nil(usd[circle][actuator])) { ACSErr::Completion_var completion; - ACS::ROlong_var actPos_var; + ACS::ROlong_var actPos_var; ACS::RWlong_var cmdPos_var; ACS::RWlong_var Fmin_var; ACS::RWlong_var Fmax_var; @@ -1916,7 +1914,7 @@ void CSRTActiveSurfaceBossCore::usdStatus4GUIClient(int circle, int actuator, CO /*CompletionImpl local(completion); if (!local.isErrorFree()) { _ADD_BACKTRACE(ComponentErrors::CouldntGetAttributeExImpl,impl,local,"CSRTActiveSurfaceBossCore::usdStatus4GUIClient()"); - impl.setComponentName((const char*)usd[circle][actuator]->name()); + impl.setComponentName((const char*)usd[circle][actuator]->name()); impl.setAttributeName("usd status"); throw impl; }*/ @@ -2080,7 +2078,7 @@ void CSRTActiveSurfaceBossCore::enableAutoUpdate() { if (!AutoUpdate) { AutoUpdate=true; - ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::enableAutoUpdate()",(LM_NOTICE,"SRTActiveSurfaceBoss::AUTOMATIC_UPDATE_ENABLED")); + ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::enableAutoUpdate()",(LM_NOTICE,"SRTActiveSurfaceBoss::AUTOMATIC_UPDATE_ENABLED")); } } @@ -2088,7 +2086,7 @@ void CSRTActiveSurfaceBossCore::disableAutoUpdate() { if (AutoUpdate) { AutoUpdate=false; - ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::disableAutoUpdate()",(LM_NOTICE,"SRTActiveSurfaceBoss::AUTOMATIC_UPDATE_DISABLED")); + ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::disableAutoUpdate()",(LM_NOTICE,"SRTActiveSurfaceBoss::AUTOMATIC_UPDATE_DISABLED")); } } -- GitLab From 3bbce95b25ceb8a749109d30fdccae212b3145e8 Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 18 Oct 2017 17:25:19 +0200 Subject: [PATCH 093/145] fix #175: added the missing line continuation character --- SystemMake/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 212b6c331..540d9a230 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -114,7 +114,7 @@ ifeq ($(STATION),Medicina) ClientErrors ComponentErrors AntennaErrors ParserErrors BackendsErrors ManagementErrors ReceiversErrors MetrologyErrors MinorServoErrors XBackendErrors\ CommonInterface ManagmentInterface AntennaInterface ReceiversInterface BackendsInterface MinorServoInterface WeatherStationInterface ActiveSurfaceInterface XBackendInterface\ MedicinaAntennaInterface MedicinaWeatherStationInterface \ - SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel XarcosLibrary + SlaLibrary IRALibrary TextWindowLibrary ParserLibrary ComponentProxy ModbusChannel XarcosLibrary \ PyTestingLibrary \ AntennaBoss Observatory OTF PointingModel Refraction SkySource Moon FitsWriter Scheduler ReceiversBoss ExternalClients CalibrationTool \ Metrology TotalPower NoiseGenerator MedicinaMount MedWeatherStation CustomLogger XBackend MedicinaMinorServo\ -- GitLab From e25639812d5688b86d9a968984abff833770c491 Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 6 Dec 2017 10:49:21 +0100 Subject: [PATCH 094/145] fix #180: ACS team changed the way the logging service is registered in the naming service. Some tuning done --- .../ComponentErrors/idl/ComponentErrors.xml | 4 + .../CustomLogger/include/CustomLoggerImpl.h | 13 ++- .../CustomLogger/src/CustomLoggerImpl.cpp | 106 ++++++++++++------ Common/Servers/CustomLogger/src/Makefile | 4 + .../Servers/CustomLogger/src/emitErrorLogTest | 6 + .../CustomLogger/src/emitLogMessage.py | 67 +++++++++++ 6 files changed, 165 insertions(+), 35 deletions(-) create mode 100644 Common/Servers/CustomLogger/src/emitErrorLogTest create mode 100644 Common/Servers/CustomLogger/src/emitLogMessage.py diff --git a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml index b1feadac7..a95bc74da 100644 --- a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml +++ b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml @@ -104,6 +104,10 @@ + + + + diff --git a/Common/Servers/CustomLogger/include/CustomLoggerImpl.h b/Common/Servers/CustomLogger/include/CustomLoggerImpl.h index 675c18c55..e63d571c1 100644 --- a/Common/Servers/CustomLogger/include/CustomLoggerImpl.h +++ b/Common/Servers/CustomLogger/include/CustomLoggerImpl.h @@ -108,8 +108,8 @@ class CustomLoggerImpl: public virtual baci::CharacteristicComponentImpl, nc::SimpleSupplier *m_loggingSupplier; CosNaming::NamingContext_var namingContext_m; CosNotifyChannelAdmin::EventChannel_var ec_; - CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_; - CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_; + //CosNotifyChannelAdmin::InterFilterGroupOperator ifgop_; + CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin_; //* CustomStructuredPushConsumer* consumer_; /** * Filter the log records. @@ -151,6 +151,15 @@ class CustomLoggerImpl: public virtual baci::CharacteristicComponentImpl, */ void addToLoggingQueue(LogRecord_sp log_record); /**@}*/ + /** + * + */ + void createConsumerAdmin(); + /** + * get the reference to notification channel + * @throw ComponentErrors::CORBAProblemExImpl + */ + void resolveNotifyChannel(const char *channel_binding_name) throw (ComponentErrors::CORBAProblemExImpl); }; /** diff --git a/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp b/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp index c2cf93480..1b7595fec 100644 --- a/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp +++ b/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp @@ -114,42 +114,56 @@ CustomLoggerImpl::setMaxLevel(LogLevel level) throw (CORBA::SystemException) void CustomLoggerImpl::initialize() throw (ACSErr::ACSbaseExImpl) { - ACS::Time _timestamp; - setLogging(false); - CosNaming::Name name(1); - name.length(1); - name[0].id = CORBA::string_dup(CUSTOM_LOGGING_CHANNEL); - name[0].kind = LOGGING_CHANNEL_KIND; - ifgop_ = CosNotifyChannelAdmin::OR_OP; - m_nevents_sp->getDevIO()->write((long)0, _timestamp); - ACS_SHORT_LOG((LM_DEBUG, "CutomLoggerImpl : resolving name service")); - namingContext_m = maci::ContainerImpl::getContainer()->getService(acscommon::NAMING_SERVICE_NAME, 0, true); - if(CORBA::is_nil(namingContext_m)) - { - _EXCPT(ComponentErrors::CORBAProblemExImpl, _dummy, "CustomLoggerImpl::initialize"); - //CUSTOM_EXCPT_LOG(_dummy); - throw _dummy; - } - ACS_SHORT_LOG((LM_DEBUG, "CutomLoggerImpl : resolving logging channel name")); - CORBA::Object_var obj = namingContext_m -> resolve(name); - ec_ = CosNotifyChannelAdmin::EventChannel::_narrow(obj.in()); - ACS_SHORT_LOG((LM_DEBUG, "CutomLoggerImpl : subscribing to the logging channel")); - CosNotifyChannelAdmin::AdminID adminid; - consumer_admin_ = ec_->new_for_consumers(ifgop_, adminid); - ACE_ASSERT(!CORBA::is_nil(consumer_admin_.in())); - consumer_ = new CustomStructuredPushConsumer (this); - consumer_->connect (consumer_admin_.in()); - CosNotification::EventTypeSeq added(1); - CosNotification::EventTypeSeq removed (0); - added.length (1); - removed.length (0); - added[0].domain_name = CORBA::string_dup ("*"); - added[0].type_name = CORBA::string_dup ("*"); - consumer_admin_->subscription_change (added, removed); + ACS::Time _timestamp; + setLogging(false); + //CosNaming::Name name(1); + //name.length(1); + //name[0].id = CORBA::string_dup(CUSTOM_LOGGING_CHANNEL); + //name[0].kind = LOGGING_CHANNEL_KIND; + //ifgop_ = CosNotifyChannelAdmin::OR_OP; + m_nevents_sp->getDevIO()->write((long)0, _timestamp); + ACS_SHORT_LOG((LM_DEBUG,"Resolving the name service")); + try { + namingContext_m = maci::ContainerImpl::getContainer()->getService(acscommon::NAMING_SERVICE_NAME, 0, true); + } + catch (maciErrType::CannotGetServiceExImpl& ex) { + _ADD_BACKTRACE(ComponentErrors::ACSServiceExImpl,impl,ex,"CustomLoggerImpl::initialize"); + impl.setServiceName(acscommon::NAMING_SERVICE_NAME); + throw impl; + } + if(CORBA::is_nil(namingContext_m)) + { + _EXCPT(ComponentErrors::CORBAProblemExImpl, _dummy,"CustomLoggerImpl::initialize"); + //CUSTOM_EXCPT_LOG(_dummy); + throw _dummy; + } + ACS_SHORT_LOG((LM_DEBUG,"Resolving logging channel name")); + // this should be the name of the logging channel as it should be registered in the name service + std::string channelName=BaseHelper::combineChannelAndDomainName(acscommon::LOGGING_CHANNEL_XML_NAME,acscommon::ACS_NC_DOMAIN_LOGGING); + //CORBA::Object_var obj = namingContext_m -> resolve(name); + //ec_ = CosNotifyChannelAdmin::EventChannel::_narrow(obj.in()); + resolveNotifyChannel(channelName.c_str()); // throw (ComponentErrors::CORBAProblemExImpl) + // now subscribe to the channel...... + ACS_SHORT_LOG((LM_DEBUG,"Subscribing to the logging channel")); + //CosNotifyChannelAdmin::AdminID adminid; + //consumer_admin_ = ec_->new_for_consumers(ifgop_, adminid); + //ACE_ASSERT(!CORBA::is_nil(consumer_admin_.in())); + createConsumerAdmin(); + // creating a new consumer..... + consumer_=new CustomStructuredPushConsumer (this); + consumer_->connect(consumer_admin_.in()); + // Setup the CA to receive event_type + CosNotification::EventTypeSeq added(1); + CosNotification::EventTypeSeq removed (0); + added.length(1); + removed.length(0); + added[0].domain_name=CORBA::string_dup ("*"); + added[0].type_name=CORBA::string_dup ("*"); + consumer_admin_->subscription_change(added,removed); /* LOGGING INITIALIZATION ========================*/ - ACS_SHORT_LOG((LM_DEBUG, "CutomLoggerImpl : Initializing EXPAT for xml parsing")); + ACS_SHORT_LOG((LM_DEBUG, "Initializing EXPAT for xml parsing")); log_parser = init_log_parsing(); long _a_age; if(IRA::CIRATools::getDBValue(getContainerServices(), "LogMaxAgeMillis", _a_age)) @@ -548,6 +562,32 @@ CustomLoggerImpl::handle_xml_error() _writer->resume(); }; +void CustomLoggerImpl::createConsumerAdmin() +{ + CosNotifyChannelAdmin::AdminID adminid; + CosNotifyChannelAdmin::InterFilterGroupOperator ifgop=CosNotifyChannelAdmin::OR_OP; + consumer_admin_=ec_->new_for_consumers(ifgop,adminid); + ACE_ASSERT(!CORBA::is_nil(consumer_admin_.in())); +} + +void CustomLoggerImpl::resolveNotifyChannel(const char *channel_binding_name) throw (ComponentErrors::CORBAProblemExImpl) +{ + CORBA::Object_var obj; + CosNaming::Name name(1); + name.length(1); + name[0].id=CORBA::string_dup(channel_binding_name); + name[0].kind=acscommon::NC_KIND; + try { + obj=namingContext_m->resolve(name); + ec_=CosNotifyChannelAdmin::EventChannel::_narrow(obj.in()); + } + catch (...) { + _EXCPT(ComponentErrors::CORBAProblemExImpl, _dummy,"CustomLoggerImpl::resolveNotifyChannel"); + throw _dummy; + } + +} + CustomStructuredPushConsumer::CustomStructuredPushConsumer(CustomLoggerImpl* logger) : logger_(logger) { diff --git a/Common/Servers/CustomLogger/src/Makefile b/Common/Servers/CustomLogger/src/Makefile index 338ce0ec8..862c80533 100644 --- a/Common/Servers/CustomLogger/src/Makefile +++ b/Common/Servers/CustomLogger/src/Makefile @@ -30,6 +30,10 @@ IDL_FILES = TAO_IDLFLAGS = USER_IDL = +SCRIPTS_L = emitErrorLogTest + +PY_SCRIPTS_L = emitLogMessage + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ diff --git a/Common/Servers/CustomLogger/src/emitErrorLogTest b/Common/Servers/CustomLogger/src/emitErrorLogTest new file mode 100644 index 000000000..253ea9474 --- /dev/null +++ b/Common/Servers/CustomLogger/src/emitErrorLogTest @@ -0,0 +1,6 @@ +#! /bin/bash +. acsstartupLogging.sh + + +ACS_LOG_ERROR "emitErrorLog" "Test Error log......." + diff --git a/Common/Servers/CustomLogger/src/emitLogMessage.py b/Common/Servers/CustomLogger/src/emitLogMessage.py new file mode 100644 index 000000000..5a944799c --- /dev/null +++ b/Common/Servers/CustomLogger/src/emitLogMessage.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python + +# This is a python test program that send a log message to the ACS logging service. +#who when what +#Andrea Orlati(a.orlati@ira.inaf.it) 01/12/2017 Creation + +import getopt, sys +from Acspy.Clients.SimpleClient import PySimpleClient +from IRAPy import logger + +def usage(): + print "emitLogMessage [-h|--help] [-m|--message=] [-e] [-n]" + print + print "Emits two logs, one classic ACS log and one custom" + print + print "[-h|--help] displays this help" + print "[-t|--text=] allows to give the test message of the log" + print "[-e] log an error message, if not provided a notice is logged" + +def main(): + try: + opts, args = getopt.getopt(sys.argv[1:],"hent:",["help","text="]) + except getopt.GetoptError, err: + print str(err) + usage() + sys.exit(1) + + message="" + error=False + for o, a in opts: + if o in ("-h", "--help"): + usage() + sys.exit(1) + elif o in ("-t", "--text"): + message=a + elif o in ("-e"): + error=True + + if message=="": + print "text message is mandatory" + print "" + usage() + sys.exit(1) + + simpleClient=PySimpleClient() + + print "emitting custom log...." + + if error: + logger.logError(message) + else: + logger.logNotice(message) + + print "emitting ACS log...." + + if error: + simpleClient.getLogger().logError(message) + else: + simpleClient.getLogger().logNotice(message) + + + print "all done...." + + simpleClient.disconnect() + +if __name__=="__main__": + main() -- GitLab From 4d3f4bfbf60aa6a5b6073dc69f8379a5f2f78e35 Mon Sep 17 00:00:00 2001 From: aorlati Date: Thu, 11 Jan 2018 18:32:32 +0100 Subject: [PATCH 095/145] fix #182: all warnings solved, also in SRT and Noto lines --- .../AntennaErrors/idl/AntennaErrors.xml | 32 +++++----- .../BackendsErrors/idl/BackendsErrors.xml | 16 ++--- .../Errors/ClientErrors/idl/ClientErrors.xml | 18 +++--- .../ComponentErrors/idl/ComponentErrors.xml | 52 ++++++++--------- .../ManagementErrors/idl/ManagementErrors.xml | 58 +++++++++---------- .../Errors/ParserErrors/idl/ParserErrors.xml | 26 ++++----- .../ReceiversErrors/idl/DerotatorErrors.xml | 16 ++--- .../ReceiversErrors/idl/ReceiversErrors.xml | 28 ++++----- .../XBackendErrors/idl/XBackendsErrors.xml | 8 +-- .../NotoActiveSurfaceErrors/idl/ASErrors.xml | 54 ++++++++--------- .../SRTActiveSurfaceErrors/idl/ASErrors.xml | 54 ++++++++--------- 11 files changed, 181 insertions(+), 181 deletions(-) diff --git a/Common/Errors/AntennaErrors/idl/AntennaErrors.xml b/Common/Errors/AntennaErrors/idl/AntennaErrors.xml index e0e3000ac..8ee09ef91 100644 --- a/Common/Errors/AntennaErrors/idl/AntennaErrors.xml +++ b/Common/Errors/AntennaErrors/idl/AntennaErrors.xml @@ -16,47 +16,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/BackendsErrors/idl/BackendsErrors.xml b/Common/Errors/BackendsErrors/idl/BackendsErrors.xml index f59ab6625..5875e3213 100644 --- a/Common/Errors/BackendsErrors/idl/BackendsErrors.xml +++ b/Common/Errors/BackendsErrors/idl/BackendsErrors.xml @@ -15,23 +15,23 @@ - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ClientErrors/idl/ClientErrors.xml b/Common/Errors/ClientErrors/idl/ClientErrors.xml index 8fdfb1517..ee479d671 100644 --- a/Common/Errors/ClientErrors/idl/ClientErrors.xml +++ b/Common/Errors/ClientErrors/idl/ClientErrors.xml @@ -13,32 +13,32 @@ - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml index a95bc74da..05c31e4c8 100644 --- a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml +++ b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml @@ -16,97 +16,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml index 813af16b2..60ec4573d 100644 --- a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml +++ b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml @@ -18,94 +18,94 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ParserErrors/idl/ParserErrors.xml b/Common/Errors/ParserErrors/idl/ParserErrors.xml index eac005172..aed5689a6 100644 --- a/Common/Errors/ParserErrors/idl/ParserErrors.xml +++ b/Common/Errors/ParserErrors/idl/ParserErrors.xml @@ -16,41 +16,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml b/Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml index 276a675a0..8e5905906 100755 --- a/Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml +++ b/Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml @@ -19,24 +19,24 @@ description="Cannot perform the derotator configuration"/> + shortDescription=" " + description="The derotator is not remotely controllable"/> + shortDescription=" " + description="Cannot set the position"/> + shortDescription=" " + description="Position out of range"/> + shortDescription=" " + description="Unexpected error"/> diff --git a/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml b/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml index c889993a4..6bc708697 100755 --- a/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml +++ b/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml @@ -14,45 +14,45 @@ shortDescription="Error configuring the receiver" description="Cannot perform the receiver configuration"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml b/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml index d62dad8c9..8c1bea51f 100644 --- a/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml +++ b/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml @@ -13,12 +13,12 @@ - + - + - + - + diff --git a/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml b/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml index 16f3a9952..b13f6468f 100644 --- a/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml +++ b/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml @@ -14,37 +14,37 @@ xmlns="Alma/ACSError" xsi:noNamespaceSchemaLocation="Alma/ACSError ACSError.xsd" name="ASErrors" type="2003" _prefix="alma"> - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + diff --git a/SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml b/SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml index 16f3a9952..b13f6468f 100644 --- a/SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml +++ b/SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml @@ -14,37 +14,37 @@ xmlns="Alma/ACSError" xsi:noNamespaceSchemaLocation="Alma/ACSError ACSError.xsd" name="ASErrors" type="2003" _prefix="alma"> - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + -- GitLab From 55980e027d2f3d4f3e4beccb3dcd7977132eaba4 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 22 Jan 2018 18:12:29 +0100 Subject: [PATCH 096/145] Fix #185, addressed segfault error. (#186) sounds good. --- Common/Libraries/IRALibrary/src/Error.cpp | 4 +- .../IRALibrary/tests/CError_regression.i | 39 +++++++++++++++++++ .../Libraries/IRALibrary/tests/unittest.cpp | 5 +++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 Common/Libraries/IRALibrary/tests/CError_regression.i diff --git a/Common/Libraries/IRALibrary/src/Error.cpp b/Common/Libraries/IRALibrary/src/Error.cpp index 3fac15476..caab234a7 100644 --- a/Common/Libraries/IRALibrary/src/Error.cpp +++ b/Common/Libraries/IRALibrary/src/Error.cpp @@ -52,7 +52,7 @@ CError::CError(const CError& rSrc) m_sFile=rSrc.m_sFile; m_sRoutine=rSrc.m_sRoutine; m_dwLine=rSrc.m_dwLine; - for(int i=0;i + +namespace IRALibraryTest { + +class IRALibrary_CError : public ::testing::Test { +public: + ::testing::AssertionResult copyConstructor_segfault() { + testSegFault(); + return ::testing::AssertionSuccess(); + } + +private: + IRA::CError m_error; + + IRA::CError testSegFault() { + // This SHOULD NOT generate a Segmentation fault after fix #185. + m_error.setError(IRA::CError::SerialType,IRA::CError::SrlPortConfig); + return m_error; + } + +protected: + + static void TearDownTestCase() + { + } + + static void SetUpTestCase() + { + } + + virtual void SetUp() { + } + virtual void TearDown() { + } +}; + +} diff --git a/Common/Libraries/IRALibrary/tests/unittest.cpp b/Common/Libraries/IRALibrary/tests/unittest.cpp index 436406cbb..8c702deab 100644 --- a/Common/Libraries/IRALibrary/tests/unittest.cpp +++ b/Common/Libraries/IRALibrary/tests/unittest.cpp @@ -4,6 +4,7 @@ #include "FastQueue_test.i" #include "Socket_test.i" +#include "CError_regression.i" using namespace IRALibraryTest; @@ -62,3 +63,7 @@ TEST_F(IRALibrary_FastQueue,FastQueue_checkConsistency){ TEST_F(IRALibrary_Socket, sendWithoutConnection){ EXPECT_TRUE(sendWithoutConnection()); } + +TEST_F(IRALibrary_CError, copyConstructor_segfault){ + EXPECT_TRUE(copyConstructor_segfault()); +} -- GitLab From c2735dc70d51924a71fed2ab74bac3c287166ebc Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 22 Jan 2018 18:14:42 +0100 Subject: [PATCH 097/145] Fix #181, removed redundant inheritance. This has to be tested properly with the telescope. (#183) Closing issue... --- SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl b/SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl index 225fd18a1..2710d184f 100644 --- a/SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl +++ b/SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl @@ -10,7 +10,7 @@ module Receivers { - interface SRTKBandDerotator : ACS::CharacteristicComponent, GenericDerotator { + interface SRTKBandDerotator : GenericDerotator { /** Computation of the sensor lenght * -- GitLab From 8aca224aacb6c1cf10720f65fb6e17d44a9a1117 Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 23 Jan 2018 10:28:54 +0100 Subject: [PATCH 098/145] Fix #184: solved --- .../Errors/ManagementErrors/idl/ManagementErrors.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml index 60ec4573d..13d029e05 100644 --- a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml +++ b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -102,7 +102,7 @@ - + -- GitLab From d885b80de5717054965dac040b2293e41b0a0e48 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Tue, 23 Jan 2018 13:55:52 +0100 Subject: [PATCH 099/145] Fix #179, added SRTLPBandReceiver in SRT/Servers/Makefile. (#187) --- SRT/Servers/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SRT/Servers/Makefile b/SRT/Servers/Makefile index d38ba4173..d8f18c92f 100644 --- a/SRT/Servers/Makefile +++ b/SRT/Servers/Makefile @@ -36,7 +36,8 @@ MODULES = SRTActiveSurfaceLanServer \ SRTMount \ SRTKBandMFReceiver \ SRTWeatherStation \ - SRT7GHzReceiver + SRT7GHzReceiver \ + SRTLPBandReceiver MAKE_FLAGS = "-k" PLATFORM := $(shell uname) -- GitLab From 67a891277af21741689e0e299356d2112279bc4d Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Tue, 23 Jan 2018 15:24:44 +0100 Subject: [PATCH 100/145] Fix #188, fixed the cause of multiple cdbChecker warnings. (#191) --- .../config/CDB/schemas/GenericBackend.xsd | 10 +- .../config/CDB/schemas/LocalOscillator.xsd | 10 +- .../CDB/schemas/LocalOscillatorEthernet.xsd | 19 ++- .../config/CDB/schemas/AntennaBoss.xsd | 144 +++++++++--------- .../config/CDB/schemas/CalibrationTool.xsd | 99 ++++++------ .../config/CDB/schemas/CustomLogger.xsd | 34 ++--- .../config/CDB/schemas/ExternalClients.xsd | 6 +- .../config/CDB/schemas/RFIMonitoring.xsd | 6 +- .../config/CDB/schemas/FitsWriter.xsd | 68 +++++---- .../config/CDB/schemas/Observatory.xsd | 8 +- .../config/CDB/schemas/DewarPositioner.xsd | 9 +- .../config/CDB/schemas/ReceiversBoss.xsd | 10 +- .../config/CDB/schemas/Scheduler.xsd | 6 +- .../CDB/schemas/SRTActiveSurfaceBoss.xsd | 4 + .../config/CDB/schemas/lan.xsd | 14 +- .../config/CDB/schemas/usd.xsd | 29 ++-- .../config/CDB/schemas/SRTKBandDerotator.xsd | 6 +- .../config/CDB/schemas/MinorServo.xsd | 18 ++- .../SRTMount/config/CDB/schemas/SRTMount.xsd | 10 +- .../config/CDB/schemas/WeatherStation.xsd | 8 +- 20 files changed, 296 insertions(+), 222 deletions(-) diff --git a/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd b/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd index 90b37ab8c..a305f51e2 100644 --- a/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd +++ b/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd @@ -18,12 +18,16 @@ - + + + + default="TCP=${HOST}:14000"/> + + - \ No newline at end of file + diff --git a/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd b/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd index f60199b9a..20fbcefea 100644 --- a/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd +++ b/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd @@ -9,17 +9,19 @@ - - + + + - + - + + diff --git a/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillatorEthernet.xsd b/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillatorEthernet.xsd index a11aa685d..b197ef410 100644 --- a/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillatorEthernet.xsd +++ b/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillatorEthernet.xsd @@ -9,14 +9,17 @@ - - - - - - - - + + + + + + + + + + + diff --git a/Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd b/Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd index af5e1ec7f..47b0bb869 100644 --- a/Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd +++ b/Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd @@ -22,77 +22,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd b/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd index 75af69ae4..2d00a930f 100644 --- a/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd +++ b/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd @@ -21,54 +21,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/Common/Servers/CustomLogger/config/CDB/schemas/CustomLogger.xsd b/Common/Servers/CustomLogger/config/CDB/schemas/CustomLogger.xsd index 20af0357f..4d2365678 100644 --- a/Common/Servers/CustomLogger/config/CDB/schemas/CustomLogger.xsd +++ b/Common/Servers/CustomLogger/config/CDB/schemas/CustomLogger.xsd @@ -17,23 +17,23 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Common/Servers/ExternalClients/config/CDB/schemas/ExternalClients.xsd b/Common/Servers/ExternalClients/config/CDB/schemas/ExternalClients.xsd index 248554d7d..483f31cf8 100644 --- a/Common/Servers/ExternalClients/config/CDB/schemas/ExternalClients.xsd +++ b/Common/Servers/ExternalClients/config/CDB/schemas/ExternalClients.xsd @@ -20,6 +20,8 @@ + + @@ -27,7 +29,9 @@ - + + + diff --git a/Common/Servers/ExternalClients/config/CDB/schemas/RFIMonitoring.xsd b/Common/Servers/ExternalClients/config/CDB/schemas/RFIMonitoring.xsd index 0956e6e22..270e43b29 100644 --- a/Common/Servers/ExternalClients/config/CDB/schemas/RFIMonitoring.xsd +++ b/Common/Servers/ExternalClients/config/CDB/schemas/RFIMonitoring.xsd @@ -20,6 +20,8 @@ + + @@ -27,7 +29,9 @@ - + + + diff --git a/Common/Servers/FitsWriter/config/CDB/schemas/FitsWriter.xsd b/Common/Servers/FitsWriter/config/CDB/schemas/FitsWriter.xsd index ee3294917..4bcecc514 100644 --- a/Common/Servers/FitsWriter/config/CDB/schemas/FitsWriter.xsd +++ b/Common/Servers/FitsWriter/config/CDB/schemas/FitsWriter.xsd @@ -21,7 +21,9 @@ - + + + @@ -32,37 +34,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd index ce3318669..f0b1cb7f7 100644 --- a/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd +++ b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd @@ -19,7 +19,9 @@ - + + + @@ -45,7 +47,9 @@ - + + + diff --git a/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd b/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd index 7dbc56443..d9bb3de64 100644 --- a/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd +++ b/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd @@ -16,13 +16,14 @@ - + + - - + @@ -30,6 +31,8 @@ + + diff --git a/Common/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd b/Common/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd index dcd42e2c9..8f5d7b79b 100644 --- a/Common/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd +++ b/Common/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd @@ -26,7 +26,9 @@ - + + + @@ -59,9 +61,11 @@ - + + + - \ No newline at end of file + diff --git a/Common/Servers/Scheduler/config/CDB/schemas/Scheduler.xsd b/Common/Servers/Scheduler/config/CDB/schemas/Scheduler.xsd index c5be4399a..a319070d3 100644 --- a/Common/Servers/Scheduler/config/CDB/schemas/Scheduler.xsd +++ b/Common/Servers/Scheduler/config/CDB/schemas/Scheduler.xsd @@ -22,6 +22,8 @@ + + @@ -82,7 +84,9 @@ - + + + diff --git a/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd b/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd index 4c39d0558..54aaadcf2 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd +++ b/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd @@ -23,6 +23,8 @@ + + @@ -36,6 +38,8 @@ + + diff --git a/SRT/Servers/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd b/SRT/Servers/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd index 66661b19b..94fe40eb3 100644 --- a/SRT/Servers/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd +++ b/SRT/Servers/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd @@ -17,14 +17,18 @@ - - + + + + - + - - + + + + diff --git a/SRT/Servers/SRTActiveSurfaceUSDServer/config/CDB/schemas/usd.xsd b/SRT/Servers/SRTActiveSurfaceUSDServer/config/CDB/schemas/usd.xsd index 110e97dea..50162a561 100644 --- a/SRT/Servers/SRTActiveSurfaceUSDServer/config/CDB/schemas/usd.xsd +++ b/SRT/Servers/SRTActiveSurfaceUSDServer/config/CDB/schemas/usd.xsd @@ -19,7 +19,9 @@ - + + + @@ -47,19 +49,20 @@ - + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd index 80665066e..1e63b2f81 100644 --- a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd +++ b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd @@ -23,7 +23,8 @@ schemaLocation="Managment.xsd"/> - + + @@ -113,6 +114,9 @@ + + + diff --git a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd index e80803ce6..f1dff65be 100644 --- a/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd +++ b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd @@ -22,6 +22,8 @@ + + @@ -78,8 +80,8 @@ - - + @@ -103,16 +105,20 @@ - + + + + + @@ -127,8 +133,8 @@ - - + @@ -143,6 +149,8 @@ + + diff --git a/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd b/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd index 459411aa3..d55c6a762 100644 --- a/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd +++ b/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd @@ -86,7 +86,9 @@ - + + + @@ -100,7 +102,7 @@ - + @@ -147,7 +149,9 @@ - + + + diff --git a/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd b/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd index 56f9b144d..5b5039648 100644 --- a/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd +++ b/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd @@ -3,7 +3,9 @@ - + + + @@ -16,7 +18,9 @@ - + + + -- GitLab From 6229dd61256f05ac337a98093ec8bbb0d4c2eb1f Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 23 Jan 2018 15:49:06 +0100 Subject: [PATCH 101/145] Fix #190: all three production line affected, also test CDB tuned (#192) --- Medicina/CDB/MACI/Managers/Manager/Manager.xml | 9 +++++---- .../Configuration/CDB/MACI/Managers/Manager/Manager.xml | 9 +++++---- Noto/CDB/MACI/Managers/Manager/Manager.xml | 9 +++++---- Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml | 9 +++++---- SRT/CDB/MACI/Managers/Manager/Manager.xml | 4 +++- SRT/Configuration/CDB/MACI/Managers/Manager/Manager.xml | 4 +++- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Medicina/CDB/MACI/Managers/Manager/Manager.xml b/Medicina/CDB/MACI/Managers/Manager/Manager.xml index 7a192ed1f..78350a0f6 100755 --- a/Medicina/CDB/MACI/Managers/Manager/Manager.xml +++ b/Medicina/CDB/MACI/Managers/Manager/Manager.xml @@ -3,10 +3,11 @@ xmlns="urn:schemas-cosylab-com:Manager:1.0" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Timeout="50.0" - ClientPingInterval="30.0" - ContainerPingInterval="30.0" - AdministratorPingInterval="20.0"> + Timeout="50.0" + ClientPingInterval="30.0" + AdministratorPingInterval="45.0" + ContainerPingInterval="30.0" + ServerThreads="15"> diff --git a/Medicina/Configuration/CDB/MACI/Managers/Manager/Manager.xml b/Medicina/Configuration/CDB/MACI/Managers/Manager/Manager.xml index 3d6cf5327..cdb694a10 100755 --- a/Medicina/Configuration/CDB/MACI/Managers/Manager/Manager.xml +++ b/Medicina/Configuration/CDB/MACI/Managers/Manager/Manager.xml @@ -3,10 +3,11 @@ xmlns="urn:schemas-cosylab-com:Manager:1.0" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Timeout="50.0" - ClientPingInterval="30.0" - ContainerPingInterval="30.0" - AdministratorPingInterval="20.0"> + Timeout="50.0" + ClientPingInterval="30.0" + AdministratorPingInterval="45.0" + ContainerPingInterval="30.0" + ServerThreads="15"> diff --git a/Noto/CDB/MACI/Managers/Manager/Manager.xml b/Noto/CDB/MACI/Managers/Manager/Manager.xml index 3d6cf5327..cdb694a10 100755 --- a/Noto/CDB/MACI/Managers/Manager/Manager.xml +++ b/Noto/CDB/MACI/Managers/Manager/Manager.xml @@ -3,10 +3,11 @@ xmlns="urn:schemas-cosylab-com:Manager:1.0" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Timeout="50.0" - ClientPingInterval="30.0" - ContainerPingInterval="30.0" - AdministratorPingInterval="20.0"> + Timeout="50.0" + ClientPingInterval="30.0" + AdministratorPingInterval="45.0" + ContainerPingInterval="30.0" + ServerThreads="15"> diff --git a/Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml b/Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml index ee6d25582..649d76c05 100755 --- a/Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml +++ b/Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml @@ -3,10 +3,11 @@ xmlns="urn:schemas-cosylab-com:Manager:1.0" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Timeout="50.0" - ClientPingInterval="30.0" - ContainerPingInterval="30.0" - AdministratorPingInterval="20.0"> + Timeout="50.0" + ClientPingInterval="30.0" + AdministratorPingInterval="45.0" + ContainerPingInterval="30.0" + ServerThreads="15"> diff --git a/SRT/CDB/MACI/Managers/Manager/Manager.xml b/SRT/CDB/MACI/Managers/Manager/Manager.xml index 2d98b97d3..89a110563 100755 --- a/SRT/CDB/MACI/Managers/Manager/Manager.xml +++ b/SRT/CDB/MACI/Managers/Manager/Manager.xml @@ -4,8 +4,10 @@ xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Timeout="50.0" + ClientPingInterval="30.0" + AdministratorPingInterval="45.0" ContainerPingInterval="30.0" - DeadlockTimeout="240.0"> + ServerThreads="15"> - diff --git a/SRT/Configuration/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml b/SRT/Configuration/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml new file mode 100644 index 000000000..8b6e502bf --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml b/SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml new file mode 100644 index 000000000..75b8b71c0 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + -- GitLab From 37d1c2a8db87efa830dbf7d5d22b7fa2327b7b4a Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Tue, 23 Jan 2018 17:46:47 +0100 Subject: [PATCH 104/145] Fix #196, corrected wrong 'name' fields that caused the issue. (#197) * Fix #196, corrected wrong 'name' fields that caused the issue. * Another fix for #196, 'WeatherStation.xml' edit was missing. --- .../Components/MANAGEMENT/ExternalClients/ExternalClients.xml | 2 +- .../Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml | 2 +- .../Components/WEATHERSTATION/WeatherStation/WeatherStation.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/ExternalClients.xml b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/ExternalClients.xml index 6bf67da13..58f240855 100644 --- a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/ExternalClients.xml +++ b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/ExternalClients.xml @@ -8,7 +8,7 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="EXTERNALCLIENTS" + Name="ExternalClients" Code="ExternalClientsImpl" Type="IDL:alma/Management/ExternalClients:1.0" Container="ExternalClientsContainer" diff --git a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml index fa1cc995c..6e49e217f 100644 --- a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml +++ b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml @@ -8,7 +8,7 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="RFIMONITORING" + Name="RFIMonitoring" Code="ExternalClientsImpl" Type="IDL:alma/Management/ExternalClients:1.0" Container="ExternalClientsContainer" diff --git a/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml b/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml index b414a4560..16d8cb2cb 100644 --- a/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml +++ b/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml @@ -8,7 +8,7 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="WeatherStation2" + Name="WeatherStation" Code="SRTWeatherStationImpl" Type="IDL:alma/Weather/SRTStation:1.0" Container="WeatherStationContainer" -- GitLab From 93fed41ece0998f80ac894abcaf79de41888a080 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Wed, 24 Jan 2018 09:09:31 +0100 Subject: [PATCH 105/145] Fix #188, added missing files. I hope they are the last ones. (#198) --- .../config/CDB/schemas/SRT7GHzReceiver.xsd | 8 ++++++-- .../config/CDB/schemas/SRTKBandMFReceiver.xsd | 10 +++++++--- .../config/CDB/schemas/SRTLPBandReceiver.xsd | 8 ++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd index e11733fad..d5d8d3a3c 100644 --- a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd +++ b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd @@ -37,7 +37,9 @@ - + + + @@ -95,7 +97,9 @@ - + + + diff --git a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd index e7c38d2d9..7b1ddf12b 100644 --- a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd +++ b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd @@ -33,7 +33,9 @@ - + + + @@ -131,8 +133,8 @@ - - + @@ -151,6 +153,8 @@ + + diff --git a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd index 867cbe072..86f129078 100755 --- a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd +++ b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd @@ -44,6 +44,8 @@ + + @@ -117,8 +119,8 @@ - - + @@ -141,6 +143,8 @@ + + -- GitLab From 8b1ef470a9b8f8cd0c2f96d3194a1460ca4a0238 Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 24 Jan 2018 09:43:50 +0100 Subject: [PATCH 106/145] fixed last issues that the cdbChecker was complaining about. Now No more errors are found --- .../ExternalClientsContainer.xml | 30 +++++++++++++++++++ .../ExternalClientsContainer.xml | 30 +++++++++++++++++++ .../config/CDB/schemas/SRT7GHzReceiver.xsd | 2 +- .../config/CDB/schemas/SRTKBandMFReceiver.xsd | 2 +- .../config/CDB/schemas/SRTLPBandReceiver.xsd | 2 +- 5 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml create mode 100644 SRT/Configuration/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml diff --git a/SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml b/SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml new file mode 100644 index 000000000..a960e4654 --- /dev/null +++ b/SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml b/SRT/Configuration/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml new file mode 100644 index 000000000..a960e4654 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd index d5d8d3a3c..b6895e7c4 100644 --- a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd +++ b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd @@ -19,7 +19,7 @@ - + diff --git a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd index 7b1ddf12b..dbcbb8177 100644 --- a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd +++ b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd @@ -14,7 +14,7 @@ - + diff --git a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd index 86f129078..fddc898df 100755 --- a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd +++ b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd @@ -14,7 +14,7 @@ - + -- GitLab From 92d2579be3f78686400b8907541c6be11e3d9054 Mon Sep 17 00:00:00 2001 From: aorlati Date: Fri, 26 Jan 2018 14:48:50 +0100 Subject: [PATCH 107/145] Fix #200: Rewritten class IRA::CDtaField in order not to rely on BACIValue class anumore.This should solve the problem related to TotalPower configuration (#201) --- .../Libraries/IRALibrary/include/DataField.h | 8 +- Common/Libraries/IRALibrary/src/DataField.cpp | 46 +++++++----- .../IRALibrary/tests/CDBTable_regression.i | 73 +++++++++++++++++++ .../Libraries/IRALibrary/tests/unittest.cpp | 9 ++- 4 files changed, 112 insertions(+), 24 deletions(-) create mode 100644 Common/Libraries/IRALibrary/tests/CDBTable_regression.i diff --git a/Common/Libraries/IRALibrary/include/DataField.h b/Common/Libraries/IRALibrary/include/DataField.h index c20b91070..521ffbf2e 100644 --- a/Common/Libraries/IRALibrary/include/DataField.h +++ b/Common/Libraries/IRALibrary/include/DataField.h @@ -9,6 +9,7 @@ /* */ /* Who when What */ /* Andrea Orlati(aorlati@ira.inaf.it) 07/06/2006 Creation */ +/* Andrea Orlati(aorlati@ira.inaf.it) 26/01/2018 Rewritten in order to bypass an issue with 64bit ACS2017 */ #include #include @@ -115,12 +116,12 @@ protected: void Last(); /** - * Sets the current field pointer to the next avilable position. If the pointer already points the last one, nothing happens. + * Sets the current field pointer to the next available position. If the pointer already points the last one, nothing happens. */ void Next(); /** - * Sets the current field pointer to the previuos avilable position. If the pointer already points the first one, nothing happens. + * Sets the current field pointer to the previous available position. If the pointer already points the first one, nothing happens. */ void Prev(); @@ -134,7 +135,8 @@ private: CString m_title; TFieldType m_type; int m_listPointer; - std::vector m_valueList; + //std::vector m_valueList; + std::vector m_valueList; CDataField(const CDataField& rSrc); // no implementation given void operator=(const CDataField& rSrc); // no implementation given diff --git a/Common/Libraries/IRALibrary/src/DataField.cpp b/Common/Libraries/IRALibrary/src/DataField.cpp index c0ffb68c1..ebbe731ac 100644 --- a/Common/Libraries/IRALibrary/src/DataField.cpp +++ b/Common/Libraries/IRALibrary/src/DataField.cpp @@ -13,17 +13,17 @@ CDataField::CDataField(const CString& name,const TFieldType& type) : m_title(nam CDataField::~CDataField() { for(unsigned i=0;i=0) { - tmp=m_valueList[m_listPointer]; - return tmp->isNull(); + IRA::CString *tmp=m_valueList[m_listPointer]; + if ((*tmp)!="") return true; + else return false; } else { return true; @@ -37,12 +37,11 @@ IRA::CString CDataField::getColumnName() const IRA::CString CDataField::asString() const { - baci::BACIValue *tmp; + IRA::CString *tmp; if (m_listPointer>=0) { tmp=m_valueList[m_listPointer]; - const char *p=tmp->stringValue(); - if (p==NULL) return IRA::CString(""); - else return IRA::CString(p); + if (tmp==NULL) return IRA::CString(""); + else return *tmp; } else { return IRA::CString(""); @@ -51,10 +50,12 @@ IRA::CString CDataField::asString() const long long CDataField::asLongLong() const { - baci::BACIValue *tmp; + IRA::CString *tmp; + char *pend; if (m_listPointer>=0) { tmp=m_valueList[m_listPointer]; - return tmp->longLongValue(); + if (tmp==NULL) return 0; + return (strtoll((const char *)(*tmp),&pend,10)); } else { return 0; @@ -63,10 +64,12 @@ long long CDataField::asLongLong() const DDWORD CDataField::asDoubleDoubleWord() const { - baci::BACIValue *tmp; + IRA::CString *tmp; + char *pend; if (m_listPointer>=0) { tmp=m_valueList[m_listPointer]; - return (DWORD)tmp->uLongLongValue(); + if (tmp==NULL) return 0; + return (strtoul((const char *)(*tmp),&pend,10)); } else { return 0; @@ -75,29 +78,34 @@ DDWORD CDataField::asDoubleDoubleWord() const double CDataField::asDouble() const { - baci::BACIValue *tmp; + IRA::CString *tmp; + char *pend; if (m_listPointer>=0) { tmp=m_valueList[m_listPointer]; - return tmp->doubleValue(); + if (tmp==NULL) return 0.0; + return (strtod((const char *)(*tmp),&pend)); } else { return 0.0; - } + } } void CDataField::addValue() { - m_valueList.push_back(new baci::BACIValue()); +// m_valueList.push_back(new baci::BACIValue()); + m_valueList.push_back(new IRA::CString("")); } void CDataField::setValue(const CString& value) { - if (value!="") { + IRA::CString *tmp=m_valueList.back(); + (*tmp)=value; + /*if (value!="") { m_valueList.back()->setValue((const char*)value); switch (m_type) { case LONGLONG : { m_valueList.back()->setType(baci::BACIValue::type_longLong); - m_valueList.back()->setValue((const BACIlongLong)atoll((const char*)value)); + //m_valueList.back()->setValue((const BACIlongLong)atoll((const char*)value)); } case DOUBLEDOUBLEWORD : { m_valueList.back()->setType(baci::BACIValue::type_uLongLong); @@ -114,7 +122,7 @@ void CDataField::setValue(const CString& value) m_valueList.back()->setValue((const char*)value); } } - } + }*/ } void CDataField::setPointer(const WORD& pos) diff --git a/Common/Libraries/IRALibrary/tests/CDBTable_regression.i b/Common/Libraries/IRALibrary/tests/CDBTable_regression.i new file mode 100644 index 000000000..968102f1b --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/CDBTable_regression.i @@ -0,0 +1,73 @@ +#include "DataField.h" +#include "String.h" + + +#include + +namespace IRALibraryTest { + +class IRALibrary_CDataField : public ::testing::Test { +public: + // this is the test that identifies issue #200. + ::testing::AssertionResult typeConversion_fail() { + CDBTestField fieldS("string",IRA::CDataField::STRING); + CDBTestField fieldL("long",IRA::CDataField::LONGLONG); + CDBTestField fieldD("double",IRA::CDataField::DOUBLE); + CDBTestField fieldW("word",IRA::CDataField::DOUBLEDOUBLEWORD); + fieldS.addValue(); + fieldL.addValue(); + fieldD.addValue(); + fieldW.addValue(); + fieldS.setValue("dummy"); + fieldL.setValue("-456789"); + fieldD.setValue("12345.678"); + fieldW.setValue("9000"); + fieldS.First(); + fieldL.First(); + fieldD.First();; + fieldW.First(); + if (fieldS.asString()!="dummy") return ::testing::AssertionFailure() << " string not properly converted"; + if (fieldD.asDouble()!=12345.678) return ::testing::AssertionFailure() << " double not properly converted"; + if (fieldW.asDoubleDoubleWord()!=9000) return ::testing::AssertionFailure() << " unsigned long not properly converted"; + if (fieldL.asLongLong()!=-456789) return ::testing::AssertionFailure() << " signed long not properly converted"; + return ::testing::AssertionSuccess(); + } + +private: + // this is a fake class in order to manipulate the CDataField protected methods + class CDBTestField: public IRA::CDataField { + public: + CDBTestField(const IRA::CString& name,const TFieldType& type): IRA::CDataField(name,type) { + } + void addValue() { + IRA::CDataField::addValue(); + } + void setValue(const IRA::CString& value) { + IRA::CDataField::setValue(value); + } + void First() { + IRA::CDataField::First(); + } + void Next() { + IRA::CDataField::Next(); + } + }; + +protected: + + static void TearDownTestCase() + { + } + + static void SetUpTestCase() + { + } + + virtual void SetUp() { + } + + virtual void TearDown() { + } +}; + +} diff --git a/Common/Libraries/IRALibrary/tests/unittest.cpp b/Common/Libraries/IRALibrary/tests/unittest.cpp index 8c702deab..e2e99a744 100644 --- a/Common/Libraries/IRALibrary/tests/unittest.cpp +++ b/Common/Libraries/IRALibrary/tests/unittest.cpp @@ -5,6 +5,7 @@ #include "Socket_test.i" #include "CError_regression.i" +#include "CDBTable_regression.i" using namespace IRALibraryTest; @@ -60,10 +61,14 @@ TEST_F(IRALibrary_FastQueue,FastQueue_checkConsistency){ EXPECT_TRUE(FastQueue_checkConsistency()); } -TEST_F(IRALibrary_Socket, sendWithoutConnection){ +TEST_F(IRALibrary_Socket,sendWithoutConnection){ EXPECT_TRUE(sendWithoutConnection()); } -TEST_F(IRALibrary_CError, copyConstructor_segfault){ +TEST_F(IRALibrary_CError,copyConstructor_segfault){ EXPECT_TRUE(copyConstructor_segfault()); } + +TEST_F(IRALibrary_CDataField,typeConversion_fail){ + EXPECT_TRUE(typeConversion_fail()); +} -- GitLab From fa6002685e4b64f6042a2789f9bf42befc945c48 Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 30 Jan 2018 18:10:17 +0100 Subject: [PATCH 108/145] fix #202: some configurations of the SRT line have been reviewed (#203) --- .../MACI/Components}/LO_SBAND/LO_SBAND.xml | 0 .../SRTSBandMFReceiver/SRTSBandMFReceiver.xml | 0 .../SRTSBandContainer/SRTSBandContainer.xml | 0 SRT/CDB/alma/MINORSERVO/PFP/PFP.xml | 9 +++++---- SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml | 13 +++++++++++++ .../MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml | 6 +++--- SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml | 7 ++++--- .../CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml | 12 +++++++----- 8 files changed, 32 insertions(+), 15 deletions(-) rename SRT/{Configuration/CDB/MACI/Components/RECEIVERS => CDB/MACI/Components}/LO_SBAND/LO_SBAND.xml (100%) rename SRT/{Configuration => }/CDB/MACI/Components/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml (100%) rename SRT/{Configuration => }/CDB/MACI/Containers/SRTSBandContainer/SRTSBandContainer.xml (100%) create mode 100644 SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_SBAND/LO_SBAND.xml b/SRT/CDB/MACI/Components/LO_SBAND/LO_SBAND.xml similarity index 100% rename from SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_SBAND/LO_SBAND.xml rename to SRT/CDB/MACI/Components/LO_SBAND/LO_SBAND.xml diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml b/SRT/CDB/MACI/Components/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml similarity index 100% rename from SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml rename to SRT/CDB/MACI/Components/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml diff --git a/SRT/Configuration/CDB/MACI/Containers/SRTSBandContainer/SRTSBandContainer.xml b/SRT/CDB/MACI/Containers/SRTSBandContainer/SRTSBandContainer.xml similarity index 100% rename from SRT/Configuration/CDB/MACI/Containers/SRTSBandContainer/SRTSBandContainer.xml rename to SRT/CDB/MACI/Containers/SRTSBandContainer/SRTSBandContainer.xml diff --git a/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml b/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml index 7b9ee1231..e27a57e23 100644 --- a/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml +++ b/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml @@ -4,11 +4,12 @@ Marco Buttu, mbuttu@oa-cagliari.inaf.it Created: Tue Oct 13 09:36:00 CEST 2009 - Last Modified: 23/05/2013: limits + modified: 23/05/2013: limits + modified: 29/01/2018: changed the limits of PFP theta --> - + diff --git a/SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml b/SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml new file mode 100644 index 000000000..88a7f0bdd --- /dev/null +++ b/SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml index 628660331..736a18b7e 100644 --- a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml +++ b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml @@ -9,10 +9,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="LO_CBAND" - Code="LocalOscillatorImpl" + Code="LocalOscillatorImpl.LocalOscillator" Type="IDL:alma/Receivers/LocalOscillator:1.0" - Container="LocalOscillatorsContainer" + Container="LocalOscillatorsLPContainer" KeepAliveTime="10" Default="false" - ImplLang="cpp" + ImplLang="py" /> diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml b/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml index b0f3ce3c7..e27a57e23 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml @@ -4,11 +4,12 @@ Marco Buttu, mbuttu@oa-cagliari.inaf.it Created: Tue Oct 13 09:36:00 CEST 2009 - Last Modified: 23/05/2013: limits + modified: 23/05/2013: limits + modified: 29/01/2018: changed the limits of PFP theta --> - + diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml b/SRT/Configuration/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml index 51fe9dc0e..88a7f0bdd 100644 --- a/SRT/Configuration/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml +++ b/SRT/Configuration/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml @@ -4,8 +4,10 @@ - Thu Nov 22 11:09:00 UTC 2012 modified by jDAL - Thu Nov 22 11:09:34 UTC 2012 modified by jDAL --> - - - - - + + + + + + -- GitLab From 4b53bf4a003bec0d3ec885d8c25c4d2ea25eb54e Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 20 Mar 2018 16:14:12 +0100 Subject: [PATCH 109/145] fixed a typo in LO_CBAND component CDB configuration --- .../CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml index 736a18b7e..fd19e1383 100644 --- a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml +++ b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_CBAND/LO_CBAND.xml @@ -11,7 +11,7 @@ Name="LO_CBAND" Code="LocalOscillatorImpl.LocalOscillator" Type="IDL:alma/Receivers/LocalOscillator:1.0" - Container="LocalOscillatorsLPContainer" + Container="LocalOscillatorLPContainer" KeepAliveTime="10" Default="false" ImplLang="py" -- GitLab From b5f568e2f2bd000b836dff43b0950c3197f2bc14 Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 24 Apr 2018 16:17:04 +0200 Subject: [PATCH 110/145] fix #205: fixed for both TotalPower and XArcos (#207) * fix #205: fixed for both TotalPower and XArcos * Fix #125, removed some remaining references to `THeaderRecord` structure and objects. Another reference can be found in XarcosThread.h, used in XarcosThread.cpp, but I believe the methods that uses it are no longer needed. Also, a reference can be found in Common/Servers/HolographyBackend but I'm leaving it there because the component does not build correctly (see #208). * Roach updated with latest TRUNK modifications. --- .../Servers/FitsWriter/src/DataCollection.cpp | 21 ++-- .../include/NoiseGeneratorImpl.h | 4 - .../NoiseGenerator/src/NoiseGeneratorImpl.cpp | 21 ++-- Common/Servers/Roach/include/CommandLine.h | 2 + Common/Servers/Roach/include/RoachImpl.h | 4 - Common/Servers/Roach/src/CommandLine.cpp | 118 ++++++++++++------ Common/Servers/Roach/src/RoachImpl.cpp | 49 ++++---- .../TotalPower/include/TotalPowerImpl.h | 4 - .../Servers/TotalPower/src/SenderThread.cpp | 6 +- .../Servers/TotalPower/src/TotalPowerImpl.cpp | 47 +++---- .../Servers/XBackend/include/XBackendsImpl.h | 5 - Common/Servers/XBackend/src/XBackendsImpl.cpp | 51 ++++---- 12 files changed, 189 insertions(+), 143 deletions(-) diff --git a/Common/Servers/FitsWriter/src/DataCollection.cpp b/Common/Servers/FitsWriter/src/DataCollection.cpp index 0923d4096..50f4148b2 100644 --- a/Common/Servers/FitsWriter/src/DataCollection.cpp +++ b/Common/Servers/FitsWriter/src/DataCollection.cpp @@ -74,17 +74,18 @@ void CDataCollection::saveMainHeaders(Backends::TMainHeader const * h,Backends:: printf("sampleSize: %ld\n",(long)m_mainH.sampleSize); for (long j=0;jid); - printf("bins: %ld\n",(long)m_sectionH->bins); - printf("polarization: %ld\n",(long)m_sectionH->polarization); - printf("bandWidth: %lf\n",(double)m_sectionH->bandWidth); - printf("frequency: %lf\n",(double)m_sectionH->frequency); - printf("attenuation: %lf, %lf\n",(double)m_sectionH->attenuation[0],(double)m_sectionH->attenuation[1]); - printf("sampleRate: %lf\n",(double)m_sectionH->sampleRate); - printf("feed: %ld\n",(long)m_sectionH->feed); - printf("inputs: %ld\n",(long)m_sectionH->inputs); - printf("IF: %ld %ld\n",(long)m_sectionH->IF[0],(long)m_sectionH->IF[1]); + printf("id: %ld\n",(long)m_sectionH[j].id); + printf("bins: %ld\n",(long)m_sectionH[j].bins); + printf("polarization: %d\n",m_sectionH[j].polarization); + printf("bandWidth: %lf\n",m_sectionH[j].bandWidth); + printf("frequency: %lf\n",m_sectionH[j].frequency); + printf("attenuation: %lf, %lf\n",m_sectionH[j].attenuation[0],m_sectionH[j].attenuation[1]); + printf("sampleRate: %lf\n",m_sectionH[j].sampleRate); + printf("feed: %ld\n",(long)m_sectionH[j].feed); + printf("inputs: %ld\n",(long)m_sectionH[j].inputs); + printf("IF: %ld %ld\n",(long)m_sectionH[j].IF[0],(long)m_sectionH[j].IF[1]); }*/ + m_ready=true; // main headers are saved....before that no activity can take place //if (getIsNoData()) { // m_start=true; diff --git a/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h b/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h index 74bbdcfef..0c17a3707 100644 --- a/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h +++ b/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h @@ -401,10 +401,6 @@ protected: virtual void stopSend() throw (CORBA::SystemException, AVStopSendErrorEx) { }; private: - struct THeaderRecord { - Backends::TMainHeader header; - Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; - }; SmartPropertyPointer m_ptime; SmartPropertyPointer m_pbackendName; SmartPropertyPointer m_pbandWidth; diff --git a/Common/Servers/NoiseGenerator/src/NoiseGeneratorImpl.cpp b/Common/Servers/NoiseGenerator/src/NoiseGeneratorImpl.cpp index 5498e9fc0..eea5882d9 100644 --- a/Common/Servers/NoiseGenerator/src/NoiseGeneratorImpl.cpp +++ b/Common/Servers/NoiseGenerator/src/NoiseGeneratorImpl.cpp @@ -236,9 +236,9 @@ void NoiseGeneratorImpl::setTargetFileName (const char * fileName) throw (CORBA: void NoiseGeneratorImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx) { AUTO_TRACE("NoiseGeneratorImpl::sendHeader()"); - //Backends::TMainHeader header; - //Backends::TChannelHeader chHeader[MAX_INPUT_NUMBER]; - THeaderRecord buffer; + Backends::TMainHeader header; + Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; + ACS::doubleSeq tpi; try { m_commandLine->startDataAcquisition(); @@ -247,12 +247,17 @@ void NoiseGeneratorImpl::sendHeader() throw (CORBA::SystemException, BackendsErr ex.log(LM_DEBUG); throw ex.getBackendsErrorsEx(); } - m_commandLine->fillMainHeader(buffer.header); - m_commandLine->fillChannelHeader(buffer.chHeader,MAX_SECTION_NUMBER); + m_commandLine->fillMainHeader(header); + m_commandLine->fillChannelHeader(chHeader,MAX_SECTION_NUMBER); m_commandLine->setTime(); + + char buffer[sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)]; + memcpy(buffer,(void *)&header,sizeof(Backends::TMainHeader)); + memcpy(buffer+sizeof(Backends::TMainHeader),(void *)chHeader,header.sections*sizeof(Backends::TSectionHeader)); + try { - getSender()->startSend(FLOW_NUMBER,(const char*)&buffer, - sizeof(Backends::TMainHeader)+buffer.header.sections*sizeof(Backends::TSectionHeader)); + getSender()->startSend(FLOW_NUMBER,(const char*)buffer, + sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)); //getSender()->startSend(FLOW_NUMBER,(const char*)&header,sizeof(header)); } catch (AVStartSendErrorExImpl& ex) { @@ -268,7 +273,7 @@ void NoiseGeneratorImpl::sendHeader() throw (CORBA::SystemException, BackendsErr } ACS_LOG(LM_FULL_INFO,"NoiseGeneratorImpl::sendHeader()",(LM_INFO,"HEADERS_SENT")); // inform the sender thread about the configuration...... - m_senderThread->saveDataHeader(&(buffer.header),(buffer.chHeader)); + m_senderThread->saveDataHeader(&header,chHeader); } void NoiseGeneratorImpl::terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, diff --git a/Common/Servers/Roach/include/CommandLine.h b/Common/Servers/Roach/include/CommandLine.h index 822e7f3ab..c6adcf054 100644 --- a/Common/Servers/Roach/include/CommandLine.h +++ b/Common/Servers/Roach/include/CommandLine.h @@ -739,10 +739,12 @@ private: */ inline void clearStatusField(TstatusFields field) { m_backendStatus &= ~(1 << field); } + bool m_RK77; bool m_RK00; bool m_RC00; bool m_RL00; bool m_RP00; + bool m_RK77S; bool m_RK00S; bool m_RC00S; bool m_RL00S; diff --git a/Common/Servers/Roach/include/RoachImpl.h b/Common/Servers/Roach/include/RoachImpl.h index 201c70d42..e91a97427 100644 --- a/Common/Servers/Roach/include/RoachImpl.h +++ b/Common/Servers/Roach/include/RoachImpl.h @@ -469,10 +469,6 @@ protected: virtual void stopSend() throw (CORBA::SystemException, AVStopSendErrorEx) { }; private: - struct THeaderRecord { - Backends::TMainHeader header; - Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; - }; SmartPropertyPointer m_ptime; SmartPropertyPointer m_pbackendName; SmartPropertyPointer m_pbandWidth; diff --git a/Common/Servers/Roach/src/CommandLine.cpp b/Common/Servers/Roach/src/CommandLine.cpp index 66271ad8f..508ca42c1 100644 --- a/Common/Servers/Roach/src/CommandLine.cpp +++ b/Common/Servers/Roach/src/CommandLine.cpp @@ -2,9 +2,9 @@ #include #include "CommandLine.h" -/*****************************************************************************************************************************/ +/****************************************************************************************************************************/ #include -/*****************************************************************************************************************************/ +/****************************************************************************************************************************/ #define _CHECK_ERRORS(ROUTINE) \ else if (res==FAIL) { \ @@ -41,10 +41,12 @@ CCommandLine::CCommandLine(ContainerServices *service): CSocket(), m_backendStatus=0; setStatus(NOTCNTD); m_setTpiIntegration=true; + m_RK77=false; m_RK00=false; m_RC00=false; m_RL00=false; m_RP00=false; + m_RK77S=false; m_RK00S=false; m_RC00S=false; m_RL00S=false; @@ -157,7 +159,18 @@ void CCommandLine::stopDataAcquisition() throw (BackendsErrors::ConnectionExImpl ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,ComponentErrors::NotAllowedExImpl,BackendsErrors::BackendFailExImpl) { AUTO_TRACE("CCommandLine::stopDataAcquisition()"); - Message reply = sendBackendCommand(Command::stop()); + /*****************************************************************/ + // since both suspend and stop data acquisition are mapped into Command::stop message to the backend + // It happens (@ the end of a scan) that the backend receives two Command::stop messages. Even if this is not + // an issue for the backend, this leads to an unwanted behviour of the control software. The thrown exception, infact, + // leads to skip the first subscan of the next scan. Temporarly workround if to catch the exception here. A debug messages is sent. + /*****************************************************************/ + try { + Message reply = sendBackendCommand(Command::stop()); + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_DEBUG,"backend error while issuing a stop ascquisition")); + } ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_INFO,"TRANSFER_JOB_STOPPED")); clearStatusField(CCommandLine::BUSY); // sets the component status to busy clearStatusField(CCommandLine::SUSPEND); // sets the component status to transfer job suspended...... @@ -428,11 +441,15 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const if (pol >= 0) { // the user ask for a new value if ((pol == 0) || (pol == 1)) { // LCP or RCP newPol = pol; - m_sectionsNumber = 2; + m_sectionsNumber = 2; + if (m_RK77 == true) + m_sectionsNumber = 14; } if (pol == 2) { // FULL STOKES newPol = pol; - m_sectionsNumber = 1; + m_sectionsNumber = 1; + if (m_RK77S == true) + m_sectionsNumber = 7; } if (pol >= 3) { _EXCPT(ComponentErrors::ValueOutofRangeExImpl,impl,"CCommandLine::setConfiguration()"); @@ -514,7 +531,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const temp="FULL_STOKES"; ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"SECTION_CONFIGURED %ld,FREQ=%lf,BW=%lf,FEED=%d,POL=%s,SR=%lf,BINS=%d",inputId,m_frequency[inputId],newBW,m_feedNumber[inputId], (const char *)temp,newSR,m_bins[inputId])); - if (m_RK00==true || m_RC00==true || m_RK00S==true || m_RC00S==true) { + if (m_RK00==true || m_RC00==true || m_RK00S==true || m_RC00S==true || m_RK77==true || m_RK77S==true) { if (newBW==300.00) filter=300.00; if (newBW==1500.00) @@ -690,8 +707,10 @@ void CCommandLine::getZero(ACS::doubleSeq& tpi) throw (ComponentErrors::TimeoutE BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl) { //getSample(tpi,true); - tpi.length(m_sectionsNumber); - for (int j=0;jgetBoardsNumber(),m_sectionsNumber,m_boards)) { _THROW_EXCPT(BackendsErrors::MalformedAnswerExImpl,"CCommandLine::getSample()"); }*/ - tpi.length(m_sectionsNumber); - for (int j=0;j(j); if (zero) m_tpiZero[j]=tpi[j]; // in case of tpiZero we store it...... @@ -862,10 +881,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ReplyNotValidExImpl,BackendsErrors::BackendFailExImpl) { AUTO_TRACE("CCommandLine::setDefaultConfiguration()"); - double filter; + //double filter; // I do not check for backend busy because this is a call done at the initialization and never repeated - Message reply = sendBackendCommand(Command::setConfiguration(string((const char*)config))); + //Message reply = sendBackendCommand(Command::setConfiguration(string((const char*)config))); /* strcpy (sBuff,"?set-configuration,"); strcat (sBuff,(const char*)config); @@ -878,11 +897,11 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C } */ //if (res>0) { // operation was ok. - if(reply.is_success_reply()){ + //if(reply.is_success_reply()){ //if (!CProtocol::setConfiguration((const char*)config)) { // _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::setDefaultConfiguration()"); //} - } + //} /* else if (res==FAIL) { _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); @@ -899,53 +918,68 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C } ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_INFO,"DEFAULTS_ARE_SET")); */ + if (config.Compare("RK77")==0) { + m_filter=1250.0; + m_rfInputs=2; + m_RK77=true; + m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + } if (config.Compare("RK00")==0) { m_filter=1250.0; m_rfInputs=2; m_RK00=true; - m_RC00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; } if (config.Compare("RC00")==0) { m_filter=1250.0; m_rfInputs=2; m_RC00=true; - m_RK00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; } if (config.Compare("RL00")==0) { m_filter = 2300.0; m_rfInputs=2; m_RL00=true; - m_RK00=m_RC00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; } if (config.Compare("RP00")==0) { m_filter = 730.0; m_rfInputs=2; m_RP00=true; - m_RK00=m_RC00=m_RL00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RL00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + } + if (config.Compare("RK77S")==0) { + m_filter=1250.0; + m_rfInputs=2; + m_RK77S=true; + m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; } if (config.Compare("RK00S")==0) { m_filter=1250.0; m_rfInputs=2; m_RK00S=true; - m_RC00=m_RL00=m_RP00=m_RK00=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RC00S=m_RL00S=m_RP00S=false; } if (config.Compare("RC00S")==0) { m_filter=1250.0; m_rfInputs=2; + m_sectionsNumber=1; m_RC00S=true; - m_RK00=m_RL00=m_RP00=m_RK00S=m_RC00=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RL00S=m_RP00S=false; } if (config.Compare("RL00S")==0) { m_filter = 2300.0; m_rfInputs=2; + m_sectionsNumber=1; m_RL00S=true; - m_RK00=m_RC00=m_RP00=m_RK00S=m_RC00S=m_RL00=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RP00S=false; } if (config.Compare("RP00S")==0) { m_filter = 730.0; m_rfInputs=2; + m_sectionsNumber=1; m_RP00S=true; - m_RK00=m_RC00=m_RL00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=false; }/* try { m_totalPower->setSection(0,-1, filter, -1, -1, -1, -1); @@ -1007,7 +1041,7 @@ void CCommandLine::setup(const char *conf) throw (BackendsErrors::BackendBusyExI ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,ComponentErrors::CDBAccessExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ReplyNotValidExImpl,BackendsErrors::BackendFailExImpl) { AUTO_TRACE("CCommandLine::setup()"); - double filter; + //double filter; /* if (getIsBusy()) { _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::setup()"); @@ -1284,8 +1318,8 @@ void CCommandLine::getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::S void CCommandLine::getFrequency(ACS::doubleSeq& freq) const { - freq.length(m_sectionsNumber); - for (int i=0;i0) { // load OK - bw.length(m_sectionsNumber); - for (int i=0;i line=m_commandLine->Get(); - line->fillMainHeader(buffer.header); - line->fillChannelHeader(buffer.chHeader,MAX_SECTION_NUMBER); + line->fillMainHeader(header); + line->fillChannelHeader(chHeader,MAX_SECTION_NUMBER); /*try { line->setTime(); } @@ -324,10 +323,16 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw dummy.getComponentErrorsEx(); } */ + + char buffer[sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)]; + + memcpy(buffer,(void *)&header,sizeof(Backends::TMainHeader)); + memcpy(buffer+sizeof(Backends::TMainHeader),(void *)chHeader,header.sections*sizeof(Backends::TSectionHeader)); + #ifndef BKD_DEBUG try { - getSender()->startSend(FLOW_NUMBER,(const char*)&buffer, - sizeof(Backends::TMainHeader)+buffer.header.sections*sizeof(Backends::TSectionHeader)); + getSender()->startSend(FLOW_NUMBER,(const char*)buffer, + sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)); } catch (AVStartSendErrorExImpl& ex) { _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"RoachImpl::sendHeader()"); @@ -341,24 +346,24 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw impl.getComponentErrorsEx(); } #else - printf("Sects: %d beams: %d integration: %d sampleSize: %d\n",buffer.header.sections,buffer.header.beams, - buffer.header.integration,buffer.header.sampleSize); - for(int h=0;hsaveDataHeader(&(buffer.header),(buffer.chHeader)); + m_senderThread->saveDataHeader(&header,chHeader); // measure the zero tpi #ifndef BKD_DEBUG /*try { @@ -378,7 +383,7 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw dummy.getComponentErrorsEx(); }*/ #else - for(int i=0;isaveZero(tpi); diff --git a/Common/Servers/TotalPower/include/TotalPowerImpl.h b/Common/Servers/TotalPower/include/TotalPowerImpl.h index badd16902..b37bebb34 100644 --- a/Common/Servers/TotalPower/include/TotalPowerImpl.h +++ b/Common/Servers/TotalPower/include/TotalPowerImpl.h @@ -490,10 +490,6 @@ protected: virtual void stopSend() throw (CORBA::SystemException, AVStopSendErrorEx) { }; private: - struct THeaderRecord { - Backends::TMainHeader header; - Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; - }; SmartPropertyPointer m_ptime; SmartPropertyPointer m_pbackendName; SmartPropertyPointer m_pbandWidth; diff --git a/Common/Servers/TotalPower/src/SenderThread.cpp b/Common/Servers/TotalPower/src/SenderThread.cpp index 8f550cf76..be57c2e59 100644 --- a/Common/Servers/TotalPower/src/SenderThread.cpp +++ b/Common/Servers/TotalPower/src/SenderThread.cpp @@ -289,12 +289,12 @@ void CSenderThread::computeSample(TSampleRecord& samp,TIMEVALUE& sampleTime,DWOR hd.dumpSize+=sizeof(double)*m_dataHeader.channels; // add data size required for tsys trasmission ACE_Message_Block buffer(hd.dumpSize+sizeof(Backends::TDumpHeader)); //memcpy(buffer,&hd,sizeof(Backends::TDumpHeader)); - for (long jj=0;jj line=m_commandLine->Get(); - line->fillMainHeader(buffer.header); - line->fillChannelHeader(buffer.chHeader,MAX_SECTION_NUMBER); + line->fillMainHeader(header); + line->fillChannelHeader(chHeader,MAX_SECTION_NUMBER); try { line->setTime(); } @@ -324,10 +324,15 @@ void TotalPowerImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors: dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } + + char buffer[sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)]; + + memcpy(buffer,(void *)&header,sizeof(Backends::TMainHeader)); + memcpy(buffer+sizeof(Backends::TMainHeader),(void *)chHeader,header.sections*sizeof(Backends::TSectionHeader)); #ifndef BKD_DEBUG try { - getSender()->startSend(FLOW_NUMBER,(const char*)&buffer, - sizeof(Backends::TMainHeader)+buffer.header.sections*sizeof(Backends::TSectionHeader)); + getSender()->startSend(FLOW_NUMBER,(const char*)buffer, + sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)); //getSender()->startSend(FLOW_NUMBER,(const char*)&header,sizeof(header)); } catch (AVStartSendErrorExImpl& ex) { @@ -342,24 +347,24 @@ void TotalPowerImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors: throw impl.getComponentErrorsEx(); } #else - printf("Sects: %d beams: %d integration: %d sampleSize: %d\n",buffer.header.sections,buffer.header.beams, - buffer.header.integration,buffer.header.sampleSize); - for(int h=0;hsaveDataHeader(&(buffer.header),(buffer.chHeader)); + m_senderThread->saveDataHeader(&header,chHeader); // measure the zero tpi #ifndef BKD_DEBUG try { diff --git a/Common/Servers/XBackend/include/XBackendsImpl.h b/Common/Servers/XBackend/include/XBackendsImpl.h index b0d289262..b9c3b5e54 100644 --- a/Common/Servers/XBackend/include/XBackendsImpl.h +++ b/Common/Servers/XBackend/include/XBackendsImpl.h @@ -494,11 +494,6 @@ protected: private: - struct THeaderRecord { - Backends::TMainHeader header; - Backends::TSectionHeader chHeader[MAX_INPUT_NUMBER]; - }; - SmartPropertyPointer m_ptime; SmartPropertyPointer m_pbackendName; SmartPropertyPointer m_pbandWidth; diff --git a/Common/Servers/XBackend/src/XBackendsImpl.cpp b/Common/Servers/XBackend/src/XBackendsImpl.cpp index a883b4bb5..c47c82c43 100644 --- a/Common/Servers/XBackend/src/XBackendsImpl.cpp +++ b/Common/Servers/XBackend/src/XBackendsImpl.cpp @@ -321,9 +321,8 @@ void XBackendsImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx,ComponentErrors::ComponentErrorsEx) { AUTO_TRACE("XBackendsImpl::sendHeader()"); -// Backends::TMainHeader header; -// Backends::TSectionHeader chHeader[MAX_INPUT_NUMBER]; - THeaderRecord buffer; + Backends::TMainHeader header; + Backends::TSectionHeader chHeader[MAX_INPUT_NUMBER]; DWORD tpi[MAX_INPUT_NUMBER]; CSecAreaResourceWrapper line=m_commandLine->Get(); /* @@ -351,13 +350,19 @@ void XBackendsImpl::sendHeader() } */ ACS_DEBUG("XBackendsImpl::sendHeader()","Initialization"); - line->fillMainHeader(buffer.header); - line->fillChannelHeader(buffer.chHeader,MAX_INPUT_NUMBER); + line->fillMainHeader(header); + line->fillChannelHeader(chHeader,MAX_INPUT_NUMBER); + + char buffer[sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)]; + + memcpy(buffer,(void *)&header,sizeof(Backends::TMainHeader)); + memcpy(buffer+sizeof(Backends::TMainHeader),(void *)chHeader,header.sections*sizeof(Backends::TSectionHeader)); + #ifndef BKD_DEBUG try { ACS_LOG(LM_FULL_INFO,"XBackendsImpl::sendHeader()",(LM_INFO,"HEADERS_SENT_OK")); - getSender()->startSend(FLOW_NUMBER,(const char*)&buffer, - sizeof(Backends::TMainHeader)+buffer.header.sections*sizeof(Backends::TSectionHeader)); + getSender()->startSend(FLOW_NUMBER,(const char*)buffer, + sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)); } catch (AVStartSendErrorExImpl& ex) { _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"XBackendsImpl::sendHeader()"); @@ -371,26 +376,26 @@ void XBackendsImpl::sendHeader() throw impl.getComponentErrorsEx(); } #else - printf("Chnls: %d beams: %d integration: %d sampleSize: %d\n",buffer.header.sections,buffer.header.beams, - buffer.header.integration,buffer.header.sampleSize); - for(int h=0;hsaveDataHeader(&(buffer.header),(buffer.chHeader)); + ACS_DEBUG_PARAM("XBackendsImpl::sendHeader()"," chHeader %lf ", chHeader); + m_pcontrolLoop->saveDataHeader(&header,chHeader); #ifndef BKD_DEBUG // measure the zero tpi try { -- GitLab From 389b11a5bfcfad0d7d5140e665eb94f52e9afefa Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Wed, 6 Jun 2018 17:32:13 +0200 Subject: [PATCH 111/145] Fix #214. USDs calibrate set to 0. (#215) --- SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml | 4 ++-- SRT/Configuration/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml | 4 ++-- SRT/Configuration/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml | 4 ++-- SRT/Configuration/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml | 4 ++-- SRT/Configuration/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml | 5 +++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml b/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml index c06bd0adb..6ce88baf6 100644 --- a/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml +++ b/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml @@ -333,7 +333,7 @@ - Fri Jun 12 07:09:02 UTC 2015 modified by jDAL - Fri Jun 12 12:27:42 UTC 2015 modified by jDAL --> - + @@ -347,4 +347,4 @@ - \ No newline at end of file + diff --git a/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml b/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml index c6963dfe6..a6ca94bc9 100644 --- a/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml +++ b/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN11/USD15/USD15.xml @@ -212,7 +212,7 @@ - Thu Jun 11 14:56:12 UTC 2015 modified by jDAL - Fri Jun 12 07:17:05 UTC 2015 modified by jDAL --> - + @@ -226,4 +226,4 @@ - \ No newline at end of file + diff --git a/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml b/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml index d08fcb28c..7d7730d16 100644 --- a/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml +++ b/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN03/USD12/USD12.xml @@ -104,7 +104,7 @@ - Fri Jun 12 07:09:14 UTC 2015 modified by jDAL - Fri Jun 12 12:27:54 UTC 2015 modified by jDAL --> - + @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml b/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml index 6c7d6f478..236097ce2 100644 --- a/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml +++ b/SRT/Configuration/CDB/alma/AS/SECTOR04/LAN12/USD11/USD11.xml @@ -112,7 +112,7 @@ - Fri Jun 12 07:18:11 UTC 2015 modified by jDAL - Fri Jun 12 12:36:40 UTC 2015 modified by jDAL --> - + @@ -126,4 +126,4 @@ - \ No newline at end of file + diff --git a/SRT/Configuration/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml b/SRT/Configuration/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml index 1e8408140..14eea798d 100644 --- a/SRT/Configuration/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml +++ b/SRT/Configuration/CDB/alma/AS/SECTOR08/LAN09/USD12/USD12.xml @@ -149,8 +149,9 @@ - Thu Jun 11 14:53:23 UTC 2015 modified by jDAL - Fri Jun 12 07:14:32 UTC 2015 modified by jDAL - Fri Jun 12 12:33:09 UTC 2015 modified by jDAL + - Tue Apr 24 12:06:29 UTC 2018 modified by jDAL --> - + @@ -164,4 +165,4 @@ - \ No newline at end of file + -- GitLab From 5c276b9dec419f61cf68782064dd15849963365c Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Wed, 6 Jun 2018 17:50:44 +0200 Subject: [PATCH 112/145] Fix issue 205, fixed ACS bulk data transfer. Also fixed some roach bugs and added some configurations to it. (#216) * fix #205: fixed for both TotalPower and XArcos * Fix #125, removed some remaining references to `THeaderRecord` structure and objects. Another reference can be found in XarcosThread.h, used in XarcosThread.cpp, but I believe the methods that uses it are no longer needed. Also, a reference can be found in Common/Servers/HolographyBackend but I'm leaving it there because the component does not build correctly (see #208). * Roach updated with latest TRUNK modifications. * Fix #205 BulkDataTransfer fixed in roach. Also some roach bugs have been fixed and some new configurations have been added. --- Common/Servers/Roach/include/CommandLine.h | 7 +- Common/Servers/Roach/include/DevIOBandWidth.h | 2 +- Common/Servers/Roach/include/DevIOFeed.h | 2 +- Common/Servers/Roach/include/DevIOFrequency.h | 2 +- Common/Servers/Roach/src/CommandLine.cpp | 584 +++++++----------- Common/Servers/Roach/src/RoachImpl.cpp | 3 +- .../CDB/alma/BACKENDS/Roach/Roach.xml | 6 +- .../CDB/alma/DataBlock/Roach/Roach.xml | 104 +++- 8 files changed, 318 insertions(+), 392 deletions(-) diff --git a/Common/Servers/Roach/include/CommandLine.h b/Common/Servers/Roach/include/CommandLine.h index c6adcf054..8e46ea3e9 100644 --- a/Common/Servers/Roach/include/CommandLine.h +++ b/Common/Servers/Roach/include/CommandLine.h @@ -73,7 +73,7 @@ public: * In this implementation the inputs number is the same of the number of section (SIMPLE_SECTION) */ //inline void getInputsNumber(long &in) const { in=m_sectionsNumber; } - inline void getInputsNumber(long &in) const { in=m_rfInputs; } + inline void getInputsNumber(long &in) const { in=m_inputsNumber; } /** * Call this function to get the milliseconds of integration time @@ -86,6 +86,7 @@ public: * Call this function in order to get the start frequency value for each section. */ void getFrequency(ACS::doubleSeq& freq) const; + void getFrequencyAttr(ACS::doubleSeq& freq) const; /** * Call this function in order to get the sample rate for each section. @@ -111,6 +112,7 @@ public: * Call this function in order to get the feed connected to each section. */ void getFeed(ACS::longSeq& feed) const; + void getFeedAttr(ACS::longSeq& feed) const; /** * Call this function in order to get the IF connected to each input. @@ -160,6 +162,7 @@ public: */ void getBandWidth(ACS::doubleSeq& bw) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl, BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl); + void getBandWidthAttr(ACS::doubleSeq& bw) const; /** * Call this function in order to get the time clock reported by the backend. @@ -640,7 +643,7 @@ private: */ double m_tpiZero[MAX_SECTION_NUMBER]; - long m_rfInputs; + long m_inputsNumber; double m_filter; diff --git a/Common/Servers/Roach/include/DevIOBandWidth.h b/Common/Servers/Roach/include/DevIOBandWidth.h index 15d5dd378..38e5f11bf 100644 --- a/Common/Servers/Roach/include/DevIOBandWidth.h +++ b/Common/Servers/Roach/include/DevIOBandWidth.h @@ -63,7 +63,7 @@ public: // get the CommandLine ....... CSecAreaResourceWrapper line=m_pLink->Get(); try { - line->getBandWidth(m_val); + line->getBandWidthAttr(m_val); } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOBandWidth::read()"); diff --git a/Common/Servers/Roach/include/DevIOFeed.h b/Common/Servers/Roach/include/DevIOFeed.h index a9120c367..9d96758ff 100644 --- a/Common/Servers/Roach/include/DevIOFeed.h +++ b/Common/Servers/Roach/include/DevIOFeed.h @@ -63,7 +63,7 @@ public: // get the CommandLine ....... CSecAreaResourceWrapper line=m_pLink->Get(); try { - line->getFeed(m_val); + line->getFeedAttr(m_val); } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOFeed::read()"); diff --git a/Common/Servers/Roach/include/DevIOFrequency.h b/Common/Servers/Roach/include/DevIOFrequency.h index 054d88866..ae212e709 100644 --- a/Common/Servers/Roach/include/DevIOFrequency.h +++ b/Common/Servers/Roach/include/DevIOFrequency.h @@ -63,7 +63,7 @@ public: // get the CommandLine ....... CSecAreaResourceWrapper line=m_pLink->Get(); try { - line->getFrequency(m_val); + line->getFrequencyAttr(m_val); } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOFrequency::read()"); diff --git a/Common/Servers/Roach/src/CommandLine.cpp b/Common/Servers/Roach/src/CommandLine.cpp index 508ca42c1..222f60a31 100644 --- a/Common/Servers/Roach/src/CommandLine.cpp +++ b/Common/Servers/Roach/src/CommandLine.cpp @@ -41,16 +41,20 @@ CCommandLine::CCommandLine(ContainerServices *service): CSocket(), m_backendStatus=0; setStatus(NOTCNTD); m_setTpiIntegration=true; - m_RK77=false; - m_RK00=false; - m_RC00=false; - m_RL00=false; - m_RP00=false; - m_RK77S=false; - m_RK00S=false; - m_RC00S=false; - m_RL00S=false; - m_RP00S=false; + m_SK77=false; + m_SK03=false; + m_SK06=false; + m_SK00=false; + m_SC00=false; + m_SL00=false; + m_SP00=false; + m_SK77S=false; + m_SK03S=false; + m_SK06S=false; + m_SK00S=false; + m_SC00S=false; + m_SL00S=false; + m_SP00S=false; } CCommandLine::~CCommandLine() @@ -271,28 +275,11 @@ void CCommandLine::setAttenuation(const long&inputId, const double& attenuation) ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl) { AUTO_TRACE("CCommandLine::setAttenuation()"); - //int res; - //WORD len; - //char sBuff[SENDBUFFERSIZE]; - //char rBuff[RECBUFFERSIZE]; double newAtt; - try { - m_totalPower->setAttenuation(inputId, attenuation); - } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CExternalClientsSocketServer::cmdToScheduler()"); - impl.log(LM_ERROR); - } - -/* if (getIsBusy()) { - _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::setAttenuation()"); - throw impl; - } -*/ if (inputId>=0) { //if (inputId>=m_sectionsNumber) { - if (inputId>m_sectionsNumber) { // TBC !!! + if (inputId>m_inputsNumber) { // TBC !!! _EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CCommandLine::setAttenuation()"); impl.setReason("the input identifier is out of range"); throw impl; @@ -316,39 +303,19 @@ void CCommandLine::setAttenuation(const long&inputId, const double& attenuation) impl.setValueLimit(MAX_ATTENUATION); throw impl; } - newAtt=attenuation; + m_attenuation[inputId]=attenuation; + try { + m_totalPower->setAttenuation(inputId, attenuation); + } + catch (...) { + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CExternalClientsSocketServer::cmdToScheduler()"); + impl.log(LM_ERROR); + } } else { newAtt=m_attenuation[inputId]; } - /* - newBW=m_bandWidth[inputId]; - len=CProtocol::setConfiguration(sBuff,inputId,m_input[inputId],newAtt,newBW,m_boards); // get the buffer - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - } - if (res>0) { // operation was ok. - if (!CProtocol::isAck(rBuff)) { - _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::setAttenuation()"); - } - ACS_LOG(LM_FULL_INFO,"CCommandLine::setAttenuation()",(LM_NOTICE,"INPUT_CONFIGURED %ld,ATT=%lf",inputId,newAtt)); - //CUSTOM_LOG(LM_FULL_INFO,"CCommandLine::setAttenuation()",(LM_NOTICE,"INPUT_CONFIGURED %ld,ATT=%lf",inputId,newAtt)); - m_attenuation[inputId]=newAtt; - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::setAttenuation()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::setAttenuation()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setAttenuation()"); - } - */ + } void CCommandLine::setConfiguration(const long& inputId,const double& freq,const double& bw,const long& feed,const long& pol, const double& sr,const long& bins) throw ( @@ -412,7 +379,6 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const else { newSR=m_sampleRate[inputId]; } - newAtt=m_attenuation[inputId]; if (freq >= 0) { // the user ask for a new value if (freq >= MIN_FREQUENCY && freq <= MAX_FREQUENCY) { @@ -441,15 +407,9 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const if (pol >= 0) { // the user ask for a new value if ((pol == 0) || (pol == 1)) { // LCP or RCP newPol = pol; - m_sectionsNumber = 2; - if (m_RK77 == true) - m_sectionsNumber = 14; } if (pol == 2) { // FULL STOKES newPol = pol; - m_sectionsNumber = 1; - if (m_RK77S == true) - m_sectionsNumber = 7; } if (pol >= 3) { _EXCPT(ComponentErrors::ValueOutofRangeExImpl,impl,"CCommandLine::setConfiguration()"); @@ -483,87 +443,42 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const }*/ - //len=CProtocol::setConfiguration(sBuff,inputId,m_input[inputId],newAtt,newBW,m_boards); // get the buffer - Message request = Command::setSection(inputId, newFreq, newBW, newFeed, newPol, newSR, newBins); - /*IRA::CString temp; - strcpy (sBuff,"?set-section,"); - temp.Format("%ld",inputId); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%f",freq); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%f",newBW); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%ld",feed); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%ld",pol); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%f",newSR); - strcat (sBuff,(const char *)temp); - strcat (sBuff,","); - temp.Format("%ld",bins); - strcat (sBuff,(const char *)temp); - strcat (sBuff,"\r\n"); - len = strlen (sBuff); - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - printf("set-section = %s\n",rBuff); - }*/ - Message reply = sendBackendCommand(request); - if(reply.is_success_reply()){ - m_bandWidth[inputId]=newBW; - for (int j=0;jsetSection(0,-1, filter, -1, -1, -1, -1); - m_totalPower->setSection(1,-1, filter, -1, -1, -1, -1); - } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setDefaultConfiguration()"); - impl.log(LM_ERROR); + if (m_SK00==true || m_SC00==true || m_SK00S==true || m_SC00S==true || m_SK77==true || m_SK77S==true || m_SK03==true || m_SK03S==true || m_SK06==true || m_SK06S==true) { + if (newBW==420.00) + filter=300.00; + if (newBW==1500.00) + filter=1250.00; + if (newBW==2300.00) + filter=2350.00; + if (newBW == 420.00 || newBW == 1500.00 || newBW == 2300.00) { + for (int i=0;isetSection(i,-1, filter, -1, -1, -1, -1); } } } } - /* - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::setConfiguration()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::setConfiguration()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setConfiguration()"); - }*/ + catch (...) {} } void CCommandLine::getZeroTPI(DWORD *tpi) throw (ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, @@ -708,9 +623,9 @@ void CCommandLine::getZero(ACS::doubleSeq& tpi) throw (ComponentErrors::TimeoutE { //getSample(tpi,true); // tpi.length(m_sectionsNumber); - tpi.length(m_rfInputs); + tpi.length(m_inputsNumber); //for (int j=0;jgetBoardsNumber(),m_sectionsNumber,m_boards)) { _THROW_EXCPT(BackendsErrors::MalformedAnswerExImpl,"CCommandLine::getSample()"); }*/ - tpi.length(m_rfInputs/*m_sectionsNumber*/); - for (int j=0;j(j); if (zero) m_tpiZero[j]=tpi[j]; // in case of tpiZero we store it...... @@ -881,114 +796,97 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ReplyNotValidExImpl,BackendsErrors::BackendFailExImpl) { AUTO_TRACE("CCommandLine::setDefaultConfiguration()"); - //double filter; - - // I do not check for backend busy because this is a call done at the initialization and never repeated - //Message reply = sendBackendCommand(Command::setConfiguration(string((const char*)config))); - /* - strcpy (sBuff,"?set-configuration,"); - strcat (sBuff,(const char*)config); - strcat (sBuff,"\r\n"); - len = strlen (sBuff); - - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - printf("set-configuration = %s\n",rBuff); - } - */ - //if (res>0) { // operation was ok. - //if(reply.is_success_reply()){ - //if (!CProtocol::setConfiguration((const char*)config)) { - // _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::setDefaultConfiguration()"); - //} - //} - /* - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::setDefaultConfiguration()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::setDefaultConfiguration()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setDefaultConfiguration()"); - } - ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_INFO,"DEFAULTS_ARE_SET")); - */ - if (config.Compare("RK77")==0) { + if (config.Compare("SK77")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RK77=true; - m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_SK77=true; + m_SK00=m_SK03=m_SK06=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RK00")==0) { + if (config.Compare("SK03")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RK00=true; - m_RK77=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_SK03=true; + m_SK77=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RC00")==0) { + if (config.Compare("SK06")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RC00=true; - m_RK77=m_RK00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_SK06=true; + m_SK77=m_SK03=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RL00")==0) { + if (config.Compare("SK00")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_SK00=true; + m_SK77=m_SK03=m_SK06=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; + } + if (config.Compare("SC00")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_SC00=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; + } + if (config.Compare("SL00")==0) { m_filter = 2300.0; - m_rfInputs=2; - m_RL00=true; - m_RK77=m_RK00=m_RC00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_SL00=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RP00")==0) { + if (config.Compare("SP00")==0) { m_filter = 730.0; - m_rfInputs=2; - m_RP00=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_SP00=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; + } + if (config.Compare("SK77S")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SK77S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RK77S")==0) { + if (config.Compare("SK03S")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RK77S=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SK03S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RK00S")==0) { + if (config.Compare("SK06S")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RK00S=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RC00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SK06S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RC00S")==0) { + if (config.Compare("SK00S")==0) { m_filter=1250.0; - m_rfInputs=2; - m_sectionsNumber=1; - m_RC00S=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RL00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SK00S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SC00S=m_SL00S=m_SP00S=false; } - if (config.Compare("RL00S")==0) { + if (config.Compare("SC00S")==0) { + m_filter=1250.0; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SC00S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SL00S=m_SP00S=false; + } + if (config.Compare("SL00S")==0) { m_filter = 2300.0; - m_rfInputs=2; - m_sectionsNumber=1; - m_RL00S=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RP00S=false; + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SL00S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SP00S=false; } - if (config.Compare("RP00S")==0) { + if (config.Compare("SP00S")==0) { m_filter = 730.0; - m_rfInputs=2; - m_sectionsNumber=1; - m_RP00S=true; - m_RK77=m_RK00=m_RC00=m_RL00=m_RP00=m_RK77S=m_RK00S=m_RC00S=m_RL00S=false; - }/* - try { - m_totalPower->setSection(0,-1, filter, -1, -1, -1, -1); - m_totalPower->setSection(1,-1, filter, -1, -1, -1, -1); + m_inputsNumber=m_sectionsNumber; + m_sectionsNumber=m_sectionsNumber/2; + m_SP00S=true; + m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=false; } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setDefaultConfiguration()"); - impl.log(LM_ERROR); - }*/ } void CCommandLine::setTargetFileName(const char *conf) @@ -1041,83 +939,36 @@ void CCommandLine::setup(const char *conf) throw (BackendsErrors::BackendBusyExI ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,ComponentErrors::CDBAccessExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ReplyNotValidExImpl,BackendsErrors::BackendFailExImpl) { AUTO_TRACE("CCommandLine::setup()"); - //double filter; -/* if (getIsBusy()) { + /* if (getIsBusy()) { _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::setup()"); throw impl; }*/ + if (!initializeConfiguration(conf)) { _EXCPT(BackendsErrors::ConfigurationErrorExImpl,impl,"CCommandLine::setup()"); throw impl; } - Message reply = sendBackendCommand(Command::setConfiguration(string((const char*)conf))); - if(reply.is_success_reply()){ - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZED, CONFIGURATION: %s",conf)); - } - else { - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); + try { + Message request = Command::setConfiguration(string((const char*)conf)); + Message reply = sendBackendCommand(request); + if(reply.is_success_reply()) + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZED, CONFIGURATION: %s",conf)); + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); } setDefaultConfiguration(conf); - /* - if (strcpy(conf,"RK00")) { - filter=1250.0; - m_RK00=true; - m_RC00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RC00")) { - filter=1250.0; - m_RC00=true; - m_RK00=m_RL00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RL00")) { - filter = 2300.0; - m_RL00=true; - m_RK00=m_RC00=m_RP00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RP00")) { - filter = 730.0; - m_RP00=true; - m_RK00=m_RC00=m_RL00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RK00S")) { - filter=1250.0; - m_RK00S=true; - m_RC00=m_RL00=m_RP00=m_RK00=m_RC00S=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RC00S")) { - filter=1250.0; - m_RC00S=true; - m_RK00=m_RL00=m_RP00=m_RK00S=m_RC00=m_RL00S=m_RP00S=false; - } - if (strcpy(conf,"RL00S")) { - filter = 2300.0; - m_RL00S=true; - m_RK00=m_RC00=m_RP00=m_RK00S=m_RC00S=m_RL00=m_RP00S=false; - } - if (strcpy(conf,"RP00S")) { - filter = 730.0; - m_RP00S=true; - m_RK00=m_RC00=m_RL00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=false; - }*/ - try { - m_totalPower->setSection(0,-1, m_filter, -1, -1, -1, -1); - m_totalPower->setSection(1,-1, m_filter, -1, -1, -1, -1); + for (int i=0;isetSection(i,-1, m_filter, -1, -1, -1, -1); } catch (...) { _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setDefaultConfiguration()"); impl.log(LM_ERROR); } - /*try { - setDefaultConfiguration(conf); - } - catch (...) { - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); - - }*/ } void CCommandLine::checkTime() throw (BackendsErrors::ConnectionExImpl,BackendsErrors::MalformedAnswerExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl) @@ -1283,43 +1134,44 @@ void CCommandLine::setIntegration(const long& integration) throw (BackendsError throw impl; }*/ m_integration = integration; - if (m_integration>=MIN_INTEGRATION && m_integration <= MAX_INTEGRATION) { - Message request = Command::setIntegration(integration); - Message reply = sendBackendCommand(request); - if (reply.is_success_reply()) { - // TBD - ACS_LOG(LM_FULL_INFO,"CCommandLine::setIntegration()",(LM_NOTICE,"INTEGRATION is now %ld (millisec)",m_integration)); - } - } - else { - _EXCPT(ComponentErrors::ValueOutofRangeExImpl,impl,"CCommandLine::setIntegration()"); - impl.setValueName("integration"); + if (m_integration>=MIN_INTEGRATION && m_integration <= MAX_INTEGRATION) { + Message request = Command::setIntegration(integration); + Message reply = sendBackendCommand(request); + if (reply.is_success_reply()) { + // TBD + ACS_LOG(LM_FULL_INFO,"CCommandLine::setIntegration()",(LM_NOTICE,"INTEGRATION is now %ld (millisec)",m_integration)); + } + } + else { + _EXCPT(ComponentErrors::ValueOutofRangeExImpl,impl,"CCommandLine::setIntegration()"); + impl.setValueName("integration"); throw impl; - } + } } void CCommandLine::getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl, ComponentErrors::TimeoutExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl) { AUTO_TRACE("CCommandLine::getAttenuation()"); - //int res; - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getAttenuation()"); + ACS::doubleSeq attenuation; + att.length(m_inputsNumber); + for (int i=0;i0) { // load OK - att.length(m_sectionsNumber); - for (int i=0;i0) { // load OK - bw.length(m_rfInputs/*sectionsNumber*/); - for (int i=0;i(0).c_str()); + try { + Message reply = sendBackendCommand(request); + if(reply.is_success_reply()) + { + strcpy(configuration, reply.get_argument(0).c_str()); + } + } + catch (...) { + } /* TIMEVALUE Now; @@ -1931,8 +1797,6 @@ bool CCommandLine::initializeConfiguration(const IRA::CString & config) throw (C else { return false; } - //if (config.Compare("RC00")==0) - // m_rfInputs=2; // Common configurations....... m_integration=DEFAULT_INTEGRATION; // integration if by default zero...that means the 1/samplerate is the real integration time diff --git a/Common/Servers/Roach/src/RoachImpl.cpp b/Common/Servers/Roach/src/RoachImpl.cpp index a9faf4a61..c3366590f 100644 --- a/Common/Servers/Roach/src/RoachImpl.cpp +++ b/Common/Servers/Roach/src/RoachImpl.cpp @@ -163,8 +163,7 @@ void RoachImpl::initialize() throw (ACSErr::ACSbaseExImpl) // command parser configuration m_parser->add("integration",new function1 >(line,&CCommandLine::setIntegration),1); m_parser->add("calSwitch",new function1 >(line,&CCommandLine::activateCalSwitching),1 ); - m_parser->add("setSection", - new function7,I,I,I,I >,I,I > + m_parser->add("setSection", new function7,I,I,I,I >,I,I > (line,&CCommandLine::setConfiguration),7 ); m_parser->add("setAttenuation", new function2,I >(line,&CCommandLine::setAttenuation),2 ); m_parser->add("enable",new function1 >(line,&CCommandLine::setEnabled),1 ); diff --git a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml b/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml index 5daf7c92d..c524893f7 100644 --- a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml +++ b/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml @@ -10,10 +10,10 @@ sender_protocols="TCP=${HOST}:14000" IPAddress="192.168.200.216" Port="10000" - CommandLineTimeout="10000000" - ConnectTimeout="3000000" + CommandLineTimeout="100000000" + ConnectTimeout="300000000" PropertyRefreshTime="1000000" - Configuration="RC00" + Configuration="SC00" TimeTollerance="250000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" diff --git a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml b/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml index ff91bf433..db8142607 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml @@ -6,8 +6,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - RK00 - 2 + SK00 + 2 TRUE GREGORIAN 1 @@ -21,7 +21,37 @@ - RK77 + SK03 + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + L R L R + 0 0 3 3 + 0 1 0 1 + 1024 + + + + SK06 + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + L R L R + 0 0 6 6 + 0 1 0 1 + 1024 + + + + SK77 14 TRUE GREGORIAN @@ -36,7 +66,7 @@ - RC00 + SC00 2 TRUE BWG @@ -51,7 +81,7 @@ - RL00 + SL00 2 TRUE PRIMARY @@ -66,7 +96,7 @@ - RP00 + SP00 2 TRUE PRIMARY @@ -81,75 +111,105 @@ - RK00S - 1 + SK00S + 2 TRUE GREGORIAN 1 1500.0 7.0 - 0 1 - S + 0 1 2 3 + S S 0 0 0 1 1024 - RK77S - 7 + SK03S + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + S S S S + 0 0 3 3 + 0 1 0 1 + 1024 + + + + SK06S + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + S S S S + 0 0 6 6 + 0 1 0 1 + 1024 + + + + SK77S + 14 TRUE GREGORIAN 7 1500.0 7.0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - S S S S S S S + S S S S S S S S S S S S S S 0 0 1 1 2 2 3 3 4 4 5 5 6 6 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1024 - RC00S - 1 + SC00S + 2 TRUE BWG 1 1500.0 9.0 0 1 - S + S S 0 0 0 1 1024 - RL00S - 1 + SL00S + 2 TRUE PRIMARY 1 1500.0 10.0 2 3 - S + S S 0 0 0 1 1024 - RP00S - 1 + SP00S + 2 TRUE PRIMARY 1 500.0 10.0 0 1 - S + S S 0 0 0 1 1024 -- GitLab From 45a004b3c35e102d9deaea8cc04ae1c533e67325 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Wed, 6 Jun 2018 17:56:15 +0200 Subject: [PATCH 113/145] Update CommandLine.h Wrong file while merging, my bad. --- Common/Servers/Roach/include/CommandLine.h | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Common/Servers/Roach/include/CommandLine.h b/Common/Servers/Roach/include/CommandLine.h index 8e46ea3e9..c35a929c7 100644 --- a/Common/Servers/Roach/include/CommandLine.h +++ b/Common/Servers/Roach/include/CommandLine.h @@ -742,16 +742,20 @@ private: */ inline void clearStatusField(TstatusFields field) { m_backendStatus &= ~(1 << field); } - bool m_RK77; - bool m_RK00; - bool m_RC00; - bool m_RL00; - bool m_RP00; - bool m_RK77S; - bool m_RK00S; - bool m_RC00S; - bool m_RL00S; - bool m_RP00S; + bool m_SK77; + bool m_SK03; + bool m_SK06; + bool m_SK00; + bool m_SC00; + bool m_SL00; + bool m_SP00; + bool m_SK77S; + bool m_SK03S; + bool m_SK06S; + bool m_SK00S; + bool m_SC00S; + bool m_SL00S; + bool m_SP00S; }; -- GitLab From 97548181a575681877f4888b115c557dedbfa9c5 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Tue, 19 Jun 2018 09:03:04 +0200 Subject: [PATCH 114/145] IFDistributor implementation complete. (#218) * Issue #210. Created a generic IFDistributor interface. Also, reworked the original SRT IFDistributor from `ifdistributor` branch in order to inherit from the generic interface. * Fix #210, implemented the new IFDistributor component. Also wrote its default configuration and renamed the old IFDistributor to SRTIFDistributor14. * Fix #210. Possible final implementation of IFDistributor component. The component has been tested with the new simulator, but it needs to be tested with the actual hardware before merging this branch. * Fix #210, some minor bugs fixed. Also added attribute `N_BOARDS` in schema. * Fix #210. Added methods documentation and fixed some logging messages. * Fix #210, edit according to proposed changes. --- .../idl/GenericIFDistributor.idl | 51 ++ .../ReceiversInterface/src/Makefile | 6 +- .../SRTIFDistributor/SRTIFDistributor.xml | 18 + .../PyIFDistributorContainer.xml | 27 + .../Configuration/Configuration.xml | 24 + .../SRTIFDistributor14/Mapping/Mapping.xml | 87 ++++ .../SRTIFDistributor/SRTIFDistributor.xml | 13 + .../SRTIFDistributor14/SRTIFDistributor14.xml | 8 + .../SRTIFDistributor/SRTIFDistributor.xml | 18 + .../PyIFDistributorContainer.xml | 27 + .../Configuration/Configuration.xml | 24 + .../SRTIFDistributor/SRTIFDistributor.xml | 13 + .../CDB/schemas/SRTIFDistributor14Table.xsd | 32 ++ .../CDB/schemas/SRTIFDistributorTable.xsd | 90 ++++ .../idl/SRTIFDistributor.idl | 21 + .../idl/SRTIFDistributor14.idl | 68 +++ .../SRTReceiversInterface/src/Makefile | 12 +- .../config/CDB/schemas/SRTIFDistributor.xsd | 39 ++ .../src/IFDistributor/IFDParser.py | 85 +++ .../src/IFDistributor/SRTIFDistributorImpl.py | 482 ++++++++++++++++++ .../src/IFDistributor/__init__.py | 0 .../src/IFDistributor/devios.py | 17 + SRT/Servers/SRTPyIFDistributor/src/Makefile | 42 ++ SRT/Servers/SRTPyIFDistributor/test/Makefile | 93 ++++ .../SRTPyIFDistributor/test/README.rst | 4 + .../test/external/__init__.py | 0 .../test/functional/__init__.py | 0 .../test/interface/__init__.py | 0 .../test/pyunit/__init__.py | 0 .../SRTPyIFDistributor/test/run_coverage | 5 + .../config/CDB/schemas/SRTIFDistributor14.xsd | 31 ++ .../IFDistributor14/SRTIFDistributor14Impl.py | 226 ++++++++ .../src/IFDistributor14/__init__.py | 0 SRT/Servers/SRTPyIFDistributor14/src/Makefile | 43 ++ .../SRTPyIFDistributor14/test/Makefile | 94 ++++ .../SRTPyIFDistributor14/test/README.rst | 4 + .../test/external/__init__.py | 0 .../test/functional/__init__.py | 0 .../test/interface/__init__.py | 0 .../test/pyunit/__init__.py | 0 .../SRTPyIFDistributor14/test/run_coverage | 5 + 41 files changed, 1704 insertions(+), 5 deletions(-) create mode 100644 Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl create mode 100644 SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml create mode 100644 SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml create mode 100755 SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml create mode 100755 SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml create mode 100644 SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml create mode 100644 SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml create mode 100644 SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml create mode 100644 SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml create mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml create mode 100644 SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml create mode 100644 SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributor14Table.xsd create mode 100644 SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd create mode 100644 SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor.idl create mode 100644 SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor14.idl create mode 100644 SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd create mode 100644 SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py create mode 100644 SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py create mode 100644 SRT/Servers/SRTPyIFDistributor/src/IFDistributor/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py create mode 100644 SRT/Servers/SRTPyIFDistributor/src/Makefile create mode 100644 SRT/Servers/SRTPyIFDistributor/test/Makefile create mode 100644 SRT/Servers/SRTPyIFDistributor/test/README.rst create mode 100644 SRT/Servers/SRTPyIFDistributor/test/external/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor/test/functional/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor/test/interface/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor/test/pyunit/__init__.py create mode 100755 SRT/Servers/SRTPyIFDistributor/test/run_coverage create mode 100644 SRT/Servers/SRTPyIFDistributor14/config/CDB/schemas/SRTIFDistributor14.xsd create mode 100644 SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/SRTIFDistributor14Impl.py create mode 100644 SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor14/src/Makefile create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/Makefile create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/README.rst create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/external/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/functional/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/interface/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor14/test/pyunit/__init__.py create mode 100755 SRT/Servers/SRTPyIFDistributor14/test/run_coverage diff --git a/Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl b/Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl new file mode 100644 index 000000000..f9d7abc77 --- /dev/null +++ b/Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl @@ -0,0 +1,51 @@ +/***************************************************************\ + * Authors: + * Marco Buttu + * Giuseppe Carboni +\***************************************************************/ + +#ifndef __GENERIC_IFDISTRIBUTOR__IDL__ +#define __GENERIC_IFDISTRIBUTOR__IDL__ + +#include +#include + +#pragma prefix "alma" + + +module Receivers { + + interface GenericIFDistributor + { + + /** Take the backend name and configurate the component + * + * @param backend_name the full name, i.e. BACKENDS/TotalPower + * @throw ComponentErrors::ComponentErrorsEx + */ + void setup(in string backend_name) raises (ComponentErrors::ComponentErrorsEx); + + + /** Get the IFDistributor infos, like name, hardware and firmware versions. + * + * @return the string of infos. + */ + string getInfo() raises (ComponentErrors::ComponentErrorsEx); + + + /** Sets the IFDistributor to its default values **/ + void setDefault() raises (ComponentErrors::ComponentErrorsEx); + + + /** Return the actual setup + * + * Return an empty string if the component is not yet + * configured, otherwise the setup value (BACKENDS/TotalPower, ...) + */ + string getSetup(); + + }; +}; + +#endif + diff --git a/Common/Interfaces/ReceiversInterface/src/Makefile b/Common/Interfaces/ReceiversInterface/src/Makefile index 0abdc1d4e..2331291a2 100644 --- a/Common/Interfaces/ReceiversInterface/src/Makefile +++ b/Common/Interfaces/ReceiversInterface/src/Makefile @@ -20,7 +20,8 @@ CDB_SCHEMAS = Feeds ReceiversModeSetup LocalOscillatorLookUpTable \ # IDL Files and flags IDL_FILES = CommonReceiverInterface ReceiversBoss \ GenericReceiver LocalOscillatorInterface \ - DewarPositionerDefinitions GenericDerotator DewarPositioner + DewarPositionerDefinitions GenericDerotator \ + DewarPositioner GenericIFDistributor CommonReceiverInterfaceStubs_LIBS = baciStubs ComponentErrorsStubs ManagementErrorsStubs \ @@ -36,6 +37,7 @@ GenericDerotatorStubs_LIBS = baciStubs DerotatorErrorsStubs ComponentErrorsStubs ManagmentDefinitionsStubs DewarPositionerStubs_LIBS = baciStubs maciErrTypeStubs ComponentErrorsStubs \ ManagmentDefinitionsStubs AntennaDefinitionsStubs DewarPositionerDefinitionsStubs +GenericIFDistributorStubs_LIBS = baciStubs maciErrTypeStubs ComponentErrorsStubs # list of all possible C-sources (used to create automatic dependencies) @@ -60,6 +62,8 @@ all: do_all clean : clean_all $(RM) $(INTROOT)/lib/python/site-packages/DewarPositioner*_idl*.py* $(RM) $(INTROOT)/lib/python/site-packages/libDewarPositionerStubs.* + $(RM) $(INTROOT)/lib/python/site-packages/GenericIFDistributor*_idl*.py* + $(RM) $(INTROOT)/lib/python/site-packages/libGenericIFDistributorStubs.* @echo " . . . clean done" clean_dist : clean_all clean_dist_all diff --git a/SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 000000000..42b5b7832 --- /dev/null +++ b/SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,18 @@ + + + + diff --git a/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml b/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml new file mode 100644 index 000000000..6563a97be --- /dev/null +++ b/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml new file mode 100755 index 000000000..0673377c3 --- /dev/null +++ b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -0,0 +1,24 @@ + + + + + + DEFAULT + + 0 + 1 + 2300 + + + 1 + 3 + + + 2 + 3 + + + diff --git a/SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml b/SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml new file mode 100755 index 000000000..e4b6c1bf2 --- /dev/null +++ b/SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml @@ -0,0 +1,87 @@ + + + + +SARDARA0
1
 +SARDARA1
2
 +SARDARA2
3
 +SARDARA3
4
 +SARDARA4
5
 +SARDARA5
6
 +SARDARA6
7
 +SARDARA7
8
 +SARDARA8
9
 +SARDARA9
10
 +SARDARA10
11
 +SARDARA11
12
 +SARDARA12
13
 +SARDARA13
14
 + +XARCOS0
15
 +XARCOS1
16
 +XARCOS2
17
 +XARCOS3
18
 +XARCOS4
19
 +XARCOS5
20
 +XARCOS6
21
 +XARCOS7
22
 +XARCOS8
23
 +XARCOS9
24
 +XARCOS10
25
 +XARCOS11
26
 +XARCOS12
27
 +XARCOS13
28
 + +M-B SPARE0
29
 +M-B SPARE1
30
 +M-B SPARE2
31
 +M-B SPARE3
32
 +M-B SPARE4
33
 +M-B SPARE5
34
 +M-B SPARE6
35
 +M-B SPARE7
36
 +M-B SPARE8
37
 +M-B SPARE9
38
 +M-B SPARE10
39
 +M-B SPARE11
40
 +M-B SPARE12
41
 +M-B SPARE13
42
 +M-B SPARE14
43
 +M-B SPARE15
44
 + +DFB0
45
 +DFB1
46
 +DFB2
47
 +DFB3
48
 + +DBBC10
49
 +DBBC11
50
 +DBBC12
51
 +DBBC13
52
 + +ROACH0
53
 +ROACH1
54
 +ROACH2
55
 +ROACH3
56
 + +SETI0
57
 +SETI1
58
 + +RFI0
59
 + +SPACE-DEBRIS0
60
 +SPACE-DEBRIS1
61
 + +HOLOGRAPHY0
62
 +HOLOGRAPHY1
63
 + +SB-SPARE0
64
 +SB-SPARE1
65
 + +SB-SPARE2
66
 +SB-SPARE3
67
 + + diff --git a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 000000000..d91a8cd08 --- /dev/null +++ b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml new file mode 100644 index 000000000..bf284b212 --- /dev/null +++ b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml @@ -0,0 +1,8 @@ + + diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 000000000..42b5b7832 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,18 @@ + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml b/SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml new file mode 100644 index 000000000..6563a97be --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml new file mode 100755 index 000000000..0673377c3 --- /dev/null +++ b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -0,0 +1,24 @@ + + + + + + DEFAULT + + 0 + 1 + 2300 + + + 1 + 3 + + + 2 + 3 + + + diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 000000000..438c631be --- /dev/null +++ b/SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributor14Table.xsd b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributor14Table.xsd new file mode 100644 index 000000000..e11b3cd5d --- /dev/null +++ b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributor14Table.xsd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd new file mode 100644 index 000000000..44a7cd415 --- /dev/null +++ b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor.idl b/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor.idl new file mode 100644 index 000000000..411850f95 --- /dev/null +++ b/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor.idl @@ -0,0 +1,21 @@ +/***************************************************************\ + * Authors: + * Giuseppe Carboni +\***************************************************************/ + +#ifndef __SRT_IFDISTRIBUTOR__IDL__ +#define __SRT_IFDISTRIBUTOR__IDL__ + +#include "GenericIFDistributor.idl" +#include "LocalOscillatorInterface.idl" + +#pragma prefix "alma" + +module Receivers { + + interface SRTIFDistributor: GenericIFDistributor, LocalOscillator + { + }; +}; + +#endif diff --git a/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor14.idl b/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor14.idl new file mode 100644 index 000000000..edbdcf3a3 --- /dev/null +++ b/SRT/Interfaces/SRTReceiversInterface/idl/SRTIFDistributor14.idl @@ -0,0 +1,68 @@ +/***************************************************************\ + * Authors: + * Marco Buttu + * Giuseppe Carboni +\***************************************************************/ + +#ifndef __SRT_IFDISTRIBUTOR14__IDL__ +#define __SRT_IFDISTRIBUTOR14__IDL__ + +#include +#include "GenericIFDistributor.idl" + +#pragma prefix "alma" + + +module Receivers { + + interface SRTIFDistributor14: GenericIFDistributor, ACS::CharacteristicComponent + { + /** Take the channel id and set its attenuator value + * + * The id parameter is an integer starting from 0. For instance, + * if the backend has 6 channels, id will be in (0, 5). This id + * value does not match the attenuator address, so we have to + * read a table and get the address associated to this id. + * + * @param id the channel ID + * @param value the attenuation + * @throw ComponentErrors::ComponentErrorsEx + */ + void setAttenuation(in long id, in double value) raises (ComponentErrors::ComponentErrorsEx); + + + /** Take the channel id and returns its attenuation value + * + * The id parameter is an integer starting from 0. For instance, + * if the backend has 6 channels, id will be in (0, 5). This id + * value does not match the attenuator address, so we have to + * read a table and get the address associated to this id. + * + * @return the current attenuation value for the given channel id + */ + double getAttenuation(in long id) raises (ComponentErrors::ComponentErrorsEx); + + + /** Set the switch + * + * The first 4 channels of each backend have in input some switches. + * This switches allow to swap the signal. I.e. the signal of the + * first channel will be swapped with the fourth channel, and so on. + * When the enable argument is False, the swapping does not occour, + * and this is the normal and default configuration. + * + * @param enable if False, nothing will be swapped + * @throw ComponentErrors::ComponentErrorsEx + */ + void setSwitch(in boolean enable) raises (ComponentErrors::ComponentErrorsEx); + + + /** Get the switch status + * + * @return a boolean which tells if the backend switch is enabled. + */ + boolean getSwitch() raises (ComponentErrors::ComponentErrorsEx); + }; +}; + +#endif diff --git a/SRT/Interfaces/SRTReceiversInterface/src/Makefile b/SRT/Interfaces/SRTReceiversInterface/src/Makefile index c5666177c..7d6e85583 100644 --- a/SRT/Interfaces/SRTReceiversInterface/src/Makefile +++ b/SRT/Interfaces/SRTReceiversInterface/src/Makefile @@ -1,23 +1,27 @@ #***************************************************************** # Makefile of Receivers # ===================== -# Marco Buttu -# Andrea Orlati +# Marco Buttu +# Andrea Orlati +# Giuseppe Carboni + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py new file mode 100644 index 000000000..78533e4f3 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py @@ -0,0 +1,85 @@ +# Author: +# Giuseppe Carboni + +import sys + +module = sys.modules[__name__] + +common_schema = [ + 'SLOT', + 'ADDRESS', + 'TYPE', +] + +board_types = [] +board_types.append(['_FILTER']) +board_types.append(['_FILTER', '_INPUT']) +for i in range(3): + board_types.append(['_LO']) +board_types.append(['_LO', '_ATT']) + +def _LO(response): + """This method parses the current status of the local oscillator. + + :param response: the tuple containing the ordered status of the board. + """ + LO_status = {} + + LO_status['REF_FREQ'] = int(response[3]) + LO_status['FREQ'] = int(response[4]) + LO_status['ENABLED'] = int(bin(response[9])[2:].zfill(8)[4], 2) + LO_status['ERR'] = int(response[10]) + LO_status['LOCK'] = int(response[11]) + + return LO_status + +def _INPUT(response): + """This method parses the current status of the input conversion. + + :param response: the tuple containing the ordered status of the board. + """ + INPUT_status = {} + + INPUT_status['INPUT_CONV'] = int(bin(response[9])[2:].zfill(8)[5:7], 2) - 1 + + return INPUT_status + +def _FILTER(response): + """This method parses the current bandwidth of the filter of the board. + + :param response: the tuple containing the ordered status of the board.""" + FILTER_status = {} + + FILTER_status['BANDWIDTH'] = int(bin(response[9])[2:].zfill(8)[3:5], 2) + + return FILTER_status + +def _ATT(response): + """This method parses the attenuation values of the board, one for each of + the board channels. + + :param response: the tuple containing the ordered status of the board.""" + ATT_status = {} + + ATT_status['ATT'] = [int(value) for value in response[5:9]] + + return ATT_status + +def parse(response): + """This method conveniently parses the response retrieved from the device + into a dictionary. Since every board has its characteristics or a + combination of them, naming the response dictionary keys starting from the + board type simplifies the subsequent checking procedure. + + :param response: the tuple containing the ordered status of the board.""" + status = {} + for i in range(len(common_schema)): + status[common_schema[i]] = int(response[i]) + try: + pcb_type = board_types[response[2]] + except IndexError: + raise ValueError('Unknown PCB type %d.' % response[2]) + for configuration in pcb_type: + method = getattr(module, configuration) + status.update(method(response)) + return status diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py new file mode 100644 index 000000000..b37dd2198 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py @@ -0,0 +1,482 @@ +# Author: +# Giuseppe Carboni + +from Receivers__POA import SRTIFDistributor +from Acspy.Servants.CharacteristicComponent import CharacteristicComponent as cc +from Acspy.Servants.ContainerServices import ContainerServices as services +from Acspy.Servants.ComponentLifecycle import ComponentLifecycle as lcycle +from Acspy.Util.BaciHelper import addProperty +from maciErrType import CannotGetComponentEx +from ACSErrTypeCommonImpl import CORBAProblemExImpl +from threading import Timer +from IRAPy import logger +from IFDistributor.devios import GenericDevIO + +from xml.etree import ElementTree +from Acspy.Util import ACSCorba + +import socket +import Receivers +import ComponentErrorsImpl +import cdbErrType +import re +import IFDParser + +class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): + + def __init__(self): + cc.__init__(self) + services.__init__(self) + self.configuration_name = '' + self.configuration = {} + self.attributes = {} + self.configurations = {} + + self.LO_board = None + self.freq = 0 + self.lock = 0 + self.ampl = 0.0 + self.t = None + + def initialize(self): + self._set_cdb_attributes('alma/RECEIVERS/SRTIFDistributor') + self._set_cdb_configuration('alma/DataBlock/SRTIFDistributor/Configuration') + + addProperty(self, 'frequency', devio_ref=GenericDevIO(self, 'freq')) + addProperty(self, 'amplitude', devio_ref=GenericDevIO(self, 'ampl')) + addProperty(self, 'isLocked', devio_ref=GenericDevIO(self, 'lock')) + + self.setDefault() + + def cleanUp(self): + pass + + def setup(self, configuration_name): + """This method performs a complete setup of the device by receiving the + desired configuration name as a string and using the corresponding CDB + configuration. If the desired configuration is unknown it raises and + logs an exception. + + :param configuration_name: the desired device configuration.""" + if configuration_name not in self.configurations: + reason = ( + 'Unknown IFDistributor configuration: %s' + % configuration_name + ) + logger.logError(reason) + exc = ComponentErrorsImpl.CouldntGetAttributeExImpl() + exc.setData('reason', reason) + raise exc.getComponentErrorsEx() + + self.configuration_name = configuration_name + self.configuration = self.configurations[configuration_name] + + # LO + LO_conf = self.configuration.get('LO') + if not LO_conf: + reason = ( + 'Local oscillator configuration not present. Aborting setup.' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValidationErrorExImpl(reason) + + if int(LO_conf['Board']) != self._LO_board(): + reason = ( + 'Wrong board selected for local oscillator. ' + + 'Please, fix the board index in CDB.' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + if LO_conf['Enable'] == '0': + self.rfoff() + else: + self._set_LO(int(LO_conf['Frequency']), 1) + + # BW + for line in (self.configuration.get('BW') or []): + self._set_filter( + int(line['Board']), + int(line['Bandwidth']) + ) + + # ATT + for line in (self.configuration.get('ATT') or []): + for channel_conf in line['ChannelConfiguration']: + self._set_att( + int(line['Board']), + int(channel_conf['Channel']), + float(channel_conf['Attenuation']), + ) + + # INPUT + for line in (self.configuration.get('INPUT') or []): + self._set_input( + int(line['Board']), + int(line['Conversion']) + ) + + if not self.t: # Check if a control timer has already been created + self._is_configured() + + def setDefault(self): + """Sets the IFDistributor to its default values.""" + self.setup(self.attributes['DEFAULT_CONFIG']) + + def getSetup(self): + """If present, returns the current configuration name, otherwise it + returns an empty string.""" + return self.configuration_name + + def get(self): + """Returns the current amplitude and frequency + of the local oscillator.""" + return self.ampl, self.freq + + def set(self, _, frequency): + """Sets the frequency and turn on the local oscillator. + :param _: placeholder for amplitude. Since the amplitude of the local + oscillator cannot be set (it's 1 when the local oscillator is + enabled or 0 when the local oscillator is disabled), it is simply + ignored. + :param frequency: the frequency to which the local oscillator will be + set. + """ + self._set_LO(frequency, 1) + + def rfoff(self): + """Turns off the local oscillator.""" + self._LO_board() + self._set_LO(self.freq, 0) + + def rfon(self): + """Turns on the local oscillator.""" + self._LO_board() + self._set_LO(self.freq, 1) + + def _set_LO(self, lo_freq, lo_on): + """This method is used to issue commands to the local oscillator + board (type 2). + + :param lo_freq: the frequency to which the local oscillator will be + set. + :param lo_on: a boolean flag that enables or disables the local + oscillator. + """ + command = ( + 'S %d %d %d %d\n' % + ( + self._LO_board(), + int(self.attributes['REF_FREQ']), + lo_freq, + lo_on + ) + ) + + response = self._send_command(command)[0] + + if response == 'nak': + reason = ( + ('Command `%s` has not been accepted. ' % command[:-1]) + + 'Check sent values for correctness.' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + if self.configuration: + self.configuration['LO']['Frequency'] = str(lo_freq) + self.configuration['LO']['Enable'] = str(lo_on) + + def _set_filter(self, board, bandwidth): + """This method is used to issue commands to the set the filter + bandwidth to type 0 and 1 boards. + + :param board: the board index to which the command will be sent. + :param bandwidth: an integer that indicates the desired bandwidth + of the filter. 0: narrow, 1: medium, 2: large, 3: all bandwidth. + Any other value will force the device to answer with a nak. + """ + status = self._get_board_status(board) + if status['TYPE'] not in [0, 1]: + reason = 'Bandwidth cannot be set in board %d.' % board + logger.logError(reason) + raise ComponentErrorsImpl.OperationErrorExImpl(reason) + + command = 'B %d %d\n' % (board, bandwidth) + + response = self._send_command(command)[0] + if response == 'nak': + reason = ( + 'Command `set bandwidth` has not been accepted. ' + + 'Make sure to send a proper bandwidth value.' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + def _set_att(self, board, channel, attenuation): + """This method is used to issue commands to set the + board attenuations to type 5 boards. + + :param board: the board index to which the command will be sent. + :param channel: the board channel whose attenuation will be set. + Accepted channels are 0, 1, 2 and 3. Any other value will force + the device to answer with a nak. + :param attenuation: the attenuation to set to the given channel. + It is a floating point number between 0 and 31.5dB. Any value + outside this range will be rejected with a nak. + """ + status = self._get_board_status(board) + if status['TYPE'] != 5: + reason = 'Attenuation cannot be set in board %d.' % board + logger.logError(reason) + raise ComponentErrorsImpl.OperationErrorExImpl(reason) + + command = 'A %d %d %.3f\n' % (board, channel, attenuation) + + response = self._send_command(command)[0] + if response == 'nak': + reason = ( + 'Command `set attenuation` has not been accepted. ' + + 'Make sure to send a proper channel ' + + 'and/or attenuation value(s).' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + def _set_input(self, board, conversion): + """This method is used to issue commands to set the input conversion on + type 1 boards. + + :param board: the board index to which the command will be sent. + :param conversion: a boolean flag indicating whether the input + conversion switch should be enabled. + """ + status = self._get_board_status(board) + if status['TYPE'] != 1: + reason = 'Input conversion cannot be set in board %d.' % board + logger.logError(reason) + raise ComponentErrorsImpl.OperationErrorExImpl(reason) + + command = 'I %d %d\n' % (board, conversion) + + response = self._send_command(command)[0] + if response == 'nak': + reason = ( + 'Command `set input conversion` has not been accepted. ' + + 'Make sure to send a proper input conversion value (0 or 1)' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + def _LO_board(self): + """This method checks and returns which board is a local oscillator + board (type 2). It should be called to get the local oscillator board + index instead of directly accessing the attribute.""" + if self.LO_board is None: + for board in range(int(self.attributes['N_BOARDS'])): + status = self._get_board_status(board) + if status['TYPE'] == 2: + self.LO_board = board + self.freq = status['FREQ'] + self.lock = status['LOCK'] + self.ampl = float(self.lock) + break + + if self.LO_board is not None: + return self.LO_board + else: + reason = 'No local oscillator boards detected.' + logger.logError(reason) + raise ComponentErrorsImpl.UnexpectedExImpl(reason) + + def _get_board_status(self, board): + """This method is used to retrieve the status of a given board. It + makes use of the IFDParser module to conveniently parse the status + message retrieved from the device. + + :param board: the desired board index. + """ + if board not in range(int(self.attributes['N_BOARDS'])): + reason = 'Invalid board index %d.' % board + reason += ( + 'Choose a board index between 0 and %d.' + % int(self.attributes['N_BOARDS']) + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + + command = '? %d\n' % board + + response = self._send_command(command) + + if len(response) == 1: + return response[0] + + response = [int(x.strip()) for x in response[1].split(',')] + + status = IFDParser.parse(response) + return status + + def _send_command(self, command): + """This method opens a socket and send the given command. + + :param command: the command to be sent to the device. + """ + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + try: + s.connect((self.attributes['IP'], int(self.attributes['PORT']))) + except socket.error: + reason = 'Could not reach the device!' + logger.logError(reason) + raise ComponentErrorsImpl.SocketErrorExImpl(reason) + + s.sendall(command) + + response = s.recv(1024) + s.close() + response = response.strip().split('\n') + return response + + def _is_configured(self): + """This method checks if the device is configured accordingly to the + configuration issued in the setup process. It is meant to be called + only once after the setup procedure, it will then spawn a timer that + will call again this method with a period defined in the component + configuration attributes (CYCLE_TIME).""" + self.t = Timer(int(self.attributes['CYCLE_TIME']), self._is_configured) + self.t.daemon = True + self.t.start() + + configuration = self.configuration + + LO_conf = configuration.get('LO') + LO_status = self._get_board_status(self._LO_board()) + + self.freq = LO_status['FREQ'] + self.lock = LO_status['LOCK'] + self.ampl = float(self.lock) + + if LO_status['ENABLED'] != int(LO_conf['Enable']): + logger.logWarning( + 'Local oscillator is %s, but it should be %s.' % + ( + ('enabled' if LO_status['ENABLED'] else 'disabled'), + ('enabled' if int(LO_conf['Enable']) else 'disabled') + ) + ) + if LO_status['ENABLED']: + if LO_status['REF_FREQ'] != int(self.attributes['REF_FREQ']): + logger.logWarning( + 'Wrong reference frequency of local oscillator.' + ) + if LO_status['FREQ'] != int(LO_conf['Frequency']): + logger.logWarning('Wrong frequency of local oscillator.') + if LO_status['ERR'] != 0: + logger.logWarning('Local oscillator error.') + + for line in (configuration.get('BW') or []): + BW_status = self._get_board_status(int(line['Board'])) + if BW_status['BANDWIDTH'] != int(line['Bandwidth']): + logger.logWarning( + 'Board %d bandwidth not configured correctly.' + % int(line['Board']) + ) + + for line in (configuration.get('ATT') or []): + board = int(line['Board']) + ATT_status = self._get_board_status(board)['ATT'] + for channel_config in line['ChannelConfiguration']: + channel = int(channel_config['Channel']) + config_att = float(channel_config['Attenuation']) + if int(config_att * 2) != ATT_status[channel]: + logger.logWarning( + ('Board %d, channel %d ' % (board, channel)) + + 'attenuation not configured correctly.' + ) + + for line in (configuration.get('INPUT') or []): + INPUT_status = self._get_board_status(int(line['Board'])) + if INPUT_status['INPUT_CONV'] != int(line['Conversion']): + logger.logWarning( + 'Board %d input conversion not configured correctly.' + % int(line['Board']) + ) + + def _set_cdb_attributes(self, path): + """This method reads the attributes of the component and conveniently + stores them in a dictionary. + + :param path: the CDB path of the component configuration. + """ + try: + dal = ACSCorba.cdb() + dao = dal.get_DAO_Servant(path) + except cdbErrType.CDBRecordDoesNotExistEx: + reason = "CDB record %s does not exists" % path + logger.logError(reason) + raise ComponentErrorsImpl.CouldntGetAttributeExImpl(reason) + + attributes = [ + 'IP', + 'PORT', + 'REF_FREQ', + 'DEFAULT_CONFIG', + 'CYCLE_TIME', + 'N_BOARDS' + ] + + for name in attributes: + try: + self.attributes[name] = dao.get_field_data(name).strip() + except cdbErrType.CDBFieldDoesNotExistEx: + reason = "CDB field %s does not exist" % name + logger.logError(reason) + raise ComponentErrorsImpl.CouldntGetAttributeExImpl(reason) + + def _set_cdb_configuration(self, path): + """This method reads the possible device configurations from the CDB + and conveniently stores them in a dictionary for further use and + comparison. + + :param path: the CDB path of the device configurations file. + """ + try: + dal = ACSCorba.cdb() + dao = dal.get_DAO(path) + except cdbErrType.CDBRecordDoesNotExistEx: + reason = "CDB record %s does not exists" % path + logger.logError(reason) + raise ComponentErrorsImpl.CouldntGetAttributeExImpl(reason) + + children = ElementTree.fromstring(dao) + for child in children: + conf_name, conf_data = _dictify(child) + self.configurations[conf_name] = conf_data + + +def _dictify(node, root=True): + """This function reads the XML string retrieved from the CDB and + recursively iterates through each node of the various configurations. + It finally returns a dictionary with all the configuration parameters. + + :param node: the XML node to parse + :param root: boolean identifying if the current node is the root node. + """ + tag = re.sub(r'\{.*\}', '', node.tag) + text = node.text.strip() + if root: + content = _dictify(node, False) + return content.pop('ConfigurationName'), content + if text: + return text + d = {} + for x in node.findall("./*"): + tag = re.sub(r'\{.*\}', '', x.tag) + element = _dictify(x, False) + if tag in ['BW', 'ATT', 'ChannelConfiguration', 'INPUT']: + if tag not in d: + d[tag] = [] + d[tag].append(element) + else: + d[tag] = element + return d diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/__init__.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py new file mode 100644 index 000000000..b4aae519e --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py @@ -0,0 +1,17 @@ +from ACSImpl.DevIO import DevIO +from IRAPy import logger + + +class GenericDevIO(DevIO): + + def __init__(self, comp, what): + self.comp = comp + self.what = what + DevIO.__init__(self, self.read()) + + def read(self): + return getattr(self.comp, self.what) + + def write(self, value): + attrib = getattr(self.comp, self.what) + attrib = value diff --git a/SRT/Servers/SRTPyIFDistributor/src/Makefile b/SRT/Servers/SRTPyIFDistributor/src/Makefile new file mode 100644 index 000000000..15e6b3ec5 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/Makefile @@ -0,0 +1,42 @@ +#------------------------------------------------- +# Giuseppe Carboni +#------------------------------------------------- + + +CDB_SCHEMAS = SRTIFDistributor + +PY_SCRIPTS = +PY_MODULES = +PY_PACKAGES = IFDistributor + + +# INCLUDE STANDARDS +# ----------------- +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + +# TARGETS +# ------- +all: do_all + @echo " . . . 'all' done" + +clean : clean_all + $(RM) *~ *Impl/*~ IFDistributor/*.pyc + $(RM) ../lib/python/site-packages/* + $(RM) $(INTROOT)/lib/python/site-packages/IFDistributor + @echo " . . . clean done" + +clean_dist : clean_all clean_dist_all + @echo " . . . clean_dist done" + +man : do_man + @echo " . . . man page(s) done" + +install : install_all + @echo " . . . installation done" + +#___oOo___ + diff --git a/SRT/Servers/SRTPyIFDistributor/test/Makefile b/SRT/Servers/SRTPyIFDistributor/test/Makefile new file mode 100644 index 000000000..6ca365190 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/test/Makefile @@ -0,0 +1,93 @@ +PY_PACKAGES = SRTIFDistributorMockers + +# CPP UNIT TESTING SETUP +#-------------- +# GTEST_HOME=/usr/local/include/gtest +# GMOCK_HOME=/usr/local/include/gmock +# GTEST_LIBS=gtest gtest_main + +# USER_INC=-I$(GTEST_HOME) -I$(GMOCK_HOME) +# USER_LIBS=C++ pthread +# END OF CPP UNIT TESTING SETUP +#--------------------- + +# DEFINE YOUR CPP UNIT TEST EXECUTABLES HERE as: +# +# EXECTUABLES_L = unittest +# unittest_OBJECTS = unittest +# unittest_LIBS = $(GTEST_LIBS) + +# EXECUTABLES_L = unittest +# unittest_OBJECTS = unittest +# unittest_LIBS = $(GTEST_LIBS) + +# END OF CUSTOMIZATION +# do not edit below this line +#---------------------------- + +CSOURCENAMES = \ + $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ + $(foreach rtos, $(RTAI_MODULES) , $($(rtos)_OBJECTS)) \ + $(foreach lib, $(LIBRARIES) $(LIBRARIES_L), $($(lib)_OBJECTS)) + +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + +# TEST TARGETS +#TODO: unittest(2) discover pyunit + +do_unit: all + @echo "running cpp unit tests" + ../bin/unittest --gtest_output=xml:results/cppunittest.xml + +do_pyunit: + @echo "running python unit tests" + unit2 pyunit + +do_functional: + @echo "running python functional tests" + unit2 discover functional + +do_external: + @echo "running python external tests" + unit2 discover external + +clean_test: + rm -f results/*.xml + rm -f functional/*.pyc + rm -f pyunit/*.pyc + rm -f external/*.pyc + rm -rf ../lib/python/site-packages/* + rm -rf $(INTROOT)/lib/python/site-packages/SRTIFDistributorMockers* + +unit: do_unit + @echo " . . . 'unit' done" + +pyunit: do_pyunit + @echo " . . . 'pyunit' done" + +functional: do_functional + @echo " . . . 'functional' done" + +external: do_external + @echo " . . . 'external' done" + +# TARGETS +# ------- +all: do_all + @echo " . . . 'all' done" + +clean : clean_all clean_test + @echo " . . . clean done" + +clean_dist : clean_all clean_dist_all clean_test + @echo " . . . clean_dist done" + +man : do_man + @echo " . . . man page(s) done" + +install : install_all + @echo " . . . installation done" diff --git a/SRT/Servers/SRTPyIFDistributor/test/README.rst b/SRT/Servers/SRTPyIFDistributor/test/README.rst new file mode 100644 index 000000000..aa58919af --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/test/README.rst @@ -0,0 +1,4 @@ +******************* +Containers to start +******************* +- acsStartContainer -py PyIFDistributorContainer diff --git a/SRT/Servers/SRTPyIFDistributor/test/external/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/external/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor/test/functional/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/functional/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor/test/interface/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/interface/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor/test/pyunit/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/pyunit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor/test/run_coverage b/SRT/Servers/SRTPyIFDistributor/test/run_coverage new file mode 100755 index 000000000..2a6d2c446 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/test/run_coverage @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -f .coverage +coverage run -m unittest discover +coverage report --include $INTROOT"/lib/python/site-packages/SRTIFDistributor/*" diff --git a/SRT/Servers/SRTPyIFDistributor14/config/CDB/schemas/SRTIFDistributor14.xsd b/SRT/Servers/SRTPyIFDistributor14/config/CDB/schemas/SRTIFDistributor14.xsd new file mode 100644 index 000000000..4ede878e4 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/config/CDB/schemas/SRTIFDistributor14.xsd @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/SRTIFDistributor14Impl.py b/SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/SRTIFDistributor14Impl.py new file mode 100644 index 000000000..c292225d7 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/SRTIFDistributor14Impl.py @@ -0,0 +1,226 @@ +# Authors: +# Marco Buttu +# Giuseppe Carboni + +from Receivers__POA import SRTIFDistributor14 +from Acspy.Servants.CharacteristicComponent import CharacteristicComponent as cc +from Acspy.Servants.ContainerServices import ContainerServices as services +from Acspy.Servants.ComponentLifecycle import ComponentLifecycle as lcycle +from maciErrType import CannotGetComponentEx +from ACSErrTypeCommonImpl import CORBAProblemExImpl + +from xml.etree import ElementTree +from Acspy.Util import ACSCorba + +import socket +import Receivers +import ComponentErrorsImpl +import ComponentErrors +import cdbErrType + +class SRTIFDistributor14Impl(SRTIFDistributor14, cc, services, lcycle): + + + def __init__(self): + cc.__init__(self) + services.__init__(self) + self.backend_name = '' + self.attributes = {} + self.mapping = {} + + def initialize(self): + self._set_cdb_attributes('alma/RECEIVERS/SRTIFDistributor14') + self._set_cdb_mapping('alma/DataBlock/SRTIFDistributor14/Mapping') + + def cleanUp(self): + pass + + def setup(self, backend_name): + self.backend_name = backend_name + + def setAttenuation(self, channel, value): + """Attenuate the backend channel to the value `value`. + + The channel is an integer starting from 0. For instance, if + a backend has 5 channels, the channel value will be between + 0 and 4. Given a specified backend (self.backend), and given + its channel, we read a table and get the correspondig attenuator + address. + + The values are in decibel. The IFDistributor firmware takes + a code and coverts it to the corresponding value. + For instance, we take 0.025 as value, and to tell the + firmware to set it, we should send the code 001 to it. + + 0.00 -> 000 (value*4) + 0.25 -> 001 (value*4) + 0.50 -> 002 (value*4) + ... + + The command to send is '#AAA 99 999\n', where AAA is + ATT (it means ATTenuate). The 99 is the address, and + 999 is the value. For instance, given setAttenuation(6, 0.50), + we have first of all to find the address associated at the + couple (self.backend, channel 6). Let's suppose this address + is 47. At this point we have to find the code associated to + the decibel 0.50, and we just have to multiply the value by 4. + Therefore the code will be: 0.50*4 -> 002. + The final command will be: + + #ATT 47 002\n + """ + + self._check_backend() + + if channel not in self.mapping[self.backend_name]: + raise ValueError('Channel %s not in %s.' + % (channel, self.mapping[self.backend_name].keys()) + ) + + address = int(self.mapping[self.backend_name][channel]) + + if address not in range(97): + raise ValueError('Address %d out of range.' % (address)) + + code = '%03d' % int(round(value*4)) + command = b'#ATT %02d %s\n' % (address, code) + self._send_command(command) + + def getAttenuation(self, channel): + """Gets the current attenuation value for the channel `channel`. + Then it returns it as a floating point number. + The `channel` parameter is used to retrieve its + associated address (as in setAttenuation() method). + """ + + self._check_backend() + + if channel not in self.mapping[self.backend_name]: + raise ValueError('Channel %s not in %s.' + % (channel, self.mapping[self.backend_name].keys()) + ) + + address = int(self.mapping[self.backend_name][channel]) + + if address not in range(97): + raise ValueError('Address %d out of range.' % (address)) + + command = b'#ATT %02d?\n' % (address) + return float(self._send_command(command, True)[1:-1]) + + def setSwitch(self, enable): + """Enable or disable the backend switch. + `enable` parameter is a boolean that enables the switch when `True`, + and disable it when `False`. + """ + + self._check_backend() + + command = b'#SWT 00 %03d\n' % (1 if enable else 0) + self._send_command(command) + + def getSwitch(self): + """Gets the current state of the backend switch and + returns it as a boolean. + `True` means that the switch is enabled, otherwise it returns `False`. + """ + + self._check_backend() + + command = b'#SWT 00?\n' + response = int(self._send_command(command, True)[1:-1]) + return True if response == 1 else False + + def getInfo(self): + """Gets the IFDistributor infos, like its name and its hardware + and firmware versions. + """ + + self._check_backend() + + command = b'#*IDN?\n' + response = self._send_command(command, True) + return response + + def setDefault(self): + """Sets the IFDistributor to its default values""" + + self._check_backend() + + command = b'#*RST\n' + self._send_command(command) + + def getSetup(self): + return self.backend_name + + def _check_backend(self): + if not self.backend_name: + raise LookupError('Select a backend first.') + elif self.backend_name not in self.mapping: + raise LookupError('Backend %s not in %s.' + % (self.backend_name, self.mapping.keys()) + ) + + def _send_command(self, command, expect_response=False): + """Open a socket and send the command `command`. + Parameter `expect_response` is a boolean which lets the method + expect a response or return immediately. + """ + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((self.attributes['IP'], int(self.attributes['PORT']))) + s.send(command) + + response = b'' + if expect_response: + response = s.recv(1024) + s.close() + return response + + def _set_cdb_attributes(self, path): + try: + dal = ACSCorba.cdb() + dao = dal.get_DAO_Servant(path) + except cdbErrType.CDBRecordDoesNotExistEx: + raeson = "CDB record %s does not exists" % path + # logger.logError(raeson) + exc = ComponentErrorsImpl.ValidationErrorExImpl() + exc.setReason(raeson) + raise exc + + for name in ('IP', 'PORT'): + try: + self.attributes[name] = dao.get_field_data(name).strip() + except cdbErrType.CDBFieldDoesNotExistEx: + raeson = "CDB field %s does not exist" % name + # logger.logWarning(raeson) + exc = ComponentErrorsImpl.ValidationErrorExImpl() + exc.setReason(raeson) + raise exc + + def _set_cdb_mapping(self, path): + try: + dal = ACSCorba.cdb() + dao = dal.get_DAO(path) + except cdbErrType.CDBRecordDoesNotExistEx: + raeson = "CDB record %s does not exists" % path + # logger.logError(raeson) + exc = ComponentErrorsImpl.ValidationErrorExImpl() + exc.setReason(raeson) + raise exc + + try: + children = ElementTree.fromstring(dao).getchildren() + for child in children: + backend, channel, address = [c.text.strip() for c in child] + value = {int(channel): int(address)} + if backend in self.mapping: + self.mapping[backend].update(value) + else: + self.mapping[backend] = value + except cdbErrType.CDBRecordDoesNotExistEx: + raeson = "CDB record %s does not exists" % path + # logger.logError(raeson) + exc = ComponentErrorsImpl.ValidationErrorExImpl() + exc.setReason(raeson) + raise exc diff --git a/SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/__init__.py b/SRT/Servers/SRTPyIFDistributor14/src/IFDistributor14/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor14/src/Makefile b/SRT/Servers/SRTPyIFDistributor14/src/Makefile new file mode 100644 index 000000000..726e7acb5 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/src/Makefile @@ -0,0 +1,43 @@ +#------------------------------------------------- +# Marco Buttu +# Giuseppe Carboni +#------------------------------------------------- + + +CDB_SCHEMAS = SRTIFDistributor14 + +PY_SCRIPTS = +PY_MODULES = +PY_PACKAGES = IFDistributor14 + + +# INCLUDE STANDARDS +# ----------------- +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + +# TARGETS +# ------- +all: do_all + @echo " . . . 'all' done" + +clean : clean_all + $(RM) *~ *Impl/*~ IFDistributor14/*.pyc + $(RM) ../lib/python/site-packages/* + $(RM) $(INTROOT)/lib/python/site-packages/IFDistributor14 + @echo " . . . clean done" + +clean_dist : clean_all clean_dist_all + @echo " . . . clean_dist done" + +man : do_man + @echo " . . . man page(s) done" + +install : install_all + @echo " . . . installation done" + +#___oOo___ + diff --git a/SRT/Servers/SRTPyIFDistributor14/test/Makefile b/SRT/Servers/SRTPyIFDistributor14/test/Makefile new file mode 100644 index 000000000..56eb1df5b --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/test/Makefile @@ -0,0 +1,94 @@ +PY_PACKAGES = SRTIFDistributor14Mockers + +# CPP UNIT TESTING SETUP +#-------------- +# GTEST_HOME=/usr/local/include/gtest +# GMOCK_HOME=/usr/local/include/gmock +# GTEST_LIBS=gtest gtest_main + +# USER_INC=-I$(GTEST_HOME) -I$(GMOCK_HOME) +# USER_LIBS=C++ pthread +# END OF CPP UNIT TESTING SETUP +#--------------------- + +# DEFINE YOUR CPP UNIT TEST EXECUTABLES HERE as: +# +# EXECTUABLES_L = unittest +# unittest_OBJECTS = unittest +# unittest_LIBS = $(GTEST_LIBS) + +# EXECUTABLES_L = unittest +# unittest_OBJECTS = unittest +# unittest_LIBS = $(GTEST_LIBS) + +# END OF CUSTOMIZATION +# do not edit below this line +#---------------------------- + +CSOURCENAMES = \ + $(foreach exe, $(EXECUTABLES) $(EXECUTABLES_L), $($(exe)_OBJECTS)) \ + $(foreach rtos, $(RTAI_MODULES) , $($(rtos)_OBJECTS)) \ + $(foreach lib, $(LIBRARIES) $(LIBRARIES_L), $($(lib)_OBJECTS)) + +MAKEDIRTMP := $(shell searchFile include/acsMakefile) +ifneq ($(MAKEDIRTMP),\#error\#) + MAKEDIR := $(MAKEDIRTMP)/include + include $(MAKEDIR)/acsMakefile +endif + +# TEST TARGETS +#TODO: unittest(2) discover pyunit + +do_unit: all + @echo "running cpp unit tests" + ../bin/unittest --gtest_output=xml:results/cppunittest.xml + +do_pyunit: + @echo "running python unit tests" + unit2 pyunit + +do_functional: + @echo "running python functional tests" + unit2 discover functional + +do_external: + @echo "running python external tests" + unit2 discover external + +clean_test: + rm -f results/*.xml + rm -f functional/*.pyc + rm -f pyunit/*.pyc + rm -f external/*.pyc + rm -rf ../lib/python/site-packages/* + rm -rf $(INTROOT)/lib/python/site-packages/SRTIFDistributor14Mockers* + +unit: do_unit + @echo " . . . 'unit' done" + +pyunit: do_pyunit + @echo " . . . 'pyunit' done" + +functional: do_functional + @echo " . . . 'functional' done" + +external: do_external + @echo " . . . 'external' done" + +# TARGETS +# ------- +all: do_all + @echo " . . . 'all' done" + +clean : clean_all clean_test + @echo " . . . clean done" + +clean_dist : clean_all clean_dist_all clean_test + @echo " . . . clean_dist done" + +man : do_man + @echo " . . . man page(s) done" + +install : install_all + @echo " . . . installation done" + diff --git a/SRT/Servers/SRTPyIFDistributor14/test/README.rst b/SRT/Servers/SRTPyIFDistributor14/test/README.rst new file mode 100644 index 000000000..aa58919af --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/test/README.rst @@ -0,0 +1,4 @@ +******************* +Containers to start +******************* +- acsStartContainer -py PyIFDistributorContainer diff --git a/SRT/Servers/SRTPyIFDistributor14/test/external/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/external/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor14/test/functional/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/functional/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor14/test/interface/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/interface/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor14/test/pyunit/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/pyunit/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Servers/SRTPyIFDistributor14/test/run_coverage b/SRT/Servers/SRTPyIFDistributor14/test/run_coverage new file mode 100755 index 000000000..066cd1681 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor14/test/run_coverage @@ -0,0 +1,5 @@ +#!/bin/bash + +rm -f .coverage +coverage run -m unittest discover +coverage report --include $INTROOT"/lib/python/site-packages/SRTIFDistributor14/*" -- GitLab From 5c150dd0bb92b0c24dd30710b5832c194d2da1d9 Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 20 Jun 2018 11:47:12 +0200 Subject: [PATCH 115/145] fix #213: buggy python ACS impletation forsed some workaround. Also fixed problem related to the logged error messages to be empty (#217) --- .../AntennaErrors/idl/AntennaErrors.xml | 32 ++++----- .../BackendsErrors/idl/BackendsErrors.xml | 18 ++--- .../Errors/ClientErrors/idl/ClientErrors.xml | 18 ++--- .../ComponentErrors/idl/ComponentErrors.xml | 52 +++++++------- .../ManagementErrors/idl/ManagementErrors.xml | 58 ++++++++-------- .../Errors/ParserErrors/idl/ParserErrors.xml | 26 +++---- .../ReceiversErrors/idl/ReceiversErrors.xml | 28 ++++---- .../XBackendErrors/idl/XBackendsErrors.xml | 8 +-- .../IRALibrary/include/Definitions.h | 13 ++++ .../IRALibrary/src/IRAPy/__init__.py | 13 +++- .../IRALibrary/src/IRAPy/customlogging.py | 27 +++++--- .../ParserLibrary/include/SP_parser.h | 7 ++ .../ParserLibrary/include/SP_parser.i | 41 ++++++++++- .../ParserLibrary/src/TestFunctions.cpp | 4 +- .../Libraries/ParserLibrary/src/TestTypes.cpp | 6 +- .../tests/gtest/exceptionMessages.cpp | 63 +++++++++++++++++ .../tests/results/cppunittest.xml | 13 ---- .../ParserLibrary/tests/unittest.cpp | 3 +- Common/Servers/CustomLogger/src/Makefile | 2 +- .../CustomLogger/src/emitLogMessage.py | 36 +++++----- .../Servers/CustomLogger/src/sendException.py | 69 +++++++++++++++++++ 21 files changed, 367 insertions(+), 170 deletions(-) create mode 100644 Common/Libraries/ParserLibrary/tests/gtest/exceptionMessages.cpp delete mode 100644 Common/Libraries/ParserLibrary/tests/results/cppunittest.xml create mode 100644 Common/Servers/CustomLogger/src/sendException.py diff --git a/Common/Errors/AntennaErrors/idl/AntennaErrors.xml b/Common/Errors/AntennaErrors/idl/AntennaErrors.xml index 8ee09ef91..c1a06e7fa 100644 --- a/Common/Errors/AntennaErrors/idl/AntennaErrors.xml +++ b/Common/Errors/AntennaErrors/idl/AntennaErrors.xml @@ -16,47 +16,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/BackendsErrors/idl/BackendsErrors.xml b/Common/Errors/BackendsErrors/idl/BackendsErrors.xml index 5875e3213..137e4ae37 100644 --- a/Common/Errors/BackendsErrors/idl/BackendsErrors.xml +++ b/Common/Errors/BackendsErrors/idl/BackendsErrors.xml @@ -15,23 +15,23 @@ - + - - + + - + - + - + - + - + - + diff --git a/Common/Errors/ClientErrors/idl/ClientErrors.xml b/Common/Errors/ClientErrors/idl/ClientErrors.xml index ee479d671..27d267944 100644 --- a/Common/Errors/ClientErrors/idl/ClientErrors.xml +++ b/Common/Errors/ClientErrors/idl/ClientErrors.xml @@ -13,32 +13,32 @@ - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml index 05c31e4c8..0db785b61 100644 --- a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml +++ b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml @@ -16,97 +16,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml index 13d029e05..f2587cb0a 100644 --- a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml +++ b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml @@ -18,94 +18,94 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ParserErrors/idl/ParserErrors.xml b/Common/Errors/ParserErrors/idl/ParserErrors.xml index aed5689a6..13753156d 100644 --- a/Common/Errors/ParserErrors/idl/ParserErrors.xml +++ b/Common/Errors/ParserErrors/idl/ParserErrors.xml @@ -16,41 +16,41 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml b/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml index 6bc708697..981efa639 100755 --- a/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml +++ b/Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml @@ -14,45 +14,45 @@ shortDescription="Error configuring the receiver" description="Cannot perform the receiver configuration"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml b/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml index 8c1bea51f..2be8b9376 100644 --- a/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml +++ b/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml @@ -13,12 +13,12 @@ - + - + - + - + diff --git a/Common/Libraries/IRALibrary/include/Definitions.h b/Common/Libraries/IRALibrary/include/Definitions.h index ae3028a8a..f7624b62d 100644 --- a/Common/Libraries/IRALibrary/include/Definitions.h +++ b/Common/Libraries/IRALibrary/include/Definitions.h @@ -13,6 +13,11 @@ #ifndef DEFINITIONS_H #define DEFINITIONS_H +// if this value is changed the modfication should be reflected also in python implementation in module customlogging.py +#ifndef USER_MESSAGE_FIELDNAME +#define USER_MESSAGE_FIELDNAME "Message-to-User" +#endif + #ifndef NULL #define NULL 0 #endif @@ -75,6 +80,14 @@ */ #define _ADD_EXTRA(OBJ,NAME,VALUE) OBJ.addData(NAME,VALUE) +/** + * Appends the message to be returned to the user for a completion or an exception. + * The message i shown in the operatro input by cansequence of a user command + * @param OBJ object (completion or exception) to which extra data must be appended + * @param VALUE message to the user +*/ +#define _ADD_USER_MESSAGE(OBJ,VALUE) _ADD_EXTRA(OBJ,USER_MESSAGE_FIELDNAME,VALUE) + /** * Used to read extra information from a completion or exception * @param OBJ object (completion or exception) to which extra data is appended diff --git a/Common/Libraries/IRALibrary/src/IRAPy/__init__.py b/Common/Libraries/IRALibrary/src/IRAPy/__init__.py index c30406046..9990a95d2 100644 --- a/Common/Libraries/IRALibrary/src/IRAPy/__init__.py +++ b/Common/Libraries/IRALibrary/src/IRAPy/__init__.py @@ -9,6 +9,17 @@ list of modules: """ import customlogging -logger = customlogging.getLogger("IRA_CUSTOM_LOGGER") +import ACSLog + +#Some comments required here. The custom logger mechanism is not working in python. +#do the way to separate the system logs to the ones do be shown to the user is to use different +#logging channels. +logger = customlogging.getLogger("IRA_SERVICE_LOGGER") +userLogger = customlogging.getLogger("IRA_CUSTOM_LOGGER") +userLogger.isUserLogger=True + +def _add_user_message(ex,message): + ex.addData("Message-to-User",message) + customlogging.Log.setCapacity(1) customlogging.Log.setBatchSize(1) diff --git a/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py b/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py index c9e37254f..535902241 100644 --- a/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py +++ b/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py @@ -5,6 +5,8 @@ from the ACS system log. """ from Acspy.Common import Log import logging +import ACSLog + """ Key-Value pair distinguishing our custom logging. @@ -18,6 +20,7 @@ class CustomLogger(Log.Logger): Each log event now will have additional custom key-value data pairs. """ def __init__(self, name): + self.isUserLogger=False Log.Logger.__init__(self, name) def __formatMessage(self, msg): @@ -26,17 +29,25 @@ class CustomLogger(Log.Logger): def log(self, level, msg, *args, **kwargs): """Add key-value custom data to the LogRecord structure """ - if 'extra' in kwargs: - if 'data' in kwargs['extra']: - kwargs['extra']['data'].update(CUSTOM_ENV) - else: - kwargs['extra'].update(CUSTOM_DATA) - else: - kwargs.update(CUSTOM_EXTRA) + #if 'extra' in kwargs: + # if 'data' in kwargs['extra']: + # kwargs['extra']['data'].update(CUSTOM_ENV) + # else: + # kwargs['extra'].update(CUSTOM_DATA) + #else: + # kwargs.update(CUSTOM_EXTRA) msg = msg.replace('[', '{') msg = msg.replace(']', '}') Log.Logger.log(self, level, msg, *args, **kwargs) - + + #This is another workaround to match c++ with buggy python behaviour. + #It results into having a double entry in acs log + #The LOG_CRITICAL level correspond in the ERROR level...other ACS bug! + def logException(self,ex): + if self.isUserLogger: + self.logError(ex.shortDescription) + ex.log(self,ACSLog.ACS_LOG_CRITICAL) + logging.setLoggerClass(CustomLogger) logging.root.setLevel(logging.NOTSET) diff --git a/Common/Libraries/ParserLibrary/include/SP_parser.h b/Common/Libraries/ParserLibrary/include/SP_parser.h index 4b00c421b..71c6b7159 100644 --- a/Common/Libraries/ParserLibrary/include/SP_parser.h +++ b/Common/Libraries/ParserLibrary/include/SP_parser.h @@ -115,6 +115,13 @@ namespace SimpleParser { #define _SP_TIMETAGGEDQUEUECLEARALL "flushAll" #define _SP_TIMETAGGEDQUEUECLEARALL_PARAMS 0 +template class CFormatter { +public: + static void exceptionToUser(EX& exObj,IRA::CString& output); +private: + static IRA::CString getMessage(EX& exObj); +}; + /** * This is the parser main class. It allows to add execution rules, to parse command line according to the supported grammar to execute * the commands and, in case, to return back the values generated by the execution. The template parameter is the class that owns diff --git a/Common/Libraries/ParserLibrary/include/SP_parser.i b/Common/Libraries/ParserLibrary/include/SP_parser.i index 491fc91a7..8f946f43e 100644 --- a/Common/Libraries/ParserLibrary/include/SP_parser.i +++ b/Common/Libraries/ParserLibrary/include/SP_parser.i @@ -2,6 +2,41 @@ #define TIMERIDENTIFIER '!' #define PROCEDUREPARAMETER '$' +template +void CFormatter::exceptionToUser(EX& exObj,IRA::CString& output) +{ + IRA::CString tmp; + exObj.top(); + tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), + (const char *)getMessage(exObj)); + output=tmp; + while (exObj.getNext()!=NULL) { + tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), + (const char *)getMessage(exObj)); + output+="\n"; + output+=tmp; + } + exObj.top(); +} + +template +IRA::CString CFormatter::getMessage(EX& exObj) +{ + char *descr; + ACE_CString msg=exObj.getData(USER_MESSAGE_FIELDNAME); + if (msg.length()==0) { + descr=exObj.getDescription(); + IRA::CString ret(descr); + CORBA::string_free(descr); + return ret; + } + else { + IRA::CString ret(msg); + return ret; + } +} + + template void CParser::run(const IRA::CString& command,IRA::CString& out) throw (ParserErrors::ParserErrorsExImpl,ACSErr::ACSbaseExImpl) { @@ -19,13 +54,15 @@ void CParser::run(const IRA::CString& command,IRA::CString& out) throw (Pa } catch (ParserErrors::ParserErrorsExImpl& ex) { IRA::CString msg; - _EXCPT_TO_CSTRING(msg,ex); + SimpleParser::CFormatter::exceptionToUser(ex,msg); + //_EXCPT_TO_CSTRING(msg,ex); out=instr+m_errorDelimiter+msg; throw ex; } catch (ACSErr::ACSbaseExImpl& ex) { IRA::CString msg; - _EXCPT_TO_CSTRING(msg,ex); + //_EXCPT_TO_CSTRING(msg,ex); + SimpleParser::CFormatter::exceptionToUser(ex,msg); out=instr+m_errorDelimiter+msg; throw ex; } diff --git a/Common/Libraries/ParserLibrary/src/TestFunctions.cpp b/Common/Libraries/ParserLibrary/src/TestFunctions.cpp index c7bd002af..d69d1b506 100644 --- a/Common/Libraries/ParserLibrary/src/TestFunctions.cpp +++ b/Common/Libraries/ParserLibrary/src/TestFunctions.cpp @@ -177,13 +177,13 @@ int main(int argc, char *argv[]) { printf("\nTesting time.....1\n"); time_type tm1("201-18:04:32.1"); printf("time is %s\n",(const char *)tm1); - printf("100 nanoseconds are %llu\n",(ACS::Time)tm1); + printf("100 nanoseconds are %lu\n",(ACS::Time)tm1); printf("\nTesting time.....2\n"); TIMEVALUE now; IRA::CIRATools::getTime(now); time_type tm2(now.value().value); printf("time is %s\n",(const char *)tm2); - printf("100 nanoseconds are %llu\n",(ACS::Time)tm2); + printf("100 nanoseconds are %lu\n",(ACS::Time)tm2); // Test error handling diff --git a/Common/Libraries/ParserLibrary/src/TestTypes.cpp b/Common/Libraries/ParserLibrary/src/TestTypes.cpp index 997d9b946..a63c79bc4 100644 --- a/Common/Libraries/ParserLibrary/src/TestTypes.cpp +++ b/Common/Libraries/ParserLibrary/src/TestTypes.cpp @@ -125,14 +125,14 @@ int main(int argc, char *argv[]) { time_type tt; tt="2014-110-14:20:23.56"; - printf("valore di tt: %s, %lld\n",(const char *)tt,(ACS::Time)tt); + printf("valore di tt: %s, %lu\n",(const char *)tt,(ACS::Time)tt); time_type tt1; tt1=12233434334522300ll; - printf("valore di tt1: %s, %lld\n",(const char *)tt1,(ACS::Time)tt1); + printf("valore di tt1: %s, %lu\n",(const char *)tt1,(ACS::Time)tt1); interval_type itt(864010000000ll); - printf("valore di itt: %s, %lld\n",(const char *)itt,(ACS::Time)itt); + printf("valore di itt: %s, %lu\n",(const char *)itt,(ACS::Time)itt); longSeq_type lseq; lseq="10;12;14;13;22"; diff --git a/Common/Libraries/ParserLibrary/tests/gtest/exceptionMessages.cpp b/Common/Libraries/ParserLibrary/tests/gtest/exceptionMessages.cpp new file mode 100644 index 000000000..b65331986 --- /dev/null +++ b/Common/Libraries/ParserLibrary/tests/gtest/exceptionMessages.cpp @@ -0,0 +1,63 @@ +#include +#include +#include + +class TestExceptionMessages : public ::testing::Test +{ + public: + TestExceptionMessages(); + virtual ~TestExceptionMessages(); + +}; + + +TestExceptionMessages::TestExceptionMessages() +{ +} + +TestExceptionMessages::~TestExceptionMessages() +{ +} + +TEST_F(TestExceptionMessages,single_exception_description) +{ + ParserErrors::NotSupportedErrorExImpl ex(__FILE__,__LINE__,"single_exception_description"); + IRA::CString output; + _EXCPT_TO_CSTRING(output,ex); + RecordProperty("output_message", (const char*) output); + ASSERT_TRUE(output.GetLength()>1); +} + +TEST_F(TestExceptionMessages,double_exception_description) +{ + IRA::CString output; + ParserErrors::NotSupportedErrorExImpl ex(__FILE__,__LINE__,"double_exception_description"); + _ADD_BACKTRACE(ParserErrors::ConversionErrorExImpl,ex1,ex,"double_exception_description"); + _EXCPT_TO_CSTRING(output,ex1); + RecordProperty("output_message", (const char*) output); + ASSERT_TRUE(output.GetLength()>1); +} + +TEST_F(TestExceptionMessages,message_to_user) +{ + IRA::CString output; + ParserErrors::NotSupportedErrorExImpl ex(__FILE__,__LINE__,"message_to_user"); + _ADD_BACKTRACE(ParserErrors::ConversionErrorExImpl,ex1,ex,"message_to_user"); + SimpleParser::CFormatter::exceptionToUser(ex1,output); + RecordProperty("output_message", (const char*) output); + ASSERT_TRUE(output.GetLength()>1); +} + +TEST_F(TestExceptionMessages,adhoc_message_to_user) +{ + IRA::CString output; + ParserErrors::NotSupportedErrorExImpl ex(__FILE__,__LINE__,"adhoc_message_to_user"); + _ADD_USER_MESSAGE(ex,"This is a unit test"); + _ADD_BACKTRACE(ParserErrors::ConversionErrorExImpl,ex1,ex,"adhoc_message_to_user"); + SimpleParser::CFormatter::exceptionToUser(ex1,output); + RecordProperty("output_message", (const char*) output); + //cout << (const char *)output << endl; + ASSERT_TRUE(output.GetLength()>1); +} + + \ No newline at end of file diff --git a/Common/Libraries/ParserLibrary/tests/results/cppunittest.xml b/Common/Libraries/ParserLibrary/tests/results/cppunittest.xml deleted file mode 100644 index 86370aa70..000000000 --- a/Common/Libraries/ParserLibrary/tests/results/cppunittest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Common/Libraries/ParserLibrary/tests/unittest.cpp b/Common/Libraries/ParserLibrary/tests/unittest.cpp index 3b5e6c818..521c327da 100644 --- a/Common/Libraries/ParserLibrary/tests/unittest.cpp +++ b/Common/Libraries/ParserLibrary/tests/unittest.cpp @@ -1,2 +1,3 @@ +#include "gtest/gtest.h" #include "gtest/procedures.cpp" - +#include "gtest/exceptionMessages.cpp" \ No newline at end of file diff --git a/Common/Servers/CustomLogger/src/Makefile b/Common/Servers/CustomLogger/src/Makefile index 862c80533..d02d84e1b 100644 --- a/Common/Servers/CustomLogger/src/Makefile +++ b/Common/Servers/CustomLogger/src/Makefile @@ -32,7 +32,7 @@ USER_IDL = SCRIPTS_L = emitErrorLogTest -PY_SCRIPTS_L = emitLogMessage +PY_SCRIPTS_L = emitLogMessage sendException # # list of all possible C-sources (used to create automatic dependencies) diff --git a/Common/Servers/CustomLogger/src/emitLogMessage.py b/Common/Servers/CustomLogger/src/emitLogMessage.py index 5a944799c..b11d75047 100644 --- a/Common/Servers/CustomLogger/src/emitLogMessage.py +++ b/Common/Servers/CustomLogger/src/emitLogMessage.py @@ -6,20 +6,21 @@ import getopt, sys from Acspy.Clients.SimpleClient import PySimpleClient -from IRAPy import logger +from IRAPy import logger,userLogger def usage(): - print "emitLogMessage [-h|--help] [-m|--message=] [-e] [-n]" + print "emitLogMessage [-h|--help] [-t|--text=] [-u] [-e]" print print "Emits two logs, one classic ACS log and one custom" print print "[-h|--help] displays this help" print "[-t|--text=] allows to give the test message of the log" - print "[-e] log an error message, if not provided a notice is logged" + print "[-u] the log will be visible to the user otherwise it will be send to acs log" + print "[-e] log an error message, if not provided a notice is logged" def main(): try: - opts, args = getopt.getopt(sys.argv[1:],"hent:",["help","text="]) + opts, args = getopt.getopt(sys.argv[1:],"heut:",["help","text="]) except getopt.GetoptError, err: print str(err) usage() @@ -27,6 +28,7 @@ def main(): message="" error=False + user=False for o, a in opts: if o in ("-h", "--help"): usage() @@ -35,6 +37,8 @@ def main(): message=a elif o in ("-e"): error=True + elif o in ("-u"): + user=True if message=="": print "text message is mandatory" @@ -44,22 +48,16 @@ def main(): simpleClient=PySimpleClient() - print "emitting custom log...." - - if error: - logger.logError(message) + if user: + if error: + userLogger.logError(message) + else: + userLogger.logNotice(message) else: - logger.logNotice(message) - - print "emitting ACS log...." - - if error: - simpleClient.getLogger().logError(message) - else: - simpleClient.getLogger().logNotice(message) - - - print "all done...." + if error: + logger.logError(message) + else: + logger.logNotice(message) simpleClient.disconnect() diff --git a/Common/Servers/CustomLogger/src/sendException.py b/Common/Servers/CustomLogger/src/sendException.py new file mode 100644 index 000000000..38cbab14a --- /dev/null +++ b/Common/Servers/CustomLogger/src/sendException.py @@ -0,0 +1,69 @@ +#!/usr/bin/env python + +# This is a python test program that logs an exception message to the ACS logging service. +#who when what +#Andrea Orlati(andrea.orlati@inaf.it) 23/06/2018 Creation + +import getopt, sys +from Acspy.Clients.SimpleClient import PySimpleClient +from IRAPy import logger,userLogger,_add_user_message +from AntennaErrorsImpl import ConnectionExImpl +from AntennaErrorsImpl import AntennaBusyExImpl + + +def usage(): + print "sendException [-h|--help] [-u] [-s] [-t|--text==]" + print + print "send exceptions to the logging system" + print + print "[-h|--help] displays this help" + print "[-u] the log will be visible to the user otherwise it will be send to acs log" + print "[-s] send a stacked exception otherwise a simple one" + print "[-t|--text==] additional text to be appended, this will be show from the operator input" + +def main(): + try: + opts, args = getopt.getopt(sys.argv[1:],"hust:",["help","text="]) + except getopt.GetoptError, err: + print str(err) + usage() + sys.exit(1) + + user=False + stacked=False + message="" + for o, a in opts: + if o in ("-h", "--help"): + usage() + sys.exit(1) + elif o in ("-u"): + user=True + elif o in ("-s"): + stacked=True + elif o in ("-t","--text"): + message=a + + simpleClient=PySimpleClient() + + ex1=None + + if stacked==True: + ex=ConnectionExImpl() + ex1=AntennaBusyExImpl(exception=ex) + else: + ex1=AntennaBusyExImpl() + + if message!="": + _add_user_message(ex1,message) + + if user==True: + userLogger.logException(ex1) + else: + logger.logException(ex1) + + print "all done...." + + simpleClient.disconnect() + +if __name__=="__main__": + main() -- GitLab From c3054faa8f21f9189feb5bb090650a5992593892 Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 20 Jun 2018 12:13:21 +0200 Subject: [PATCH 116/145] fix #219: section is now a spectra section when the type is LCP o RCP and the number of spectral bins is greateer than 1 (#220) --- Common/Servers/FitsWriter/src/Configuration.cpp | 2 +- Common/Servers/FitsWriter/src/DataCollection.cpp | 2 +- Common/Servers/FitsWriter/src/FitsWriter.cpp | 7 ++++++- Common/Servers/FitsWriter/src/FitsWriterImpl.cpp | 4 ++-- Common/Servers/FitsWriter/src/TestWriter.cpp | 16 ++++++++++++---- .../FitsWriter/src/testBulkTransmission.cpp | 4 ++-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Common/Servers/FitsWriter/src/Configuration.cpp b/Common/Servers/FitsWriter/src/Configuration.cpp index f7e30bb78..255e2fad6 100644 --- a/Common/Servers/FitsWriter/src/Configuration.cpp +++ b/Common/Servers/FitsWriter/src/Configuration.cpp @@ -14,7 +14,7 @@ using namespace FitsWriter_private; } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } diff --git a/Common/Servers/FitsWriter/src/DataCollection.cpp b/Common/Servers/FitsWriter/src/DataCollection.cpp index 50f4148b2..40cddc4f4 100644 --- a/Common/Servers/FitsWriter/src/DataCollection.cpp +++ b/Common/Servers/FitsWriter/src/DataCollection.cpp @@ -386,7 +386,7 @@ bool CDataCollection::setSubScanSetup(const Management::TSubScanSetup& setup,boo ////******************************************************* IRA::CString outstr; IRA::CIRATools::timeToStr(setup.startUt,outstr); - ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"SUBSCAN IS %ld",setup.subScanId)); + ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"SUBSCAN IS %ld",(long)setup.subScanId)); ACS_LOG(LM_FULL_INFO,"CDataCollection::setSubScanSetup()",(LM_NOTICE,"REQUESTED_START_TIME WAS %s",(const char *)outstr)); ///////////// DEBUGGING *************************************** if (m_start && m_running) { diff --git a/Common/Servers/FitsWriter/src/FitsWriter.cpp b/Common/Servers/FitsWriter/src/FitsWriter.cpp index 37dcc05a3..99e682022 100644 --- a/Common/Servers/FitsWriter/src/FitsWriter.cpp +++ b/Common/Servers/FitsWriter/src/FitsWriter.cpp @@ -526,7 +526,12 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq §ionID, const ACS::long type << (4 * bins[i]) << data_type; //full stokes } else { - sect_type.push_back("simple"); + if (bins[i]==1) { + sect_type.push_back("simple"); + } + else { + sect_type.push_back("spectra"); + } type << (1 * bins[i]) << data_type; } if (!noData) { diff --git a/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp b/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp index 1e249b273..aad22a62f 100644 --- a/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp +++ b/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp @@ -13,8 +13,8 @@ #include "DevIODeviceID.h" #include "DevIOScanAxis.h" -static char *rcsId="@(#) $Id: FitsWriterImpl.cpp,v 1.12 2011-06-21 16:38:41 a.orlati Exp $"; -static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId); +//static char *rcsId="@(#) $Id: FitsWriterImpl.cpp,v 1.12 2011-06-21 16:38:41 a.orlati Exp $"; +//static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId); #define WORKTHREADNAME "FITSENGINE" #define COLLECTORTHREADNAME "COLLECTORTHREAD" diff --git a/Common/Servers/FitsWriter/src/TestWriter.cpp b/Common/Servers/FitsWriter/src/TestWriter.cpp index 2230056f3..f63f23d84 100644 --- a/Common/Servers/FitsWriter/src/TestWriter.cpp +++ b/Common/Servers/FitsWriter/src/TestWriter.cpp @@ -63,14 +63,22 @@ int main(int argc, char *argv[]) for (int i=0;i((const char *)writer,0,true); @@ -163,7 +163,7 @@ int main(int argc, char *argv[]) exit(-1); } ACS_LOG(LM_FULL_INFO,"::main()",(LM_INFO,"GOT_COMPONENENT: %s",(const char *)writer)); - ACS_LOG(LM_FULL_INFO,"::main()",(LM_INFO,"Reference is: %d",recv.ptr())); + ACS_LOG(LM_FULL_INFO,"::main()",(LM_INFO,"Reference is: %ld",(long)recv.ptr())); ACS_LOG(LM_FULL_INFO,"::main()",(LM_INFO,"ALL_COMPONENTS_RETRIEVED")); try { recv->reset(); -- GitLab From abfa4420c4ce69db6ca29fb73553c6f03155757d Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Thu, 28 Jun 2018 10:35:32 +0200 Subject: [PATCH 117/145] Fix #222, done a little rework on `IRAPY/customlogging.py` module. (#224) Added an internal method in the CustomLogger class that recursively replaces the `<` and `>` characters in exception strings with `{` and `}` respectively before logging them. Also now the `logException` method logs the name of the calling method to the user correctly (before this fix the caller appeared to be `logException` with no further informations). --- .../IRALibrary/src/IRAPy/customlogging.py | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py b/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py index 535902241..3cd47d96d 100644 --- a/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py +++ b/Common/Libraries/IRALibrary/src/IRAPy/customlogging.py @@ -1,23 +1,15 @@ """ -This module is intended to replace the ACS Logging module in our python code. -This is necessary as our logging events contain a key-value pair of extra data used to distinguish them -from the ACS system log. +This module is intended to extend the ACS Logging module in our python code. """ -from Acspy.Common import Log import logging -import ACSLog - - -""" -Key-Value pair distinguishing our custom logging. -""" -CUSTOM_ENV = dict(source="custom") -CUSTOM_DATA = dict(data=CUSTOM_ENV) -CUSTOM_EXTRA = dict(extra=CUSTOM_DATA) +import sys +from Acspy.Common import Log +from ACSLog import ACS_LOG_CRITICAL class CustomLogger(Log.Logger): - """This class replaces the standard logging functionalities by overloading the log method. - Each log event now will have additional custom key-value data pairs. + """ + This class replaces the standard logging functionalities by overloading the + `log` method and by defining a new `logException` method. """ def __init__(self, name): self.isUserLogger=False @@ -27,33 +19,41 @@ class CustomLogger(Log.Logger): return self._Logger__formatMessage(msg) def log(self, level, msg, *args, **kwargs): - """Add key-value custom data to the LogRecord structure - """ - #if 'extra' in kwargs: - # if 'data' in kwargs['extra']: - # kwargs['extra']['data'].update(CUSTOM_ENV) - # else: - # kwargs['extra'].update(CUSTOM_DATA) - #else: - # kwargs.update(CUSTOM_EXTRA) + # Replace some characters in order to avoid parsing errors msg = msg.replace('[', '{') msg = msg.replace(']', '}') Log.Logger.log(self, level, msg, *args, **kwargs) - #This is another workaround to match c++ with buggy python behaviour. - #It results into having a double entry in acs log - #The LOG_CRITICAL level correspond in the ERROR level...other ACS bug! - def logException(self,ex): + def logException(self, ex): + """This method is another workaround to match c++ with buggy python + behaviour. It results into having a double entry in acs log. The + LOG_CRITICAL level correspond in the ERROR level...other ACS bug! + """ + ex.errorTrace = self._fix_error_trace(ex.errorTrace) if self.isUserLogger: - self.logError(ex.shortDescription) - ex.log(self,ACSLog.ACS_LOG_CRITICAL) - + # Get caller name first to log it correctly + caller = sys._getframe(1).f_code.co_name + self.log(logging.ERROR, '%s - %s' % (caller, ex.shortDescription)) + ex.log(self, ACS_LOG_CRITICAL) + + def _fix_error_trace(self, trace): + """In order to avoid XML parsing errors in the CustomLogger component, + fields errorTrace.file and errorTrace.routine must not have XML key + characters `<` and `>`, therefore, we replace them with `{` and `}`.""" + trace.file = trace.file.replace('<', '{').replace('>', '}') + trace.routine = trace.routine.replace('<', '{').replace('>', '}') + for index in range(len(trace.previousError)): + previousTrace = trace.previousError[index] + previousTrace = self._fix_error_trace(previousTrace) + trace.previousError[index] = previousTrace + return trace + + logging.setLoggerClass(CustomLogger) logging.root.setLevel(logging.NOTSET) def getLogger(name=None): - """Get our custom logger form the system - """ + """Get our custom logger from the system.""" return logging.getLogger(str(name)) if __name__ == '__main__': -- GitLab From 4c6d903466fcf1522665eeb118e87918ea3553ea Mon Sep 17 00:00:00 2001 From: aorlati Date: Thu, 28 Jun 2018 16:21:17 +0200 Subject: [PATCH 118/145] =?UTF-8?q?fix=20#221:=20LO=20under=20control=20of?= =?UTF-8?q?=20L=20band,=20introduced=20ifd=20command=20by=20the=20u?= =?UTF-8?q?=E2=80=A6=20(#223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix #221: LO under control of L band, introduced ifd command by the use of a python script * fix#221: change according sugestions * Fix #221, improved integration for filters bandwidth. --- .../IRALibrary/include/Definitions.h | 12 - .../IRALibrary/src/IRAPy/__init__.py | 3 - .../Libraries/IRALibrary/tests/CString_test.i | 54 + .../Libraries/IRALibrary/tests/unittest.cpp | 10 + .../ParserLibrary/include/ParserConnector.h | 45 + .../ParserLibrary/include/ParserConnector.i | 33 + .../ParserLibrary/include/SP_parser.h | 51 +- .../ParserLibrary/include/SP_parser.i | 68 +- .../Libraries/ParserLibrary/include/pstream.h | 2095 +++++++++++++++++ Common/Libraries/ParserLibrary/src/Makefile | 5 +- .../src/SimpleParserPy/ParserConnector.py | 43 + .../src/SimpleParserPy/__init__.py | 10 + .../Servers/CustomLogger/src/sendException.py | 5 +- Common/Servers/FitsWriter/src/FitsWriter.cpp | 2 +- Common/Servers/Scheduler/src/Core.cpp | 3 +- .../Configuration/Configuration.xml | 41 +- .../SRTLPBandReceiver/SRTLPBandReceiver.xml | 2 +- .../Configuration/Configuration.xml | 41 +- .../SRTLPBandReceiver/SRTLPBandReceiver.xml | 2 +- .../CDB/schemas/SRTIFDistributorTable.xsd | 4 +- .../config/CDB/schemas/SRTIFDistributor.xsd | 4 +- .../src/IFDistributor/IFDParser.py | 2 +- .../src/IFDistributor/SRTIFDistributorImpl.py | 112 +- SRT/Servers/SRTPyIFDistributor/src/Makefile | 2 +- SRT/Servers/SRTPyIFDistributor/src/_ifd.py | 57 + 25 files changed, 2573 insertions(+), 133 deletions(-) create mode 100644 Common/Libraries/IRALibrary/tests/CString_test.i create mode 100644 Common/Libraries/ParserLibrary/include/ParserConnector.h create mode 100644 Common/Libraries/ParserLibrary/include/ParserConnector.i create mode 100644 Common/Libraries/ParserLibrary/include/pstream.h create mode 100644 Common/Libraries/ParserLibrary/src/SimpleParserPy/ParserConnector.py create mode 100644 Common/Libraries/ParserLibrary/src/SimpleParserPy/__init__.py create mode 100644 SRT/Servers/SRTPyIFDistributor/src/_ifd.py diff --git a/Common/Libraries/IRALibrary/include/Definitions.h b/Common/Libraries/IRALibrary/include/Definitions.h index f7624b62d..8d496a1bd 100644 --- a/Common/Libraries/IRALibrary/include/Definitions.h +++ b/Common/Libraries/IRALibrary/include/Definitions.h @@ -13,11 +13,6 @@ #ifndef DEFINITIONS_H #define DEFINITIONS_H -// if this value is changed the modfication should be reflected also in python implementation in module customlogging.py -#ifndef USER_MESSAGE_FIELDNAME -#define USER_MESSAGE_FIELDNAME "Message-to-User" -#endif - #ifndef NULL #define NULL 0 #endif @@ -80,13 +75,6 @@ */ #define _ADD_EXTRA(OBJ,NAME,VALUE) OBJ.addData(NAME,VALUE) -/** - * Appends the message to be returned to the user for a completion or an exception. - * The message i shown in the operatro input by cansequence of a user command - * @param OBJ object (completion or exception) to which extra data must be appended - * @param VALUE message to the user -*/ -#define _ADD_USER_MESSAGE(OBJ,VALUE) _ADD_EXTRA(OBJ,USER_MESSAGE_FIELDNAME,VALUE) /** * Used to read extra information from a completion or exception diff --git a/Common/Libraries/IRALibrary/src/IRAPy/__init__.py b/Common/Libraries/IRALibrary/src/IRAPy/__init__.py index 9990a95d2..f5b3d9a6a 100644 --- a/Common/Libraries/IRALibrary/src/IRAPy/__init__.py +++ b/Common/Libraries/IRALibrary/src/IRAPy/__init__.py @@ -18,8 +18,5 @@ logger = customlogging.getLogger("IRA_SERVICE_LOGGER") userLogger = customlogging.getLogger("IRA_CUSTOM_LOGGER") userLogger.isUserLogger=True -def _add_user_message(ex,message): - ex.addData("Message-to-User",message) - customlogging.Log.setCapacity(1) customlogging.Log.setBatchSize(1) diff --git a/Common/Libraries/IRALibrary/tests/CString_test.i b/Common/Libraries/IRALibrary/tests/CString_test.i new file mode 100644 index 000000000..d761e4fac --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/CString_test.i @@ -0,0 +1,54 @@ +#include "String.h" +#include + +namespace IRALibraryTest { + +class IRALibrary_String : public ::testing::Test { +public: + ::testing::AssertionResult string_checkLeft() { + RecordProperty("description","check the CString Left method"); + IRA::CString base("error and error message"); + IRA::CString token("error "); + IRA::CString comp("and error message"); + IRA::CString res; + res=base.Left(token.GetLength()); + if (res.GetLength()+comp.GetLength()!=base.GetLength()) { + return ::testing::AssertionFailure() << " the length of the strings does not match"; + } + if (res!=token) { + return ::testing::AssertionFailure() << " unexpected function output, the resulting string is'" + << (const char *)res << "' instead of '" << (const char *)token << "'"; + } + return ::testing::AssertionSuccess(); + } + + ::testing::AssertionResult string_checkSplit() { + RecordProperty("description","check the how CString handle string splitting"); + IRA::CString base("That is a test string that must be split"); + IRA::CString token("is"); + IRA::CString split1,split2; + int pos=base.Find((const char *)token); + split1=base.Left(pos+token.GetLength()); + split2=base.Right(base.GetLength()-(pos+token.GetLength())); + if (split1.GetLength()+split2.GetLength()!=base.GetLength()) { + return ::testing::AssertionFailure() << " the length of the strings does not match"; + } + if (split1!="That is") { + return ::testing::AssertionFailure() << " unexpected function output, the resulting string is '" + << (const char *)split1 << "' instead of 'This is'"; + } + if (split2!=" a test string that must be split") { + return ::testing::AssertionFailure() << " unexpected function output, the resulting string is '" + << (const char *)split2 << "' instead of ' a test string that must be split'"; + } + return ::testing::AssertionSuccess(); + } + +protected: + virtual void SetUp() { + } + virtual void TearDown() { + } +}; + +} \ No newline at end of file diff --git a/Common/Libraries/IRALibrary/tests/unittest.cpp b/Common/Libraries/IRALibrary/tests/unittest.cpp index e2e99a744..89957181f 100644 --- a/Common/Libraries/IRALibrary/tests/unittest.cpp +++ b/Common/Libraries/IRALibrary/tests/unittest.cpp @@ -7,6 +7,8 @@ #include "CError_regression.i" #include "CDBTable_regression.i" +#include "CString_test.i" + using namespace IRALibraryTest; TEST_F(IRALibrary_IRATools, makeDirectory_createSimpleDirectory){ @@ -72,3 +74,11 @@ TEST_F(IRALibrary_CError,copyConstructor_segfault){ TEST_F(IRALibrary_CDataField,typeConversion_fail){ EXPECT_TRUE(typeConversion_fail()); } + +TEST_F(IRALibrary_String,string_checkLeft){ + EXPECT_TRUE(string_checkLeft()); +} + +TEST_F(IRALibrary_String,string_checkSplit) { + EXPECT_TRUE(string_checkSplit()); +} diff --git a/Common/Libraries/ParserLibrary/include/ParserConnector.h b/Common/Libraries/ParserLibrary/include/ParserConnector.h new file mode 100644 index 000000000..f6d787bee --- /dev/null +++ b/Common/Libraries/ParserLibrary/include/ParserConnector.h @@ -0,0 +1,45 @@ +#include +#include + +// if this value is changed the modification should be reflected also in python implementation +#ifndef USER_MESSAGE_FIELDNAME +#define USER_MESSAGE_FIELDNAME "Message-to-User" +#endif + +/** + * Appends the message to be returned to the user for a completion or an exception. + * The message i shown in the operator input by consequence of a user command + * @param OBJ object (completion or exception) to which extra data must be appended + * @param VALUE message to the user +*/ +#define _ADD_USER_MESSAGE(OBJ,VALUE) _ADD_EXTRA(OBJ,USER_MESSAGE_FIELDNAME,VALUE) + +/** + * Appends the message to be returned to the user for a completion or an exception. + * The message i shown in the operator input by consequence of a user command. + * This version will also send a message to the user from a stand-alone program. + * @param OBJ object (completion or exception) to which extra data must be appended + * @param VALUE message to the user +*/ +#define _ADD_USER_MESSAGE_DIRECT(OBJ,VALUE) { \ + IRA::CString out; \ + _ADD_EXTRA(OBJ,USER_MESSAGE_FIELDNAME,VALUE); \ + exceptionToUser(OBJ,out); \ + std::cerr << "error " << (const char *)out; \ +} + +namespace SimpleParser { + +template class CFormatter { +public: + static void exceptionToUser(EX& exObj,IRA::CString& output); +private: + static IRA::CString getMessage(EX& exObj); +}; + +#include "ParserConnector.i" + +} + + + diff --git a/Common/Libraries/ParserLibrary/include/ParserConnector.i b/Common/Libraries/ParserLibrary/include/ParserConnector.i new file mode 100644 index 000000000..05b7e7302 --- /dev/null +++ b/Common/Libraries/ParserLibrary/include/ParserConnector.i @@ -0,0 +1,33 @@ +template +void CFormatter::exceptionToUser(EX& exObj,IRA::CString& output) +{ + IRA::CString tmp; + exObj.top(); + tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), + (const char *)getMessage(exObj)); + output=tmp; + while (exObj.getNext()!=NULL) { + tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), + (const char *)getMessage(exObj)); + output+="\n"; + output+=tmp; + } + exObj.top(); +} + +template +IRA::CString CFormatter::getMessage(EX& exObj) +{ + char *descr; + ACE_CString msg=exObj.getData(USER_MESSAGE_FIELDNAME); + if (msg.length()==0) { + descr=exObj.getDescription(); + IRA::CString ret(descr); + CORBA::string_free(descr); + return ret; + } + else { + IRA::CString ret(msg); + return ret; + } +} \ No newline at end of file diff --git a/Common/Libraries/ParserLibrary/include/SP_parser.h b/Common/Libraries/ParserLibrary/include/SP_parser.h index 71c6b7159..1f77dcfe4 100644 --- a/Common/Libraries/ParserLibrary/include/SP_parser.h +++ b/Common/Libraries/ParserLibrary/include/SP_parser.h @@ -84,11 +84,14 @@ #include "SP_function5.h" #include "SP_function6.h" #include "SP_function7.h" +#include "ParserConnector.h" #include #include #include #include #include +#include +#include "pstream.h" /** @@ -115,12 +118,7 @@ namespace SimpleParser { #define _SP_TIMETAGGEDQUEUECLEARALL "flushAll" #define _SP_TIMETAGGEDQUEUECLEARALL_PARAMS 0 -template class CFormatter { -public: - static void exceptionToUser(EX& exObj,IRA::CString& output); -private: - static IRA::CString getMessage(EX& exObj); -}; + /** * This is the parser main class. It allows to add execution rules, to parse command line according to the supported grammar to execute @@ -238,10 +236,14 @@ public: * @param fName name of the command, identifies the command that will be recognized by the parser. * @param function function associated to the command, the number of input parameters must correspond to the number specified by the * template parameter. + * @param station specify for which product line the command is available, default is ALL */ - void add(const IRA::CString& fName,CBaseFunction *function,int N) { - TRule *elem=new TRule(function,fName,N); - m_ruleSet.push_back(elem); + void add(const IRA::CString& fName,CBaseFunction *function,int N, + const IRA::CString& station="ALL") { + if (checkStation(station)) { + TRule *elem=new TRule(function,fName,N); + m_ruleSet.push_back(elem); + } } /** @@ -252,10 +254,14 @@ public: * @param package extra string that can be used to compose the answer by the remote function, it can be the name of a collection or a library that the function belongs to. * @param prm extra parameter passed to the called remote function. * @remoteFunc pointer to the function to be called in case the command name is recognized + * @param station specify for which product line the command is available, default is ALL * */ - void add(const IRA::CString& name,const IRA::CString& package,const long& prm,_SP_REMOTECALL(remoteFunc)) { - TRule *elem=new TRule(remoteFunc,name,package,prm); - m_ruleSet.push_back(elem); + void add(const IRA::CString& name,const IRA::CString& package,const long& prm,_SP_REMOTECALL(remoteFunc), + const IRA::CString& station="ALL") { + if (checkStation(station)) { + TRule *elem=new TRule(remoteFunc,name,package,prm); + m_ruleSet.push_back(elem); + } } /** @@ -263,10 +269,14 @@ public: * @param name name of the command associated to the procedure * @param package extra string that can be used to compose the answer, it can be the name of a collection that the function belongs to. * @param procedure list of commands that compose the procedure + * @param station specify for which product line the command is available, default is ALL * */ - void add(const IRA::CString& name,const IRA::CString& package,const ACS::stringSeq& procedure,int N) { - TRule *elem=new TRule(procedure,name,package,N); - m_ruleSet.push_back(elem); + void add(const IRA::CString& name,const IRA::CString& package,const ACS::stringSeq& procedure, + int N,const IRA::CString& station="ALL") { + if (checkStation(station)) { + TRule *elem=new TRule(procedure,name,package,N); + m_ruleSet.push_back(elem); + } } /** @@ -275,10 +285,13 @@ public: * @param name name of the command, identifies the command that will be recognized by the parser. * @param syscall function associated to the command, the number of input parameters must correspond to the number specified by the * template parameter. + * @param station specify for which product line the command is available, default is ALL */ - void add(const IRA::CString& name,IRA::CString syscall,int N) { - TRule *elem=new TRule(syscall,name,N); - m_ruleSet.push_back(elem); + void add(const IRA::CString& name,IRA::CString syscall,int N,const IRA::CString& station="ALL") { + if (checkStation(station)) { + TRule *elem=new TRule(syscall,name,N); + m_ruleSet.push_back(elem); + } } /** @@ -575,6 +588,8 @@ private: */ bool popCommand(TExecutionUnit *& cmd); + bool checkStation(const IRA::CString& st); + //Copies are disabled CParser(const CParser& src); const CParser& operator = (const CParser& src); diff --git a/Common/Libraries/ParserLibrary/include/SP_parser.i b/Common/Libraries/ParserLibrary/include/SP_parser.i index 8f946f43e..a9e809459 100644 --- a/Common/Libraries/ParserLibrary/include/SP_parser.i +++ b/Common/Libraries/ParserLibrary/include/SP_parser.i @@ -2,41 +2,6 @@ #define TIMERIDENTIFIER '!' #define PROCEDUREPARAMETER '$' -template -void CFormatter::exceptionToUser(EX& exObj,IRA::CString& output) -{ - IRA::CString tmp; - exObj.top(); - tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), - (const char *)getMessage(exObj)); - output=tmp; - while (exObj.getNext()!=NULL) { - tmp.Format("(type:%ld code:%ld): %s",exObj.getErrorType(),exObj.getErrorCode(), - (const char *)getMessage(exObj)); - output+="\n"; - output+=tmp; - } - exObj.top(); -} - -template -IRA::CString CFormatter::getMessage(EX& exObj) -{ - char *descr; - ACE_CString msg=exObj.getData(USER_MESSAGE_FIELDNAME); - if (msg.length()==0) { - descr=exObj.getDescription(); - IRA::CString ret(descr); - CORBA::string_free(descr); - return ret; - } - else { - IRA::CString ret(msg); - return ret; - } -} - - template void CParser::run(const IRA::CString& command,IRA::CString& out) throw (ParserErrors::ParserErrorsExImpl,ACSErr::ACSbaseExImpl) { @@ -130,18 +95,30 @@ IRA::CString CParser::executeCommand(const IRA::CString& command,IRA::CStri } else if (elem->m_type==SYSTEMCALL) { CUSTOM_LOG(LM_FULL_INFO,"CParser::executeCommand()",(LM_NOTICE,"Command issued {%s}",(const char *)command)); - IRA::CString composeCall; - composeCall=elem->m_syscall; + //work around in order to avoid message proliferation on stderr stdout + IRA::CString composeCall("export ACS_LOG_STDOUT=11; "); + IRA::CString answer(""); + composeCall+=elem->m_syscall; for (WORD k=0;km_type==KEYCOMMAND) { if (instr==_SP_TIMETAGGEDQUEUE) { @@ -437,6 +414,17 @@ bool CParser::popCommand(TExecutionUnit *& cmd) } } +template +bool CParser::checkStation(const IRA::CString& st) +{ + if (st=="ALL") { + return true; + } + IRA::CString env(std::getenv("STATION")); + if (env==st) return true; + else return false; +} + template IRA::CString CParser::showTimeBasedCommands() { diff --git a/Common/Libraries/ParserLibrary/include/pstream.h b/Common/Libraries/ParserLibrary/include/pstream.h new file mode 100644 index 000000000..bb91f5f2c --- /dev/null +++ b/Common/Libraries/ParserLibrary/include/pstream.h @@ -0,0 +1,2095 @@ +/* $Id: pstream.h,v 1.115 2011/11/15 11:12:10 redi Exp $ +PStreams - POSIX Process I/O for C++ +Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010 Jonathan Wakely + +This file is part of PStreams. + +PStreams is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +PStreams 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 Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see . +*/ + +/** + * @file pstream.h + * @brief Declares all PStreams classes. + * @author Jonathan Wakely + * + * Defines classes redi::ipstream, redi::opstream, redi::pstream + * and redi::rpstream. + */ + +#ifndef REDI_PSTREAM_H_SEEN +#define REDI_PSTREAM_H_SEEN + +#include +#include +#include +#include +#include +#include +#include // for min() +#include // for errno +#include // for size_t, NULL +#include // for exit() +#include // for pid_t +#include // for waitpid() +#include // for ioctl() and FIONREAD +#if defined(__sun) +# include // for FIONREAD on Solaris 2.5 +#endif +#include // for pipe() fork() exec() and filedes functions +#include // for kill() +#include // for fcntl() +#if REDI_EVISCERATE_PSTREAMS +# include // for FILE, fdopen() +#endif + + +/// The library version. +#define PSTREAMS_VERSION 0x0072 // 0.7.2 + +/** + * @namespace redi + * @brief All PStreams classes are declared in namespace redi. + * + * Like the standard iostreams, PStreams is a set of class templates, + * taking a character type and traits type. As with the standard streams + * they are most likely to be used with @c char and the default + * traits type, so typedefs for this most common case are provided. + * + * The @c pstream_common class template is not intended to be used directly, + * it is used internally to provide the common functionality for the + * other stream classes. + */ +namespace redi +{ + /// Common base class providing constants and typenames. + struct pstreams + { + /// Type used to specify how to connect to the process. + typedef std::ios_base::openmode pmode; + + /// Type used to hold the arguments for a command. + typedef std::vector argv_type; + + /// Type used for file descriptors. + typedef int fd_type; + + static const pmode pstdin = std::ios_base::out; ///< Write to stdin + static const pmode pstdout = std::ios_base::in; ///< Read from stdout + static const pmode pstderr = std::ios_base::app; ///< Read from stderr + + protected: + enum { bufsz = 32 }; ///< Size of pstreambuf buffers. + enum { pbsz = 2 }; ///< Number of putback characters kept. + }; + + /// Class template for stream buffer. + template > + class basic_pstreambuf + : public std::basic_streambuf + , public pstreams + { + public: + // Type definitions for dependent types + typedef CharT char_type; + typedef Traits traits_type; + typedef typename traits_type::int_type int_type; + typedef typename traits_type::off_type off_type; + typedef typename traits_type::pos_type pos_type; + /** @deprecated use pstreams::fd_type instead. */ + typedef fd_type fd_t; + + /// Default constructor. + basic_pstreambuf(); + + /// Constructor that initialises the buffer with @a command. + basic_pstreambuf(const std::string& command, pmode mode); + + /// Constructor that initialises the buffer with @a file and @a argv. + basic_pstreambuf( const std::string& file, + const argv_type& argv, + pmode mode ); + + /// Destructor. + ~basic_pstreambuf(); + + /// Initialise the stream buffer with @a command. + basic_pstreambuf* + open(const std::string& command, pmode mode); + + /// Initialise the stream buffer with @a file and @a argv. + basic_pstreambuf* + open(const std::string& file, const argv_type& argv, pmode mode); + + /// Close the stream buffer and wait for the process to exit. + basic_pstreambuf* + close(); + + /// Send a signal to the process. + basic_pstreambuf* + kill(int signal = SIGTERM); + + /// Close the pipe connected to the process' stdin. + void + peof(); + + /// Change active input source. + bool + read_err(bool readerr = true); + + /// Report whether the stream buffer has been initialised. + bool + is_open() const; + + /// Report whether the process has exited. + bool + exited(); + +#if REDI_EVISCERATE_PSTREAMS + /// Obtain FILE pointers for each of the process' standard streams. + std::size_t + fopen(FILE*& in, FILE*& out, FILE*& err); +#endif + + /// Return the exit status of the process. + int + status() const; + + /// Return the error number (errno) for the most recent failed operation. + int + error() const; + + protected: + /// Transfer characters to the pipe when character buffer overflows. + int_type + overflow(int_type c); + + /// Transfer characters from the pipe when the character buffer is empty. + int_type + underflow(); + + /// Make a character available to be returned by the next extraction. + int_type + pbackfail(int_type c = traits_type::eof()); + + /// Write any buffered characters to the stream. + int + sync(); + + /// Insert multiple characters into the pipe. + std::streamsize + xsputn(const char_type* s, std::streamsize n); + + /// Insert a sequence of characters into the pipe. + std::streamsize + write(const char_type* s, std::streamsize n); + + /// Extract a sequence of characters from the pipe. + std::streamsize + read(char_type* s, std::streamsize n); + + /// Report how many characters can be read from active input without blocking. + std::streamsize + showmanyc(); + + protected: + /// Enumerated type to indicate whether stdout or stderr is to be read. + enum buf_read_src { rsrc_out = 0, rsrc_err = 1 }; + + /// Initialise pipes and fork process. + pid_t + fork(pmode mode); + + /// Wait for the child process to exit. + int + wait(bool nohang = false); + + /// Return the file descriptor for the output pipe. + fd_type& + wpipe(); + + /// Return the file descriptor for the active input pipe. + fd_type& + rpipe(); + + /// Return the file descriptor for the specified input pipe. + fd_type& + rpipe(buf_read_src which); + + void + create_buffers(pmode mode); + + void + destroy_buffers(pmode mode); + + /// Writes buffered characters to the process' stdin pipe. + bool + empty_buffer(); + + bool + fill_buffer(bool non_blocking = false); + + /// Return the active input buffer. + char_type* + rbuffer(); + + buf_read_src + switch_read_buffer(buf_read_src); + + private: + basic_pstreambuf(const basic_pstreambuf&); + basic_pstreambuf& operator=(const basic_pstreambuf&); + + void + init_rbuffers(); + + pid_t ppid_; // pid of process + fd_type wpipe_; // pipe used to write to process' stdin + fd_type rpipe_[2]; // two pipes to read from, stdout and stderr + char_type* wbuffer_; + char_type* rbuffer_[2]; + char_type* rbufstate_[3]; + /// Index into rpipe_[] to indicate active source for read operations. + buf_read_src rsrc_; + int status_; // hold exit status of child process + int error_; // hold errno if fork() or exec() fails + }; + + /// Class template for common base class. + template > + class pstream_common + : virtual public std::basic_ios + , virtual public pstreams + { + protected: + typedef basic_pstreambuf streambuf_type; + + typedef pstreams::pmode pmode; + typedef pstreams::argv_type argv_type; + + /// Default constructor. + pstream_common(); + + /// Constructor that initialises the stream by starting a process. + pstream_common(const std::string& command, pmode mode); + + /// Constructor that initialises the stream by starting a process. + pstream_common(const std::string& file, const argv_type& argv, pmode mode); + + /// Pure virtual destructor. + virtual + ~pstream_common() = 0; + + /// Start a process. + void + do_open(const std::string& command, pmode mode); + + /// Start a process. + void + do_open(const std::string& file, const argv_type& argv, pmode mode); + + public: + /// Close the pipe. + void + close(); + + /// Report whether the stream's buffer has been initialised. + bool + is_open() const; + + /// Return the command used to initialise the stream. + const std::string& + command() const; + + /// Return a pointer to the stream buffer. + streambuf_type* + rdbuf() const; + +#if REDI_EVISCERATE_PSTREAMS + /// Obtain FILE pointers for each of the process' standard streams. + std::size_t + fopen(FILE*& in, FILE*& out, FILE*& err); +#endif + + protected: + std::string command_; ///< The command used to start the process. + streambuf_type buf_; ///< The stream buffer. + }; + + + /** + * @class basic_ipstream + * @brief Class template for Input PStreams. + * + * Reading from an ipstream reads the command's standard output and/or + * standard error (depending on how the ipstream is opened) + * and the command's standard input is the same as that of the process + * that created the object, unless altered by the command itself. + */ + + template > + class basic_ipstream + : public std::basic_istream + , public pstream_common + , virtual public pstreams + { + typedef std::basic_istream istream_type; + typedef pstream_common pbase_type; + + using pbase_type::buf_; // declare name in this scope + + pmode readable(pmode mode) + { + if (!(mode & (pstdout|pstderr))) + mode |= pstdout; + return mode; + } + + public: + /// Type used to specify how to connect to the process. + typedef typename pbase_type::pmode pmode; + + /// Type used to hold the arguments for a command. + typedef typename pbase_type::argv_type argv_type; + + /// Default constructor, creates an uninitialised stream. + basic_ipstream() + : istream_type(NULL), pbase_type() + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + basic_ipstream(const std::string& command, pmode mode = pstdout) + : istream_type(NULL), pbase_type(command, readable(mode)) + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + basic_ipstream( const std::string& file, + const argv_type& argv, + pmode mode = pstdout ) + : istream_type(NULL), pbase_type(file, argv, readable(mode)) + { } + + /** + * @brief Destructor. + * + * Closes the stream and waits for the child to exit. + */ + ~basic_ipstream() + { } + + /** + * @brief Start a process. + * + * Calls do_open( @a %command , @a mode|pstdout ). + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + void + open(const std::string& command, pmode mode = pstdout) + { + this->do_open(command, readable(mode)); + } + + /** + * @brief Start a process. + * + * Calls do_open( @a file , @a argv , @a mode|pstdout ). + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + void + open( const std::string& file, + const argv_type& argv, + pmode mode = pstdout ) + { + this->do_open(file, argv, readable(mode)); + } + + /** + * @brief Set streambuf to read from process' @c stdout. + * @return @c *this + */ + basic_ipstream& + out() + { + this->buf_.read_err(false); + return *this; + } + + /** + * @brief Set streambuf to read from process' @c stderr. + * @return @c *this + */ + basic_ipstream& + err() + { + this->buf_.read_err(true); + return *this; + } + }; + + + /** + * @class basic_opstream + * @brief Class template for Output PStreams. + * + * Writing to an open opstream writes to the standard input of the command; + * the command's standard output is the same as that of the process that + * created the pstream object, unless altered by the command itself. + */ + + template > + class basic_opstream + : public std::basic_ostream + , public pstream_common + , virtual public pstreams + { + typedef std::basic_ostream ostream_type; + typedef pstream_common pbase_type; + + using pbase_type::buf_; // declare name in this scope + + public: + /// Type used to specify how to connect to the process. + typedef typename pbase_type::pmode pmode; + + /// Type used to hold the arguments for a command. + typedef typename pbase_type::argv_type argv_type; + + /// Default constructor, creates an uninitialised stream. + basic_opstream() + : ostream_type(NULL), pbase_type() + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + basic_opstream(const std::string& command, pmode mode = pstdin) + : ostream_type(NULL), pbase_type(command, mode|pstdin) + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + basic_opstream( const std::string& file, + const argv_type& argv, + pmode mode = pstdin ) + : ostream_type(NULL), pbase_type(file, argv, mode|pstdin) + { } + + /** + * @brief Destructor + * + * Closes the stream and waits for the child to exit. + */ + ~basic_opstream() { } + + /** + * @brief Start a process. + * + * Calls do_open( @a %command , @a mode|pstdin ). + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + void + open(const std::string& command, pmode mode = pstdin) + { + this->do_open(command, mode|pstdin); + } + + /** + * @brief Start a process. + * + * Calls do_open( @a file , @a argv , @a mode|pstdin ). + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + void + open( const std::string& file, + const argv_type& argv, + pmode mode = pstdin) + { + this->do_open(file, argv, mode|pstdin); + } + }; + + + /** + * @class basic_pstream + * @brief Class template for Bidirectional PStreams. + * + * Writing to a pstream opened with @c pmode @c pstdin writes to the + * standard input of the command. + * Reading from a pstream opened with @c pmode @c pstdout and/or @c pstderr + * reads the command's standard output and/or standard error. + * Any of the process' @c stdin, @c stdout or @c stderr that is not + * connected to the pstream (as specified by the @c pmode) + * will be the same as the process that created the pstream object, + * unless altered by the command itself. + */ + template > + class basic_pstream + : public std::basic_iostream + , public pstream_common + , virtual public pstreams + { + typedef std::basic_iostream iostream_type; + typedef pstream_common pbase_type; + + using pbase_type::buf_; // declare name in this scope + + public: + /// Type used to specify how to connect to the process. + typedef typename pbase_type::pmode pmode; + + /// Type used to hold the arguments for a command. + typedef typename pbase_type::argv_type argv_type; + + /// Default constructor, creates an uninitialised stream. + basic_pstream() + : iostream_type(NULL), pbase_type() + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + basic_pstream(const std::string& command, pmode mode = pstdout|pstdin) + : iostream_type(NULL), pbase_type(command, mode) + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + basic_pstream( const std::string& file, + const argv_type& argv, + pmode mode = pstdout|pstdin ) + : iostream_type(NULL), pbase_type(file, argv, mode) + { } + + /** + * @brief Destructor + * + * Closes the stream and waits for the child to exit. + */ + ~basic_pstream() { } + + /** + * @brief Start a process. + * + * Calls do_open( @a %command , @a mode ). + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + void + open(const std::string& command, pmode mode = pstdout|pstdin) + { + this->do_open(command, mode); + } + + /** + * @brief Start a process. + * + * Calls do_open( @a file , @a argv , @a mode ). + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + void + open( const std::string& file, + const argv_type& argv, + pmode mode = pstdout|pstdin ) + { + this->do_open(file, argv, mode); + } + + /** + * @brief Set streambuf to read from process' @c stdout. + * @return @c *this + */ + basic_pstream& + out() + { + this->buf_.read_err(false); + return *this; + } + + /** + * @brief Set streambuf to read from process' @c stderr. + * @return @c *this + */ + basic_pstream& + err() + { + this->buf_.read_err(true); + return *this; + } + }; + + + /** + * @class basic_rpstream + * @brief template for Restricted PStreams. + * + * Writing to an rpstream opened with @c pmode @c pstdin writes to the + * standard input of the command. + * It is not possible to read directly from an rpstream object, to use + * an rpstream as in istream you must call either basic_rpstream::out() + * or basic_rpstream::err(). This is to prevent accidental reads from + * the wrong input source. If the rpstream was not opened with @c pmode + * @c pstderr then the class cannot read the process' @c stderr, and + * basic_rpstream::err() will return an istream that reads from the + * process' @c stdout, and vice versa. + * Reading from an rpstream opened with @c pmode @c pstdout and/or + * @c pstderr reads the command's standard output and/or standard error. + * Any of the process' @c stdin, @c stdout or @c stderr that is not + * connected to the pstream (as specified by the @c pmode) + * will be the same as the process that created the pstream object, + * unless altered by the command itself. + */ + + template > + class basic_rpstream + : public std::basic_ostream + , private std::basic_istream + , private pstream_common + , virtual public pstreams + { + typedef std::basic_ostream ostream_type; + typedef std::basic_istream istream_type; + typedef pstream_common pbase_type; + + using pbase_type::buf_; // declare name in this scope + + public: + /// Type used to specify how to connect to the process. + typedef typename pbase_type::pmode pmode; + + /// Type used to hold the arguments for a command. + typedef typename pbase_type::argv_type argv_type; + + /// Default constructor, creates an uninitialised stream. + basic_rpstream() + : ostream_type(NULL), istream_type(NULL), pbase_type() + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + basic_rpstream(const std::string& command, pmode mode = pstdout|pstdin) + : ostream_type(NULL) , istream_type(NULL) , pbase_type(command, mode) + { } + + /** + * @brief Constructor that initialises the stream by starting a process. + * + * Initialises the stream buffer by calling do_open() with the supplied + * arguments. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + basic_rpstream( const std::string& file, + const argv_type& argv, + pmode mode = pstdout|pstdin ) + : ostream_type(NULL), istream_type(NULL), pbase_type(file, argv, mode) + { } + + /// Destructor + ~basic_rpstream() { } + + /** + * @brief Start a process. + * + * Calls do_open( @a %command , @a mode ). + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + void + open(const std::string& command, pmode mode = pstdout|pstdin) + { + this->do_open(command, mode); + } + + /** + * @brief Start a process. + * + * Calls do_open( @a file , @a argv , @a mode ). + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + void + open( const std::string& file, + const argv_type& argv, + pmode mode = pstdout|pstdin ) + { + this->do_open(file, argv, mode); + } + + /** + * @brief Obtain a reference to the istream that reads + * the process' @c stdout. + * @return @c *this + */ + istream_type& + out() + { + this->buf_.read_err(false); + return *this; + } + + /** + * @brief Obtain a reference to the istream that reads + * the process' @c stderr. + * @return @c *this + */ + istream_type& + err() + { + this->buf_.read_err(true); + return *this; + } + }; + + + /// Type definition for common template specialisation. + typedef basic_pstreambuf pstreambuf; + /// Type definition for common template specialisation. + typedef basic_ipstream ipstream; + /// Type definition for common template specialisation. + typedef basic_opstream opstream; + /// Type definition for common template specialisation. + typedef basic_pstream pstream; + /// Type definition for common template specialisation. + typedef basic_rpstream rpstream; + + + /** + * When inserted into an output pstream the manipulator calls + * basic_pstreambuf::peof() to close the output pipe, + * causing the child process to receive the end-of-file indicator + * on subsequent reads from its @c stdin stream. + * + * @brief Manipulator to close the pipe connected to the process' stdin. + * @param s An output PStream class. + * @return The stream object the manipulator was invoked on. + * @see basic_pstreambuf::peof() + * @relates basic_opstream basic_pstream basic_rpstream + */ + template + inline std::basic_ostream& + peof(std::basic_ostream& s) + { + typedef basic_pstreambuf pstreambuf; + if (pstreambuf* p = dynamic_cast(s.rdbuf())) + p->peof(); + return s; + } + + + /* + * member definitions for pstreambuf + */ + + + /** + * @class basic_pstreambuf + * Provides underlying streambuf functionality for the PStreams classes. + */ + + /** Creates an uninitialised stream buffer. */ + template + inline + basic_pstreambuf::basic_pstreambuf() + : ppid_(-1) // initialise to -1 to indicate no process run yet. + , wpipe_(-1) + , wbuffer_(NULL) + , rsrc_(rsrc_out) + , status_(-1) + , error_(0) + { + init_rbuffers(); + } + + /** + * Initialises the stream buffer by calling open() with the supplied + * arguments. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see open() + */ + template + inline + basic_pstreambuf::basic_pstreambuf(const std::string& command, pmode mode) + : ppid_(-1) // initialise to -1 to indicate no process run yet. + , wpipe_(-1) + , wbuffer_(NULL) + , rsrc_(rsrc_out) + , status_(-1) + , error_(0) + { + init_rbuffers(); + open(command, mode); + } + + /** + * Initialises the stream buffer by calling open() with the supplied + * arguments. + * + * @param file a string containing the name of a program to execute. + * @param argv a vector of argument strings passsed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see open() + */ + template + inline + basic_pstreambuf::basic_pstreambuf( const std::string& file, + const argv_type& argv, + pmode mode ) + : ppid_(-1) // initialise to -1 to indicate no process run yet. + , wpipe_(-1) + , wbuffer_(NULL) + , rsrc_(rsrc_out) + , status_(-1) + , error_(0) + { + init_rbuffers(); + open(file, argv, mode); + } + + /** + * Closes the stream by calling close(). + * @see close() + */ + template + inline + basic_pstreambuf::~basic_pstreambuf() + { + close(); + } + + /** + * Starts a new process by passing @a command to the shell (/bin/sh) + * and opens pipes to the process with the specified @a mode. + * + * If @a mode contains @c pstdout the initial read source will be + * the child process' stdout, otherwise if @a mode contains @c pstderr + * the initial read source will be the child's stderr. + * + * Will duplicate the actions of the shell in searching for an + * executable file if the specified file name does not contain a slash (/) + * character. + * + * @warning + * There is no way to tell whether the shell command succeeded, this + * function will always succeed unless resource limits (such as + * memory usage, or number of processes or open files) are exceeded. + * This means is_open() will return true even if @a command cannot + * be executed. + * Use pstreambuf::open(const std::string&, const argv_type&, pmode) + * if you need to know whether the command failed to execute. + * + * @param command a string containing a shell command. + * @param mode a bitwise OR of one or more of @c out, @c in, @c err. + * @return NULL if the shell could not be started or the + * pipes could not be opened, @c this otherwise. + * @see execl(3) + */ + template + basic_pstreambuf* + basic_pstreambuf::open(const std::string& command, pmode mode) + { + const char * shell_path = "/bin/sh"; +#if 0 + const std::string argv[] = { "sh", "-c", command }; + return this->open(shell_path, argv_type(argv, argv+3), mode); +#else + basic_pstreambuf* ret = NULL; + + if (!is_open()) + { + switch(fork(mode)) + { + case 0 : + // this is the new process, exec command + ::execl(shell_path, "sh", "-c", command.c_str(), (char*)NULL); + + // can only reach this point if exec() failed + + // parent can get exit code from waitpid() + ::_exit(errno); + // using std::exit() would make static dtors run twice + + case -1 : + // couldn't fork, error already handled in pstreambuf::fork() + break; + + default : + // this is the parent process + // activate buffers + create_buffers(mode); + ret = this; + } + } + return ret; +#endif + } + + /** + * @brief Helper function to close a file descriptor. + * + * Inspects @a fd and calls close(3) if it has a non-negative value. + * + * @param fd a file descriptor. + * @relates basic_pstreambuf + */ + inline void + close_fd(pstreams::fd_type& fd) + { + if (fd >= 0 && ::close(fd) == 0) + fd = -1; + } + + /** + * @brief Helper function to close an array of file descriptors. + * + * Calls @c close_fd() on each member of the array. + * The length of the array is determined automatically by + * template argument deduction to avoid errors. + * + * @param fds an array of file descriptors. + * @relates basic_pstreambuf + */ + template + inline void + close_fd_array(pstreams::fd_type (&fds)[N]) + { + for (std::size_t i = 0; i < N; ++i) + close_fd(fds[i]); + } + + /** + * Starts a new process by executing @a file with the arguments in + * @a argv and opens pipes to the process with the specified @a mode. + * + * By convention @c argv[0] should be the file name of the file being + * executed. + * + * If @a mode contains @c pstdout the initial read source will be + * the child process' stdout, otherwise if @a mode contains @c pstderr + * the initial read source will be the child's stderr. + * + * Will duplicate the actions of the shell in searching for an + * executable file if the specified file name does not contain a slash (/) + * character. + * + * Iff @a file is successfully executed then is_open() will return true. + * Otherwise, pstreambuf::error() can be used to obtain the value of + * @c errno that was set by execvp(3) in the child process. + * + * The exit status of the new process will be returned by + * pstreambuf::status() after pstreambuf::exited() returns true. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode a bitwise OR of one or more of @c out, @c in and @c err. + * @return NULL if a pipe could not be opened or if the program could + * not be executed, @c this otherwise. + * @see execvp(3) + */ + template + basic_pstreambuf* + basic_pstreambuf::open( const std::string& file, + const argv_type& argv, + pmode mode ) + { + basic_pstreambuf* ret = NULL; + + if (!is_open()) + { + // constants for read/write ends of pipe + enum { RD, WR }; + + // open another pipe and set close-on-exec + fd_type ck_exec[] = { -1, -1 }; + if (-1 == ::pipe(ck_exec) + || -1 == ::fcntl(ck_exec[RD], F_SETFD, FD_CLOEXEC) + || -1 == ::fcntl(ck_exec[WR], F_SETFD, FD_CLOEXEC)) + { + error_ = errno; + close_fd_array(ck_exec); + } + else + { + switch(fork(mode)) + { + case 0 : + // this is the new process, exec command + { + char** arg_v = new char*[argv.size()+1]; + for (std::size_t i = 0; i < argv.size(); ++i) + { + const std::string& src = argv[i]; + char*& dest = arg_v[i]; + dest = new char[src.size()+1]; + dest[ src.copy(dest, src.size()) ] = '\0'; + } + arg_v[argv.size()] = NULL; + + ::execvp(file.c_str(), arg_v); + + // can only reach this point if exec() failed + + // parent can get error code from ck_exec pipe + error_ = errno; + + ::write(ck_exec[WR], &error_, sizeof(error_)); + ::close(ck_exec[WR]); + ::close(ck_exec[RD]); + + ::_exit(error_); + // using std::exit() would make static dtors run twice + } + + case -1 : + // couldn't fork, error already handled in pstreambuf::fork() + close_fd_array(ck_exec); + break; + + default : + // this is the parent process + + // check child called exec() successfully + ::close(ck_exec[WR]); + switch (::read(ck_exec[RD], &error_, sizeof(error_))) + { + case 0: + // activate buffers + create_buffers(mode); + ret = this; + break; + case -1: + error_ = errno; + break; + default: + // error_ contains error code from child + // call wait() to clean up and set ppid_ to 0 + this->wait(); + break; + } + ::close(ck_exec[RD]); + } + } + } + return ret; + } + + /** + * Creates pipes as specified by @a mode and calls @c fork() to create + * a new process. If the fork is successful the parent process stores + * the child's PID and the opened pipes and the child process replaces + * its standard streams with the opened pipes. + * + * If an error occurs the error code will be set to one of the possible + * errors for @c pipe() or @c fork(). + * See your system's documentation for these error codes. + * + * @param mode an OR of pmodes specifying which of the child's + * standard streams to connect to. + * @return On success the PID of the child is returned in the parent's + * context and zero is returned in the child's context. + * On error -1 is returned and the error code is set appropriately. + */ + template + pid_t + basic_pstreambuf::fork(pmode mode) + { + pid_t pid = -1; + + // Three pairs of file descriptors, for pipes connected to the + // process' stdin, stdout and stderr + // (stored in a single array so close_fd_array() can close all at once) + fd_type fd[] = { -1, -1, -1, -1, -1, -1 }; + fd_type* const pin = fd; + fd_type* const pout = fd+2; + fd_type* const perr = fd+4; + + // constants for read/write ends of pipe + enum { RD, WR }; + + // N.B. + // For the pstreambuf pin is an output stream and + // pout and perr are input streams. + + if (!error_ && mode&pstdin && ::pipe(pin)) + error_ = errno; + + if (!error_ && mode&pstdout && ::pipe(pout)) + error_ = errno; + + if (!error_ && mode&pstderr && ::pipe(perr)) + error_ = errno; + + if (!error_) + { + pid = ::fork(); + switch (pid) + { + case 0 : + { + // this is the new process + + // for each open pipe close one end and redirect the + // respective standard stream to the other end + + if (*pin >= 0) + { + ::close(pin[WR]); + ::dup2(pin[RD], STDIN_FILENO); + ::close(pin[RD]); + } + if (*pout >= 0) + { + ::close(pout[RD]); + ::dup2(pout[WR], STDOUT_FILENO); + ::close(pout[WR]); + } + if (*perr >= 0) + { + ::close(perr[RD]); + ::dup2(perr[WR], STDERR_FILENO); + ::close(perr[WR]); + } + break; + } + case -1 : + { + // couldn't fork for some reason + error_ = errno; + // close any open pipes + close_fd_array(fd); + break; + } + default : + { + // this is the parent process, store process' pid + ppid_ = pid; + + // store one end of open pipes and close other end + if (*pin >= 0) + { + wpipe_ = pin[WR]; + ::close(pin[RD]); + } + if (*pout >= 0) + { + rpipe_[rsrc_out] = pout[RD]; + ::close(pout[WR]); + } + if (*perr >= 0) + { + rpipe_[rsrc_err] = perr[RD]; + ::close(perr[WR]); + } + } + } + } + else + { + // close any pipes we opened before failure + close_fd_array(fd); + } + return pid; + } + + /** + * Closes all pipes and calls wait() to wait for the process to finish. + * If an error occurs the error code will be set to one of the possible + * errors for @c waitpid(). + * See your system's documentation for these errors. + * + * @return @c this on successful close or @c NULL if there is no + * process to close or if an error occurs. + */ + template + basic_pstreambuf* + basic_pstreambuf::close() + { + const bool running = is_open(); + + sync(); // this might call wait() and reap the child process + + // rather than trying to work out whether or not we need to clean up + // just do it anyway, all cleanup functions are safe to call twice. + + destroy_buffers(pstdin|pstdout|pstderr); + + // close pipes before wait() so child gets EOF/SIGPIPE + close_fd(wpipe_); + close_fd_array(rpipe_); + + do + { + error_ = 0; + } while (wait() == -1 && error() == EINTR); + + return running ? this : NULL; + } + + /** + * Called on construction to initialise the arrays used for reading. + */ + template + inline void + basic_pstreambuf::init_rbuffers() + { + rpipe_[rsrc_out] = rpipe_[rsrc_err] = -1; + rbuffer_[rsrc_out] = rbuffer_[rsrc_err] = NULL; + rbufstate_[0] = rbufstate_[1] = rbufstate_[2] = NULL; + } + + template + void + basic_pstreambuf::create_buffers(pmode mode) + { + if (mode & pstdin) + { + delete[] wbuffer_; + wbuffer_ = new char_type[bufsz]; + this->setp(wbuffer_, wbuffer_ + bufsz); + } + if (mode & pstdout) + { + delete[] rbuffer_[rsrc_out]; + rbuffer_[rsrc_out] = new char_type[bufsz]; + rsrc_ = rsrc_out; + this->setg(rbuffer_[rsrc_out] + pbsz, rbuffer_[rsrc_out] + pbsz, + rbuffer_[rsrc_out] + pbsz); + } + if (mode & pstderr) + { + delete[] rbuffer_[rsrc_err]; + rbuffer_[rsrc_err] = new char_type[bufsz]; + if (!(mode & pstdout)) + { + rsrc_ = rsrc_err; + this->setg(rbuffer_[rsrc_err] + pbsz, rbuffer_[rsrc_err] + pbsz, + rbuffer_[rsrc_err] + pbsz); + } + } + } + + template + void + basic_pstreambuf::destroy_buffers(pmode mode) + { + if (mode & pstdin) + { + this->setp(NULL, NULL); + delete[] wbuffer_; + wbuffer_ = NULL; + } + if (mode & pstdout) + { + if (rsrc_ == rsrc_out) + this->setg(NULL, NULL, NULL); + delete[] rbuffer_[rsrc_out]; + rbuffer_[rsrc_out] = NULL; + } + if (mode & pstderr) + { + if (rsrc_ == rsrc_err) + this->setg(NULL, NULL, NULL); + delete[] rbuffer_[rsrc_err]; + rbuffer_[rsrc_err] = NULL; + } + } + + template + typename basic_pstreambuf::buf_read_src + basic_pstreambuf::switch_read_buffer(buf_read_src src) + { + if (rsrc_ != src) + { + char_type* tmpbufstate[] = {this->eback(), this->gptr(), this->egptr()}; + this->setg(rbufstate_[0], rbufstate_[1], rbufstate_[2]); + for (std::size_t i = 0; i < 3; ++i) + rbufstate_[i] = tmpbufstate[i]; + rsrc_ = src; + } + return rsrc_; + } + + /** + * Suspends execution and waits for the associated process to exit, or + * until a signal is delivered whose action is to terminate the current + * process or to call a signal handling function. If the process has + * already exited (i.e. it is a "zombie" process) then wait() returns + * immediately. Waiting for the child process causes all its system + * resources to be freed. + * + * error() will return EINTR if wait() is interrupted by a signal. + * + * @param nohang true to return immediately if the process has not exited. + * @return 1 if the process has exited and wait() has not yet been called. + * 0 if @a nohang is true and the process has not exited yet. + * -1 if no process has been started or if an error occurs, + * in which case the error can be found using error(). + */ + template + int + basic_pstreambuf::wait(bool nohang) + { + int exited = -1; + if (is_open()) + { + int status; + switch(::waitpid(ppid_, &status, nohang ? WNOHANG : 0)) + { + case 0 : + // nohang was true and process has not exited + exited = 0; + break; + case -1 : + error_ = errno; + break; + default : + // process has exited + ppid_ = 0; + status_ = status; + exited = 1; + // Close wpipe, would get SIGPIPE if we used it. + destroy_buffers(pstdin); + close_fd(wpipe_); + // Must free read buffers and pipes on destruction + // or next call to open()/close() + break; + } + } + return exited; + } + + /** + * Sends the specified signal to the process. A signal can be used to + * terminate a child process that would not exit otherwise. + * + * If an error occurs the error code will be set to one of the possible + * errors for @c kill(). See your system's documentation for these errors. + * + * @param signal A signal to send to the child process. + * @return @c this or @c NULL if @c kill() fails. + */ + template + inline basic_pstreambuf* + basic_pstreambuf::kill(int signal) + { + basic_pstreambuf* ret = NULL; + if (is_open()) + { + if (::kill(ppid_, signal)) + error_ = errno; + else + { +#if 0 + // TODO call exited() to check for exit and clean up? leave to user? + if (signal==SIGTERM || signal==SIGKILL) + this->exited(); +#endif + ret = this; + } + } + return ret; + } + + /** + * This function can call pstreambuf::wait() and so may change the + * object's state if the child process has already exited. + * + * @return True if the associated process has exited, false otherwise. + * @see basic_pstreambuf::wait() + */ + template + inline bool + basic_pstreambuf::exited() + { + return ppid_ == 0 || wait(true)==1; + } + + + /** + * @return The exit status of the child process, or -1 if wait() + * has not yet been called to wait for the child to exit. + * @see basic_pstreambuf::wait() + */ + template + inline int + basic_pstreambuf::status() const + { + return status_; + } + + /** + * @return The error code of the most recently failed operation, or zero. + */ + template + inline int + basic_pstreambuf::error() const + { + return error_; + } + + /** + * Closes the output pipe, causing the child process to receive the + * end-of-file indicator on subsequent reads from its @c stdin stream. + */ + template + inline void + basic_pstreambuf::peof() + { + sync(); + destroy_buffers(pstdin); + close_fd(wpipe_); + } + + /** + * Unlike pstreambuf::exited(), this function will not call wait() and + * so will not change the object's state. This means that once a child + * process is executed successfully this function will continue to + * return true even after the process exits (until wait() is called.) + * + * @return true if a previous call to open() succeeded and wait() has + * not been called and determined that the process has exited, + * false otherwise. + */ + template + inline bool + basic_pstreambuf::is_open() const + { + return ppid_ > 0; + } + + /** + * Toggle the stream used for reading. If @a readerr is @c true then the + * process' @c stderr output will be used for subsequent extractions, if + * @a readerr is false the the process' stdout will be used. + * @param readerr @c true to read @c stderr, @c false to read @c stdout. + * @return @c true if the requested stream is open and will be used for + * subsequent extractions, @c false otherwise. + */ + template + inline bool + basic_pstreambuf::read_err(bool readerr) + { + buf_read_src src = readerr ? rsrc_err : rsrc_out; + if (rpipe_[src]>=0) + { + switch_read_buffer(src); + return true; + } + return false; + } + + /** + * Called when the internal character buffer is not present or is full, + * to transfer the buffer contents to the pipe. + * + * @param c a character to be written to the pipe. + * @return @c traits_type::eof() if an error occurs, otherwise if @a c + * is not equal to @c traits_type::eof() it will be buffered and + * a value other than @c traits_type::eof() returned to indicate + * success. + */ + template + typename basic_pstreambuf::int_type + basic_pstreambuf::overflow(int_type c) + { + if (!empty_buffer()) + return traits_type::eof(); + else if (!traits_type::eq_int_type(c, traits_type::eof())) + return this->sputc(c); + else + return traits_type::not_eof(c); + } + + + template + int + basic_pstreambuf::sync() + { + return !exited() && empty_buffer() ? 0 : -1; + } + + /** + * @param s character buffer. + * @param n buffer length. + * @return the number of characters written. + */ + template + std::streamsize + basic_pstreambuf::xsputn(const char_type* s, std::streamsize n) + { + if (n < this->epptr() - this->pptr()) + { + traits_type::copy(this->pptr(), s, n); + this->pbump(n); + return n; + } + else + { + for (std::streamsize i = 0; i < n; ++i) + { + if (traits_type::eq_int_type(this->sputc(s[i]), traits_type::eof())) + return i; + } + return n; + } + } + + /** + * @return true if the buffer was emptied, false otherwise. + */ + template + bool + basic_pstreambuf::empty_buffer() + { + const std::streamsize count = this->pptr() - this->pbase(); + if (count > 0) + { + const std::streamsize written = this->write(this->wbuffer_, count); + if (written > 0) + { + if (const std::streamsize unwritten = count - written) + traits_type::move(this->pbase(), this->pbase()+written, unwritten); + this->pbump(-written); + return true; + } + } + return false; + } + + /** + * Called when the internal character buffer is is empty, to re-fill it + * from the pipe. + * + * @return The first available character in the buffer, + * or @c traits_type::eof() in case of failure. + */ + template + typename basic_pstreambuf::int_type + basic_pstreambuf::underflow() + { + if (this->gptr() < this->egptr() || fill_buffer()) + return traits_type::to_int_type(*this->gptr()); + else + return traits_type::eof(); + } + + /** + * Attempts to make @a c available as the next character to be read by + * @c sgetc(). + * + * @param c a character to make available for extraction. + * @return @a c if the character can be made available, + * @c traits_type::eof() otherwise. + */ + template + typename basic_pstreambuf::int_type + basic_pstreambuf::pbackfail(int_type c) + { + if (this->gptr() != this->eback()) + { + this->gbump(-1); + if (!traits_type::eq_int_type(c, traits_type::eof())) + *this->gptr() = traits_type::to_char_type(c); + return traits_type::not_eof(c); + } + else + return traits_type::eof(); + } + + template + std::streamsize + basic_pstreambuf::showmanyc() + { + int avail = 0; + if (sizeof(char_type) == 1) + avail = fill_buffer(true) ? this->egptr() - this->gptr() : -1; +#ifdef FIONREAD + else + { + if (::ioctl(rpipe(), FIONREAD, &avail) == -1) + avail = -1; + else if (avail) + avail /= sizeof(char_type); + } +#endif + return std::streamsize(avail); + } + + /** + * @return true if the buffer was filled, false otherwise. + */ + template + bool + basic_pstreambuf::fill_buffer(bool non_blocking) + { + const std::streamsize pb1 = this->gptr() - this->eback(); + const std::streamsize pb2 = pbsz; + const std::streamsize npb = std::min(pb1, pb2); + + char_type* const rbuf = rbuffer(); + + traits_type::move(rbuf + pbsz - npb, this->gptr() - npb, npb); + + std::streamsize rc = -1; + + if (non_blocking) + { + const int flags = ::fcntl(rpipe(), F_GETFL); + if (flags != -1) + { + const bool blocking = !(flags & O_NONBLOCK); + if (blocking) + ::fcntl(rpipe(), F_SETFL, flags | O_NONBLOCK); // set non-blocking + + error_ = 0; + rc = read(rbuf + pbsz, bufsz - pbsz); + + if (rc == -1 && error_ == EAGAIN) // nothing available + rc = 0; + else if (rc == 0) // EOF + rc = -1; + + if (blocking) + ::fcntl(rpipe(), F_SETFL, flags); // restore + } + } + else + rc = read(rbuf + pbsz, bufsz - pbsz); + + if (rc > 0 || (rc == 0 && non_blocking)) + { + this->setg( rbuf + pbsz - npb, + rbuf + pbsz, + rbuf + pbsz + rc ); + return true; + } + else + { + this->setg(NULL, NULL, NULL); + return false; + } + } + + /** + * Writes up to @a n characters to the pipe from the buffer @a s. + * + * @param s character buffer. + * @param n buffer length. + * @return the number of characters written. + */ + template + inline std::streamsize + basic_pstreambuf::write(const char_type* s, std::streamsize n) + { + std::streamsize nwritten = 0; + if (wpipe() >= 0) + { + nwritten = ::write(wpipe(), s, n * sizeof(char_type)); + if (nwritten == -1) + error_ = errno; + else + nwritten /= sizeof(char_type); + } + return nwritten; + } + + /** + * Reads up to @a n characters from the pipe to the buffer @a s. + * + * @param s character buffer. + * @param n buffer length. + * @return the number of characters read. + */ + template + inline std::streamsize + basic_pstreambuf::read(char_type* s, std::streamsize n) + { + std::streamsize nread = 0; + if (rpipe() >= 0) + { + nread = ::read(rpipe(), s, n * sizeof(char_type)); + if (nread == -1) + error_ = errno; + else + nread /= sizeof(char_type); + } + return nread; + } + + /** @return a reference to the output file descriptor */ + template + inline pstreams::fd_type& + basic_pstreambuf::wpipe() + { + return wpipe_; + } + + /** @return a reference to the active input file descriptor */ + template + inline pstreams::fd_type& + basic_pstreambuf::rpipe() + { + return rpipe_[rsrc_]; + } + + /** @return a reference to the specified input file descriptor */ + template + inline pstreams::fd_type& + basic_pstreambuf::rpipe(buf_read_src which) + { + return rpipe_[which]; + } + + /** @return a pointer to the start of the active input buffer area. */ + template + inline typename basic_pstreambuf::char_type* + basic_pstreambuf::rbuffer() + { + return rbuffer_[rsrc_]; + } + + + /* + * member definitions for pstream_common + */ + + /** + * @class pstream_common + * Abstract Base Class providing common functionality for basic_ipstream, + * basic_opstream and basic_pstream. + * pstream_common manages the basic_pstreambuf stream buffer that is used + * by the derived classes to initialise an iostream class. + */ + + /** Creates an uninitialised stream. */ + template + inline + pstream_common::pstream_common() + : std::basic_ios(NULL) + , command_() + , buf_() + { + this->std::basic_ios::rdbuf(&buf_); + } + + /** + * Initialises the stream buffer by calling + * do_open( @a command , @a mode ) + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, pmode) + */ + template + inline + pstream_common::pstream_common(const std::string& command, pmode mode) + : std::basic_ios(NULL) + , command_(command) + , buf_() + { + this->std::basic_ios::rdbuf(&buf_); + do_open(command, mode); + } + + /** + * Initialises the stream buffer by calling + * do_open( @a file , @a argv , @a mode ) + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see do_open(const std::string&, const argv_type&, pmode) + */ + template + inline + pstream_common::pstream_common( const std::string& file, + const argv_type& argv, + pmode mode ) + : std::basic_ios(NULL) + , command_(file) + , buf_() + { + this->std::basic_ios::rdbuf(&buf_); + do_open(file, argv, mode); + } + + /** + * This is a pure virtual function to make @c pstream_common abstract. + * Because it is the destructor it will be called by derived classes + * and so must be defined. It is also protected, to discourage use of + * the PStreams classes through pointers or references to the base class. + * + * @sa If defining a pure virtual seems odd you should read + * http://www.gotw.ca/gotw/031.htm (and the rest of the site as well!) + */ + template + inline + pstream_common::~pstream_common() + { + } + + /** + * Calls rdbuf()->open( @a command , @a mode ) + * and sets @c failbit on error. + * + * @param command a string containing a shell command. + * @param mode the I/O mode to use when opening the pipe. + * @see basic_pstreambuf::open(const std::string&, pmode) + */ + template + inline void + pstream_common::do_open(const std::string& command, pmode mode) + { + if (!buf_.open((command_=command), mode)) + this->setstate(std::ios_base::failbit); + } + + /** + * Calls rdbuf()->open( @a file, @a argv, @a mode ) + * and sets @c failbit on error. + * + * @param file a string containing the pathname of a program to execute. + * @param argv a vector of argument strings passed to the new program. + * @param mode the I/O mode to use when opening the pipe. + * @see basic_pstreambuf::open(const std::string&, const argv_type&, pmode) + */ + template + inline void + pstream_common::do_open( const std::string& file, + const argv_type& argv, + pmode mode ) + { + if (!buf_.open((command_=file), argv, mode)) + this->setstate(std::ios_base::failbit); + } + + /** Calls rdbuf->close() and sets @c failbit on error. */ + template + inline void + pstream_common::close() + { + if (!buf_.close()) + this->setstate(std::ios_base::failbit); + } + + /** + * @return rdbuf()->is_open(). + * @see basic_pstreambuf::is_open() + */ + template + inline bool + pstream_common::is_open() const + { + return buf_.is_open(); + } + + /** @return a string containing the command used to initialise the stream. */ + template + inline const std::string& + pstream_common::command() const + { + return command_; + } + + /** @return a pointer to the private stream buffer member. */ + // TODO document behaviour if buffer replaced. + template + inline typename pstream_common::streambuf_type* + pstream_common::rdbuf() const + { + return const_cast(&buf_); + } + + +#if REDI_EVISCERATE_PSTREAMS + /** + * @def REDI_EVISCERATE_PSTREAMS + * If this macro has a non-zero value then certain internals of the + * @c basic_pstreambuf template class are exposed. In general this is + * a Bad Thing, as the internal implementation is largely undocumented + * and may be subject to change at any time, so this feature is only + * provided because it might make PStreams useful in situations where + * it is necessary to do Bad Things. + */ + + /** + * @warning This function exposes the internals of the stream buffer and + * should be used with caution. It is the caller's responsibility + * to flush streams etc. in order to clear any buffered data. + * The POSIX.1 function fdopen(3) is used to obtain the + * @c FILE pointers from the streambuf's private file descriptor + * members so consult your system's documentation for + * fdopen(3). + * + * @param in A FILE* that will refer to the process' stdin. + * @param out A FILE* that will refer to the process' stdout. + * @param err A FILE* that will refer to the process' stderr. + * @return An OR of zero or more of @c pstdin, @c pstdout, @c pstderr. + * + * For each open stream shared with the child process a @c FILE* is + * obtained and assigned to the corresponding parameter. For closed + * streams @c NULL is assigned to the parameter. + * The return value can be tested to see which parameters should be + * @c !NULL by masking with the corresponding @c pmode value. + * + * @see fdopen(3) + */ + template + std::size_t + basic_pstreambuf::fopen(FILE*& in, FILE*& out, FILE*& err) + { + in = out = err = NULL; + std::size_t open_files = 0; + if (wpipe() > -1) + { + if ((in = ::fdopen(wpipe(), "w"))) + { + open_files |= pstdin; + } + } + if (rpipe(rsrc_out) > -1) + { + if ((out = ::fdopen(rpipe(rsrc_out), "r"))) + { + open_files |= pstdout; + } + } + if (rpipe(rsrc_err) > -1) + { + if ((err = ::fdopen(rpipe(rsrc_err), "r"))) + { + open_files |= pstderr; + } + } + return open_files; + } + + /** + * @warning This function exposes the internals of the stream buffer and + * should be used with caution. + * + * @param in A FILE* that will refer to the process' stdin. + * @param out A FILE* that will refer to the process' stdout. + * @param err A FILE* that will refer to the process' stderr. + * @return A bitwise-or of zero or more of @c pstdin, @c pstdout, @c pstderr. + * @see basic_pstreambuf::fopen() + */ + template + inline std::size_t + pstream_common::fopen(FILE*& fin, FILE*& fout, FILE*& ferr) + { + return buf_.fopen(fin, fout, ferr); + } + +#endif // REDI_EVISCERATE_PSTREAMS + + +} // namespace redi + +/** + * @mainpage PStreams Reference + * @htmlinclude mainpage.html + */ + +#endif // REDI_PSTREAM_H_SEEN + +// vim: ts=2 sw=2 expandtab + diff --git a/Common/Libraries/ParserLibrary/src/Makefile b/Common/Libraries/ParserLibrary/src/Makefile index 8591eb5f9..e431de1fe 100644 --- a/Common/Libraries/ParserLibrary/src/Makefile +++ b/Common/Libraries/ParserLibrary/src/Makefile @@ -38,6 +38,9 @@ EXECUTABLES = EXECUTABLES_L = TestFunctions TestParser TestTypes +PY_PACKAGES = SimpleParserPy +PY_SCRIPTS = + # # @@ -55,7 +58,7 @@ TestTypes_LIBS = IRALibrary SlaLibrary ParserErrors ComponentErrors # Includes (.h) files (public only) # --------------------------------- INCLUDES = SP_typeConversion.h SP_types.h SP_functor.h SP_function0.h SP_function1.h SP_function2.h SP_function3.h SP_function4.h SP_function5.h\ - SP_function6.h SP_function7.h SP_parser.h SP_parser.i + SP_function6.h SP_function7.h SP_parser.h SP_parser.i pstream.h ParserConnector.h ParserConnector.i # # list of all possible C-sources (used to create automatic dependencies) diff --git a/Common/Libraries/ParserLibrary/src/SimpleParserPy/ParserConnector.py b/Common/Libraries/ParserLibrary/src/SimpleParserPy/ParserConnector.py new file mode 100644 index 000000000..19762efa8 --- /dev/null +++ b/Common/Libraries/ParserLibrary/src/SimpleParserPy/ParserConnector.py @@ -0,0 +1,43 @@ +""" +This module provides support for python code to be used in components and client for +interacting with the user and the user console (operator input) via the Simple Parser +""" +import sys + +def exceptionToUser(ex): + err=ex.getErrorTrace() + output='' + temp='(type:%ld code:%ld): %s' % (err.errorType,err.errorCode,getMessage(err)) + output=temp + while err.previousError!=[]: + err=err.previousError[0] + temp='(type:%ld code:%ld): %s' % (err.errorType,err.errorCode,getMessage(err)) + output=output+'\n'+temp + return output + +def getMessage(tr): + l=len(tr.data) + descr='' + count=0 + descr=tr.shortDescription + while (countadd("project",new function1 >(this,&CCore::_setProjectCode),1); // no range checks because * is allowed m_parser->add("skydip",new function3 >,I >,I >(this,&CCore::skydip),3); - m_parser->add("agc","_tp_agc",2); + m_parser->add("agc","_tp_agc",2,"NONE"); + m_parser->add("ifd","_ifd",1,"SRT"); m_parser->add("restFrequency",new function1 >(this,&CCore::_setRestFrequency),1); m_parser->add("fTrack",new function1 >(this,&CCore::_fTrack),1); m_parser->add("peaker",new function3,I,I >(this,&CCore::_peaker),3); diff --git a/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml index 0673377c3..51fb4fa2c 100755 --- a/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml +++ b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -6,12 +6,48 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - DEFAULT + LO-DEFAULT 0 1 - 2300 + 2300.0 + + + BW-NARROW + + 1 + 0 + + + 2 + 0 + + + + BW-MEDIUM + + 1 + 1 + + + 2 + 1 + + + + BW-WIDE + + 1 + 2 + + + 2 + 2 + + + + BW-UNFILTERED 1 3 @@ -21,4 +57,5 @@ 3 + diff --git a/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml index 83f090279..b51f1681c 100755 --- a/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml +++ b/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml @@ -27,7 +27,7 @@ RepetitionExpireTime="10000000" ReceiverName="SRTLPBand" DefaultMode="L3L4" - LocalOscillatorInstance="RECEIVERS/LO_LP" + LocalOscillatorInstance="RECEIVERS/SRTIFDistributor" > diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml index 0673377c3..51fb4fa2c 100755 --- a/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -6,12 +6,48 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - DEFAULT + LO-DEFAULT 0 1 - 2300 + 2300.0 + + + BW-NARROW + + 1 + 0 + + + 2 + 0 + + + + BW-MEDIUM + + 1 + 1 + + + 2 + 1 + + + + BW-WIDE + + 1 + 2 + + + 2 + 2 + + + + BW-UNFILTERED 1 3 @@ -21,4 +57,5 @@ 3 + diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml index 0fda5b76a..2aeec11a9 100755 --- a/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml +++ b/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml @@ -27,7 +27,7 @@ RepetitionExpireTime="10000000" ReceiverName="SRTLPBand" DefaultMode="L3L4" - LocalOscillatorInstance="RECEIVERS/LO_LP" + LocalOscillatorInstance="RECEIVERS/SRTIFDistributor" > diff --git a/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd index 44a7cd415..20cd627fe 100644 --- a/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd +++ b/SRT/Interfaces/SRTReceiversInterface/config/CDB/schemas/SRTIFDistributorTable.xsd @@ -17,7 +17,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd b/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd index ce576844c..d1ca3f367 100644 --- a/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd +++ b/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd @@ -1,6 +1,6 @@ - + diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py index 78533e4f3..266012c18 100644 --- a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py @@ -26,7 +26,7 @@ def _LO(response): LO_status = {} LO_status['REF_FREQ'] = int(response[3]) - LO_status['FREQ'] = int(response[4]) + LO_status['FREQ'] = float(response[4]) LO_status['ENABLED'] = int(bin(response[9])[2:].zfill(8)[4], 2) LO_status['ERR'] = int(response[10]) LO_status['LOCK'] = int(response[11]) diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py index b37dd2198..a376a6fc7 100644 --- a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py @@ -21,14 +21,14 @@ import ComponentErrorsImpl import cdbErrType import re import IFDParser +import time +import copy class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): - + def __init__(self): cc.__init__(self) services.__init__(self) - self.configuration_name = '' - self.configuration = {} self.attributes = {} self.configurations = {} @@ -38,6 +38,8 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): self.ampl = 0.0 self.t = None + self._reset_configuration() + def initialize(self): self._set_cdb_attributes('alma/RECEIVERS/SRTIFDistributor') self._set_cdb_configuration('alma/DataBlock/SRTIFDistributor/Configuration') @@ -51,47 +53,52 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): def cleanUp(self): pass - def setup(self, configuration_name): + def setup(self, config_string): """This method performs a complete setup of the device by receiving the - desired configuration name as a string and using the corresponding CDB - configuration. If the desired configuration is unknown it raises and - logs an exception. + desired configurations as a string and using the corresponding CDB + configurations. If one of the desired configuration is unknown it + raises and logs an exception. - :param configuration_name: the desired device configuration.""" - if configuration_name not in self.configurations: - reason = ( - 'Unknown IFDistributor configuration: %s' - % configuration_name - ) - logger.logError(reason) - exc = ComponentErrorsImpl.CouldntGetAttributeExImpl() - exc.setData('reason', reason) - raise exc.getComponentErrorsEx() + :param config_string: the desired device configuration(s).""" - self.configuration_name = configuration_name - self.configuration = self.configurations[configuration_name] + configurations = [c.strip() for c in config_string.split(',')] - # LO - LO_conf = self.configuration.get('LO') - if not LO_conf: - reason = ( - 'Local oscillator configuration not present. Aborting setup.' + for configuration_name in configurations: + if configuration_name not in self.configurations: + reason = ( + 'Unknown IFDistributor configuration: %s' + % configuration_name + ) + logger.logError(reason) + exc = ComponentErrorsImpl.CouldntGetAttributeExImpl() + exc.setData('reason', reason) + raise exc.getComponentErrorsEx() + + for configuration_name in configurations: + for conf in self.current_configurations: + if configuration_name[:configuration_name.find('-') + 1] in conf: + self.current_configurations.remove(conf) + + self.current_configurations.append(configuration_name) + self.configuration.update( + copy.deepcopy(self.configurations[configuration_name]) ) - logger.logError(reason) - raise ComponentErrorsImpl.ValidationErrorExImpl(reason) - if int(LO_conf['Board']) != self._LO_board(): - reason = ( - 'Wrong board selected for local oscillator. ' - + 'Please, fix the board index in CDB.' - ) - logger.logError(reason) - raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) + # LO + LO_conf = self.configuration.get('LO') + if LO_conf: + if int(LO_conf['Board']) != self._LO_board(): + reason = ( + 'Wrong board selected for local oscillator. ' + + 'Please, fix the board index in CDB.' + ) + logger.logError(reason) + raise ComponentErrorsImpl.ValueOutofRangeExImpl(reason) - if LO_conf['Enable'] == '0': - self.rfoff() - else: - self._set_LO(int(LO_conf['Frequency']), 1) + if LO_conf['Enable'] == '0': + self.rfoff() + else: + self._set_LO(float(LO_conf['Frequency']), 1) # BW for line in (self.configuration.get('BW') or []): @@ -116,17 +123,20 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): int(line['Conversion']) ) - if not self.t: # Check if a control timer has already been created - self._is_configured() + if self.t: + self.t.cancel() + self.t = None + self._is_configured() def setDefault(self): """Sets the IFDistributor to its default values.""" - self.setup(self.attributes['DEFAULT_CONFIG']) + self._reset_configuration() + self.setup(self.attributes['DEFAULT_CONFIGS']) def getSetup(self): """If present, returns the current configuration name, otherwise it returns an empty string.""" - return self.configuration_name + return ', '.join(self.current_configurations) def get(self): """Returns the current amplitude and frequency @@ -135,6 +145,7 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): def set(self, _, frequency): """Sets the frequency and turn on the local oscillator. + :param _: placeholder for amplitude. Since the amplitude of the local oscillator cannot be set (it's 1 when the local oscillator is enabled or 0 when the local oscillator is disabled), it is simply @@ -144,6 +155,10 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): """ self._set_LO(frequency, 1) + for index in range(len(self.current_configurations)): + if 'LO-' in self.current_configurations[index]: + self.current_configurations[index] = 'LO-CUSTOM' + def rfoff(self): """Turns off the local oscillator.""" self._LO_board() @@ -154,6 +169,10 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): self._LO_board() self._set_LO(self.freq, 1) + def _reset_configuration(self): + self.configuration = {} + self.current_configurations = [] + def _set_LO(self, lo_freq, lo_on): """This method is used to issue commands to the local oscillator board (type 2). @@ -187,6 +206,11 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): self.configuration['LO']['Frequency'] = str(lo_freq) self.configuration['LO']['Enable'] = str(lo_on) + LO_status = self._get_board_status(self._LO_board()) + self.freq = LO_status['FREQ'] + self.lock = LO_status['LOCK'] + self.ampl = float(self.lock) + def _set_filter(self, board, bandwidth): """This method is used to issue commands to the set the filter bandwidth to type 0 and 1 boards. @@ -332,6 +356,8 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): s.sendall(command) + time.sleep(0.1) + response = s.recv(1024) s.close() response = response.strip().split('\n') @@ -369,7 +395,7 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): logger.logWarning( 'Wrong reference frequency of local oscillator.' ) - if LO_status['FREQ'] != int(LO_conf['Frequency']): + if LO_status['FREQ'] != float(LO_conf['Frequency']): logger.logWarning('Wrong frequency of local oscillator.') if LO_status['ERR'] != 0: logger.logWarning('Local oscillator error.') @@ -420,7 +446,7 @@ class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): 'IP', 'PORT', 'REF_FREQ', - 'DEFAULT_CONFIG', + 'DEFAULT_CONFIGS', 'CYCLE_TIME', 'N_BOARDS' ] diff --git a/SRT/Servers/SRTPyIFDistributor/src/Makefile b/SRT/Servers/SRTPyIFDistributor/src/Makefile index 15e6b3ec5..b6fc40368 100644 --- a/SRT/Servers/SRTPyIFDistributor/src/Makefile +++ b/SRT/Servers/SRTPyIFDistributor/src/Makefile @@ -5,7 +5,7 @@ CDB_SCHEMAS = SRTIFDistributor -PY_SCRIPTS = +PY_SCRIPTS = _ifd PY_MODULES = PY_PACKAGES = IFDistributor diff --git a/SRT/Servers/SRTPyIFDistributor/src/_ifd.py b/SRT/Servers/SRTPyIFDistributor/src/_ifd.py new file mode 100644 index 000000000..4fb14a37d --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/_ifd.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python + +# This is a python script that can be used to configure the filters of the SRT +# temporary IF distributor. +#who when what +#andrea orlati(andrea.orlati@inaf.it) 22/06/2018 Creation + +from Acspy.Clients.SimpleClient import PySimpleClient +import ACSLog +import maciErrType +import maciErrTypeImpl +import ClientErrorsImpl +import ManagementErrorsImpl +import sys +import os +from IRAPy import logger,userLogger +from SimpleParserPy import add_user_message + +def main(): + + + compName = "RECEIVERS/SRTIFDistributor" + + simpleClient = PySimpleClient() + #check we are at the SRT + station=os.environ['STATION'] + + if station!="SRT": + newEx = ManagementErrorsImpl.UnsupportedOperationExImpl() + add_user_message(newEx,"The command is not available or it is not supported") + userLogger.logExcpetion(newEx) + simpleClient.disconnect() + sys.exit(1) + + try: + component=simpleClient.getComponent(compName) + except Exception , ex: + newEx = ClientErrorsImpl.CouldntAccessComponentExImpl( exception=ex, create=1 ) + newEx.setComponentName(compName) + add_user_message(newEx,"IFD device not ready or not properly configured") + userLogger.logException(newEx) + simpleClient.disconnect() + sys.exit(1) + + try: + inputs=component.setup(sys.argv[1]) + except Exception, ex: + newEx = ClientErrorsImpl.CouldntPerformActionExImpl( exception=ex, create=1 ) + newEx.setReason("IF distributor configuration") + add_user_message(newEx,"Unable to configure the IFD device") + userLogger.logException(newEx) + simpleClient.disconnect() + sys.exit(1) + + +if __name__=="__main__": + main() \ No newline at end of file -- GitLab From 5e513680c9f97507401ca57a03ba2fb78a79584d Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Fri, 29 Jun 2018 15:18:00 +0200 Subject: [PATCH 119/145] Fix #226, directories `bin`, `lib` and `object` hid from repository synchronization. (#227) --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0440de820..ece8c14ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .branchenv introot* +bin/ +lib/ +object/ -- GitLab From 06d03a812d3240d437c743512f23bd72e4d7a513 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 2 Jul 2018 19:54:49 +0200 Subject: [PATCH 120/145] Fix #228. Renamed `roach` to `sardara` and integrated it. (#229) --- .../SystemTerminal/src/nuraghe_commands.py | 6 + .../BackendsInterface/idl/GenericBackend.idl | 2 + .../idl/{Roach.idl => Sardara.idl} | 10 +- .../Interfaces/BackendsInterface/src/Makefile | 4 +- .../DiscosBackendProtocol/include/command.hpp | 1 + Common/Servers/DBBC/include/DBBCImpl.h | 2 + .../include/HolographyImpl.h | 2 + .../include/NoiseGeneratorImpl.h | 2 + .../config/CDB/schemas/Sardara.xsd} | 10 +- .../config/CDB/schemas/SardaraSetup.xsd} | 10 +- .../{Roach => Sardara}/include/CommandLine.h | 5 +- .../{Roach => Sardara}/include/Common.h | 0 .../include/Configuration.h | 2 +- .../include/ControlThread.h | 0 .../include/DevIOAttenuation.h | 0 .../include/DevIOBandWidth.h | 0 .../{Roach => Sardara}/include/DevIOBins.h | 0 .../{Roach => Sardara}/include/DevIOBusy.h | 0 .../{Roach => Sardara}/include/DevIOFeed.h | 0 .../include/DevIOFrequency.h | 0 .../include/DevIOInputSection.h | 0 .../include/DevIOInputsNumber.h | 0 .../include/DevIOIntegration.h | 0 .../include/DevIOPolarization.h | 0 .../include/DevIOSampleRate.h | 0 .../include/DevIOSectionsNumber.h | 0 .../{Roach => Sardara}/include/DevIOStatus.h | 0 .../{Roach => Sardara}/include/DevIOTime.h | 0 .../{Roach => Sardara}/include/DevIOTsys.h | 0 .../{Roach => Sardara}/include/Protocol.h | 0 .../include/SardaraImpl.h} | 23 +- .../{Roach => Sardara}/include/SenderThread.h | 4 +- .../{Roach => Sardara}/src/CommandLine.cpp | 271 ++++++--------- .../{Roach => Sardara}/src/Configuration.cpp | 4 +- .../{Roach => Sardara}/src/ControlThread.cpp | 0 .../Servers/{Roach => Sardara}/src/Makefile | 8 +- .../{Roach => Sardara}/src/Protocol.cpp | 0 .../src/SardaraImpl.cpp} | 310 +++++++----------- .../{Roach => Sardara}/src/SenderThread.cpp | 2 +- .../src/_send_backend_command | 0 Common/Servers/Scheduler/src/Core.cpp | 1 + .../TotalPower/include/TotalPowerImpl.h | 2 + .../Servers/XBackend/include/XBackendsImpl.h | 2 + .../{Roach/Roach.xml => Sardara/Sardara.xml} | 8 +- .../SardaraContainer.xml} | 0 .../{Roach/Roach.xml => Sardara/Sardara.xml} | 6 +- .../alma/DataBlock/Equipment/Equipment.xml | 2 +- .../CDB/alma/DataBlock/Sardara/Sardara.xml | 4 +- .../{Roach/Roach.xml => Sardara/Sardara.xml} | 8 +- .../ExternalClients/RFIMonitoring.xml | 18 - .../SardaraContainer.xml} | 0 .../{Roach/Roach.xml => Sardara/Sardara.xml} | 8 +- .../alma/DataBlock/Equipment/Equipment.xml | 2 +- .../CDB/alma/DataBlock/Sardara/Sardara.xml | 110 +++++-- .../ExternalClients/RFIMonitoring.xml | 17 - SystemMake/Makefile | 2 +- 56 files changed, 390 insertions(+), 478 deletions(-) rename Common/Interfaces/BackendsInterface/idl/{Roach.idl => Sardara.idl} (97%) rename Common/Servers/{Roach/config/CDB/schemas/Roach.xsd => Sardara/config/CDB/schemas/Sardara.xsd} (96%) rename Common/Servers/{Roach/config/CDB/schemas/RoachSetup.xsd => Sardara/config/CDB/schemas/SardaraSetup.xsd} (95%) rename Common/Servers/{Roach => Sardara}/include/CommandLine.h (99%) rename Common/Servers/{Roach => Sardara}/include/Common.h (100%) rename Common/Servers/{Roach => Sardara}/include/Configuration.h (99%) rename Common/Servers/{Roach => Sardara}/include/ControlThread.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOAttenuation.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOBandWidth.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOBins.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOBusy.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOFeed.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOFrequency.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOInputSection.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOInputsNumber.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOIntegration.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOPolarization.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOSampleRate.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOSectionsNumber.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOStatus.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOTime.h (100%) rename Common/Servers/{Roach => Sardara}/include/DevIOTsys.h (100%) rename Common/Servers/{Roach => Sardara}/include/Protocol.h (100%) rename Common/Servers/{Roach/include/RoachImpl.h => Sardara/include/SardaraImpl.h} (97%) rename Common/Servers/{Roach => Sardara}/include/SenderThread.h (99%) rename Common/Servers/{Roach => Sardara}/src/CommandLine.cpp (89%) rename Common/Servers/{Roach => Sardara}/src/Configuration.cpp (98%) rename Common/Servers/{Roach => Sardara}/src/ControlThread.cpp (100%) rename Common/Servers/{Roach => Sardara}/src/Makefile (92%) rename Common/Servers/{Roach => Sardara}/src/Protocol.cpp (100%) rename Common/Servers/{Roach/src/RoachImpl.cpp => Sardara/src/SardaraImpl.cpp} (67%) rename Common/Servers/{Roach => Sardara}/src/SenderThread.cpp (99%) rename Common/Servers/{Roach => Sardara}/src/_send_backend_command (100%) rename Medicina/Configuration/CDB/MACI/Components/BACKENDS/{Roach/Roach.xml => Sardara/Sardara.xml} (77%) rename Medicina/Configuration/CDB/MACI/Containers/{RoachContainer/RoachContainer.xml => SardaraContainer/SardaraContainer.xml} (100%) rename Medicina/Configuration/CDB/alma/BACKENDS/{Roach/Roach.xml => Sardara/Sardara.xml} (92%) rename SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml => Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml (98%) rename SRT/Configuration/CDB/MACI/Components/BACKENDS/{Roach/Roach.xml => Sardara/Sardara.xml} (77%) delete mode 100644 SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml rename SRT/Configuration/CDB/MACI/Containers/{RoachContainer/RoachContainer.xml => SardaraContainer/SardaraContainer.xml} (100%) rename SRT/Configuration/CDB/alma/BACKENDS/{Roach/Roach.xml => Sardara/Sardara.xml} (88%) rename Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml => SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml (58%) delete mode 100644 SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml diff --git a/Common/Clients/SystemTerminal/src/nuraghe_commands.py b/Common/Clients/SystemTerminal/src/nuraghe_commands.py index d2df20456..1ab5c3876 100755 --- a/Common/Clients/SystemTerminal/src/nuraghe_commands.py +++ b/Common/Clients/SystemTerminal/src/nuraghe_commands.py @@ -354,6 +354,12 @@ def getTpi(): and lists them according to increasing section number """ +def getRms(): + """ + getRms reads rms value of the signal for the active sections, + and lists them according to increasing section number + """ + def goOff(): """ goOff=frame,offset diff --git a/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl b/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl index f30da8b84..6e37ce08e 100644 --- a/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl +++ b/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl @@ -300,6 +300,8 @@ module Backends { * @return a sequence of double that reports the total power of each input (@sa inputsNumber). The caller must take care of freeing it. */ ACS::doubleSeq getTpi() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + + ACS::doubleSeq getRms() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); /** * Call this method in order to read the total power from each input when the input are connected directly to the 50 Ohm. diff --git a/Common/Interfaces/BackendsInterface/idl/Roach.idl b/Common/Interfaces/BackendsInterface/idl/Sardara.idl similarity index 97% rename from Common/Interfaces/BackendsInterface/idl/Roach.idl rename to Common/Interfaces/BackendsInterface/idl/Sardara.idl index e096cc96f..4bf2d36f5 100644 --- a/Common/Interfaces/BackendsInterface/idl/Roach.idl +++ b/Common/Interfaces/BackendsInterface/idl/Sardara.idl @@ -1,6 +1,6 @@ /* ******************************************************************************************* */ /* OAC Osservatorio Astronomico di Cagliari */ -/* $Id: Roach.idl,v 1.1 2011-03-14 14:54:11 c.migoni Exp $ */ +/* $Id: Sardara.idl,v 1.1 2011-03-14 14:54:11 c.migoni Exp $ */ /* */ /* This code is under GNU General Public Licence (GPL). */ /* */ @@ -8,8 +8,8 @@ /* Carlo Migoni (migoni@oa-cagliari.inaf.it) 12/05/2015 Creation */ -#ifndef _ROACH_IDL_ -#define _ROACH_IDL_ +#ifndef _SARDARA_IDL_ +#define _SARDARA_IDL_ #include #include @@ -20,7 +20,7 @@ module Backends { /** - * The Roach2 is a digital backend. bla bla bla + * The Sardara is a digital backend. bla bla bla *
* * @@ -101,7 +101,7 @@ module Backends { * Since this measure requires an input signal switching the backend is forced to wait two times the integration to allow the * new signal level to stabilize. */ - interface Roach : GenericBackend { + interface Sardara : GenericBackend { /** * This method can be called to activate or disactivate the switching of the calibration noise diode. The mode the switching is done is controlled diff --git a/Common/Interfaces/BackendsInterface/src/Makefile b/Common/Interfaces/BackendsInterface/src/Makefile index 0720507d8..2efff1000 100644 --- a/Common/Interfaces/BackendsInterface/src/Makefile +++ b/Common/Interfaces/BackendsInterface/src/Makefile @@ -33,7 +33,7 @@ CDB_SCHEMAS = GenericBackend DigitalXCorrelator Holography # # IDL Files and flags # -IDL_FILES = GenericBackend BackendsBoss TotalPower NoiseGenerator DigitalXCorrelator Holography DBBC DFBInterface Roach +IDL_FILES = GenericBackend BackendsBoss TotalPower NoiseGenerator DigitalXCorrelator Holography DBBC DFBInterface Sardara IDL_TAO_FLAGS = USER_IDL = @@ -48,7 +48,7 @@ DigitalXCorrelatorStubs_LIBS = acscomponentStubs ACSErrTypeFPGAConnectionStubs \ HolographyStubs_LIBS = baciStubs GenericBackendStubs DBBCStubs_LIBS = baciStubs GenericBackendStubs DFBInterfaceStubs_LIBS = baciStubs GenericBackendStubs -RoachStubs_LIBS = baciStubs GenericBackendStubs +SardaraStubs_LIBS = baciStubs GenericBackendStubs # # list of all possible C-sources (used to create automatic dependencies) diff --git a/Common/Libraries/DiscosBackendProtocol/include/command.hpp b/Common/Libraries/DiscosBackendProtocol/include/command.hpp index cb2ae8a40..d00b70d3c 100644 --- a/Common/Libraries/DiscosBackendProtocol/include/command.hpp +++ b/Common/Libraries/DiscosBackendProtocol/include/command.hpp @@ -26,6 +26,7 @@ namespace DiscosBackend{ static Message calOn(long interleave = 0); static Message setFilename(string filename); static Message convertData(){return Message(REQUEST, "convert-data");}; + static Message getRms(){return Message(REQUEST, "get-rms");}; }; //class Command }; //namespace DiscosBackend diff --git a/Common/Servers/DBBC/include/DBBCImpl.h b/Common/Servers/DBBC/include/DBBCImpl.h index 8cac004fe..fabe1618c 100644 --- a/Common/Servers/DBBC/include/DBBCImpl.h +++ b/Common/Servers/DBBC/include/DBBCImpl.h @@ -67,6 +67,8 @@ virtual void setTime () throw (CORBA::SystemException,ComponentErrors::Component virtual ACS::doubleSeq * getTpi () throw(CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){return 0;}; +virtual ACS::doubleSeq * getRms () throw(CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){return 0;}; + virtual ACS::doubleSeq * getZero () throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx){return 0;}; virtual void setKelvinCountsRatio (const ACS::doubleSeq & ratio, diff --git a/Common/Servers/HolographyBackend/include/HolographyImpl.h b/Common/Servers/HolographyBackend/include/HolographyImpl.h index ad273673f..9e247e5b5 100755 --- a/Common/Servers/HolographyBackend/include/HolographyImpl.h +++ b/Common/Servers/HolographyBackend/include/HolographyImpl.h @@ -201,6 +201,8 @@ public: virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + virtual ACS::doubleSeq * getRms () throw (CORBA::SystemException, + ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;}; /** * This method is used to inform the component about the proper conversion factor between Kelvin and counts. This value is used for the tsys computation during diff --git a/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h b/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h index 0c17a3707..1af4cc4ba 100644 --- a/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h +++ b/Common/Servers/NoiseGenerator/include/NoiseGeneratorImpl.h @@ -247,6 +247,8 @@ public: */ virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + virtual ACS::doubleSeq * getRms () throw (CORBA::SystemException, + ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); /** * Call this function in order to get a total power measure for each input channel. The measure is done when the inputs are directly diff --git a/Common/Servers/Roach/config/CDB/schemas/Roach.xsd b/Common/Servers/Sardara/config/CDB/schemas/Sardara.xsd similarity index 96% rename from Common/Servers/Roach/config/CDB/schemas/Roach.xsd rename to Common/Servers/Sardara/config/CDB/schemas/Sardara.xsd index 2719dbef4..34e93aebf 100644 --- a/Common/Servers/Roach/config/CDB/schemas/Roach.xsd +++ b/Common/Servers/Sardara/config/CDB/schemas/Sardara.xsd @@ -1,6 +1,6 @@ - + @@ -129,6 +129,6 @@ - + diff --git a/Common/Servers/Roach/config/CDB/schemas/RoachSetup.xsd b/Common/Servers/Sardara/config/CDB/schemas/SardaraSetup.xsd similarity index 95% rename from Common/Servers/Roach/config/CDB/schemas/RoachSetup.xsd rename to Common/Servers/Sardara/config/CDB/schemas/SardaraSetup.xsd index 1d977c320..2d35c37a6 100644 --- a/Common/Servers/Roach/config/CDB/schemas/RoachSetup.xsd +++ b/Common/Servers/Sardara/config/CDB/schemas/SardaraSetup.xsd @@ -1,6 +1,6 @@ - + - + diff --git a/Common/Servers/Roach/include/CommandLine.h b/Common/Servers/Sardara/include/CommandLine.h similarity index 99% rename from Common/Servers/Roach/include/CommandLine.h rename to Common/Servers/Sardara/include/CommandLine.h index c35a929c7..fce0b6fee 100644 --- a/Common/Servers/Roach/include/CommandLine.h +++ b/Common/Servers/Sardara/include/CommandLine.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -370,6 +370,9 @@ public: ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl); + void getRms(ACS::doubleSeq& rms) throw (ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, + ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl); + /** * This a wrapper function of the getSample() method. In this case the sample correspond the power measurment in each channel with full attenuation. * @throw ComponentErrors::SocketErrorExImpl diff --git a/Common/Servers/Roach/include/Common.h b/Common/Servers/Sardara/include/Common.h similarity index 100% rename from Common/Servers/Roach/include/Common.h rename to Common/Servers/Sardara/include/Common.h diff --git a/Common/Servers/Roach/include/Configuration.h b/Common/Servers/Sardara/include/Configuration.h similarity index 99% rename from Common/Servers/Roach/include/Configuration.h rename to Common/Servers/Sardara/include/Configuration.h index faebd90b5..51beb3c31 100644 --- a/Common/Servers/Roach/include/Configuration.h +++ b/Common/Servers/Sardara/include/Configuration.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "Protocol.h" #include "Common.h" diff --git a/Common/Servers/Roach/include/ControlThread.h b/Common/Servers/Sardara/include/ControlThread.h similarity index 100% rename from Common/Servers/Roach/include/ControlThread.h rename to Common/Servers/Sardara/include/ControlThread.h diff --git a/Common/Servers/Roach/include/DevIOAttenuation.h b/Common/Servers/Sardara/include/DevIOAttenuation.h similarity index 100% rename from Common/Servers/Roach/include/DevIOAttenuation.h rename to Common/Servers/Sardara/include/DevIOAttenuation.h diff --git a/Common/Servers/Roach/include/DevIOBandWidth.h b/Common/Servers/Sardara/include/DevIOBandWidth.h similarity index 100% rename from Common/Servers/Roach/include/DevIOBandWidth.h rename to Common/Servers/Sardara/include/DevIOBandWidth.h diff --git a/Common/Servers/Roach/include/DevIOBins.h b/Common/Servers/Sardara/include/DevIOBins.h similarity index 100% rename from Common/Servers/Roach/include/DevIOBins.h rename to Common/Servers/Sardara/include/DevIOBins.h diff --git a/Common/Servers/Roach/include/DevIOBusy.h b/Common/Servers/Sardara/include/DevIOBusy.h similarity index 100% rename from Common/Servers/Roach/include/DevIOBusy.h rename to Common/Servers/Sardara/include/DevIOBusy.h diff --git a/Common/Servers/Roach/include/DevIOFeed.h b/Common/Servers/Sardara/include/DevIOFeed.h similarity index 100% rename from Common/Servers/Roach/include/DevIOFeed.h rename to Common/Servers/Sardara/include/DevIOFeed.h diff --git a/Common/Servers/Roach/include/DevIOFrequency.h b/Common/Servers/Sardara/include/DevIOFrequency.h similarity index 100% rename from Common/Servers/Roach/include/DevIOFrequency.h rename to Common/Servers/Sardara/include/DevIOFrequency.h diff --git a/Common/Servers/Roach/include/DevIOInputSection.h b/Common/Servers/Sardara/include/DevIOInputSection.h similarity index 100% rename from Common/Servers/Roach/include/DevIOInputSection.h rename to Common/Servers/Sardara/include/DevIOInputSection.h diff --git a/Common/Servers/Roach/include/DevIOInputsNumber.h b/Common/Servers/Sardara/include/DevIOInputsNumber.h similarity index 100% rename from Common/Servers/Roach/include/DevIOInputsNumber.h rename to Common/Servers/Sardara/include/DevIOInputsNumber.h diff --git a/Common/Servers/Roach/include/DevIOIntegration.h b/Common/Servers/Sardara/include/DevIOIntegration.h similarity index 100% rename from Common/Servers/Roach/include/DevIOIntegration.h rename to Common/Servers/Sardara/include/DevIOIntegration.h diff --git a/Common/Servers/Roach/include/DevIOPolarization.h b/Common/Servers/Sardara/include/DevIOPolarization.h similarity index 100% rename from Common/Servers/Roach/include/DevIOPolarization.h rename to Common/Servers/Sardara/include/DevIOPolarization.h diff --git a/Common/Servers/Roach/include/DevIOSampleRate.h b/Common/Servers/Sardara/include/DevIOSampleRate.h similarity index 100% rename from Common/Servers/Roach/include/DevIOSampleRate.h rename to Common/Servers/Sardara/include/DevIOSampleRate.h diff --git a/Common/Servers/Roach/include/DevIOSectionsNumber.h b/Common/Servers/Sardara/include/DevIOSectionsNumber.h similarity index 100% rename from Common/Servers/Roach/include/DevIOSectionsNumber.h rename to Common/Servers/Sardara/include/DevIOSectionsNumber.h diff --git a/Common/Servers/Roach/include/DevIOStatus.h b/Common/Servers/Sardara/include/DevIOStatus.h similarity index 100% rename from Common/Servers/Roach/include/DevIOStatus.h rename to Common/Servers/Sardara/include/DevIOStatus.h diff --git a/Common/Servers/Roach/include/DevIOTime.h b/Common/Servers/Sardara/include/DevIOTime.h similarity index 100% rename from Common/Servers/Roach/include/DevIOTime.h rename to Common/Servers/Sardara/include/DevIOTime.h diff --git a/Common/Servers/Roach/include/DevIOTsys.h b/Common/Servers/Sardara/include/DevIOTsys.h similarity index 100% rename from Common/Servers/Roach/include/DevIOTsys.h rename to Common/Servers/Sardara/include/DevIOTsys.h diff --git a/Common/Servers/Roach/include/Protocol.h b/Common/Servers/Sardara/include/Protocol.h similarity index 100% rename from Common/Servers/Roach/include/Protocol.h rename to Common/Servers/Sardara/include/Protocol.h diff --git a/Common/Servers/Roach/include/RoachImpl.h b/Common/Servers/Sardara/include/SardaraImpl.h similarity index 97% rename from Common/Servers/Roach/include/RoachImpl.h rename to Common/Servers/Sardara/include/SardaraImpl.h index e91a97427..5b289306c 100644 --- a/Common/Servers/Roach/include/RoachImpl.h +++ b/Common/Servers/Sardara/include/SardaraImpl.h @@ -1,9 +1,9 @@ -#ifndef _ROACHIMPL_H_ -#define _ROACHIMPL_H_ +#ifndef _SARDARAIMPL_H_ +#define _SARDARAIMPL_H_ /* ************************************************************************************************************* */ /* IRA Istituto di Radioastronomia */ -/* $Id: RoachImpl.h,v 1.1 2011-03-14 14:15:07 a.orlati Exp $ */ +/* $Id: SardaraImpl.h,v 1.1 2011-03-14 14:15:07 a.orlati Exp $ */ /* */ /* This code is under GNU General Public Licence (GPL). */ /* */ @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ using namespace ACSBulkDataError; using namespace baci; /** - * @mainpage Roach backend component documentation + * @mainpage Sardara backend component documentation * @date 12/02/2013 * @version 1.61.0 * @author Andrea Orlati @@ -88,7 +88,7 @@ using namespace baci; class CSenderThread; /** - * This class implements the Backends::Roach CORBA interface. + * This class implements the Backends::Sardara CORBA interface. * All exceptions that comes from the run-time interation with clients are at logged with LM_DEBUG priority. * @todo an implementation of configure() must be done yet. * @author Andrea Orlati, @@ -97,7 +97,7 @@ class CSenderThread; * stops to send data and the data flux control (toward bulk data receviver) handled by the component itself. *
*/ -class RoachImpl: public virtual BulkDataSenderDefaultImpl, public virtual POA_Backends::Roach +class SardaraImpl: public virtual BulkDataSenderDefaultImpl, public virtual POA_Backends::Sardara { public: /** @@ -105,12 +105,12 @@ public: * @param CompName component's name. This is also the name that will be used to find the configuration data for the component in the Configuration Database. * @param containerServices pointer to the class that exposes all services offered by container */ - RoachImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices); + SardaraImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices); /** * Destructor. */ - virtual ~RoachImpl(); + virtual ~SardaraImpl(); /** * Called to give the component time to initialize itself. The component reads in configuration files/parameters, builds up connection. @@ -316,6 +316,9 @@ public: */ virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + + virtual ACS::doubleSeq * getRms () throw (CORBA::SystemException, + ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); /** * Call this function in order to get a total power measure for each input channel. The measure is done when the inputs are directly @@ -497,4 +500,4 @@ private: void deleteAll(); }; -#endif /*RoachImpl_H_*/ +#endif /*SardaraImpl_H_*/ diff --git a/Common/Servers/Roach/include/SenderThread.h b/Common/Servers/Sardara/include/SenderThread.h similarity index 99% rename from Common/Servers/Roach/include/SenderThread.h rename to Common/Servers/Sardara/include/SenderThread.h index 116e08f97..ac37a9152 100644 --- a/Common/Servers/Roach/include/SenderThread.h +++ b/Common/Servers/Sardara/include/SenderThread.h @@ -20,7 +20,7 @@ class CSenderThread : public ACS::Thread { public: struct TSenderParameter { - RoachImpl *sender; + SardaraImpl *sender; IRA::CSecureArea *command; CConfiguration *configuration; //IRA::CSocket *dataLine; @@ -122,7 +122,7 @@ private: SAMPLETYPE sample[MAX_SECTION_NUMBER]; }; //IRA::CSocket *m_dataLine; - RoachImpl *m_sender; + SardaraImpl *m_sender; IRA::CSecureArea *m_commandLine; CConfiguration *m_configuration; bool m_isConnected; diff --git a/Common/Servers/Roach/src/CommandLine.cpp b/Common/Servers/Sardara/src/CommandLine.cpp similarity index 89% rename from Common/Servers/Roach/src/CommandLine.cpp rename to Common/Servers/Sardara/src/CommandLine.cpp index 222f60a31..8f81b09c5 100644 --- a/Common/Servers/Roach/src/CommandLine.cpp +++ b/Common/Servers/Sardara/src/CommandLine.cpp @@ -472,8 +472,48 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const if (newBW==2300.00) filter=2350.00; if (newBW == 420.00 || newBW == 1500.00 || newBW == 2300.00) { - for (int i=0;isetSection(i,-1, filter, -1, -1, -1, -1); + if (m_SK00S==true || m_SC00S==true || m_SK77S==true) { + m_totalPower->setSection(2*inputId,-1, filter, -1, -1, -1, -1); + m_totalPower->setSection(2*inputId+1,-1, filter, -1, -1, -1, -1); + } + else if (m_SK03S==true) { + if (inputId == 0) { + m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); + m_totalPower->setSection(inputId+1,-1, filter, -1, -1, -1, -1); + } + if (inputId == 1) { + m_totalPower->setSection(inputId+5,-1, filter, -1, -1, -1, -1); + m_totalPower->setSection(inputId+6,-1, filter, -1, -1, -1, -1); + } + } + else if (m_SK06S==true) { + if (inputId == 0) { + m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); + m_totalPower->setSection(inputId+1,-1, filter, -1, -1, -1, -1); + } + if (inputId == 1) { + m_totalPower->setSection(inputId+11,-1, filter, -1, -1, -1, -1); + m_totalPower->setSection(inputId+12,-1, filter, -1, -1, -1, -1); + } + } + else if (m_SK03==true) { + if (inputId == 0 || inputId == 1) { + m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); + } + if (inputId == 2 || inputId == 3) { + m_totalPower->setSection(inputId+4,-1, filter, -1, -1, -1, -1); + } + } + else if (m_SK06==true) { + if (inputId == 0 || inputId == 1) { + m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); + } + if (inputId == 2 || inputId == 3) { + m_totalPower->setSection(inputId+10,-1, filter, -1, -1, -1, -1); + } + } + else + m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); } } } @@ -621,15 +661,7 @@ void CCommandLine::getZero(ACS::doubleSeq& tpi) throw (ComponentErrors::TimeoutE BackendsErrors::ConnectionExImpl,ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl, BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl) { - //getSample(tpi,true); - // tpi.length(m_sectionsNumber); - tpi.length(m_inputsNumber); - //for (int j=0;j0) { // load OK - // do nothing - } - _CHECK_ERRORS("CommandLine::getSample()"); - //if the requested integration is not equal to the current samplerate (given is milliseconds as a sample period) - // or the integration time must be forced...and the backend is not busy. Then set the correct sample rate.... - if (((integration!=m_currentSampleRate) || (m_setTpiIntegration)) && !busy) { - len=CProtocol::setIntegrationTime(sBuff,integration); // get the buffer - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - } - if (res>0) { // operation was ok. - if (!CProtocol::isAck(rBuff)) { - _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::getSample()"); - } - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getSample()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getSample()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getSample()"); - } - m_setTpiIntegration=false; - waitTime=1000000+integration*2000; // //wait time in microseconds...we should wait 2 seconds plus twice the integration time (which is given in milliseconds). - } - // if the Tpizero has been requested...than connect the backend to the 50ohm - if (zero) { - len=CProtocol::setZeroInput(sBuff,true); // get the buffer - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - } - if (res>0) { // operation was ok. - if (!CProtocol::isAck(rBuff)) { - _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::getSample()"); - } - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getSample()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getSample()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getSample()"); - } - waitTime+=integration*2000; - } - if (waitTime>0) IRA::CIRATools::Wait(waitTime); - // now read the total power - len=CProtocol::getSample(sBuff); // get the buffer - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); + try { + Message reply = sendBackendCommand(Command::getTpi()); + if(reply.is_success_reply()){ + tpi.length(m_inputsNumber/*m_sectionsNumber*/); + for (int j=0;j(j); + if (zero) m_tpiZero[j]=tpi[j]/(double)m_integration; // in case of tpiZero we store it...... + } + } + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::getTpi()",(LM_NOTICE,"BACKEND_SARDARA_GET-TPI ERROR")); } - */ - //if (res>0) { // operation was ok. +} + +void CCommandLine::getRms(ACS::doubleSeq& rms) throw (ComponentErrors::TimeoutExImpl, + BackendsErrors::ConnectionExImpl,ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl, + BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl) +{ + AUTO_TRACE("CCommandLine::getRms()"); + Message reply = sendBackendCommand(Command::getRms()); if(reply.is_success_reply()){ - /*DWORD data[MAX_SECTION_NUMBER]; - if (!CProtocol::decodeData(rBuff,data,m_configuration->getBoardsNumber(),m_sectionsNumber,m_boards)) { - _THROW_EXCPT(BackendsErrors::MalformedAnswerExImpl,"CCommandLine::getSample()"); - }*/ - tpi.length(m_inputsNumber/*m_sectionsNumber*/); + rms.length(m_inputsNumber/*m_sectionsNumber*/); for (int j=0;j(j); - if (zero) m_tpiZero[j]=tpi[j]; // in case of tpiZero we store it...... + rms[j]=(double)reply.get_argument(j); } } - /* - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getSample()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getSample()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getSample()"); - } - */ - /* - // now return to the default attenuation level - if (zero) { - len=CProtocol::setZeroInput(sBuff,false); // get the buffer - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - } - if (res>0) { // operation was ok. - if (!CProtocol::isAck(rBuff)) { - _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::getSample()"); - } - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getSample()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getSample()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getSample()"); - } - }*/ } void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, @@ -952,23 +858,34 @@ void CCommandLine::setup(const char *conf) throw (BackendsErrors::BackendBusyExI try { Message request = Command::setConfiguration(string((const char*)conf)); Message reply = sendBackendCommand(request); - if(reply.is_success_reply()) - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZED, CONFIGURATION: %s",conf)); + if(reply.is_success_reply()) { + setDefaultConfiguration(conf); + for (int i=0;isetSection(i,-1, m_filter, -1, -1, -1, -1); + } + if (i == 2 || i == 3) { + m_totalPower->setSection(i+4,-1, m_filter, -1, -1, -1, -1); + } + } + else if (m_SK06S==true || m_SK06==true) { + if (i == 0 || i == 1) { + m_totalPower->setSection(i,-1, m_filter, -1, -1, -1, -1); + } + if (i == 2 || i == 3) { + m_totalPower->setSection(i+10,-1, m_filter, -1, -1, -1, -1); + } + } + else + m_totalPower->setSection(i,-1, m_filter, -1, -1, -1, -1); + } + } + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_SARDARA_INITIALIZED, CONFIGURATION: %s",conf)); } catch (...) { - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); - } - - setDefaultConfiguration(conf); - - try { - for (int i=0;isetSection(i,-1, m_filter, -1, -1, -1, -1); - } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setDefaultConfiguration()"); - impl.log(LM_ERROR); - } + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_SARDARA_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); + } } void CCommandLine::checkTime() throw (BackendsErrors::ConnectionExImpl,BackendsErrors::MalformedAnswerExImpl,ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl) @@ -1357,7 +1274,7 @@ void CCommandLine::fillChannelHeader(Backends::TSectionHeader *chHr,const long& long index=0; for (int i=0;i #include #include @@ -22,14 +22,14 @@ #include "DevIOSectionsNumber.h" #include "SenderThread.h" -static char *rcsId="@(#) $Id: RoachImpl.cpp,v 1.1 2011-03-14 14:15:07 a.orlati Exp $"; +static char *rcsId="@(#) $Id: SardaraImpl.cpp,v 1.1 2011-03-14 14:15:07 a.orlati Exp $"; static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId); using namespace SimpleParser; _IRA_LOGFILTER_DECLARE; -RoachImpl::RoachImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices) : +SardaraImpl::SardaraImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices) : BulkDataSenderDefaultImpl(CompName,containerServices), m_ptime(this), m_pbackendName(this), @@ -48,83 +48,42 @@ RoachImpl::RoachImpl(const ACE_CString &CompName,maci::ContainerServices *contai m_psectionsNumber(this), m_pinputSection(this) { - AUTO_TRACE("RoachImpl::RoachImpl"); + AUTO_TRACE("SardaraImpl::SardaraImpl"); m_initialized=false; m_senderThread=NULL; m_controlThread=NULL; } -RoachImpl::~RoachImpl() +SardaraImpl::~SardaraImpl() { - AUTO_TRACE("RoachImpl::~RoachImpl()"); + AUTO_TRACE("SardaraImpl::~SardaraImpl()"); // if the initialization failed...clear everything as well. // otherwise it is called by the cleanUp procedure. if (!m_initialized) deleteAll(); } -void RoachImpl::initialize() throw (ACSErr::ACSbaseExImpl) +void SardaraImpl::initialize() throw (ACSErr::ACSbaseExImpl) { CError Err; CSenderThread::TSenderParameter threadPar; CCommandLine* line; //IRA::CString hostName,hostAddress; - AUTO_TRACE("RoachImpl::initialize()"); - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZING")); - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"READING_CONFIGURATION")); + AUTO_TRACE("SardaraImpl::initialize()"); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZING")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::initialize()",(LM_INFO,"READING_CONFIGURATION")); // could throw an ComponentErrors::CDBAccessExImpl exception m_configuration.init(getContainerServices()); - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"CONFIGURATION_OK")); - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"INITIALIIZING_COMMUNICATION_LINES")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::initialize()",(LM_INFO,"CONFIGURATION_OK")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::initialize()",(LM_INFO,"INITIALIIZING_COMMUNICATION_LINES")); _IRA_LOGFILTER_ACTIVATE(m_configuration.getRepetitionCacheTime(),m_configuration.getRepetitionExpireTime()); try { line=new CCommandLine(getContainerServices()); m_commandLine=new CSecureArea(line); } catch (std::bad_alloc& ex) { - _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"RoachImpl::initialize()"); + _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"SardaraImpl::initialize()"); throw dummy; } - /* hostAddress=m_configuration.getDataIPAddress(); - if (hostAddress=="") { - if ((hostName=IRA::CSocket::getHostName())=="") { - _THROW_EXCPT(ComponentErrors::SocketErrorExImpl,"RoachImpl::initialize()"); - } - else { - ACS_DEBUG_PARAM("RoachImpl::initialize()","Name of the host: %s",(const char *)hostName); - } - if ((hostAddress=IRA::CSocket::getAddrbyHostName(hostName))=="") { - _THROW_EXCPT(ComponentErrors::SocketErrorExImpl,"RoachImpl::initialize()"); - } - else { - ACS_DEBUG_PARAM("RoachImpl::initialize()","Address of the host: %s",(const char *)hostAddress); - } - } - else { - ACS_DEBUG_PARAM("RoachImpl::initialize()","Address of the host: %s",(const char *)hostAddress); - } - if (m_dataLine.Create(Err,IRA::CSocket::STREAM,m_configuration.getDataPort(),&hostAddress)!=IRA::CSocket::SUCCESS) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,Err); - dummy.setCode(Err.getErrorCode()); - dummy.setDescription((const char*)Err.getDescription()); - throw dummy; - } - // sets the socket in blocking mode - if (m_dataLine.setSockMode(Err,IRA::CSocket::NONBLOCKING)!=IRA::CSocket::SUCCESS) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,Err); - dummy.setCode(Err.getErrorCode()); - dummy.setDescription((const char*)Err.getDescription()); - throw dummy; - } - // set up the listening queue to 1 - if (m_dataLine.Listen(Err,1)!=IRA::CSocket::SUCCESS) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,Err); - dummy.setCode(Err.getErrorCode()); - dummy.setDescription((const char*)Err.getDescription()); - throw dummy; - } - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"COMMUNICATION_LINE_DONE")); - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"PROPERTY_CREATION")); - */ try { m_ptime=new ROuLongLong(getContainerServices()->getName()+":time",getComponent(), new DevIOTime(m_commandLine),true); @@ -157,7 +116,7 @@ void RoachImpl::initialize() throw (ACSErr::ACSbaseExImpl) m_parser=new CParser(line,10); } catch (std::bad_alloc& ex) { - _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"RoachImpl::initialize()"); + _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"SardaraImpl::initialize()"); throw dummy; } // command parser configuration @@ -178,6 +137,7 @@ void RoachImpl::initialize() throw (ACSErr::ACSbaseExImpl) m_parser->add("getZero",new function1 >(line,&CCommandLine::getZero),0 ); m_parser->add("getTime",new function1 >(line,&CCommandLine::getTime),0 ); m_parser->add("initialize",new function1 >(line,&CCommandLine::setup),1 ); + m_parser->add("getRms",new function1 >(line,&CCommandLine::getRms),0 ); threadPar.sender=this; threadPar.command=m_commandLine; @@ -191,34 +151,34 @@ void RoachImpl::initialize() throw (ACSErr::ACSbaseExImpl) "SUPERVISOR",m_commandLine,m_configuration.getControlResponseTime()*10,m_configuration.getControlSleepTime()*10); } catch (acsthreadErrType::acsthreadErrTypeExImpl& ex) { - _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,_dummy,ex,"RoachImpl::initialize()"); + _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,_dummy,ex,"SardaraImpl::initialize()"); throw _dummy; } catch (...) { - _THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"RoachImpl::initialize()"); + _THROW_EXCPT(ComponentErrors::UnexpectedExImpl,"SardaraImpl::initialize()"); } m_initialized=true; - ACS_LOG(LM_FULL_INFO,"RoachImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZED")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::initialize()",(LM_INFO,"COMPSTATE_INITIALIZED")); } -void RoachImpl::execute() throw (ACSErr::ACSbaseExImpl) +void SardaraImpl::execute() throw (ACSErr::ACSbaseExImpl) { - AUTO_TRACE("RoachImpl::execute()"); + AUTO_TRACE("SardaraImpl::execute()"); ACS::Time time; IRA::CError error; - ACS_LOG(LM_FULL_INFO,"RoachImpl::execute()",(LM_INFO,"BACKEND_INITIAL_CONFIGURATION")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::execute()",(LM_INFO,"BACKEND_INITIAL_CONFIGURATION")); try { //sets the property defaults....some of them cannot be changed any more (hardware dependent) m_pbackendName->getDevIO()->write(getComponent()->getName(),time); } catch (ACSErr::ACSbaseExImpl& ex) { - _ADD_BACKTRACE(ComponentErrors::InitializationProblemExImpl,impl,ex,"RoachImpl::execute()"); + _ADD_BACKTRACE(ComponentErrors::InitializationProblemExImpl,impl,ex,"SardaraImpl::execute()"); throw impl; } CSecAreaResourceWrapper line=m_commandLine->Get(); - ACS_LOG(LM_FULL_INFO,"RoachImpl::execute()",(LM_INFO,"SOCKET_CONNECTING")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::execute()",(LM_INFO,"SOCKET_CONNECTING")); try { - ACS_LOG(LM_FULL_INFO,"RoachImpl::execute()",(LM_INFO,"HARDWARE_INITIALIZATION")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::execute()",(LM_INFO,"HARDWARE_INITIALIZATION")); line->Init(&m_configuration); // this could throw an ACS exception..... //line->setTime(); // this could throw ACS exceptions.... } @@ -233,19 +193,19 @@ void RoachImpl::execute() throw (ACSErr::ACSbaseExImpl) startPropertiesMonitoring(); } catch (acsthreadErrType::CanNotStartThreadExImpl& E) { - _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,__dummy,E,"RoachImpl::execute"); + _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,__dummy,E,"SardaraImpl::execute"); deleteAll(); throw __dummy; } catch (ACSErrTypeCommon::NullPointerExImpl& E) { - _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,__dummy,E,"RoachImpl::execute"); + _ADD_BACKTRACE(ComponentErrors::ThreadErrorExImpl,__dummy,E,"SardaraImpl::execute"); deleteAll(); throw __dummy; } - ACS_LOG(LM_FULL_INFO,"RoachImpl::execute()",(LM_INFO,"COMPSTATE_OPERATIONAL")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::execute()",(LM_INFO,"COMPSTATE_OPERATIONAL")); } -void RoachImpl::deleteAll() +void SardaraImpl::deleteAll() { IRA::CError err; if (m_initialized) { @@ -273,32 +233,32 @@ void RoachImpl::deleteAll() } // need to be closed before the thread that makes use of it // m_dataLine.Close(err); - // ACS_LOG(LM_FULL_INFO,"RoachImpl::deleteAll()",(LM_INFO,"DATA_LINE_CLOSED")); + // ACS_LOG(LM_FULL_INFO,"SardaraImpl::deleteAll()",(LM_INFO,"DATA_LINE_CLOSED")); _IRA_LOGFILTER_FLUSH; _IRA_LOGFILTER_DESTROY; - ACS_LOG(LM_FULL_INFO,"RoachImpl::deleteAll()",(LM_INFO,"LOGS_FLUSHED")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::deleteAll()",(LM_INFO,"LOGS_FLUSHED")); m_initialized=false; } } -void RoachImpl::cleanUp() +void SardaraImpl::cleanUp() { - AUTO_TRACE("RoachImpl::cleanUp()"); + AUTO_TRACE("SardaraImpl::cleanUp()"); stopPropertiesMonitoring(); deleteAll(); CharacteristicComponentImpl::cleanUp(); } -void RoachImpl::aboutToAbort() +void SardaraImpl::aboutToAbort() { - AUTO_TRACE("RoachImpl::aboutToAbort()"); + AUTO_TRACE("SardaraImpl::aboutToAbort()"); deleteAll(); } -void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, +void SardaraImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx) { - AUTO_TRACE("RoachImpl::sendHeader()"); + AUTO_TRACE("SardaraImpl::sendHeader()"); Backends::TMainHeader header; Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; //DWORD tpi[MAX_SECTION_NUMBER]; @@ -317,7 +277,7 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendHeader()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendHeader()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } @@ -334,13 +294,13 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back sizeof(Backends::TMainHeader)+header.sections*sizeof(Backends::TSectionHeader)); } catch (AVStartSendErrorExImpl& ex) { - _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"RoachImpl::sendHeader()"); + _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"SardaraImpl::sendHeader()"); impl.setDetails("main header could not be sent"); impl.log(LM_DEBUG); throw impl.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"RoachImpl::sendHeader()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"SardaraImpl::sendHeader()"); impl.log(LM_DEBUG); throw impl.getComponentErrorsEx(); } @@ -360,7 +320,7 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back chHeader[h].feed); }*/ #endif - ACS_LOG(LM_FULL_INFO,"RoachImpl::sendHeader()",(LM_INFO,"HEADERS_SENT")); + ACS_LOG(LM_FULL_INFO,"SardaraImpl::sendHeader()",(LM_INFO,"HEADERS_SENT")); // inform the sender thread about the configuration...... m_senderThread->saveDataHeader(&header,chHeader); // measure the zero tpi @@ -377,7 +337,7 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendHeader()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendHeader()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); }*/ @@ -399,16 +359,16 @@ void RoachImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Back throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendHeader()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendHeader()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); }*/ } -void RoachImpl::terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, +void SardaraImpl::terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx) { - AUTO_TRACE("RoachImpl::terminate()"); + AUTO_TRACE("SardaraImpl::terminate()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->stopDataAcquisition(); @@ -422,17 +382,17 @@ void RoachImpl::terminate() throw (CORBA::SystemException, BackendsErrors::Backe throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::terminate()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::terminate()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::sendData(ACS::Time startTime) throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, +void SardaraImpl::sendData(ACS::Time startTime) throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx) { - AUTO_TRACE("RoachImpl::sendData()"); + AUTO_TRACE("SardaraImpl::sendData()"); TIMEVALUE now; ACS::Time expectedStartTime; @@ -449,7 +409,7 @@ void RoachImpl::sendData(ACS::Time startTime) throw (CORBA::SystemException, Bac throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendData()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendData()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } @@ -460,11 +420,11 @@ void RoachImpl::sendData(ACS::Time startTime) throw (CORBA::SystemException, Bac //m_senderThread->resumeTransfer(); } -void RoachImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, +void SardaraImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, ComponentErrors::ComponentErrorsEx) { - AUTO_TRACE("RoachImpl::sendStop()"); + AUTO_TRACE("SardaraImpl::sendStop()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { @@ -479,7 +439,7 @@ void RoachImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::Backen throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendStop()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendStop()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } @@ -491,12 +451,12 @@ void RoachImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::Backen getSender()->stopSend(FLOW_NUMBER); } catch (AVStopSendErrorExImpl& ex) { - _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"RoachImpl::sendStop()"); + _ADD_BACKTRACE(BackendsErrors::TXErrorExImpl,impl,ex,"SardaraImpl::sendStop()"); impl.setDetails("stop message could not be sent"); throw impl.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"RoachImpl::sendStop()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"SardaraImpl::sendStop()"); throw impl.getComponentErrorsEx(); } @@ -512,40 +472,16 @@ void RoachImpl::sendStop() throw (CORBA::SystemException, BackendsErrors::Backen throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::sendStop()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendStop()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -/*void RoachImpl::setAllSections(CORBA::Double freq,CORBA::Double bw,CORBA::Long feed,Backends::TPolarization pol,CORBA::Double sr,CORBA::Long bins) throw ( - CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) -{ - AUTO_TRACE("RoachImpl::setAllSections()"); - CSecAreaResourceWrapper line=m_commandLine->Get(); - try { - line->setConfiguration(-1,freq,bw,sr,att,pol,bins); - } - catch (ComponentErrors::ComponentErrorsExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getComponentErrorsEx(); - } - catch (BackendsErrors::BackendsErrorsExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getBackendsErrorsEx(); - } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setAllSections()"); - dummy.log(LM_DEBUG); - throw dummy.getComponentErrorsEx(); - } -}*/ - - -void RoachImpl::setSection(CORBA::Long input,CORBA::Double freq,CORBA::Double bw,CORBA::Long feed,CORBA::Long pol,CORBA::Double sr,CORBA::Long bins) throw ( +void SardaraImpl::setSection(CORBA::Long input,CORBA::Double freq,CORBA::Double bw,CORBA::Long feed,CORBA::Long pol,CORBA::Double sr,CORBA::Long bins) throw ( CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::setSection()"); + AUTO_TRACE("SardaraImpl::setSection()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->setConfiguration(input,freq,bw,feed,pol,sr,bins); @@ -559,21 +495,29 @@ void RoachImpl::setSection(CORBA::Long input,CORBA::Double freq,CORBA::Double bw throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setSection()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::setSection()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, +void SardaraImpl::setTargetFileName (const char * fileName) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::setTargetFileName()"); + AUTO_TRACE("SardaraImpl::setTargetFileName()"); CSecAreaResourceWrapper line=m_commandLine->Get(); line->setTargetFileName(fileName); +} - /*try { +ACS::doubleSeq *SardaraImpl::getRms() throw (CORBA::SystemException, + ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) +{ + AUTO_TRACE("SardaraImpl::getRms()"); + CSecAreaResourceWrapper line=m_commandLine->Get(); + ACS::doubleSeq_var rms=new ACS::doubleSeq; + try { + line->getRms(rms); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { ex.log(LM_DEBUG); @@ -581,20 +525,20 @@ void RoachImpl::setTargetFileName (const char * fileName) throw (CORBA::SystemEx } catch (BackendsErrors::BackendsErrorsExImpl& ex) { ex.log(LM_DEBUG); - throw ex.getBackendsErrorsEx(); + throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setSection()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::getRms()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); - }*/ - + } + return rms._retn(); } -ACS::doubleSeq *RoachImpl::getTpi() throw (CORBA::SystemException, +ACS::doubleSeq *SardaraImpl::getTpi() throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::getTpi()"); + AUTO_TRACE("SardaraImpl::getTpi()"); CSecAreaResourceWrapper line=m_commandLine->Get(); ACS::doubleSeq_var tpi=new ACS::doubleSeq; try { @@ -609,17 +553,17 @@ ACS::doubleSeq *RoachImpl::getTpi() throw (CORBA::SystemException, throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::getTpi()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::getTpi()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } return tpi._retn(); } -ACS::doubleSeq * RoachImpl::getZero () throw (CORBA::SystemException, +ACS::doubleSeq * SardaraImpl::getZero () throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::getZero()"); + AUTO_TRACE("SardaraImpl::getZero()"); CSecAreaResourceWrapper line=m_commandLine->Get(); ACS::doubleSeq_var tpi=new ACS::doubleSeq; //TODO: how many sections???? @@ -638,28 +582,28 @@ ACS::doubleSeq * RoachImpl::getZero () throw (CORBA::SystemException, throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::getZero()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::getZero()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } return tpi._retn(); } -void RoachImpl::setKelvinCountsRatio(const ACS::doubleSeq& ratio, const ACS::doubleSeq& tsys) throw (CORBA::SystemException) +void SardaraImpl::setKelvinCountsRatio(const ACS::doubleSeq& ratio, const ACS::doubleSeq& tsys) throw (CORBA::SystemException) { - AUTO_TRACE("RoachImpl::setKelvinCountsRatio()"); + AUTO_TRACE("SardaraImpl::setKelvinCountsRatio()"); CSecAreaResourceWrapper line=m_commandLine->Get(); line->saveTsys(tsys,ratio); //if (m_senderThread) { //m_senderThread->setKelvinCountsRatio(ratio); - //ACS_LOG(LM_FULL_INFO,"RoachImpl::setKelvinCountsRatio()",(LM_INFO,"KELVIN_COUNTS_CONVERSION_FACTOR_SET")); + //ACS_LOG(LM_FULL_INFO,"SardaraImpl::setKelvinCountsRatio()",(LM_INFO,"KELVIN_COUNTS_CONVERSION_FACTOR_SET")); //} } -void RoachImpl::enableChannels(const ACS::longSeq& enable) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, +void SardaraImpl::enableChannels(const ACS::longSeq& enable) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::enableChannels()"); + AUTO_TRACE("SardaraImpl::enableChannels()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->setEnabled(enable); @@ -673,16 +617,16 @@ void RoachImpl::enableChannels(const ACS::longSeq& enable) throw (CORBA::SystemE throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::enableChannels()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::enableChannels()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::setTime() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, +void SardaraImpl::setTime() throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::setTime()"); + AUTO_TRACE("SardaraImpl::setTime()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->setTime(); @@ -696,15 +640,15 @@ void RoachImpl::setTime() throw (CORBA::SystemException,ComponentErrors::Compone throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setTime()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::setTime()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) +void SardaraImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::setAttenutation()"); + AUTO_TRACE("SardaraImpl::setAttenutation()"); CSecAreaResourceWrapper line=m_commandLine->Get(); /*try { line->setAttenuation(input,att); @@ -718,18 +662,18 @@ void RoachImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (CORBA throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setAttenutation()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::setAttenutation()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); }*/ } -CORBA::Long RoachImpl::getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException, +CORBA::Long SardaraImpl::getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { long inputs; ACS::longSeq pol; - AUTO_TRACE("RoachImpl::getInputs()"); + AUTO_TRACE("SardaraImpl::getInputs()"); CSecAreaResourceWrapper line=m_commandLine->Get(); //no need to take care of freeing allocated memory in case of exception because there are no except........ freq=new ACS::doubleSeq; @@ -745,10 +689,10 @@ CORBA::Long RoachImpl::getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out band } -void RoachImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) throw (CORBA::SystemException, +void SardaraImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::activateNoiseCalibrationSwitching()"); + AUTO_TRACE("SardaraImpl::activateNoiseCalibrationSwitching()"); CSecAreaResourceWrapper line=m_commandLine->Get(); /*try { line->activateCalSwitching(interleave); // NOT YET AVAILABLE @@ -762,16 +706,16 @@ void RoachImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) throw throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::activateNoiseCalibrationSwitching()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::activateNoiseCalibrationSwitching()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); }*/ } -void RoachImpl::initialize(const char * configuration) throw (CORBA::SystemException, +void SardaraImpl::initialize(const char * configuration) throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::initialize()"); + AUTO_TRACE("SardaraImpl::initialize()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->setup(configuration); @@ -785,16 +729,16 @@ void RoachImpl::initialize(const char * configuration) throw (CORBA::SystemExcep throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::initialize()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::initialize()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::setIntegration(CORBA::Long Integration) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, +void SardaraImpl::setIntegration(CORBA::Long Integration) throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx, BackendsErrors::BackendsErrorsEx) { - AUTO_TRACE("RoachImpl::setIntegration()"); + AUTO_TRACE("SardaraImpl::setIntegration()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->setIntegration(Integration); @@ -808,15 +752,15 @@ void RoachImpl::setIntegration(CORBA::Long Integration) throw (CORBA::SystemExce throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::setIntegration()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::setIntegration()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::getConfiguration (CORBA::String_out configuration) throw (CORBA::SystemException) +void SardaraImpl::getConfiguration (CORBA::String_out configuration) throw (CORBA::SystemException) { - AUTO_TRACE("RoachImpl::getIntegration()"); + AUTO_TRACE("SardaraImpl::getIntegration()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->getConfiguration(configuration); @@ -830,15 +774,15 @@ void RoachImpl::getConfiguration (CORBA::String_out configuration) throw (CORBA: throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::getConfiguration()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::getConfiguration()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -void RoachImpl::getCommProtVersion (CORBA::String_out version) throw (CORBA::SystemException) +void SardaraImpl::getCommProtVersion (CORBA::String_out version) throw (CORBA::SystemException) { - AUTO_TRACE("RoachImpl::getCommProtVersion()"); + AUTO_TRACE("SardaraImpl::getCommProtVersion()"); CSecAreaResourceWrapper line=m_commandLine->Get(); try { line->getCommProtVersion(version); @@ -852,15 +796,15 @@ void RoachImpl::getCommProtVersion (CORBA::String_out version) throw (CORBA::Sys throw ex.getBackendsErrorsEx(); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"RoachImpl::getCommProtVersion()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::getCommProtVersion()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); } } -CORBA::Boolean RoachImpl::command(const char *cmd,CORBA::String_out answer) throw (CORBA::SystemException) +CORBA::Boolean SardaraImpl::command(const char *cmd,CORBA::String_out answer) throw (CORBA::SystemException) { - AUTO_TRACE("RoachImpl::command()"); + AUTO_TRACE("SardaraImpl::command()"); IRA::CString out; bool res; // this is a cheat....it forces the acquisition of the mutex before the parser. It works only because the parser has no async behaviour configured @@ -880,23 +824,23 @@ CORBA::Boolean RoachImpl::command(const char *cmd,CORBA::String_out answer) thro return res; } -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROuLongLong,m_ptime,time); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROstring,m_pbackendName,backendName); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROdoubleSeq,m_pbandWidth,bandWidth); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROdoubleSeq,m_pfrequency,frequency); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROdoubleSeq,m_psampleRate,sampleRate); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROdoubleSeq,m_pattenuation,attenuation); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlongSeq,m_ppolarization,polarization); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlongSeq,m_pbins,bins); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlong,m_pinputsNumber,inputsNumber); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlong,m_pintegration,integration); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROpattern,m_pstatus,status); -_PROPERTY_REFERENCE_CPP(RoachImpl,Management::ROTBoolean,m_pbusy,busy); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlongSeq,m_pfeed,feed); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROdoubleSeq,m_ptsys,systemTemperature); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlong,m_psectionsNumber,sectionsNumber); -_PROPERTY_REFERENCE_CPP(RoachImpl,ACS::ROlongSeq,m_pinputSection,inputSection); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROuLongLong,m_ptime,time); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROstring,m_pbackendName,backendName); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROdoubleSeq,m_pbandWidth,bandWidth); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROdoubleSeq,m_pfrequency,frequency); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROdoubleSeq,m_psampleRate,sampleRate); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROdoubleSeq,m_pattenuation,attenuation); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlongSeq,m_ppolarization,polarization); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlongSeq,m_pbins,bins); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlong,m_pinputsNumber,inputsNumber); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlong,m_pintegration,integration); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROpattern,m_pstatus,status); +_PROPERTY_REFERENCE_CPP(SardaraImpl,Management::ROTBoolean,m_pbusy,busy); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlongSeq,m_pfeed,feed); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROdoubleSeq,m_ptsys,systemTemperature); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlong,m_psectionsNumber,sectionsNumber); +_PROPERTY_REFERENCE_CPP(SardaraImpl,ACS::ROlongSeq,m_pinputSection,inputSection); /* --------------- [ MACI DLL support functions ] -----------------*/ #include -MACI_DLL_SUPPORT_FUNCTIONS(RoachImpl) +MACI_DLL_SUPPORT_FUNCTIONS(SardaraImpl) diff --git a/Common/Servers/Roach/src/SenderThread.cpp b/Common/Servers/Sardara/src/SenderThread.cpp similarity index 99% rename from Common/Servers/Roach/src/SenderThread.cpp rename to Common/Servers/Sardara/src/SenderThread.cpp index 40cec9d2d..2e27c0145 100644 --- a/Common/Servers/Roach/src/SenderThread.cpp +++ b/Common/Servers/Sardara/src/SenderThread.cpp @@ -1,6 +1,6 @@ // $Id: SenderThread.cpp,v 1.2 2011-05-12 14:14:31 a.orlati Exp $ -#include "RoachImpl.h" +#include "SardaraImpl.h" #include "CommandLine.h" #include "SenderThread.h" #include diff --git a/Common/Servers/Roach/src/_send_backend_command b/Common/Servers/Sardara/src/_send_backend_command similarity index 100% rename from Common/Servers/Roach/src/_send_backend_command rename to Common/Servers/Sardara/src/_send_backend_command diff --git a/Common/Servers/Scheduler/src/Core.cpp b/Common/Servers/Scheduler/src/Core.cpp index 4ba2b65b2..7a09fe245 100644 --- a/Common/Servers/Scheduler/src/Core.cpp +++ b/Common/Servers/Scheduler/src/Core.cpp @@ -179,6 +179,7 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: m_parser->add("getZero","backend",3,&CCore::remoteCall); m_parser->add("initialize","backend",3,&CCore::remoteCall); m_parser->add("calSwitch","backend",3,&CCore::remoteCall); + m_parser->add("getRms","backend",3,&CCore::remoteCall); // minor servo m_parser->add("servoSetup","minorservo",4,&CCore::remoteCall); diff --git a/Common/Servers/TotalPower/include/TotalPowerImpl.h b/Common/Servers/TotalPower/include/TotalPowerImpl.h index b37bebb34..91daaafbb 100644 --- a/Common/Servers/TotalPower/include/TotalPowerImpl.h +++ b/Common/Servers/TotalPower/include/TotalPowerImpl.h @@ -322,6 +322,8 @@ public: */ virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + virtual ACS::doubleSeq * getRms () throw (CORBA::SystemException, + ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;}; /** * Call this function in order to get a total power measure for each input channel. The measure is done when the inputs are directly diff --git a/Common/Servers/XBackend/include/XBackendsImpl.h b/Common/Servers/XBackend/include/XBackendsImpl.h index b9c3b5e54..a34842b9d 100644 --- a/Common/Servers/XBackend/include/XBackendsImpl.h +++ b/Common/Servers/XBackend/include/XBackendsImpl.h @@ -150,6 +150,8 @@ public: */ virtual ACS::doubleSeq * getTpi () throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx); + virtual ACS::doubleSeq * getRms () + throw (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx) {return 0;}; /** * This method is used to inform the component about the proper conversion factor between Kelvin and counts. This value is used for the tsys computation during * the sampling. If this method is never issued the default value of 1 will be used for all the channels. diff --git a/Medicina/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml b/Medicina/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml similarity index 77% rename from Medicina/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml rename to Medicina/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml index f3c345f73..581ce3e1d 100644 --- a/Medicina/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml +++ b/Medicina/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml @@ -8,10 +8,10 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="Roach" - Code="RoachImpl" - Type="IDL:alma/Backends/Roach:1.0" - Container="RoachContainer" + Name="Sardara" + Code="SardaraImpl" + Type="IDL:alma/Backends/Sardara:1.0" + Container="SardaraContainer" KeepAliveTime="-1" ImplLang="cpp" /> diff --git a/Medicina/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml b/Medicina/Configuration/CDB/MACI/Containers/SardaraContainer/SardaraContainer.xml similarity index 100% rename from Medicina/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml rename to Medicina/Configuration/CDB/MACI/Containers/SardaraContainer/SardaraContainer.xml diff --git a/Medicina/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml b/Medicina/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml similarity index 92% rename from Medicina/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml rename to Medicina/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml index 70e69dae9..9a4cff6eb 100644 --- a/Medicina/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml +++ b/Medicina/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml @@ -3,7 +3,7 @@ - History: - Wed Apr 13 15:18:03 UTC 2005 modified by Andrea Orlati --> - - + diff --git a/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml b/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml index d9a1df531..6e634cc88 100644 --- a/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml +++ b/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml @@ -21,6 +21,6 @@ - + diff --git a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml b/Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml similarity index 98% rename from SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml rename to Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml index db8142607..177d103b2 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml +++ b/Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml @@ -1,6 +1,6 @@ - @@ -215,4 +215,4 @@ 1024 - + diff --git a/SRT/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml b/SRT/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml similarity index 77% rename from SRT/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml rename to SRT/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml index f3c345f73..581ce3e1d 100644 --- a/SRT/Configuration/CDB/MACI/Components/BACKENDS/Roach/Roach.xml +++ b/SRT/Configuration/CDB/MACI/Components/BACKENDS/Sardara/Sardara.xml @@ -8,10 +8,10 @@ xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - Name="Roach" - Code="RoachImpl" - Type="IDL:alma/Backends/Roach:1.0" - Container="RoachContainer" + Name="Sardara" + Code="SardaraImpl" + Type="IDL:alma/Backends/Sardara:1.0" + Container="SardaraContainer" KeepAliveTime="-1" ImplLang="cpp" /> diff --git a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml deleted file mode 100644 index 6e49e217f..000000000 --- a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/SRT/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml b/SRT/Configuration/CDB/MACI/Containers/SardaraContainer/SardaraContainer.xml similarity index 100% rename from SRT/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml rename to SRT/Configuration/CDB/MACI/Containers/SardaraContainer/SardaraContainer.xml diff --git a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml similarity index 88% rename from SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml rename to SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml index c524893f7..5d829cb47 100644 --- a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml +++ b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml @@ -3,7 +3,7 @@ - History: - Wed Apr 13 15:18:03 UTC 2005 modified by Andrea Orlati --> - - + diff --git a/SRT/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml b/SRT/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml index 2f7952d28..4e1342187 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml @@ -22,7 +22,7 @@ - + diff --git a/Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml similarity index 58% rename from Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml rename to SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml index ad4f463c5..177d103b2 100644 --- a/Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml @@ -1,13 +1,13 @@ - - RK00 - 2 + SK00 + 2 TRUE GREGORIAN 1 @@ -21,7 +21,37 @@ - RK77 + SK03 + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + L R L R + 0 0 3 3 + 0 1 0 1 + 1024 + + + + SK06 + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + L R L R + 0 0 6 6 + 0 1 0 1 + 1024 + + + + SK77 14 TRUE GREGORIAN @@ -36,10 +66,10 @@ - RC00 + SC00 2 TRUE - GREGORIAN + BWG 1 1500.0 9.0 @@ -51,7 +81,7 @@ - RL00 + SL00 2 TRUE PRIMARY @@ -66,7 +96,7 @@ - RP00 + SP00 2 TRUE PRIMARY @@ -81,78 +111,108 @@ - RK00S - 1 + SK00S + 2 TRUE GREGORIAN 1 1500.0 7.0 - 0 1 - S + 0 1 2 3 + S S 0 0 0 1 1024 - RK77S - 7 + SK03S + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + S S S S + 0 0 3 3 + 0 1 0 1 + 1024 + + + + SK06S + 4 + TRUE + GREGORIAN + 2 + 1500.0 + 7.0 + 0 1 2 3 + S S S S + 0 0 6 6 + 0 1 0 1 + 1024 + + + + SK77S + 14 TRUE GREGORIAN 7 1500.0 7.0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - S S S S S S S + S S S S S S S S S S S S S S 0 0 1 1 2 2 3 3 4 4 5 5 6 6 0 1 0 1 0 1 0 1 0 1 0 1 0 1 1024 - RC00S - 1 + SC00S + 2 TRUE BWG 1 1500.0 9.0 0 1 - S + S S 0 0 0 1 1024 - RL00S - 1 + SL00S + 2 TRUE PRIMARY 1 1500.0 10.0 2 3 - S + S S 0 0 0 1 1024 - RP00S - 1 + SP00S + 2 TRUE PRIMARY 1 500.0 10.0 0 1 - S + S S 0 0 0 1 1024 - + diff --git a/SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml b/SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml deleted file mode 100644 index e07e01a73..000000000 --- a/SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/SystemMake/Makefile b/SystemMake/Makefile index 540d9a230..cefa177bb 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -34,7 +34,7 @@ COMMON_LIBRARIES:=SlaLibrary IRALibrary TextWindowLibrary ParserLibrary \ COMMON_SERVERS:=AntennaBoss Observatory OTF PointingModel Refraction SkySource \ Moon FitsWriter Scheduler ReceiversBoss ExternalClients \ CalibrationTool TotalPower NoiseGenerator CustomLogger \ - XBackend PyDewarPositioner Roach #DBBC + XBackend PyDewarPositioner Sardara #DBBC COMMON_CLIENTS:=AntennaBossTextClient ObservatoryTextClient \ GenericBackendTextClient ReceiversBossTextClient \ SystemTerminal CaltoolClient CustomLoggingClient \ -- GitLab From ca7abd353cf95ce4622c52de33ebe9e004993be2 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 2 Jul 2018 19:55:50 +0200 Subject: [PATCH 121/145] Fix #230, done a little rework to the SRT active surface. (#231) --- .../src/SRTActiveSurfaceCore.cpp | 3 + .../src/SRTActiveSurfaceGUI.ui | 2 +- .../src/SRTActiveSurfaceGUIui.cpp | 3 + SRT/Configuration/CDB/alma/AS/Boss/Boss.xml | 25 +++- .../idl/SRTActiveSurfaceBoss.midl | 5 +- .../src/SRTActiveSurfaceBossCore.cpp | 117 ++++++++++-------- .../src/SRTActiveSurfaceBossImpl.cpp | 46 +------ .../SRTActiveSurfaceUSDServer/src/usdImpl.cpp | 6 +- 8 files changed, 108 insertions(+), 99 deletions(-) diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp index 0c2ffdca5..5b8fe1653 100644 --- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp +++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp @@ -104,6 +104,9 @@ void SRTActiveSurfaceCore::run(void) case (ActiveSurface::AS_PARABOLIC_FIXED): asProfileCode = 3; break; + case (ActiveSurface::AS_PARK): + asProfileCode = 4; + break; } emit setGUIasProfileCode(); diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui index 23236745a..2bce96583 100644 --- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui +++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUI.ui @@ -23,7 +23,7 @@ - SRT Active Surface ver. Apr. 14 + SRT Active Surface diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp index d5d300002..50ba4bb31 100644 --- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp +++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp @@ -10260,6 +10260,9 @@ void SRTActiveSurfaceGUI::changeGUIasProfileCode() case (3): ProfilelineEdit_2->setText(QApplication::translate("SRTActiveSurfaceGUI", "PARABOLIC FIXED", 0, QApplication::UnicodeUTF8)); break; + case (4): + ProfilelineEdit_2->setText(QApplication::translate("SRTActiveSurfaceGUI", "PARK", 0, QApplication::UnicodeUTF8)); + break; } } diff --git a/SRT/Configuration/CDB/alma/AS/Boss/Boss.xml b/SRT/Configuration/CDB/alma/AS/Boss/Boss.xml index 2a8627286..d957ada29 100644 --- a/SRT/Configuration/CDB/alma/AS/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/AS/Boss/Boss.xml @@ -362,8 +362,31 @@ - Tue Jun 16 11:14:42 UTC 2015 modified by jDAL - Tue Jun 16 12:46:30 UTC 2015 modified by jDAL - Tue Jun 16 13:00:45 UTC 2015 modified by jDAL + - Mon Jun 18 10:00:57 UTC 2018 modified by jDAL + - Mon Jun 18 10:24:27 UTC 2018 modified by jDAL + - Mon Jun 18 10:46:37 UTC 2018 modified by jDAL + - Mon Jun 18 10:59:48 UTC 2018 modified by jDAL + - Mon Jun 18 14:46:50 UTC 2018 modified by jDAL + - Thu Jun 21 08:14:37 UTC 2018 modified by jDAL + - Thu Jun 21 08:37:56 UTC 2018 modified by jDAL + - Thu Jun 21 12:05:20 UTC 2018 modified by jDAL + - Thu Jun 21 12:27:04 UTC 2018 modified by jDAL + - Thu Jun 21 12:27:56 UTC 2018 modified by jDAL + - Thu Jun 21 12:28:18 UTC 2018 modified by jDAL + - Fri Jun 22 08:39:42 UTC 2018 modified by jDAL + - Fri Jun 22 08:40:21 UTC 2018 modified by jDAL + - Fri Jun 22 08:52:18 UTC 2018 modified by jDAL + - Fri Jun 22 09:24:37 UTC 2018 modified by jDAL + - Fri Jun 22 09:37:04 UTC 2018 modified by jDAL + - Fri Jun 22 10:06:01 UTC 2018 modified by jDAL + - Fri Jun 22 13:50:49 UTC 2018 modified by jDAL + - Fri Jun 22 14:01:54 UTC 2018 modified by jDAL + - Tue Jun 26 14:22:54 UTC 2018 modified by jDAL + - Tue Jun 26 14:24:02 UTC 2018 modified by jDAL + - Tue Jun 26 14:34:39 UTC 2018 modified by jDAL + - Tue Jun 26 14:35:27 UTC 2018 modified by jDAL --> - + diff --git a/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl b/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl index 952434360..ea7e1c3f6 100644 --- a/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl +++ b/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl @@ -40,9 +40,10 @@ module ActiveSurface { enum TASProfile { AS_SHAPED, - AS_SHAPED_FIXED, + AS_SHAPED_FIXED, AS_PARABOLIC, - AS_PARABOLIC_FIXED + AS_PARABOLIC_FIXED, + AS_PARK }; ACS_ENUM(TASProfile); diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp index d4844d5da..2d74b2570 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp @@ -18,12 +18,12 @@ void CSRTActiveSurfaceBossCore::initialize() { ACS_LOG(LM_FULL_INFO,"CSRTActiveSurfaceBossCore::initialize()",(LM_INFO,"CSRTActiveSurfaceBossCore::initialize")); - m_enable = false; + m_enable = false; m_tracking = false; - m_status = Management::MNG_WARNING; + m_status = Management::MNG_WARNING; m_profile = ActiveSurface::AS_SHAPED_FIXED; - AutoUpdate = false; - actuatorcounter = circlecounter = totacts = 1; + AutoUpdate = false; + actuatorcounter = circlecounter = totacts = 1; m_sector1 = false; m_sector2 = false; m_sector3 = false; @@ -1389,7 +1389,8 @@ void CSRTActiveSurfaceBossCore::sector1ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 139; i++) { + //for (i = 1; i <= 139; i++) { + for (i = 1; i <= 1; i++) { usdTableS1 >> lanIndexS1 >> circleIndexS1 >> usdCircleIndexS1 >> serial_usd >> graf >> mecc; usd[circleIndexS1][usdCircleIndexS1] = ActiveSurface::USD::_nil(); try { @@ -1423,7 +1424,8 @@ void CSRTActiveSurfaceBossCore::sector2ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 140; i++) { + //for (i = 1; i <= 140; i++) { + for (i = 1; i <= 1; i++) { usdTableS2 >> lanIndexS2 >> circleIndexS2 >> usdCircleIndexS2 >> serial_usd >> graf >> mecc; usd[circleIndexS2][usdCircleIndexS2] = ActiveSurface::USD::_nil(); try { @@ -1458,7 +1460,8 @@ void CSRTActiveSurfaceBossCore::sector3ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 139; i++) { + //for (i = 1; i <= 139; i++) { + for (i = 1; i <= 1; i++) { usdTableS3 >> lanIndexS3 >> circleIndexS3 >> usdCircleIndexS3 >> serial_usd >> graf >> mecc; usd[circleIndexS3][usdCircleIndexS3] = ActiveSurface::USD::_nil(); try { @@ -1493,7 +1496,8 @@ void CSRTActiveSurfaceBossCore::sector4ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 140; i++) { + //for (i = 1; i <= 140; i++) { + for (i = 1; i <= 1; i++) { usdTableS4 >> lanIndexS4 >> circleIndexS4 >> usdCircleIndexS4 >> serial_usd >> graf >> mecc; usd[circleIndexS4][usdCircleIndexS4] = ActiveSurface::USD::_nil(); try { @@ -1528,7 +1532,8 @@ void CSRTActiveSurfaceBossCore::sector5ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 139; i++) { + //for (i = 1; i <= 139; i++) { + for (i = 1; i <= 1; i++) { usdTableS5 >> lanIndexS5 >> circleIndexS5 >> usdCircleIndexS5 >> serial_usd >> graf >> mecc; usd[circleIndexS5][usdCircleIndexS5] = ActiveSurface::USD::_nil(); try { @@ -1563,7 +1568,8 @@ void CSRTActiveSurfaceBossCore::sector6ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 140; i++) { + //for (i = 1; i <= 140; i++) { + for (i = 1; i <= 1; i++) { usdTableS6 >> lanIndexS6 >> circleIndexS6 >> usdCircleIndexS6 >> serial_usd >> graf >> mecc; usd[circleIndexS6][usdCircleIndexS6] = ActiveSurface::USD::_nil(); try { @@ -1598,7 +1604,8 @@ void CSRTActiveSurfaceBossCore::sector7ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 139; i++) { + //for (i = 1; i <= 139; i++) { + for (i = 1; i <= 1; i++) { usdTableS7 >> lanIndexS7 >> circleIndexS7 >> usdCircleIndexS7 >> serial_usd >> graf >> mecc; usd[circleIndexS7][usdCircleIndexS7] = ActiveSurface::USD::_nil(); try { @@ -1633,7 +1640,8 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - for (i = 1; i <= 140; i++) { + //for (i = 1; i <= 140; i++) { + for (i = 1; i <= 1; i++) { usdTableS8 >> lanIndexS8 >> circleIndexS8 >> usdCircleIndexS8 >> serial_usd >> graf >> mecc; usd[circleIndexS8][usdCircleIndexS8] = ActiveSurface::USD::_nil(); try { @@ -1655,35 +1663,35 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C void CSRTActiveSurfaceBossCore::workingActiveSurface() throw (ComponentErrors::CORBAProblemExImpl, ComponentErrors::ComponentErrorsEx) { - if (AutoUpdate) { - TIMEVALUE now; - double azimuth=0.0; - double elevation=0.0; + if (AutoUpdate) { + TIMEVALUE now; + double azimuth=0.0; + double elevation=0.0; IRA::CIRATools::getTime(now); if (!CORBA::is_nil(m_antennaBoss)) { - try { - m_antennaBoss->getRawCoordinates(now.value().value, azimuth, elevation); - } - catch (CORBA::SystemException& ex) { - _EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CSRTActiveSurfaceBossCore::workingActiveSurface()"); - impl.setName(ex._name()); - impl.setMinor(ex.minor()); - m_status=Management::MNG_WARNING; - asPark(); - throw impl; - } - azimuth = 0.0; - try { - onewayAction(ActiveSurface::AS_UPDATE, 0, 0, 0, elevation*DR2D, 0, 0, m_profile); - } - catch (ComponentErrors::ComponentErrorsExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getComponentErrorsEx(); - } + try { + m_antennaBoss->getRawCoordinates(now.value().value, azimuth, elevation); + } + catch (CORBA::SystemException& ex) { + _EXCPT(ComponentErrors::CORBAProblemExImpl,impl,"CSRTActiveSurfaceBossCore::workingActiveSurface()"); + impl.setName(ex._name()); + impl.setMinor(ex.minor()); + m_status=Management::MNG_WARNING; + //asPark(); + throw impl; + } + azimuth = 0.0; + try { + onewayAction(ActiveSurface::AS_UPDATE, 0, 0, 0, elevation*DR2D, 0, 0, m_profile); + } + catch (ComponentErrors::ComponentErrorsExImpl& ex) { + ex.log(LM_DEBUG); + throw ex.getComponentErrorsEx(); + } } - } + } } void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newProfile) throw (ComponentErrors::ComponentErrorsExImpl) @@ -1724,32 +1732,30 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP m_ASup=true; m_status=Management::MNG_OK; - +/* if (usdCounter < (int)lastUSD*WARNINGUSDPERCENT) { m_status=Management::MNG_WARNING; } - if (usdCounter < (int)lastUSD*ERRORUSDPERCENT) { - m_status=Management::MNG_FAILURE; + if (usdCounter < (int)lastUSD*ERRORUSDPERCENT) { + m_status=Management::MNG_FAILURE; m_ASup=false; } - //printf("usdCounter = %d\n", usdCounter); +*/ } if (m_ASup == true) { + asOff(); CIRATools::Wait(1000000); _SET_CDB_CORE(profile, newProfile,"SRTActiveSurfaceBossCore::setProfile") m_profile = newProfile; try { onewayAction(ActiveSurface::AS_PROFILE, 0, 0, 0, 0, 0, 0, newProfile); - } - catch (ComponentErrors::ComponentErrorsExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getComponentErrorsEx(); - } - + } + catch (ComponentErrors::ComponentErrorsExImpl& ex) { + ex.log(LM_DEBUG); + throw ex.getComponentErrorsEx(); + } m_profileSetted = true; - - CIRATools::Wait(1000000); asOn(); } } @@ -1768,11 +1774,14 @@ void CSRTActiveSurfaceBossCore::asSetup() throw (ComponentErrors::ComponentError void CSRTActiveSurfaceBossCore::asOn() { if (m_profileSetted == true ) { - if ((m_profile != ActiveSurface::AS_PARABOLIC_FIXED) && (m_profile != ActiveSurface::AS_SHAPED_FIXED)) { + if ((m_profile != ActiveSurface::AS_PARABOLIC_FIXED) && (m_profile != ActiveSurface::AS_SHAPED_FIXED) && (m_profile != ActiveSurface::AS_PARK)) { enableAutoUpdate(); m_tracking = true; } else { + asOff(); + CIRATools::Wait(1000000); + //disableAutoUpdate(); m_tracking = false; try { onewayAction(ActiveSurface::AS_UPDATE, 0, 0, 0, 45.0, 0, 0, m_profile); @@ -1792,15 +1801,17 @@ void CSRTActiveSurfaceBossCore::asPark() throw (ComponentErrors::ComponentErrors { if (m_profileSetted == true ) { asOff(); - setProfile (ActiveSurface::AS_SHAPED_FIXED); + m_tracking = false; + CIRATools::Wait(1000000); + _SET_CDB_CORE(profile, ActiveSurface::AS_PARK,"SRTActiveSurfaceBossCore::asPark()") + m_profile = ActiveSurface::AS_PARK; try { - onewayAction(ActiveSurface::AS_UPDATE, 0, 0, 0, 45.0, 0, 0, m_profile); + onewayAction(ActiveSurface::AS_REFPOS, 0, 0, 0, 0.0, 0, 0, m_profile); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { ex.log(LM_DEBUG); throw ex.getComponentErrorsEx(); } - m_tracking = false; } else { printf("you must set the profile first\n"); @@ -1810,6 +1821,7 @@ void CSRTActiveSurfaceBossCore::asPark() throw (ComponentErrors::ComponentErrors void CSRTActiveSurfaceBossCore::asOff() throw (ComponentErrors::ComponentErrorsEx) { if (m_profileSetted == true ) { + disableAutoUpdate(); try { onewayAction(ActiveSurface::AS_STOP, 0, 0, 0, 0, 0, 0, m_profile); } @@ -1817,7 +1829,6 @@ void CSRTActiveSurfaceBossCore::asOff() throw (ComponentErrors::ComponentErrorsE ex.log(LM_DEBUG); throw ex.getComponentErrorsEx(); } - disableAutoUpdate(); } else { printf("you must set the profile first\n"); diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp index 788d3f7cc..8783ac242 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossImpl.cpp @@ -342,47 +342,22 @@ void SRTActiveSurfaceBossImpl::setup (const char *config) throw (CORBA::SystemEx _EXCPT(ManagementErrors::ConfigurationErrorExImpl,ex,"SRTActiveSurfaceBossImpl::setup()"); throw ex.getConfigurationErrorEx(); } -/* CSecAreaResourceWrapper resource=m_core->Get(); - try { - //resource->setProfile(config); - } - catch (ManagementErrors::ConfigurationErrorExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getConfigurationErrorEx(); - } -*/ } void SRTActiveSurfaceBossImpl::park () throw (CORBA::SystemException, ManagementErrors::ParkingErrorEx) { AUTO_TRACE("SRTActiveSurfaceBossImpl::park()"); - asOff(); - setProfile (ActiveSurface::AS_SHAPED_FIXED); - CSecAreaResourceWrapper resource=m_core->Get(); - try { - resource->onewayAction(ActiveSurface::AS_UPDATE, 0, 0, 0, 45.0, 0, 0, m_profile); - } - catch (ComponentErrors::ComponentErrorsExImpl& ex) { - _EXCPT(ManagementErrors::ParkingErrorExImpl,ex,"SRTActiveSurfaceBossImpl::park()"); - throw ex.getParkingErrorEx(); - } - resource->m_tracking = false; -} -/* -void SRTActiveSurfaceBossImpl::setup (CORBA::Long circle, CORBA::Long actuator, CORBA::Long radius) throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx) -{ - AUTO_TRACE("SRTActiveSurfaceBossImpl::setup()"); - CSecAreaResourceWrapper resource=m_core->Get(); try { - resource->onewayAction(ActiveSurface::AS_SETUP, circle, actuator, radius, 0, 0, 0, m_profile); + resource->asPark(); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { - ex.log(LM_DEBUG); - throw ex.getComponentErrorsEx(); + _EXCPT(ManagementErrors::ParkingErrorExImpl,ex,"SRTActiveSurfaceBossImpl::park()"); + throw ex.getParkingErrorEx(); } + resource->m_tracking = false; } -*/ + void SRTActiveSurfaceBossImpl::stow (CORBA::Long circle, CORBA::Long actuator, CORBA::Long radius) throw (CORBA::SystemException, ComponentErrors::ComponentErrorsEx) { AUTO_TRACE("SRTActiveSurfaceBossImpl::stow()"); @@ -530,11 +505,8 @@ void SRTActiveSurfaceBossImpl::setProfile (ActiveSurface::TASProfile newProfile) m_profile = newProfile; - //_SET_CDB(profile, m_profile,"SRTActiveSurfaceBossImpl::setProfile") - CSecAreaResourceWrapper resource=m_core->Get(); try { - //resource->onewayAction(ActiveSurface::AS_PROFILE, 0, 0, 0, 0, 0, 0, m_profile); resource->setProfile(m_profile); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -634,13 +606,6 @@ void SRTActiveSurfaceBossImpl::asOn() throw (CORBA::SystemException) ex.log(LM_DEBUG); throw ex.getComponentErrorsEx(); } -/* if ((m_profile != ActiveSurface::AS_PARABOLIC_FIXED) || (m_profile != ActiveSurface::AS_SHAPED_FIXED)) { - CSecAreaResourceWrapper resource=m_core->Get(); - resource->enableAutoUpdate(); - } - else - update(45.0); -*/ } void SRTActiveSurfaceBossImpl::asOff() throw (CORBA::SystemException) @@ -648,7 +613,6 @@ void SRTActiveSurfaceBossImpl::asOff() throw (CORBA::SystemException) AUTO_TRACE("SRTActiveSurfaceBossImpl::asOff()"); CSecAreaResourceWrapper resource=m_core->Get(); try { - //resource->disableAutoUpdate(); resource->asOff(); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { diff --git a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp index 3c2d11bb4..5600c9838 100644 --- a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp +++ b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp @@ -616,7 +616,11 @@ void USDImpl::update (CORBA::Double elevation) throw (CORBA::SystemException,ASE // } } updatePos = (CORBA::Long)(updatePosMM*MM2STEP); - //printf("upPosStep = %ld\n",updatePos); + if (updatePos > 21000) + updatePos = 21000; + if (updatePos < -21000) + updatePos = -21000; + printf("upPosStep = %ld\n",updatePos); _GET_PROP(status,m_status,"usdImpl::update()") running = m_status&MRUN; if (running == false) -- GitLab From 020d8f99407920fcd756a413eaf5b09aa974ccc2 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 2 Jul 2018 19:58:09 +0200 Subject: [PATCH 122/145] Fix #211, fixed the K band local oscillator component. (#233) Now it gets hosted by the `LocalOscillatorLPContainer` since it has the same implementation language (python). --- .../CDB/MACI/Components/RECEIVERS/LO_KBAND/LO_KBAND.xml | 6 +++--- SRT/Configuration/CDB/alma/RECEIVERS/LO_KBAND/LO_KBAND.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_KBAND/LO_KBAND.xml b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_KBAND/LO_KBAND.xml index d62dda1e8..eb9a4c43a 100644 --- a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_KBAND/LO_KBAND.xml +++ b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_KBAND/LO_KBAND.xml @@ -9,10 +9,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="LO_KBAND" - Code="LocalOscillatorImpl" + Code="LocalOscillatorImpl.LocalOscillator" Type="IDL:alma/Receivers/LocalOscillator:1.0" - Container="LocalOscillatorsContainer" + Container="LocalOscillatorLPContainer" KeepAliveTime="10" Default="false" - ImplLang="cpp" + ImplLang="py" /> diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/LO_KBAND/LO_KBAND.xml b/SRT/Configuration/CDB/alma/RECEIVERS/LO_KBAND/LO_KBAND.xml index d8351a7e5..4c3814682 100644 --- a/SRT/Configuration/CDB/alma/RECEIVERS/LO_KBAND/LO_KBAND.xml +++ b/SRT/Configuration/CDB/alma/RECEIVERS/LO_KBAND/LO_KBAND.xml @@ -1,11 +1,11 @@ - + IP="192.168.200.128" PORT="5025"> - + -- GitLab From 4baaef13d658c907b17902b843db1b6b6e33da13 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 2 Jul 2018 19:58:28 +0200 Subject: [PATCH 123/145] Fix #234, added temporary files to `.gitignore`. (#235) --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ece8c14ce..0bb5c1955 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ introot* bin/ lib/ object/ +*~ +*.swp -- GitLab From ab209055977e653aa265bf10c59a171246963a68 Mon Sep 17 00:00:00 2001 From: carlomigoni Date: Tue, 3 Jul 2018 11:32:21 +0200 Subject: [PATCH 124/145] Fix #232, fixed a problem with `ExternalClients` and `RFIMonitoring`. (#236) --- .../RFIMonitoring/RFIMonitoring.xml | 18 +++++++++++ .../RFIMonitoringContainer.xml | 30 +++++++++++++++++++ .../RFIMonitoring/RFIMonitoring.xml | 17 +++++++++++ 3 files changed, 65 insertions(+) create mode 100644 SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml create mode 100644 SRT/Configuration/CDB/MACI/Containers/RFIMonitoringContainer/RFIMonitoringContainer.xml create mode 100644 SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml diff --git a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml new file mode 100644 index 000000000..99a6359be --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml @@ -0,0 +1,18 @@ + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/RFIMonitoringContainer/RFIMonitoringContainer.xml b/SRT/Configuration/CDB/MACI/Containers/RFIMonitoringContainer/RFIMonitoringContainer.xml new file mode 100644 index 000000000..a960e4654 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/RFIMonitoringContainer/RFIMonitoringContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml b/SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml new file mode 100644 index 000000000..1157ce77f --- /dev/null +++ b/SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml @@ -0,0 +1,17 @@ + + + + + + -- GitLab From 699da7b6dcbef5dbf9b850c7e7f852db839047d8 Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 3 Jul 2018 14:00:39 +0200 Subject: [PATCH 125/145] Fix #230, some minor tweaks to some AS files. --- .../src/SRTActiveSurfaceBossCore.cpp | 27 +++++++------------ .../SRTActiveSurfaceUSDServer/src/usdImpl.cpp | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp index 2d74b2570..777124bc6 100644 --- a/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp +++ b/SRT/Servers/SRTActiveSurfaceBoss/src/SRTActiveSurfaceBossCore.cpp @@ -1389,8 +1389,7 @@ void CSRTActiveSurfaceBossCore::sector1ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 139; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 139; i++) { usdTableS1 >> lanIndexS1 >> circleIndexS1 >> usdCircleIndexS1 >> serial_usd >> graf >> mecc; usd[circleIndexS1][usdCircleIndexS1] = ActiveSurface::USD::_nil(); try { @@ -1424,8 +1423,7 @@ void CSRTActiveSurfaceBossCore::sector2ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 140; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 140; i++) { usdTableS2 >> lanIndexS2 >> circleIndexS2 >> usdCircleIndexS2 >> serial_usd >> graf >> mecc; usd[circleIndexS2][usdCircleIndexS2] = ActiveSurface::USD::_nil(); try { @@ -1460,8 +1458,7 @@ void CSRTActiveSurfaceBossCore::sector3ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 139; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 139; i++) { usdTableS3 >> lanIndexS3 >> circleIndexS3 >> usdCircleIndexS3 >> serial_usd >> graf >> mecc; usd[circleIndexS3][usdCircleIndexS3] = ActiveSurface::USD::_nil(); try { @@ -1496,8 +1493,7 @@ void CSRTActiveSurfaceBossCore::sector4ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 140; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 140; i++) { usdTableS4 >> lanIndexS4 >> circleIndexS4 >> usdCircleIndexS4 >> serial_usd >> graf >> mecc; usd[circleIndexS4][usdCircleIndexS4] = ActiveSurface::USD::_nil(); try { @@ -1532,8 +1528,7 @@ void CSRTActiveSurfaceBossCore::sector5ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 139; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 139; i++) { usdTableS5 >> lanIndexS5 >> circleIndexS5 >> usdCircleIndexS5 >> serial_usd >> graf >> mecc; usd[circleIndexS5][usdCircleIndexS5] = ActiveSurface::USD::_nil(); try { @@ -1568,8 +1563,7 @@ void CSRTActiveSurfaceBossCore::sector6ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 140; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 140; i++) { usdTableS6 >> lanIndexS6 >> circleIndexS6 >> usdCircleIndexS6 >> serial_usd >> graf >> mecc; usd[circleIndexS6][usdCircleIndexS6] = ActiveSurface::USD::_nil(); try { @@ -1604,8 +1598,7 @@ void CSRTActiveSurfaceBossCore::sector7ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 139; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 139; i++) { usdTableS7 >> lanIndexS7 >> circleIndexS7 >> usdCircleIndexS7 >> serial_usd >> graf >> mecc; usd[circleIndexS7][usdCircleIndexS7] = ActiveSurface::USD::_nil(); try { @@ -1640,8 +1633,7 @@ void CSRTActiveSurfaceBossCore::sector8ActiveSurface() throw (ComponentErrors::C exit(-1); } // Get reference to usd components - //for (i = 1; i <= 140; i++) { - for (i = 1; i <= 1; i++) { + for (i = 1; i <= 140; i++) { usdTableS8 >> lanIndexS8 >> circleIndexS8 >> usdCircleIndexS8 >> serial_usd >> graf >> mecc; usd[circleIndexS8][usdCircleIndexS8] = ActiveSurface::USD::_nil(); try { @@ -1732,7 +1724,7 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP m_ASup=true; m_status=Management::MNG_OK; -/* + if (usdCounter < (int)lastUSD*WARNINGUSDPERCENT) { m_status=Management::MNG_WARNING; } @@ -1740,7 +1732,6 @@ void CSRTActiveSurfaceBossCore::setProfile(const ActiveSurface::TASProfile& newP m_status=Management::MNG_FAILURE; m_ASup=false; } -*/ } if (m_ASup == true) { diff --git a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp index 5600c9838..af93e344e 100644 --- a/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp +++ b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp @@ -620,7 +620,7 @@ void USDImpl::update (CORBA::Double elevation) throw (CORBA::SystemException,ASE updatePos = 21000; if (updatePos < -21000) updatePos = -21000; - printf("upPosStep = %ld\n",updatePos); + //printf("upPosStep = %ld\n",updatePos); _GET_PROP(status,m_status,"usdImpl::update()") running = m_status&MRUN; if (running == false) -- GitLab From 233eb91597c132d91ebab097dd0280ff412e8f86 Mon Sep 17 00:00:00 2001 From: aorlati Date: Tue, 3 Jul 2018 17:42:38 +0200 Subject: [PATCH 126/145] fix #225: new startup procedure, it should be more reliable, faster and easier (#237) --- .svnignore | 6 - Common/Misc/Scripts/src/Makefile | 8 +- Common/Misc/Scripts/src/discos | 102 ++++++ .../MedScripts/app-defaults/discosStartup.xml | 132 +++++++ Medicina/Misc/MedScripts/src/discosConsole | 111 ++++++ Medicina/Misc/MedScripts/src/discosdown | 0 Medicina/Misc/MedScripts/src/discosup | 0 .../SRTScripts/app-defaults/discosStartup.xml | 321 ++++++++++++++++++ SRT/Misc/SRTScripts/src/Makefile | 32 +- SRT/Misc/SRTScripts/src/discosConsole | 114 +++++++ SRT/Misc/SRTScripts/src/discosdown | 36 ++ SRT/Misc/SRTScripts/src/discosup | 108 ++++++ 12 files changed, 954 insertions(+), 16 deletions(-) delete mode 100644 .svnignore create mode 100644 Common/Misc/Scripts/src/discos create mode 100644 Medicina/Misc/MedScripts/app-defaults/discosStartup.xml create mode 100644 Medicina/Misc/MedScripts/src/discosConsole create mode 100644 Medicina/Misc/MedScripts/src/discosdown create mode 100644 Medicina/Misc/MedScripts/src/discosup create mode 100644 SRT/Misc/SRTScripts/app-defaults/discosStartup.xml create mode 100644 SRT/Misc/SRTScripts/src/discosConsole create mode 100644 SRT/Misc/SRTScripts/src/discosdown create mode 100644 SRT/Misc/SRTScripts/src/discosup diff --git a/.svnignore b/.svnignore deleted file mode 100644 index ff0738696..000000000 --- a/.svnignore +++ /dev/null @@ -1,6 +0,0 @@ -rtai -object -lib -.purifydir -.idl-compilation-end -.idl-compilation-start diff --git a/Common/Misc/Scripts/src/Makefile b/Common/Misc/Scripts/src/Makefile index 0de070bfc..8830fe151 100644 --- a/Common/Misc/Scripts/src/Makefile +++ b/Common/Misc/Scripts/src/Makefile @@ -7,9 +7,9 @@ # # who when what # -------- -------- ---------------------------------------------- -# andrea 24/01/09 created -# andrea 24/01/09 scripts startschedule stopschedule configureBackend, deprecated and movved to local scripts -# +# andrea 24/01/09 created +# andrea 24/01/09 scripts startschedule stopschedule configureBackend, deprecated and movved to local scripts +# Andrea O. 28/06/18 Added and public installed the scripts discos #******************************************************************************* @@ -41,7 +41,7 @@ PY_PACKAGES = PY_PACKAGES_L = pppppp_MODULES = -SCRIPTS = data_stats tabbify +SCRIPTS = data_stats tabbify discos # # list of all possible C-sources (used to create automatic dependencies) diff --git a/Common/Misc/Scripts/src/discos b/Common/Misc/Scripts/src/discos new file mode 100644 index 000000000..86920a6eb --- /dev/null +++ b/Common/Misc/Scripts/src/discos @@ -0,0 +1,102 @@ +#! /bin/bash +# ********************************************************************************************* +# IRA Istituto di Radioastronomia +# +# +# This code is under GNU General Public Licence (GPL). +# +# Who when What +# Andrea Orlati(andrea.orlati@inaf.it) 28/06/2018 Creation +#************************************************************************ +# NAME +# +# SYNOPSIS +# +# DESCRIPTION +# +# FILES +# +# ENVIRONMENT +# +# RETURN VALUES +# +# CAUTIONS +# +# EXAMPLES +# +# SEE ALSO +# +# BUGS +# + +LONGOPTS=start,view,help +SHORTOPTS=svh +CL_START= +CL_VIEW= +CL_HELP= + +function printUsage { + echo "Gets the ESCS system started, management priviledges are needed" + echo "" + echo "Usage: `basename $0` [OPTIONS] " + echo "Options: " + echo " -s | --start load the Command Center for starting the system" + echo " -v | --view load the Command Center for monitoring purposes" + echo " -h | --help prints this help" +} + +# This simply checks for the correctness of the command line +export POSIXLY_CORRECT=1 + +getopt -n `basename $0` -Q -u -a -l $LONGOPTS $SHORTOPTS "$@" || { + printUsage + exit +} + +# Now let's parse the command line +set -- `getopt -u -a -l $LONGOPTS $SHORTOPTS "$@"` + +for i +do + case "$i" in + -h) CL_HELP=true ;; + --help) CL_HELP=true ;; + --view) CL_VIEW=true ;; + -v) CL_VIEW=true ;; + --start) CL_START=true ;; + -s) CL_START=true ;; + --) break;; + esac + shift +done + +# restore +export POSIXLY_CORRECT= +unset POSIXLY_CORRECT + +export MANAGER= + +if [ -z "$MANAGER_REFERENCE" ] ; then + export MANAGER="corbaloc::"$HOST":3000/Manager" +else + export MANAGER=$MANAGER_REFERENCE +fi + +if [ "$CL_HELP" ] ; then + printUsage + exit +fi + +if [ "$CL_START" ] ; then + acscommandcenter -r $INTROOT/app-defaults/discosStartup.xml & + exit +fi + +if [ "$CL_VIEW" ] ; then + acscommandcenter -r $INTROOT/app-defaults/discosStartup.xml $MANAGER & +fi + + + +# +# ___oOo___ diff --git a/Medicina/Misc/MedScripts/app-defaults/discosStartup.xml b/Medicina/Misc/MedScripts/app-defaults/discosStartup.xml new file mode 100644 index 000000000..e96c70dea --- /dev/null +++ b/Medicina/Misc/MedScripts/app-defaults/discosStartup.xml @@ -0,0 +1,132 @@ + + + remote_daemon + /alma/ACS-7.0/acsdata/config/defaultCDB + 0 + 192.168.1.98 + + + false + + + + + + + + + + + + LoggerContainer + cpp + + true + 0 + 192.168.1.98 + + + + WeatherStationContainer + cpp + true + 0 + 192.168.1.104 + + + + MountContainer + cpp + true + 0 + 192.168.1.104 + + + + AntennaContainer + cpp + true + 0 + 192.168.1.104 + + + + ReceiversContainer + cpp + true + 0 + 192.168.1.104 + + + + TotalPowerContainer + cpp + true + 0 + 192.168.1.104 + + + + NoiseGeneratorContainer + cpp + true + 0 + 192.168.1.104 + + + + ManagementContainer + cpp + true + 0 + 192.168.1.104 + + + + FitsZillaContainer + cpp + true + 0 + 192.168.1.104 + + + + CalibrationToolContainer + cpp + + true + 0 + 192.168.1.104 + + + + PointContainer + cpp + + true + 0 + 192.168.1.104 + + + + ExternalClientsContainer + cpp + + true + 0 + 192.168.51.98 + + + + XContainer + cpp + + true + 0 + 192.168.1.104 + + + + diff --git a/Medicina/Misc/MedScripts/src/discosConsole b/Medicina/Misc/MedScripts/src/discosConsole new file mode 100644 index 000000000..aba7e14ab --- /dev/null +++ b/Medicina/Misc/MedScripts/src/discosConsole @@ -0,0 +1,111 @@ +#! /bin/bash +# ********************************************************************************************* +# IRA Istituto di Radioastronomia +# +# This code is under GNU General Public Licence (GPL). +# +# Who when What +# Andrea Orlati(aorlati@ira.inaf.it) 12/08/2010 Creation +# Andrea Orlati(aorlati@ira.inaf.it)04/09/2013 switch --stop now available +#************************************************************************ +# NAME +# +# SYNOPSIS +# +# DESCRIPTION +# +# FILES +# +# ENVIRONMENT +# +# RETURN VALUES +# +# CAUTIONS +# +# EXAMPLES +# +# SEE ALSO +# +# BUGS +# + +LONGOPTS=help,stop +SHORTOPTS=hs +CL_HELP= +CL_STOP= + +function printUsage { + echo "Start interactive console for the ESCS system" + echo "" + echo "Usage: `basename $0` [OPTIONS] " + echo "Options: " + echo " -h | --help prints this help" + echo " -s | --stop close the console and all the user interface windows" +} + +# This simply checks for the correctness of the command line +export POSIXLY_CORRECT=1 + +getopt -n `basename $0` -Q -u -a -l $LONGOPTS $SHORTOPTS "$@" || { + printUsage + exit +} + +# Now let's parse the command line +set -- `getopt -u -a -l $LONGOPTS $SHORTOPTS "$@"` + +for i +do + case "$i" in + -h) CL_HELP=true ;; + --help) CL_HELP=true ;; + -s) CL_STOP=true ;; + --stop) CL_STOP=true ;; + --) break;; + esac + shift +done + +# restore +export POSIXLY_CORRECT= +unset POSIXLY_CORRECT + +if [ "$CL_HELP" ] ; then + printUsage + exit +fi + +if [ "$CL_STOP" ] ; then + killall -s SIGUSR1 -u $USER -q _tui_MedicinaMountTextClient + killall -s SIGUSR1 -u $USER -q _tui_ObservatoryTextClient + killall -s SIGUSR1 -u $USER -q _tui_AntennaBossTextClient + killall -s SIGUSR1 -u $USER -q _tui_GenericBackendTextClient + killall -s SIGUSR1 -u $USER -q _tui_ReceiversBossTextClient + killall -s SIGUSR1 -u $USER -q _tui_SchedulerTextClient + #close the operator input + pkill -SIGINT -f -n -u $USER _tui_SysTerm + #close the logging display client + pkill -SIGUSR1 -f -n -u $USER _gui_customLoggingClient + exit +fi + +schedulerTui +sleep 0.5s +mountTui +sleep 0.5s +observatoryTui +sleep 0.5s +antennaBossTui +sleep 0.5s +genericBackendTui BACKENDS/TotalPower +sleep 0.5s +genericBackendTui BACKENDS/XBackends +sleep 0.5s +operatorInput +sleep 0.5s +receiversBossTui +sleep 0.5s +loggingDisplay + +# +# ___oOo___ diff --git a/Medicina/Misc/MedScripts/src/discosdown b/Medicina/Misc/MedScripts/src/discosdown new file mode 100644 index 000000000..e69de29bb diff --git a/Medicina/Misc/MedScripts/src/discosup b/Medicina/Misc/MedScripts/src/discosup new file mode 100644 index 000000000..e69de29bb diff --git a/SRT/Misc/SRTScripts/app-defaults/discosStartup.xml b/SRT/Misc/SRTScripts/app-defaults/discosStartup.xml new file mode 100644 index 000000000..117984749 --- /dev/null +++ b/SRT/Misc/SRTScripts/app-defaults/discosStartup.xml @@ -0,0 +1,321 @@ + + + remote_native + + 0 + MASTERHOST + discos + + false + + + + + + + + + + + + AntennaBossContainer + cpp + + true + 0 + MASTERHOST + discos + + + AntennaContainer + cpp + + true + 0 + MASTERHOST + discos + + + CalibrationToolContainer + cpp + + true + 0 + MASTERHOST + discos + + + DerotatorContainer + cpp + + true + 0 + MASTERHOST + discos + + + DerotatorPositionerContainer + py + + true + 0 + MASTERHOST + discos + + + FitsZillaContainer + cpp + + true + 0 + MASTERHOST + discos + + + LocalOscillatorLPContainer + py + + true + 0 + MASTERHOST + discos + + + LoggerContainer + cpp + + true + 0 + MASTERHOST + discos + + + ManagementContainer + cpp + + true + 0 + MASTERHOST + discos + + + MinorServoBossContainer + cpp + + true + 0 + MASTERHOST + discos + + + MinorServoContainer + cpp + + true + 0 + MASTERHOST + discos + + + MountContainer + cpp + + true + 0 + MASTERHOST + discos + + + PointContainer + cpp + + true + 0 + MASTERHOST + discos + + + PyIFDistributorContainer + py + + true + 0 + MASTERHOST + discos + + + ReceiversContainer + cpp + + true + 0 + MASTERHOST + discos + + + SardaraContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRT7GHzContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTKBandContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTLPBandContainer + cpp + + true + 0 + MASTERHOST + discos + + + TotalPowerContainer + cpp + + true + 0 + MASTERHOST + discos + + + WeatherStationContainer + cpp + + true + 0 + MASTERHOST + discos + + + XContainer + cpp + + true + 0 + MASTERHOST + discos + + + ExternalClientsContainer + cpp + + true + 0 + MASTERHOST + discos + + + + RFIMonitoringContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer01 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer02 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer03 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer04 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer05 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer06 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer07 + cpp + + true + 0 + MASTERHOST + discos + + + SRTActiveSurfaceContainer08 + cpp + + true + 0 + MASTERHOST + discos + + + diff --git a/SRT/Misc/SRTScripts/src/Makefile b/SRT/Misc/SRTScripts/src/Makefile index fb248b8d5..dd0d3bc6d 100644 --- a/SRT/Misc/SRTScripts/src/Makefile +++ b/SRT/Misc/SRTScripts/src/Makefile @@ -8,7 +8,8 @@ # who when what # -------- -------- ---------------------------------------------- # almamgr 03/04/09 created -# +# orlati 28/06/18 nuraghe script moved in local install. It has been deprecated +# orlati 29/06/18 added discosStartup.xml file for acscommandcenter #******************************************************************************* # This Makefile follows VLT Standards (see Makefile(5) for more). @@ -17,6 +18,12 @@ # None #------------------------------------------------------------------------ +ifndef MANAGER_REFERENCE + MASTER:=$(HOST) +else + MASTER:=$(shell echo $(MANAGER_REFERENCE) | cut -d: -f 3) +endif + # # user definable C-compilation flags #USER_CFLAGS = @@ -68,8 +75,8 @@ lllll_OBJECTS = # # Scripts (public and local) # ---------------------------- -SCRIPTS = nuragheConsole nuraghe -SCRIPTS_L = +SCRIPTS = discosup discosdown discosConsole +SCRIPTS_L = nuragheConsole nuraghe # # TCL scripts (public and local) @@ -164,7 +171,8 @@ ASCII_TO_MIF = # # other files to be installed #---------------------------- -INSTALL_FILES = ../app-defaults/nuragheStartup.xml +#INSTALL_FILES = ../app-defaults/nuragheStartup.xml +INSTALL_FILES = ../app-defaults/discosStartup.xml # # list of all possible C-sources (used to create automatic dependencies) @@ -187,13 +195,21 @@ ifneq ($(MAKEDIRTMP),\#error\#) include $(MAKEDIR)/acsMakefile endif +.PHONY: all +.DEFAULT_GOAL:=all + + # # TARGETS # ------- + all: do_all + @sed -i 's/MASTERHOST/$(MASTER)/g' ../bin/discosup + @sed -i 's/MASTERHOST/$(MASTER)/g' ../bin/discosdown @echo " . . . 'all' done" clean : clean_all + @rm -f $(INTROOT)/app-defaults/discosStartup.xml @echo " . . . clean done" clean_dist : clean_all clean_dist_all @@ -203,8 +219,12 @@ man : do_man @echo " . . . man page(s) done" install : install_all - @chmod 764 $(INTROOT)/bin/nuraghe - @chmod 764 $(INTROOT)/app-defaults/nuragheStartup.xml +# @chmod 764 $(INTROOT)/bin/nuraghe +# @chmod 764 $(INTROOT)/app-defaults/nuragheStartup.xml + @sed -i 's/MASTERHOST/$(MASTER)/g' $(INTROOT)/app-defaults/discosStartup.xml + @chmod 764 $(INTROOT)/app-defaults/discosStartup.xml + + @echo " . . . installation done" diff --git a/SRT/Misc/SRTScripts/src/discosConsole b/SRT/Misc/SRTScripts/src/discosConsole new file mode 100644 index 000000000..6e9b4ef75 --- /dev/null +++ b/SRT/Misc/SRTScripts/src/discosConsole @@ -0,0 +1,114 @@ +#! /bin/bash +# ********************************************************************************************* +# IRA Istituto di Radioastronomia +# +# This code is under GNU General Public Licence (GPL). +# +# Who when What +# Andrea Orlati(aorlati@ira.inaf.it) 08/08/2012 Creation +# Andrea Orlati(aorlati@ira.inaf.it) 04/09/2013 switch --stop now available +# Andrea Orlati(andrea.orlati@inaf.it) 03/07/2018 switch --stop is now --close +#************************************************************************ +# NAME +# +# SYNOPSIS +# +# DESCRIPTION +# +# FILES +# +# ENVIRONMENT +# +# RETURN VALUES +# +# CAUTIONS +# +# EXAMPLES +# +# SEE ALSO +# +# BUGS +# + +LONGOPTS=help,close +SHORTOPTS=hc +CL_HELP= +CL_STOP= + +function printUsage { + echo "Start interactive console for the ESCS system" + echo "" + echo "Usage: `basename $0` [OPTIONS] " + echo "Options: " + echo " -h | --help prints this help" + echo " -c | --close close the console and all the user interface windows" +} + +# This simply checks for the correctness of the command line +export POSIXLY_CORRECT=1 + +getopt -n `basename $0` -Q -u -a -l $LONGOPTS $SHORTOPTS "$@" || { + printUsage + exit +} + +# Now let's parse the command line +set -- `getopt -u -a -l $LONGOPTS $SHORTOPTS "$@"` + +for i +do + case "$i" in + -h) CL_HELP=true ;; + --help) CL_HELP=true ;; + -c) CL_STOP=true ;; + --close) CL_STOP=true ;; + --) break;; + esac + shift +done + +# restore +export POSIXLY_CORRECT= +unset POSIXLY_CORRECT + +if [ "$CL_HELP" ] ; then + printUsage + exit +fi + +if [ "$CL_STOP" ] ; then + killall -s SIGUSR1 -u $USER -q _tui_SRTMountTextClient + killall -s SIGUSR1 -u $USER -q _tui_ObservatoryTextClient + killall -s SIGUSR1 -u $USER -q _tui_AntennaBossTextClient + killall -s SIGUSR1 -u $USER -q _tui_MinorServoBossTextClient + killall -s SIGUSR1 -u $USER -q _tui_GenericBackendTextClient + killall -s SIGUSR1 -u $USER -q _tui_ReceiversBossTextClient + killall -s SIGUSR1 -u $USER -q _tui_SchedulerTextClient + #close the operator input + pkill -SIGINT -f -n -u $USER _tui_SysTerm + #close the logging display client + pkill -SIGUSR1 -f -n -u $USER _gui_customLoggingClient + exit +fi + +schedulerTui +sleep 0.5s +mountTui +sleep 0.5s +minorservoBossTui +sleep 0.5s +observatoryTui +sleep 0.5s +antennaBossTui +sleep 0.5s +genericBackendTui BACKENDS/TotalPower +sleep 0.5s +operatorInput +sleep 0.5s +receiversBossTui +sleep 0.5s +loggingDisplay + + +# +# ___oOo___ diff --git a/SRT/Misc/SRTScripts/src/discosdown b/SRT/Misc/SRTScripts/src/discosdown new file mode 100644 index 000000000..8574fc21c --- /dev/null +++ b/SRT/Misc/SRTScripts/src/discosdown @@ -0,0 +1,36 @@ +#! /bin/bash +# ********************************************************************************************* +# Istituto Nazionale di Astrofisica +# +# +# This code is under GNU General Public Licence (GPL). +# +# Who when What +# Andrea Orlati(andrea.orlati@inaf.it) 30/06/2018 Creation +#************************************************************************ +# NAME +# +# SYNOPSIS +# +# DESCRIPTION +# Stops the discos system and shuts down ACS, SRT flavour +# +# FILES +# +# ENVIRONMENT +# +# RETURN VALUES +# +# CAUTIONS +# This script should also include the console shut down, in that case it is needed to know the console server address.... +# +# EXAMPLES +# +# SEE ALSO +# +# BUGS + +#MASTERHOST will be replaced by make file @installation time with proper server address + +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'echo Shutting down.... && killACS && echo ....it is all over'" + diff --git a/SRT/Misc/SRTScripts/src/discosup b/SRT/Misc/SRTScripts/src/discosup new file mode 100644 index 000000000..66a95ca53 --- /dev/null +++ b/SRT/Misc/SRTScripts/src/discosup @@ -0,0 +1,108 @@ +#! /bin/bash +# ********************************************************************************************* +# Istituto Nazionale di Astrofisica +# +# +# This code is under GNU General Public Licence (GPL). +# +# Who when What +# Andrea Orlati(andrea.orlati@inaf.it) 30/06/2018 Creation +#************************************************************************ +# NAME +# +# SYNOPSIS +# +# DESCRIPTION +# +# Starts the containers required by discos, SRT flavour +# +# FILES +# +# ENVIRONMENT +# +# RETURN VALUES +# +# CAUTIONS +# +# EXAMPLES +# +# SEE ALSO +# +# BUGS + +#MASTERHOST will be replaced by make file @installation time with proper server address + +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStart && touch $ACS_TMP/acsDone.lock'" +while ! [ -f $ACS_TMP/acsDone.lock ]; +do + echo # + sleep 1 +done +rm -f $ACS_TMP/acsDone.lock +echo "...ACS is up and running!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp AntennaBossContainer > /dev/null 2>&1 &'" +echo "...AntennaBossContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp AntennaContainer > /dev/null 2>&1 &'" +echo "...AntennaContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp CalibrationToolContainer > /dev/null 2>&1 &'" +echo "...CalibrationToolContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp DerotatorContainer > /dev/null 2>&1 &'" +echo "...DerotatorContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -py DerotatorPositionerContainer > /dev/null 2>&1 &'" +echo "...DerotatorPositionerContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp FitsZillaContainer > /dev/null 2>&1 &'" +echo "...FitsZillaContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -py LocalOscillatorLPContainer > /dev/null 2>&1 &'" +echo "...LocalOscillatorLPContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp LoggerContainer > /dev/null 2>&1 &'" +echo "...LoggerContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp MinorServoBossContainer > /dev/null 2>&1 &'" +echo "...MinorServoBossContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp MinorServoContainer > /dev/null 2>&1 &'" +echo "...MinorServoContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp MountContainer > /dev/null 2>&1 &'" +echo "...MountContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp PointContainer > /dev/null 2>&1 &'" +echo "...PointContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -py PyIFDistributorContainer > /dev/null 2>&1 &'" +echo "...PyIFDistributorContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp ReceiversContainer > /dev/null 2>&1 &'" +echo "...ReceiversContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SardaraContainer > /dev/null 2>&1 &'" +echo "...RoachContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRT7GHzContainer > /dev/null 2>&1 &'" +echo "...SRT7GHzContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTKBandContainer > /dev/null 2>&1 &'" +echo "...SRTKBandContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTLPBandContainer > /dev/null 2>&1 &'" +echo "...SRTLPBandContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp TotalPowerContainer > /dev/null 2>&1 &'" +echo "...TotalPowerContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp WeatherStationContainer > /dev/null 2>&1 &'" +echo "...WeatherStationContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp XContainer > /dev/null 2>&1 &'" +echo "...XContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp ExternalClientsContainer > /dev/null 2>&1 &'" +echo "...ExternalClientsContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp RFIMonitoringContainer > /dev/null 2>&1 &'" +echo "...RFIMonitoringContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer01 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer01!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer02 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer02!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer03 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer03!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer04 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer04!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer05 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer05!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer06 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer06!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer07 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer07!" +ssh -f -l discos MASTERHOST "/bin/bash --login -c 'acsStartContainer -cpp SRTActiveSurfaceContainer08 > /dev/null 2>&1 &'" +echo "...SRTActiveSurfaceContainer08!" + + -- GitLab From b22786ef6f2587cbb1d6e97f29f6641dd95ce77c Mon Sep 17 00:00:00 2001 From: aorlati Date: Wed, 4 Jul 2018 14:38:33 +0200 Subject: [PATCH 127/145] Up to date SRT configuration --- .../DataBlock/PointingModel/PointingModel.xml | 121 +++++++++--------- .../CDB/alma/MINORSERVO/Boss/Boss.xml | 36 +++--- .../CDB/alma/MINORSERVO/PFP/PFP.xml | 4 +- 3 files changed, 80 insertions(+), 81 deletions(-) diff --git a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index f05570265..a69e8b4da 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml +++ b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml @@ -1,30 +1,22 @@ - - - - - + + CCB 90.0 - 1 -2.3029563427 + 1 -2.2957174778 0 0.0 - 1 -0.0102762356 - 1 -0.0050985431 - 1 -0.0008867322 - 1 -0.0019946923 - 1 0.0873332769 - 1 0.0871561393 + 1 -0.0068070539 + 1 -0.0016828823 + 1 -0.0009974039 + 1 -0.0006166724 + 1 0.0852021798 + 1 0.0925736725 0 0.0 0 0.0 - 1 0.0115426397 + 1 0.0148610147 0 0 - 1 0.0020223276 - 1 0.0008122203 + 1 0.0005418550 + 1 -0.0000714987 0 0 0 0 0 0 @@ -45,37 +37,37 @@ KKG - 90.0 - 1 -2.2964186668 - 1 0.0 - 1 -0.0061030770 - 1 -0.0035287447 - 1 -0.0014408963 - 1 -0.0017973853 - 1 0.0719125122 - 1 0.0925239921 - 0 0 - 0 0 - 1 0.0128885703 - 0 0.0 - 1 0.0006690503 - 1 0.0000107827 - 0 0.0 - 0 0.0 - 0 0.0 - 0 0.0 - 0 0.0 - 0 0.0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 - 0 0 + 90.0 + 1 -2.2964186668 + 1 0.0 + 1 -0.0061030770 + 1 -0.0035287447 + 1 -0.0014408963 + 1 -0.0017973853 + 1 0.0719125122 + 1 0.0925239921 + 0 0 + 0 0 + 1 0.0128885703 + 0 0.0 + 1 0.0006690503 + 1 0.0000107827 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0.0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 + 0 0 @@ -116,20 +108,20 @@ XB 90.0 - 1 -2.3029563427 - 0 0.0 - 1 -0.0102762356 - 1 -0.0050985431 - 1 -0.0008867322 - 1 -0.0019946923 - 1 0.0873332769 - 1 0.0871561393 - 0 0.0 - 0 0.0 - 1 0.0115426397 + 1 -2.3043539524 + 0 0 + 1 -0.0103099272 + 1 0.0030994823 + 1 -0.0007470800 + 1 -0.0010929909 + 1 0.0612707771 + 1 0.0878318101 + 0 0 + 0 0 + 1 0.0308663435 0 0 - 1 0.0020223276 - 1 0.0008122203 + 1 0.0008999962 + 1 0.0000846578 0 0 0 0 0 0 @@ -148,4 +140,5 @@ 0 0 + diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml index 8d218cd08..9d964c328 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -35,18 +35,18 @@ monitoringThreadStackSize="4096" CCB_ASACTIVE=" - @ PFP: park; + @ PFP: none; @ GFR: park; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); - TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410); + TZ = (91.5590595452, -16.4202062811, 1.16941963489, -0.040640240455, 0.000733782714288, -6.62393455442e-06, 2.36410838911e-08); RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053); RY = (-0.036111111111111108); RZ = (0); @ M3R: RZ = (286.67); " CCB=" - @ PFP: park; + @ PFP: none; @ GFR: park; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); @@ -58,22 +58,22 @@ " XB_ASACTIVE=" - @ PFP: park; + @ PFP: none; @ GFR: park; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); - TZ = (11.5796960573, -0.4234293285, 0.0115320065, -0.0001960492, 0.0000012410); + TZ = (-62.4908146635, 6.98439048963, -0.29490654835, 0.00576168925985, -5.37111297435e-05, 1.93982122885e-07 ); RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053); RY = (-0.036111111111111108); RZ = (0); @ M3R: RZ = (860.8); " XB=" - @ PFP: park; + @ PFP: none; @ GFR: park; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); - TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237); + TZ = (7.92754535681, -1.73279985542, 0.147346047014, -0.00516934108597, 7.69094654954e-05, -4.0697957632e-07 ); RX(degree) = (-0.011392527142374848, -0.0001426193499425, 0.000039508844799, -0.000000131010010); RY(degree) = (-0.03611111111111111); RZ(degree) = (0); @@ -81,7 +81,7 @@ " KKG_ASACTIVE=" - @ PFP: park; + @ PFP: none; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); TZ = (-15.6669651675, 1.9293068324, -0.0628990613, 0.0007771141, -0.0000032940); @@ -91,8 +91,20 @@ @ GFR: RZ(mm) = (1323.5); @ M3R: RZ(mm) = (860); " + KKG_TEST_ASACTIVE=" + @ PFP: none; + @ SRP: TX = (-1.5); + TY = (83.53947196, -9.17664589, 0.42877766, -0.00940768, 0.00009361, -0.00000035); + TZ = (-15.6669651675, 1.9293068324, -0.0628990613, 0.0007771141, -0.0000032940); + RX = (-0.0055555555555569409, 0.00014822163433269445, 0.000027586713698, -0.000000077732053); + RY = (-0.036111111111111108); + RZ = (0); + @ GFR: RZ(mm) = (1323.5); + @ M3R: RZ(mm) = (860); + " + KKG=" - @ PFP: park; + @ PFP: none; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237); @@ -142,12 +154,6 @@ @ M3R: RZ(mm) = (860); " - SSP=" - @ SRP: park; - @ PFP: RY(mm) = (-25.95); TX(mm) = (-223); TZ(mm) = (-67); - @ GFR: RZ(mm) = (-600); - @ M3R: RZ(mm) = (860); - " slaves="GFR, M3R, PFP, SRP" > diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml b/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml index e27a57e23..c5f176b8a 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/PFP/PFP.xml @@ -9,7 +9,7 @@ --> - + -- GitLab From 73ee6be2efb2362dfd3d72c6c796062ede30131c Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Thu, 26 Jul 2018 22:58:08 +0200 Subject: [PATCH 128/145] Fix #238, fixed the return value error of `SRTLPBandReceiver/src/Configuration.cpp::getTaperTable()`. (#241) This has been tested on site with a quick observation, it appears to be the correct solution, but it should be tested again properly when completing the 64-bit migration. --- SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp b/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp index 4e2b163c8..aab4255d9 100755 --- a/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp +++ b/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp @@ -762,7 +762,7 @@ DWORD CConfiguration::getTaperTable(double * &freq,double *&taper, short feed) c count++; } } - return m_taperVectorLen; + return count; } DWORD CConfiguration::getLeftMarkTable(double *& freq, double *& markValue, short feed) const -- GitLab From af3a58e190ce8acf73113c9cb99a2e94542abac5 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Fri, 3 Aug 2018 15:56:51 +0200 Subject: [PATCH 129/145] Fix #243, replaced the `none` action with `park` for the SRT PFP. (#244) --- .../CDB/alma/MINORSERVO/Boss/Boss.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml index 9d964c328..fa26b5709 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -35,7 +35,7 @@ monitoringThreadStackSize="4096" CCB_ASACTIVE=" - @ PFP: none; + @ PFP: park; @ GFR: park; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); @@ -46,7 +46,7 @@ @ M3R: RZ = (286.67); " CCB=" - @ PFP: none; + @ PFP: park; @ GFR: park; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); @@ -58,7 +58,7 @@ " XB_ASACTIVE=" - @ PFP: none; + @ PFP: park; @ GFR: park; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); @@ -69,7 +69,7 @@ @ M3R: RZ = (860.8); " XB=" - @ PFP: none; + @ PFP: park; @ GFR: park; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); @@ -81,7 +81,7 @@ " KKG_ASACTIVE=" - @ PFP: none; + @ PFP: park; @ SRP: TX = (-1.5); TY = (29.556666666666498, 0.263472663139432, -0.018206701940039, 0.000072373113855); TZ = (-15.6669651675, 1.9293068324, -0.0628990613, 0.0007771141, -0.0000032940); @@ -92,7 +92,7 @@ @ M3R: RZ(mm) = (860); " KKG_TEST_ASACTIVE=" - @ PFP: none; + @ PFP: park; @ SRP: TX = (-1.5); TY = (83.53947196, -9.17664589, 0.42877766, -0.00940768, 0.00009361, -0.00000035); TZ = (-15.6669651675, 1.9293068324, -0.0628990613, 0.0007771141, -0.0000032940); @@ -104,7 +104,7 @@ " KKG=" - @ PFP: none; + @ PFP: park; @ SRP: TX(mm) = (-1.5); TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); TZ(mm) = (9.530113849340003, -0.169826241752, 0.000419997047, 0.000003985237); -- GitLab From 12e6981b7bf7912c00584f3daa72399cc8288fa1 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Fri, 3 Aug 2018 16:55:40 +0200 Subject: [PATCH 130/145] Fix #212, added modified julian day in observatory servers, clients and CDBs. (#240) * Fix #212, added modified julian day in observatory servers, clients and CDBs. * Fix #212, changed `clock.getJD()` to `clock.getMJD()` as requested. Also, fixed the window size according to the new text client size. --- .../include/ObservatoryTextClient.h | 4 +- .../src/ObservatoryTextClient.cpp | 56 +++++++++++-------- .../ObservatoryTextClient/src/observatoryTui | 2 +- .../AntennaInterface/idl/Observatory.midl | 6 ++ .../config/CDB/schemas/Observatory.xsd | 1 + .../Observatory/include/ObservatoryDevIOs.h | 12 ++++ .../Observatory/include/ObservatoryImpl.h | 8 +++ .../Observatory/src/ObservatoryImpl.cpp | 6 ++ .../alma/ANTENNA/Observatory/Observatory.xml | 3 +- .../alma/ANTENNA/Observatory/Observatory.xml | 1 + .../alma/ANTENNA/Observatory/Observatory.xml | 1 + .../alma/ANTENNA/Observatory/Observatory.xml | 1 + .../alma/ANTENNA/Observatory/Observatory.xml | 5 +- .../alma/ANTENNA/Observatory/Observatory.xml | 3 +- 14 files changed, 78 insertions(+), 31 deletions(-) diff --git a/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h b/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h index 975f5c102..786e1b91f 100644 --- a/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h +++ b/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h @@ -42,8 +42,8 @@ /* *************************************************************************** */ /* define the main frame dimension */ -#define WINDOW_WIDTH 69 /*columns */ -#define WINDOW_HEIGHT 16 /* rows */ +#define WINDOW_WIDTH 73 /*columns */ +#define WINDOW_HEIGHT 17 /* rows */ /* ******************************* */ /* define the routine name here, to be used for logging */ diff --git a/Common/Clients/ObservatoryTextClient/src/ObservatoryTextClient.cpp b/Common/Clients/ObservatoryTextClient/src/ObservatoryTextClient.cpp index a66f97aa8..fb9f3cf2f 100644 --- a/Common/Clients/ObservatoryTextClient/src/ObservatoryTextClient.cpp +++ b/Common/Clients/ObservatoryTextClient/src/ObservatoryTextClient.cpp @@ -129,6 +129,7 @@ int main(int argc, char *argv[]) { /* Add frame controls declaration */ TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)> *universalTime_field; TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *julianDay_field; + TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)> *mjd_field; TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)> *GAST_field; TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)> *LocalST_field; TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(string)> *name_field; @@ -243,6 +244,7 @@ int main(int argc, char *argv[]) { /* Add all component properties here */ _GET_ACS_PROPERTY(ACS::ROuLongLong,universalTime); _GET_ACS_PROPERTY(ACS::ROdouble,julianDay); + _GET_ACS_PROPERTY(ACS::ROdouble,MJD); _GET_ACS_PROPERTY(ACS::ROuLongLong,GAST); _GET_ACS_PROPERTY(ACS::ROdouble,xPolarMotion); _GET_ACS_PROPERTY(ACS::ROdouble,yPolarMotion); @@ -263,6 +265,7 @@ int main(int argc, char *argv[]) { universalTime_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)>(universalTime.in()); GAST_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)>(GAST.in()); julianDay_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(julianDay.in()); + mjd_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(MJD.in()); LocalST_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(uLongLong)>(LST.in()); name_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(string)>(observatoryName.in()); longitude_field=new TW::CPropertyText<_TW_PROPERTYCOMPONENT_T_RO(double)>(longitude.in()); @@ -285,30 +288,32 @@ int main(int argc, char *argv[]) { /** setting up the properties of the components of the frame controls */ - _TW_SET_COMPONENT(name_field,22,0,22,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(universalTime_field,22,1,22,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(name_field,26,0,22,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(universalTime_field,26,1,22,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); universalTime_field->setFormatFunction(CFormatFunctions::dateTimeClockFormat,NULL); - _TW_SET_COMPONENT(julianDay_field,22,2,20,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(julianDay_field,26,2,20,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); julianDay_field->setFormatFunction(CFormatFunctions::floatingPointFormat,NULL); - _TW_SET_COMPONENT(GAST_field,22,3,26,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(mjd_field,26,3,20,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + mjd_field->setFormatFunction(CFormatFunctions::floatingPointFormat,NULL); + _TW_SET_COMPONENT(GAST_field,26,4,26,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); GAST_field->setFormatFunction(CFormatFunctions::clockFormat,NULL); - _TW_SET_COMPONENT(LocalST_field,22,4,26,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(LocalST_field,26,5,26,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); LocalST_field->setFormatFunction(CFormatFunctions::clockFormat,NULL); - _TW_SET_COMPONENT(DUT1_field,22,5,15,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(xPolarMotion_field,22,6,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(yPolarMotion_field,35,6,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(DUT1_field,26,6,15,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(xPolarMotion_field,26,7,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(yPolarMotion_field,39,7,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(latitude_field,22,7,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(longitude_field,35,7,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); - _TW_SET_COMPONENT(height_field,48,7,6,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(latitude_field,26,8,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(longitude_field,39,8,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(height_field,52,8,6,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); strcpy(formatString,"%.3lf"); - _TW_SET_COMPONENT(xGeoid_field,22,8,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(xGeoid_field,26,9,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); xGeoid_field->setFormatFunction(CFormatFunctions::floatingPointFormat,static_cast(formatString)); - _TW_SET_COMPONENT(yGeoid_field,35,8,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(yGeoid_field,39,9,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); yGeoid_field->setFormatFunction(CFormatFunctions::floatingPointFormat,static_cast(formatString)); - _TW_SET_COMPONENT(zGeoid_field,48,8,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(zGeoid_field,52,9,12,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); zGeoid_field->setFormatFunction(CFormatFunctions::floatingPointFormat,static_cast(formatString)); - _TW_SET_COMPONENT(geodeticModel_box,55,7,10,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); + _TW_SET_COMPONENT(geodeticModel_box,59,8,10,1,CColorPair::WHITE_BLACK,CStyle::BOLD,output_label); geodeticModel_box->setStatusLook(Antenna::GEOID_WGS84); geodeticModel_box->setStatusLook(Antenna::GEOID_GRS80); geodeticModel_box->setStatusLook(Antenna::GEOID_MERIT83); @@ -330,6 +335,7 @@ int main(int argc, char *argv[]) { /** Add all required monitor installation here */ _INSTALL_MONITOR(universalTime_field,200); _INSTALL_MONITOR(julianDay_field,200); + _INSTALL_MONITOR(mjd_field,200); _INSTALL_MONITOR(GAST_field,200); _INSTALL_MONITOR(LocalST_field,200); _INSTALL_MONITOR(xGeoid_field,5000); @@ -350,15 +356,16 @@ int main(int argc, char *argv[]) { ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_INFO,MODULE_NAME"::DONE")); /* Add all the static labels */ - _TW_ADD_LABEL("Observatory Name :",0,0,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Universal Time :",0,1,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Julian Day :",0,2,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Apparent GST :",0,3,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("LST :",0,4,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("DUT1 :",0,5,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Pole motion (x,y):",0,6,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Geodetic Coords :",0,7,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); - _TW_ADD_LABEL("Geocentric Coords:",0,8,18,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Observatory Name :",0,0,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Universal Time :",0,1,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Julian Day :",0,2,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Modified Julian Day :",0,3,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Apparent GST :",0,4,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("LST :",0,5,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("DUT1 :",0,6,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Pole motion (x,y): :",0,7,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Geodetic Coords :",0,8,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); + _TW_ADD_LABEL("Geocentric Coords :",0,9,22,1,CColorPair::WHITE_BLACK,CStyle::UNDERLINE,window); /* ************************* */ /** Add all required association: components/Frame */ @@ -366,6 +373,7 @@ int main(int argc, char *argv[]) { window.addComponent((CFrameComponent*)GAST_field); window.addComponent((CFrameComponent*)LocalST_field); window.addComponent((CFrameComponent*)julianDay_field); + window.addComponent((CFrameComponent*)mjd_field); window.addComponent((CFrameComponent*)latitude_field); window.addComponent((CFrameComponent*)name_field); window.addComponent((CFrameComponent*)longitude_field); diff --git a/Common/Clients/ObservatoryTextClient/src/observatoryTui b/Common/Clients/ObservatoryTextClient/src/observatoryTui index 23fb38eac..d4c31177f 100644 --- a/Common/Clients/ObservatoryTextClient/src/observatoryTui +++ b/Common/Clients/ObservatoryTextClient/src/observatoryTui @@ -10,4 +10,4 @@ #************************************************************************ -xterm -geometry 69x16+0+0 +sb -title Observatory -e /bin/bash --login -c _tui_ObservatoryTextClient & \ No newline at end of file +xterm -geometry 73x17+0+0 +sb -title Observatory -e /bin/bash --login -c _tui_ObservatoryTextClient & diff --git a/Common/Interfaces/AntennaInterface/idl/Observatory.midl b/Common/Interfaces/AntennaInterface/idl/Observatory.midl index 9b80b58ba..f364d22bb 100644 --- a/Common/Interfaces/AntennaInterface/idl/Observatory.midl +++ b/Common/Interfaces/AntennaInterface/idl/Observatory.midl @@ -51,6 +51,12 @@ module Antenna { * This machine should be synchronized via NTP at the UTC time. */ readonly attribute ACS::ROdouble julianDay; + + /** + * This property is the current observatory time as a Modified Julian day. In practical this is the time reported by the local machine that runs the component. + * This machine should be synchronized via NTP at the UTC time. + */ + readonly attribute ACS::ROdouble MJD; /** * This property is the Greenwich Apparent Sidereal Time for the current date. diff --git a/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd index f0b1cb7f7..06a07eb93 100644 --- a/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd +++ b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd @@ -27,6 +27,7 @@ + diff --git a/Common/Servers/Observatory/include/ObservatoryDevIOs.h b/Common/Servers/Observatory/include/ObservatoryDevIOs.h index dbebd7395..4d062e1ff 100644 --- a/Common/Servers/Observatory/include/ObservatoryDevIOs.h +++ b/Common/Servers/Observatory/include/ObservatoryDevIOs.h @@ -33,6 +33,7 @@ public: enum TLinkedProperty { UNIVERSALTIME, /*!< the devio will be used to read the current time */ JULIANDAY, /*!< the devio will be used to read the current time as a julian day */ + MODIFIEDJULIANDAY, /*!< the devio will be used to read the current time as a modified julian day */ GAST, /*!< the devio will be used to read the current GST */ LST, /*!< the devio will be used to read the current Local Sidereal Time */ GEOMODEL, /*!< the devio will be used to read the current model of the geoid */ @@ -63,6 +64,10 @@ public: m_PropertyName=IRA::CString("Julian Day"); break; } + case MODIFIEDJULIANDAY : { + m_PropertyName=IRA::CString("Modified Julian Day"); + break; + } case GAST : { m_PropertyName=IRA::CString("Apparent GST"); break; @@ -165,6 +170,13 @@ public: m_Value=(T)clock.getJD(); break; } + case MODIFIEDJULIANDAY : { + TIMEVALUE now; + IRA::CIRATools::getTime(now); + IRA::CDateTime clock(now); + m_Value=(T)clock.getMJD(); + break; + } case GAST : { TIMEDIFFERENCE now; IRA::CDateTime clock; diff --git a/Common/Servers/Observatory/include/ObservatoryImpl.h b/Common/Servers/Observatory/include/ObservatoryImpl.h index ca6b99993..6da641936 100644 --- a/Common/Servers/Observatory/include/ObservatoryImpl.h +++ b/Common/Servers/Observatory/include/ObservatoryImpl.h @@ -117,6 +117,12 @@ public: * @return pointer to read-only double property julianDay */ virtual ACS::ROdouble_ptr julianDay() throw (CORBA::SystemException); + + /** + * Returns a reference to the implementation of the MJD property of the IDL interface. + * @return pointer to read-only double property MJD + */ + virtual ACS::ROdouble_ptr MJD() throw (CORBA::SystemException); /** * Returns a reference to the implementation of the GAST property of the IDL interface. @@ -242,6 +248,8 @@ private: SmartPropertyPointer m_puniversalTime; /** julianDay property */ SmartPropertyPointer m_pjulianDay; + /** MJD property */ + SmartPropertyPointer m_pMJD; /** apparentGST property */ SmartPropertyPointer m_pGAST; /** LST property */ diff --git a/Common/Servers/Observatory/src/ObservatoryImpl.cpp b/Common/Servers/Observatory/src/ObservatoryImpl.cpp index 41d588c15..a4d409959 100644 --- a/Common/Servers/Observatory/src/ObservatoryImpl.cpp +++ b/Common/Servers/Observatory/src/ObservatoryImpl.cpp @@ -60,6 +60,7 @@ ObservatoryImpl::ObservatoryImpl(const ACE_CString &CompName,maci::ContainerServ m_observatoryName(this), m_puniversalTime(this), m_pjulianDay(this), + m_pMJD(this), m_pGAST(this), m_pLST(this), m_pDUT1(this), @@ -103,6 +104,9 @@ void ObservatoryImpl::initialize() throw (ACSErr::ACSbaseExImpl) m_pjulianDay=new ROdouble(getContainerServices()->getName()+":julianDay",getComponent(), new ObsDevIO(ObsDevIO::JULIANDAY,static_cast(m_data)),true); + + m_pMJD=new ROdouble(getContainerServices()->getName()+":MJD",getComponent(), + new ObsDevIO(ObsDevIO::MODIFIEDJULIANDAY,static_cast(m_data)),true); m_pGAST=new ROuLongLong(getContainerServices()->getName()+":GAST",getComponent(), new ObsDevIO(ObsDevIO::GAST,static_cast(m_data)),true); @@ -206,6 +210,8 @@ GET_PROPERTY_REFERENCE(ACS::ROuLongLong,m_puniversalTime,universalTime); GET_PROPERTY_REFERENCE(ACS::ROdouble,m_pjulianDay,julianDay); +GET_PROPERTY_REFERENCE(ACS::ROdouble,m_pMJD,MJD); + GET_PROPERTY_REFERENCE(ACS::ROuLongLong,m_pGAST,GAST); GET_PROPERTY_REFERENCE(ACS::ROuLongLong,m_pLST,LST); diff --git a/Medicina/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Medicina/CDB/alma/ANTENNA/Observatory/Observatory.xml index ac1288245..7e8c02532 100644 --- a/Medicina/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/Medicina/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,6 +13,7 @@ + @@ -25,4 +26,4 @@ - \ No newline at end of file + diff --git a/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649..862a844f9 100644 --- a/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,6 +13,7 @@ + diff --git a/Noto/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Noto/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649..862a844f9 100644 --- a/Noto/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/Noto/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,6 +13,7 @@ + diff --git a/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649..862a844f9 100644 --- a/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,6 +13,7 @@ + diff --git a/SRT/CDB/alma/ANTENNA/Observatory/Observatory.xml b/SRT/CDB/alma/ANTENNA/Observatory/Observatory.xml index ac1288245..6ef5a7720 100644 --- a/SRT/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/SRT/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,7 +13,8 @@ - + + @@ -25,4 +26,4 @@ - \ No newline at end of file + diff --git a/SRT/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml b/SRT/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml index ac1288245..8614dd54b 100644 --- a/SRT/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml +++ b/SRT/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml @@ -13,6 +13,7 @@ + @@ -25,4 +26,4 @@ - \ No newline at end of file + -- GitLab From 0071f92bdb623e1770c19601706482a6fef269b0 Mon Sep 17 00:00:00 2001 From: Giuseppe Carboni Date: Mon, 6 Aug 2018 17:16:32 +0200 Subject: [PATCH 131/145] Fix #245, fixed some bugs of Sardara backend. (#246) Also integrated the backend with the new SRT LP band IFDistributor. --- Common/Servers/Sardara/include/CommandLine.h | 7 + .../Sardara/include/DevIOAttenuation.h | 2 +- .../Sardara/include/DevIOInputSection.h | 2 +- Common/Servers/Sardara/include/DevIOStatus.h | 2 +- Common/Servers/Sardara/src/CommandLine.cpp | 386 ++++++++---------- Common/Servers/Sardara/src/Makefile | 2 +- Common/Servers/Sardara/src/SardaraImpl.cpp | 20 +- .../CDB/alma/BACKENDS/Sardara/Sardara.xml | 8 +- 8 files changed, 203 insertions(+), 226 deletions(-) diff --git a/Common/Servers/Sardara/include/CommandLine.h b/Common/Servers/Sardara/include/CommandLine.h index fce0b6fee..64f0e008b 100644 --- a/Common/Servers/Sardara/include/CommandLine.h +++ b/Common/Servers/Sardara/include/CommandLine.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -123,6 +124,7 @@ public: * Call this function in order to know which section an input is attached to. */ void getInputSection(ACS::longSeq& inpSection) const; + void getInputSectionAttr(ACS::longSeq& inpSection) const; /** * Call this function in order to get the last measure of the system temperature. @@ -151,6 +153,8 @@ public: void getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl, BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl); + void getAttenuationAttr(ACS::doubleSeq& att) throw (ComponentErrors::SocketErrorExImpl,ComponentErrors::TimeoutExImpl, + BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl); /** * Call this function in order to get the current band width of each input. * @param bw this is a sequence of double values that correspond to the bandwidth of each analog input. @@ -481,6 +485,7 @@ private: ContainerServices* m_services; Backends::TotalPower_var m_totalPower; + Receivers::GenericIFDistributor_var m_ifDistributor; /** * List the fields of the backend status @@ -759,6 +764,8 @@ private: bool m_SC00S; bool m_SL00S; bool m_SP00S; + + bool m_stationSRT; }; diff --git a/Common/Servers/Sardara/include/DevIOAttenuation.h b/Common/Servers/Sardara/include/DevIOAttenuation.h index 75be04de5..40b378bdc 100644 --- a/Common/Servers/Sardara/include/DevIOAttenuation.h +++ b/Common/Servers/Sardara/include/DevIOAttenuation.h @@ -63,7 +63,7 @@ public: // get the CommandLine ....... CSecAreaResourceWrapper line=m_pLink->Get(); try { - line->getAttenuation(m_val); + line->getAttenuationAttr(m_val); } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOAttenuation::read()"); diff --git a/Common/Servers/Sardara/include/DevIOInputSection.h b/Common/Servers/Sardara/include/DevIOInputSection.h index e84fab13f..e1a58d48a 100644 --- a/Common/Servers/Sardara/include/DevIOInputSection.h +++ b/Common/Servers/Sardara/include/DevIOInputSection.h @@ -62,7 +62,7 @@ public: // get the CommandLine ....... CSecAreaResourceWrapper line=m_pLink->Get(); try { - line->getInputSection(m_val); + line->getInputSectionAttr(m_val); } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOInputSection::read()"); diff --git a/Common/Servers/Sardara/include/DevIOStatus.h b/Common/Servers/Sardara/include/DevIOStatus.h index f7ea7ea38..fc5900d72 100644 --- a/Common/Servers/Sardara/include/DevIOStatus.h +++ b/Common/Servers/Sardara/include/DevIOStatus.h @@ -65,7 +65,7 @@ public: try { DWORD ptrn; line->getBackendStatus(ptrn); - m_val=(ACS::pattern)ptrn; + //m_val=(ACS::pattern)ptrn; } catch (ACSErr::ACSbaseExImpl& E) { _ADD_BACKTRACE(ComponentErrors::PropertyErrorExImpl,dummy,E,"DevIOStatus::read()"); diff --git a/Common/Servers/Sardara/src/CommandLine.cpp b/Common/Servers/Sardara/src/CommandLine.cpp index 8f81b09c5..d21652b1b 100644 --- a/Common/Servers/Sardara/src/CommandLine.cpp +++ b/Common/Servers/Sardara/src/CommandLine.cpp @@ -55,6 +55,7 @@ CCommandLine::CCommandLine(ContainerServices *service): CSocket(), m_SC00S=false; m_SL00S=false; m_SP00S=false; + m_stationSRT=false; } CCommandLine::~CCommandLine() @@ -124,39 +125,40 @@ void CCommandLine::Init(CConfiguration *config) throw (ComponentErrors::SocketEr m_Error.Reset(); _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::Init()"); } - /* m_hostAddress=m_configuration->getDataIPAddress(); - if (m_hostAddress=="") { - if ((m_hostName=getHostName())=="") { - _THROW_EXCPT(ComponentErrors::SocketErrorExImpl,"CCommandLine::Init()"); - } - if ((m_hostAddress=getAddrbyHostName(m_hostName))=="") { - _THROW_EXCPT(ComponentErrors::SocketErrorExImpl,"CCommandLine::Init()"); - } - } */ /* After the first connection, the server send the protocol version string */ res=receiveBuffer(rBuff,RECBUFFERSIZE); //printf("connect = %s\n", rBuff); m_totalPower = Backends::TotalPower::_nil(); - try { - m_totalPower = m_services->getComponent("BACKENDS/TotalPower"); - } - catch (maciErrType::CannotGetComponentExImpl& ex) { - _ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,"CCommadLine::Init()"); - Impl.setComponentName("BACKENDS/TotalPower"); - throw Impl; - } - - //Waits a bit so that everything can settle down - IRA::CIRATools::Wait(0,200000); try { - //stopDataAcquisitionForced(); // this will force the backend to a normal status in case the connection came from an abnormal close - //setDefaultConfiguration(conf); //could throw exceptions........ + m_totalPower = m_services->getComponent("BACKENDS/TotalPower"); + } + catch (maciErrType::CannotGetComponentExImpl& ex) { + _ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,"CCommadLine::Init()"); + Impl.setComponentName("BACKENDS/TotalPower"); + throw Impl; + } + + m_ifDistributor = Receivers::GenericIFDistributor::_nil(); + try { + m_ifDistributor = m_services->getComponent("RECEIVERS/SRTIFDistributor"); } - catch (ACSErr::ACSbaseExImpl& ex) { // these are not real error so we do not want to give up - + catch (maciErrType::CannotGetComponentExImpl& ex) { + _ADD_BACKTRACE(ComponentErrors::CouldntGetComponentExImpl,Impl,ex,"CCommadLine::Init()"); + Impl.setComponentName("RECEIVERS/SRTIFDistributor"); + throw Impl; } + + char *Station; + IRA::CString cStation; + Station = getenv ("STATION"); + cStation = IRA::CString (Station); + if((cStation.Compare("SRT")==0)) + m_stationSRT = true; + + //Waits a bit so that everything can settle down + IRA::CIRATools::Wait(0,200000); } void CCommandLine::stopDataAcquisition() throw (BackendsErrors::ConnectionExImpl,BackendsErrors::NakExImpl, @@ -175,9 +177,9 @@ void CCommandLine::stopDataAcquisition() throw (BackendsErrors::ConnectionExImpl catch (...) { ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_DEBUG,"backend error while issuing a stop ascquisition")); } - ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_INFO,"TRANSFER_JOB_STOPPED")); - clearStatusField(CCommandLine::BUSY); // sets the component status to busy - clearStatusField(CCommandLine::SUSPEND); // sets the component status to transfer job suspended...... + ACS_LOG(LM_FULL_INFO,"CCommandLine::stopDataAcquisition()",(LM_NOTICE,"TRANSFER_JOB_STOPPED")); + clearStatusField(CCommandLine::BUSY); // unsets the component status to busy + clearStatusField(CCommandLine::SUSPEND); // unsets the component status to transfer job suspended...... } void CCommandLine::stopDataAcquisitionForced() throw (BackendsErrors::ConnectionExImpl,BackendsErrors::NakExImpl, @@ -194,8 +196,8 @@ void CCommandLine::startDataAcquisition() throw (BackendsErrors::BackendBusyExIm _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::startDataAcquisition()"); throw impl; }*/ - Message reply = sendBackendCommand(Command::start()); - ACS_LOG(LM_FULL_INFO,"CCommandLine::startDataAcquisition()",(LM_INFO,"ACQUISTION_STARTED")); + //Message reply = sendBackendCommand(Command::start()); + ACS_LOG(LM_FULL_INFO,"CCommandLine::startDataAcquisition()",(LM_NOTICE,"ACQUISTION_STARTED")); setStatusField(CCommandLine::BUSY); // sets the component status to busy setStatusField(CCommandLine::SUSPEND); // sets the component status to transfer job suspended...... } @@ -239,13 +241,10 @@ ACS::Time CCommandLine::resumeDataAcquisition(const ACS::Time& startT) throw (Ba else { expectedTime=epoch.value().value; } - /*if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::resumeDataAcquisition()"); - }*/ Message request = Command::start(); Message reply = sendBackendCommand(request); if(reply.is_success_reply()) { - ACS_LOG(LM_FULL_INFO,"CCommandLine::resumeDataAcquisition()",(LM_INFO,"TRANSFER_JOB_RESUMED")); + ACS_LOG(LM_FULL_INFO,"CCommandLine::resumeDataAcquisition()",(LM_NOTICE,"TRANSFER_JOB_RESUMED")); clearStatusField(SUSPEND); } return expectedTime; @@ -260,13 +259,10 @@ void CCommandLine::suspendDataAcquisition() throw (BackendsErrors::ConnectionExI impl.setReason("transfer job cannot be suspended in present configuration"); throw impl; }*/ - /*if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::suspendDataAcquisition()"); - }*/ Message request = Command::stop(); Message reply = sendBackendCommand(request); if(reply.is_success_reply()) { - ACS_LOG(LM_FULL_INFO,"CCommandLine::suspendDataAcquisition()",(LM_INFO,"TRANSFER_JOB_SUSPENDED")); + ACS_LOG(LM_FULL_INFO,"CCommandLine::suspendDataAcquisition()",(LM_NOTICE,"TRANSFER_JOB_SUSPENDED")); setStatusField(SUSPEND); } } @@ -277,15 +273,15 @@ void CCommandLine::setAttenuation(const long&inputId, const double& attenuation) AUTO_TRACE("CCommandLine::setAttenuation()"); double newAtt; - if (inputId>=0) { - //if (inputId>=m_sectionsNumber) { + if ((inputId < 0 ) || (inputId >= MAX_SECTION_NUMBER)) { + /*//if (inputId>=m_sectionsNumber) { if (inputId>m_inputsNumber) { // TBC !!! _EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CCommandLine::setAttenuation()"); impl.setReason("the input identifier is out of range"); throw impl; } } - else { + else {*/ _EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CCommandLine::setAttenuation()"); impl.setReason("the input identifier is out of range"); throw impl; @@ -306,9 +302,10 @@ void CCommandLine::setAttenuation(const long&inputId, const double& attenuation) m_attenuation[inputId]=attenuation; try { m_totalPower->setAttenuation(inputId, attenuation); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setAttenuation()",(LM_NOTICE,"TOTALPOWER_ATTENUATION INPUT=%ld,ATTENUATION=%lf",inputId,attenuation)); } catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CExternalClientsSocketServer::cmdToScheduler()"); + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()"); impl.log(LM_ERROR); } } @@ -324,11 +321,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const BackendsErrors::BackendBusyExImpl) { AUTO_TRACE("CCommandLine::setConfiguration()"); - //int res; - //WORD len; - //char sBuff[SENDBUFFERSIZE]; - //char rBuff[RECBUFFERSIZE]; - double newBW,newAtt,newSR,newFreq; + double newBW,newSR,newFreq; long newBins, newFeed, newPol; double filter; @@ -436,12 +429,6 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const } else newBins = m_bins[inputId]; - - /* - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setConfiguration()"); - }*/ - try { Message request = Command::setSection(inputId, newFreq, newBW, newFeed, newPol, newSR, newBins); @@ -462,7 +449,7 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const temp="RCP"; else temp="FULL_STOKES"; - ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"SECTION_CONFIGURED %ld,FREQ=%lf,BW=%lf,FEED=%d,POL=%s,SR=%lf,BINS=%d",inputId,m_frequency[inputId],newBW,m_feedNumber[inputId], + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"SECTION_CONFIGURED %ld,FREQ=%lf,BW=%lf,FEED=%ld,POL=%s,SR=%lf,BINS=%ld",inputId,m_frequency[inputId],newBW,m_feedNumber[inputId], (const char *)temp,newSR,m_bins[inputId])); if (m_SK00==true || m_SC00==true || m_SK00S==true || m_SC00S==true || m_SK77==true || m_SK77S==true || m_SK03==true || m_SK03S==true || m_SK06==true || m_SK06S==true) { if (newBW==420.00) @@ -515,10 +502,37 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const else m_totalPower->setSection(inputId,-1, filter, -1, -1, -1, -1); } + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"TOTALPOWER_FILTER_CONFIGURED %ld,FILTER=%lf",inputId,filter)); + } + if ((m_SL00==true || m_SL00S==true) && m_stationSRT == true) { + try { + if (newBW==230.00) { + m_ifDistributor->setup("BW-NARROW"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_FILTER_BW-NARROW")); + } + if (newBW==420.00) { + m_ifDistributor->setup("BW-MEDIUM"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_FILTER_BW-MEDIUM")); + } + if (newBW==500.00) { + m_ifDistributor->setup("BW-WIDE"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_FILTER_BW-WIDE")); + } + if (newBW==512.00) { + m_ifDistributor->setup("BW-UNFILTERED"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_FILTER_BW-UNFILTERED")); + } + } + catch (...) { + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()"); + impl.log(LM_ERROR); + } } } } - catch (...) {} + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::setSection()",(LM_NOTICE,"BACKEND_SARDARA_SET_SECTION ERROR")); + } } void CCommandLine::getZeroTPI(DWORD *tpi) throw (ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, @@ -675,7 +689,9 @@ void CCommandLine::getSample(ACS::doubleSeq& tpi,bool zero) throw (ComponentErro tpi.length(m_inputsNumber/*m_sectionsNumber*/); for (int j=0;j(j); - if (zero) m_tpiZero[j]=tpi[j]/(double)m_integration; // in case of tpiZero we store it...... + //if (zero) m_tpiZero[j]=tpi[j]/(double)m_integration; // in case of tpiZero we store it...... + if (zero) + m_tpiZero[j]=tpi[j]=0.0; // in case of tpiZero we store it...... } } } @@ -689,12 +705,17 @@ void CCommandLine::getRms(ACS::doubleSeq& rms) throw (ComponentErrors::TimeoutEx BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl) { AUTO_TRACE("CCommandLine::getRms()"); - Message reply = sendBackendCommand(Command::getRms()); - if(reply.is_success_reply()){ - rms.length(m_inputsNumber/*m_sectionsNumber*/); - for (int j=0;j(j); - } + try { + Message reply = sendBackendCommand(Command::getRms()); + if(reply.is_success_reply()){ + rms.length(m_inputsNumber/*m_sectionsNumber*/); + for (int j=0;j(j); + } + } + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::getRms()",(LM_NOTICE,"BACKEND_SARDARA_GET-RMS ERROR")); } } @@ -737,6 +758,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C m_inputsNumber=m_sectionsNumber; m_SL00=true; m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SL00S=m_SP00S=false; + if (m_stationSRT == true) { + m_ifDistributor->setup("BW-UNFILTERED"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED")); + } } if (config.Compare("SP00")==0) { m_filter = 730.0; @@ -785,6 +810,10 @@ void CCommandLine::setDefaultConfiguration(const IRA::CString & config) throw (C m_sectionsNumber=m_sectionsNumber/2; m_SL00S=true; m_SK77=m_SK03=m_SK06=m_SK00=m_SC00=m_SL00=m_SP00=m_SK77S=m_SK03S=m_SK06S=m_SK00S=m_SC00S=m_SP00S=false; + if (m_stationSRT == true) { + m_ifDistributor->setup("BW-UNFILTERED"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED")); + } } if (config.Compare("SP00S")==0) { m_filter = 730.0; @@ -838,7 +867,7 @@ void CCommandLine::sendTargetFileName() throw (BackendsErrors::BackendBusyExImpl else { _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::sendTargetFileName()"); } - ACS_LOG(LM_FULL_INFO,"CCommandLine::sendTargetFileName()",(LM_INFO,"targetFileName SENT")); + ACS_LOG(LM_FULL_INFO,"CCommandLine::sendTargetFileName()",(LM_NOTICE,"targetFileName SENT")); } void CCommandLine::setup(const char *conf) throw (BackendsErrors::BackendBusyExImpl,BackendsErrors::ConfigurationErrorExImpl,ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, @@ -879,6 +908,7 @@ void CCommandLine::setup(const char *conf) throw (BackendsErrors::BackendBusyExI } else m_totalPower->setSection(i,-1, m_filter, -1, -1, -1, -1); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"TOTALPOWER_FILTER_CONFIGURED %d,FILTER=%lf",i,m_filter)); } } ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_SARDARA_INITIALIZED, CONFIGURATION: %s",conf)); @@ -952,9 +982,6 @@ void CCommandLine::setTime() throw (ComponentErrors::TimeoutExImpl,BackendsErro _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::setTime()"); throw impl; }*/ - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setTime()"); - } /*len=CProtocol::setBackendTime(sBuff); // get the buffer if ((res=sendBuffer(sBuff,len))==SUCCESS) { res=receiveBuffer(rBuff,RECBUFFERSIZE); @@ -1000,9 +1027,9 @@ void CCommandLine::activateCalSwitching(const long& interleave) throw (BackendsE _EXCPT(BackendsErrors::BackendBusyExImpl,impl,"CCommandLine::setTime()"); throw impl; } - if (!checkConnection()) { + /*if (!checkConnection()) { _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setTime()"); - } + }*/ Message request = Command::calOn(interleave); Message reply = sendBackendCommand(request); if(reply.is_success_reply()){ @@ -1070,10 +1097,19 @@ void CCommandLine::getAttenuation(ACS::doubleSeq& att) throw (ComponentErrors::S ComponentErrors::TimeoutExImpl,BackendsErrors::MalformedAnswerExImpl,BackendsErrors::ConnectionExImpl) { AUTO_TRACE("CCommandLine::getAttenuation()"); - ACS::doubleSeq attenuation; att.length(m_inputsNumber); for (int i=0;i(0); - if(reply.is_success_reply()) - strcpy(status, _status.c_str()); - return _status.length(); - - /*strcpy (sBuff,"?status\r\n"); - len = strlen (sBuff); + try { + Message request = Command::status(); + Message reply = sendBackendCommand(request); + if(reply.is_success_reply()) { + string _status = reply.get_argument(2); + //strcpy(status, _status.c_str()); + status=atof(_status.c_str()); + if (status == 0) + clearStatusField(BUSY); + if (status == 1) + setStatusField(BUSY); - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - } - if (res>0) { // operation was ok. - if (!CProtocol::status(rBuff,timestamp,statusCode,acquiring)) { - _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::getBackendStatus()"); - } - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getBackendStatus()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getBackendStatus()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getBackendStatus()"); - } - ACS_LOG(LM_FULL_INFO,"CCommandLine::getBackendStatus()",(LM_INFO,"GETTING BACKEND STATUS")); - status=m_backendStatus; */ + } + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::getBackendStatus()",(LM_NOTICE,"BACKEND_SARDARA_GET_STATUS_ERROR")); + } + //return _status.length(); + return status; } void CCommandLine::getSampleRate(ACS::doubleSeq& sr) const @@ -1198,7 +1208,20 @@ void CCommandLine::getFeedAttr(ACS::longSeq& feed) const { feed.length(m_sectionsNumber); for (int i=0;i0) { // load OK - tt=m_backendTime.value().value; - }*/ - //_CHECK_ERRORS("CommandLine::getTime()"); + TIMEDIFFERENCE bkndTime; + TIMEVALUE tm; + long long seconds; + long second,minute,hour,day; + try { + Message request = Command::time(); + Message reply = sendBackendCommand(request); + if(reply.is_success_reply()) { + seconds=reply.get_argument(0); + day=seconds/86400; + seconds%=86400; + hour=seconds/3600; + seconds%=3600; + minute=seconds/60; + second=seconds % 60; + bkndTime.day(day); + bkndTime.hour(hour); + bkndTime.minute(minute); + bkndTime.second(second); + tm.reset(); + tm.normalize(true); + tm.year(1970); + tm.month(1); + tm.day(1); + tm+=bkndTime.value(); + tt=tm.value().value; + } + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::getTime()",(LM_NOTICE,"BACKEND_SARDARA_GET_TIME_ERROR")); + } } void CCommandLine::fillMainHeader(Backends::TMainHeader& bkd) { - long chs=0; - //long intTime; - // count the available channels....... - //for(int i=0;i0) { // operation was ok. clearStatusField(CCommandLine::BUSY); - //setStatusField(SUSPEND); + setStatusField(SUSPEND); } else if (res==FAIL) { _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); @@ -1534,44 +1581,6 @@ void CCommandLine::getConfiguration(char* configuration) catch (...) { } - /* - TIMEVALUE Now; - char sBuff[SENDBUFFERSIZE]; - char rBuff[RECBUFFERSIZE]; - WORD len; - int res; - - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getConfiguration()"); - } - strcpy (sBuff,"?get-configuration\r\n"); - len = strlen (sBuff); - - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - strcpy (configuration,rBuff); - } - if (res>0) { // operation was ok. - //if (!CProtocol::status(rBuff)) { - // _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::setDefaultConfiguration()"); - //} - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getConfigurationu)"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getConfiguration()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getConfiguration()"); - } - ACS_LOG(LM_FULL_INFO,"CCommandLine::getConfiguration()",(LM_INFO,"GETTING BACKEND CONFIGURATION")); - - return SENDBUFFERSIZE; */ } int CCommandLine::getCommProtVersion(CORBA::String_out version) @@ -1582,45 +1591,6 @@ int CCommandLine::getCommProtVersion(CORBA::String_out version) if(reply.is_success_reply()) strcpy(version, _version.c_str()); return _version.length(); - /* - TIMEVALUE Now; - char sBuff[SENDBUFFERSIZE]; - char rBuff[RECBUFFERSIZE]; - WORD len; - int res; - - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getCommProtVersion()"); - } - strcpy (sBuff,"?version\r\n"); - len = strlen (sBuff); - - if ((res=sendBuffer(sBuff,len))==SUCCESS) { - res=receiveBuffer(rBuff,RECBUFFERSIZE); - strcpy (version,(const char*)rBuff); - } - if (res>0) { // operation was ok. - //if (!CProtocol::status(rBuff)) { - // _THROW_EXCPT(BackendsErrors::NakExImpl,"CCommandLine::setDefaultConfiguration()"); - //} - } - else if (res==FAIL) { - _EXCPT_FROM_ERROR(ComponentErrors::IRALibraryResourceExImpl,dummy,m_Error); - dummy.setCode(m_Error.getErrorCode()); - dummy.setDescription((const char*)m_Error.getDescription()); - m_Error.Reset(); - _THROW_EXCPT_FROM_EXCPT(ComponentErrors::SocketErrorExImpl,dummy,"CCommandLine::getCommProtVersion()"); - } - else if (res==WOULDBLOCK) { - _THROW_EXCPT(ComponentErrors::TimeoutExImpl,"CCommandLine::getCommProtVersion()"); - } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getCommProtVersion()"); - } - ACS_LOG(LM_FULL_INFO,"CCommandLine::getCommProtVersion()",(LM_INFO,"GETTING COMMUNICATION PROTOCOL VERSION")); - - return SENDBUFFERSIZE; - */ } bool CCommandLine::checkConnection() diff --git a/Common/Servers/Sardara/src/Makefile b/Common/Servers/Sardara/src/Makefile index fc83109d1..aa1b160aa 100644 --- a/Common/Servers/Sardara/src/Makefile +++ b/Common/Servers/Sardara/src/Makefile @@ -62,7 +62,7 @@ LIBRARIES = SardaraImpl LIBRARIES_L = SardaraImpl_OBJECTS = SardaraImpl Configuration CommandLine SenderThread ControlThread -SardaraImpl_LIBS = IRALibrary GenericBackendStubs SardaraStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs \ +SardaraImpl_LIBS = IRALibrary GenericBackendStubs SardaraStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs SRTIFDistributorStubs\ bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors ParserErrors ManagementErrors \ DiscosBackendProtocolLib diff --git a/Common/Servers/Sardara/src/SardaraImpl.cpp b/Common/Servers/Sardara/src/SardaraImpl.cpp index ae3ad9790..8741ad1c4 100644 --- a/Common/Servers/Sardara/src/SardaraImpl.cpp +++ b/Common/Servers/Sardara/src/SardaraImpl.cpp @@ -347,7 +347,7 @@ void SardaraImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Ba // now comunicate the reading to the sender thread..... //m_senderThread->saveZero(tpi); // start the job for the backend..... - /*try { + try { line->startDataAcquisition(); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -362,7 +362,7 @@ void SardaraImpl::sendHeader() throw (CORBA::SystemException, BackendsErrors::Ba _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::sendHeader()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); - }*/ + } } void SardaraImpl::terminate() throw (CORBA::SystemException, BackendsErrors::BackendsErrorsEx, @@ -567,11 +567,11 @@ ACS::doubleSeq * SardaraImpl::getZero () throw (CORBA::SystemException, CSecAreaResourceWrapper line=m_commandLine->Get(); ACS::doubleSeq_var tpi=new ACS::doubleSeq; //TODO: how many sections???? - tpi->length(2); + //tpi->length(2); try { - //line->getSample(tpi,true); - tpi[0]=0.0; - tpi[1]=0.0; + line->getSample(tpi,true); + //tpi[0]=0.0; + //tpi[1]=0.0; } catch (ComponentErrors::ComponentErrorsExImpl& ex) { ex.log(LM_DEBUG); @@ -650,7 +650,7 @@ void SardaraImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (COR { AUTO_TRACE("SardaraImpl::setAttenutation()"); CSecAreaResourceWrapper line=m_commandLine->Get(); - /*try { + try { line->setAttenuation(input,att); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -665,7 +665,7 @@ void SardaraImpl::setAttenuation(CORBA::Long input,CORBA::Double att) throw (COR _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::setAttenutation()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); - }*/ + } } CORBA::Long SardaraImpl::getInputs(ACS::doubleSeq_out freq,ACS::doubleSeq_out bandWidth,ACS::longSeq_out feed,ACS::longSeq_out ifNumber) throw (CORBA::SystemException, @@ -694,7 +694,7 @@ void SardaraImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) thro { AUTO_TRACE("SardaraImpl::activateNoiseCalibrationSwitching()"); CSecAreaResourceWrapper line=m_commandLine->Get(); - /*try { + try { line->activateCalSwitching(interleave); // NOT YET AVAILABLE } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -709,7 +709,7 @@ void SardaraImpl::activateNoiseCalibrationSwitching(CORBA::Long interleave) thro _EXCPT(ComponentErrors::UnexpectedExImpl,dummy,"SardaraImpl::activateNoiseCalibrationSwitching()"); dummy.log(LM_DEBUG); throw dummy.getComponentErrorsEx(); - }*/ + } } void SardaraImpl::initialize(const char * configuration) throw (CORBA::SystemException, diff --git a/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml index 5d829cb47..193dc0f53 100644 --- a/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml +++ b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml @@ -20,10 +20,10 @@ DataPort="6001" DataIPAddress="192.168.200.200" DataLatency="3000000" - SenderSleepTime="300000" - SenderResponseTime="1000000" - ControlSleepTime="900000" - ControlResponseTime="1000000" + SenderSleepTime="30000000" + SenderResponseTime="10000000" + ControlSleepTime="90000000" + ControlResponseTime="100000000" BoardsNumber="14" DataBufferSize="64">
FeedCarier boardBackend channel