diff --git a/.gitignore b/.gitignore index 17db96484e84c1a6f9fc7d07904bc352d4fa24a8..0bb5c1955ff7fa45198efaaa102f4d31336d3713 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,7 @@ +.branchenv +introot* +bin/ +lib/ +object/ *~ -.svn *.swp - -# Python -*.pyc -__pycache__ - -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app diff --git a/.svnignore b/.svnignore deleted file mode 100644 index ff0738696ea2056f2aebe4b405f3d5f6525f999a..0000000000000000000000000000000000000000 --- a/.svnignore +++ /dev/null @@ -1,6 +0,0 @@ -rtai -object -lib -.purifydir -.idl-compilation-end -.idl-compilation-start diff --git a/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp b/Common/Clients/AntennaBossTextClient/src/AntennaBossTextClient.cpp index 931f2aed370a8df1687e3646e7c68966ac495655..26bfb465c382c6263a616d67f2d7d32ce0a38b9e 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; diff --git a/Common/Clients/CaltoolClient/src/Makefile b/Common/Clients/CaltoolClient/src/Makefile index e777a85fa7451989cfbe55b4ebad08a3c81ffb0a..a5b7b72093576b0b7778f2e6645d41aa7004bff0 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 -f calibrationtool_ui.py* clean_dist : clean_all clean_dist_all @echo " . . . clean_dist done" diff --git a/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h b/Common/Clients/ObservatoryTextClient/include/ObservatoryTextClient.h index 975f5c1022a0de418cb4c72c3e673656bcf4ca9b..786e1b91fd948006b227e276c4ad4ae4528af255 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 a66f97aa8673f2484062396098f3f54adccc0e0e..fb9f3cf2f72269d267936fbc8b15e824c04b74ac 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 23fb38eac15441cd20594391c60ff534618e1606..d4c31177f48771df162de7290a2e52563a796dc6 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/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp b/Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp index f5f497b2c5894d9fcb86c1b6658206c0bdbde630..c3dd3dfd09925dcbd0949c9e567635411d9310d2 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; diff --git a/Common/Clients/SystemTerminal/src/nuraghe_commands.py b/Common/Clients/SystemTerminal/src/nuraghe_commands.py index d2df204569f1596ba018cb041bcfa7bc7c730b8f..1ab5c387604101400fe91230284c261ceb149969 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/Errors/AntennaErrors/idl/AntennaErrors.xml b/Common/Errors/AntennaErrors/idl/AntennaErrors.xml index e0e3000acb4a1174a505ebe3798382eda55a49a9..c1a06e7faaa66bab7160b6773e78e8794cbaf6cd 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 f59ab66252927d8dcaaedaf8b13761e5a328a5d2..137e4ae375809c8df3aea0e16a4965494bd184fe 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 8fdfb151751511ccc47702169a52158ea2a71358..27d26794418478b09d43abc58ed071aeb26fd7b1 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 b1feadac7a2949fedb321be2707bcaa85153aab7..0db785b61cfb7c21c1bf092756131dcfbfe535a4 100644 --- a/Common/Errors/ComponentErrors/idl/ComponentErrors.xml +++ b/Common/Errors/ComponentErrors/idl/ComponentErrors.xml @@ -16,94 +16,98 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + diff --git a/Common/Errors/ManagementErrors/idl/ManagementErrors.xml b/Common/Errors/ManagementErrors/idl/ManagementErrors.xml index 813af16b2eda589510cbbc754e83b34e7c1fe454..f2587cb0a9f2bf28765631810c6c6e3998812843 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 eac005172a84434e61217c34cf5efb4b3b478dd3..13753156d0b47ab1dc240a71bae2d3535158cf96 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 276a675a0d04bedbe032825725f3a5317a80215f..8e5905906d728e46870cedbd6d0474694f31abbe 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 c889993a41db1a4064ffa28e688cb7829d4ebeb1..981efa6398199abfadae3a6cdf0387ccebb3ea8f 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 d62dad8c973df010bfc269d89e0cea6044315d09..2be8b9376c2bf23b24f935a65ccb616050f6b9bc 100644 --- a/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml +++ b/Common/Errors/XBackendErrors/idl/XBackendsErrors.xml @@ -13,12 +13,12 @@ - + - + - + - + diff --git a/Common/Interfaces/ActiveSurfaceInterface/src/Makefile b/Common/Interfaces/ActiveSurfaceInterface/src/Makefile index 73f6e4a25cd50d3113a377fe236226211d23218e..9f872ffd408767eeea7087bc43efd5a76d77a325 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 # diff --git a/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl b/Common/Interfaces/AntennaInterface/idl/AntennaBoss.midl index 62c23cf1eaffe05519d975c29a1cc62bfef0343f..7d5ace0ee792e676ae5ebe3dd30222fdc392adb3 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 b71317d2514ae082c4c7bccea03fb84d8c95c64b..eb9b3a0d04d8a5c42df5a14c37ac57edb409f46c 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 7474caf2e04c2e235a5638446c25aee0046acfb2..b764a7a89a00968ad0c03ab0431075cd6887ef05 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 diff --git a/Common/Interfaces/AntennaInterface/idl/Observatory.midl b/Common/Interfaces/AntennaInterface/idl/Observatory.midl index 9b80b58ba6574621eac1a046a6031d68ae985374..f364d22bbcd707f0ae7b201375a7b0bc48b4a538 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/Interfaces/AntennaInterface/src/Makefile b/Common/Interfaces/AntennaInterface/src/Makefile index f52c042308a58d67b2914d7e09f36df723d2bca6..e486056f0170f9b210b340833d6588823763d044 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) diff --git a/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd b/Common/Interfaces/BackendsInterface/config/CDB/schemas/GenericBackend.xsd index 90b37ab8c9e09f3f5b838a1cf07f597cfe9fdfad..a305f51e2bdaab9aa9cc529030b625b1f826ab07 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/BackendsInterface/idl/GenericBackend.idl b/Common/Interfaces/BackendsInterface/idl/GenericBackend.idl index b72b557ddf5284407d48531099d4bbbeb5fe3196..6e37ce08ed9d35dc96aa0200b07458d48032e973 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 @@ -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 e096cc96f3f96b1e4137dc07e306b6a3c10a5a9a..4bf2d36f53d73f0cc969afc30bdf64eed145def4 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 f79902d739e38470e4de4a28a857b7f198f2c280..2efff10004d57e869bdbbcb231667442f00a8d76 100644 --- a/Common/Interfaces/BackendsInterface/src/Makefile +++ b/Common/Interfaces/BackendsInterface/src/Makefile @@ -33,10 +33,23 @@ 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 = +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 +SardaraStubs_LIBS = baciStubs GenericBackendStubs + # # list of all possible C-sources (used to create automatic dependencies) # ------------------------------ diff --git a/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl b/Common/Interfaces/CommonInterface/idl/BackendsDefinitions.midl index 349f3633ce9e03469a9d18c58d27151ff197127f..4d28e08ce0c30d4f9be774742aabc7242edd4bb2 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 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 * 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 */ }; /** diff --git a/Common/Interfaces/CommonInterface/src/Makefile b/Common/Interfaces/CommonInterface/src/Makefile index fa84dbb1da9c3defac01ab4b2f5103b945a2364b..c80275755184eab119b70d976aa3aa12345d5109 100644 --- a/Common/Interfaces/CommonInterface/src/Makefile +++ b/Common/Interfaces/CommonInterface/src/Makefile @@ -38,14 +38,12 @@ 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 - -#TestAntenna_OBJECTS= AntennaModule -#TestAntenna_LIBS = AntennaDefinitionsStubs AntennaErrors ManagmentDefinitionsStubs ManagementErrors baci maci +TestManagement_LIBS= ManagementErrors baci maci # # @@ -60,7 +58,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 +71,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 # diff --git a/Common/Interfaces/ManagmentInterface/src/Makefile b/Common/Interfaces/ManagmentInterface/src/Makefile index 5cacdf88813fb056c61f564db8074da6cc5c1dcb..eeabeda3f155fa7c5b3cac2f6e3d8f84d35429c8 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 #---------------------------- diff --git a/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl b/Common/Interfaces/MinorServoInterface/idl/MinorServo.idl index fe8c5b5b55ab08ffa63afc6a981e861ed2058528..4f3bb3fdcc03a4e6a7deb9a1925683b8447350e5 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 f4f54f00fcdb2526027c9ee725b869c96199b14f..e3fab914fd9ea2d5c5181c78a68ee46508304061 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); diff --git a/Common/Interfaces/MinorServoInterface/src/Makefile b/Common/Interfaces/MinorServoInterface/src/Makefile index 3beaaa8c403aa7b2e572dcd82c812c4264551ac8..52add7d1e56e69e12a7bb85a0a147c84e7f5a02e 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 # ----------------- diff --git a/Common/Interfaces/MinorServoInterface/test/Makefile b/Common/Interfaces/MinorServoInterface/test/Makefile index bcdd86c95c08db0a10715335c3713fcc1b6f0d0b..e70daa63e47a9486f30106ddfcb5f37ec19104ff 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/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py b/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py deleted file mode 100644 index 3a4821c9fc3f3f5e66ba1b32236b588c54c8939e..0000000000000000000000000000000000000000 --- a/Common/Interfaces/MinorServoInterface/test/PyMinorServoTest/simunittest.py +++ /dev/null @@ -1,24 +0,0 @@ -import os -import sys -import time -import unittest2 -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) - time.sleep(1) # Give the server the time to start - suite = unittest2.TestSuite() - tests = unittest2.TestLoader().loadTestsFromTestCase(test_case) - suite.addTests(tests) - print 'Running the tests using the antenna simulators...' - unittest2.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 fd1d0c1466d4d168577329c8e6e05df97b24138e..aa862cae023e2ef745a3d8516fdd8a9580296eac 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,10 +16,10 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestServoSetupCmd(unittest2.TestCase): +class TestServoSetupCmd(unittest.TestCase): """Test the servoSetup command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() @@ -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 c13391cbd3864a8df2527a6e77e9ea152de78137..a4d0b257d144262fa87e7b4f801653999ffbe810 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,10 +17,10 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoASConfigurationCmd(unittest2.TestCase): +class TestSetServoASConfigurationCmd(unittest.TestCase): """Test the setServoASConfiguration command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() @@ -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 044e0b2aa6707fb60393c668df72fda490320f32..7d67f7ad17e8c49b29f56006dd71ead1355dfefa 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,10 +16,10 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoElevationTrackingCmd(unittest2.TestCase): +class TestSetServoElevationTrackingCmd(unittest.TestCase): """Test the setServoElevationTracking command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() @@ -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 7120fdd1f4d4729e5867cefe16ccbf9758678b82..64888d527253e1b121befa304476279ac76b07f5 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,10 +16,10 @@ from Acspy.Common.TimeHelper import getTimeStamp __author__ = "Marco Buttu " -class TestSetServoOffsetCmd(unittest2.TestCase): +class TestSetServoOffsetCmd(unittest.TestCase): """Test the setServoOffset command""" - telescope = os.getenv('TARGETSYS') + telescope = os.getenv('STATION') def setUp(self): self.client = PySimpleClient() @@ -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 31b8bfefda0f5887c71dd3732fc9aa32ccae2866..98ab9110f771c22df81139a9627beea0c12e1661 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_clearUserOffset.py @@ -3,32 +3,47 @@ from __future__ import with_statement import os import math import time -import unittest2 +import unittest 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 -__author__ = "Marco Buttu " +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) +__author__ = "Marco Buttu " -class TestClearUserOffset(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') +class TestClearUserOffset(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_wrong_servo_name(self): """Raise a MinorServoErrorsEx in case of wrong servo name""" @@ -37,6 +52,7 @@ 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) + 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 05962f5c93da91ef835cadfdf44eb0fe28098235..ed2b37f2cece596d2397231c5567450dcb9557e2 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 @@ -15,15 +15,33 @@ 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 TestGetAxesInfo(unittest2.TestCase): +class TestGetAxesInfo(unittest.TestCase): - telescope = os.getenv('TARGETSYS') + 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') @@ -31,6 +49,7 @@ class TestGetAxesInfo(unittest2.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" @@ -66,8 +85,8 @@ 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) + 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 a77ebdb723164c5bf0ba8fc2050f5dcb4965b5fb..7a1f575113c9dc6fb1f16c35158ae20f83873e0f 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 @@ -15,21 +15,38 @@ 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 TestGetAxesPosition(unittest2.TestCase): +class TestGetAxesPosition(unittest.TestCase): - telescope = os.getenv('TARGETSYS') + 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.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -63,8 +80,8 @@ 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) + 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 966b392ef938d2e9cef9592c6b00b426e416d254..600c3ea58e2b92473272b1d9d6d85c52cbde0456 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_getCentralScanPosition.py @@ -2,17 +2,39 @@ from __future__ import with_statement import os -import unittest2 +import unittest -from PyMinorServoTest import simunittest from Acspy.Clients.SimpleClient import PySimpleClient from MinorServoErrors import MinorServoErrorsEx -__author__ = "Marco Buttu " +from acswrapper.system import acs +from acswrapper.containers import ( + Container, ContainerError, start_containers_and_wait, + stop_containers_and_wait +) -class TestGetCentralScanPosition(unittest2.TestCase): +__author__ = "Marco Buttu " - telescope = os.getenv('TARGETSYS') +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() @@ -29,7 +51,8 @@ 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) + 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 28b03f12a47efb7faa3ee314a111593348a88d35..892aa9be6698885a53d252431c3d860618b4c7db 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 import Management import MinorServo import Antenna @@ -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(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') +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' @@ -102,7 +120,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) + 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 dc4baec9a67e7dd7d9386320cfcc4d41b2e67701..1c0c266f807bbd97a4d9e70f4c2ce0498752371d 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 import Management import MinorServo import Antenna @@ -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(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') +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(unittest2.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'): - 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) - 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 c998123bb7b00f014af0bf227d9cbb9b7049b6c9..b9cf2809636c3250f60e151aaf0c7aa00012cbea 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setASConfiguration.py @@ -1,26 +1,41 @@ from __future__ import with_statement import os -import unittest2 +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(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') +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""" @@ -35,6 +50,7 @@ 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) + 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 04d560530cfafb089053d8203058949e7ad78c93..8f24da6d380fcaefbc6bc73f399e2f9d24d4fa96 100644 --- a/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py +++ b/Common/Interfaces/MinorServoInterface/test/functional/test_setElevationTracking.py @@ -1,26 +1,41 @@ from __future__ import with_statement import os -import unittest2 +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(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') +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""" @@ -35,6 +50,7 @@ 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) + 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 42c11ae80d59d2dcb64bb4dcc8891a89cb2384cb..e25314614de906bc3d852a24d937b3ba7a24a541 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 @@ -14,21 +14,38 @@ 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 TestSystemOffset(unittest2.TestCase): +class TestSystemOffset(unittest.TestCase): - telescope = os.getenv('TARGETSYS') + 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.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -72,7 +89,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) + 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 61293ac06ae3adb75750c75b41d385f62e8e5527..269c44ce6345775709934d12822674bd1d053162 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 @@ -14,22 +14,39 @@ 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 TestUserOffset(unittest2.TestCase): +class TestUserOffset(unittest.TestCase): - telescope = os.getenv('TARGETSYS') + 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.setup_code = "CCB" if self.telescope == "SRT" else "CCC" @@ -73,7 +90,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) + from testing import simulator + simulator.run(TestUserOffset, 'srt-mscu-sim') diff --git a/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd b/Common/Interfaces/ReceiversInterface/config/CDB/schemas/LocalOscillator.xsd index f60199b9ad6f2f386bdbea8f5fa630b7e828a1f0..20fbcefea580c2e4c95904af5c3686f312367b14 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 a11aa685dd2ec24b816c506cda7093916433c918..b197ef41078caec8b79f56bfbcd9538b8cc4be47 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/Interfaces/ReceiversInterface/idl/DewarPositioner.idl b/Common/Interfaces/ReceiversInterface/idl/DewarPositioner.idl index 75bf28c4af8796e38e9ba0202c584c34ecaeeae1..802252b06c2ca14b89008969b844ae1ac5347157 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 67f96a3c58902ad3a7522fa7905b613c4a8e2e33..c336518c0378b6e0d0cf7e0f2afeca686a7b9414 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); /** diff --git a/Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl b/Common/Interfaces/ReceiversInterface/idl/GenericIFDistributor.idl new file mode 100644 index 0000000000000000000000000000000000000000..f9d7abc77e90b155ede35c9857da11d2cbe93788 --- /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 aeabeb85c924214d3bbb1922a8267c5981ed016f..2331291a2aab61e60cba7fc533fd95c592f54e82 100644 --- a/Common/Interfaces/ReceiversInterface/src/Makefile +++ b/Common/Interfaces/ReceiversInterface/src/Makefile @@ -20,7 +20,25 @@ 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 \ + 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 +GenericIFDistributorStubs_LIBS = baciStubs maciErrTypeStubs ComponentErrorsStubs + # list of all possible C-sources (used to create automatic dependencies) CSOURCENAMES = \ @@ -44,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/Common/Interfaces/WeatherStationInterface/src/Makefile b/Common/Interfaces/WeatherStationInterface/src/Makefile index 5f525fd8fcace8f2113d9f25396853494090cca9..effd4d55b2618990022162542da5effaabf70a1c 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 # diff --git a/Common/Interfaces/XBackendInterface/src/Makefile b/Common/Interfaces/XBackendInterface/src/Makefile index ccbeb380ed60193cb7b384badad748d8529e8128..015c80cbb9743ffd4d92e79a75a5423c1892c8a5 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) # ------------------------------ diff --git a/Common/Libraries/DiscosBackendProtocol/include/command.hpp b/Common/Libraries/DiscosBackendProtocol/include/command.hpp index cb2ae8a40970a8d65cb7e929f04bbaadafad251d..d00b70d3c1899f33b0aaa8401100f4fe083d8941 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/Libraries/IRALibrary/include/BaseConverter.h b/Common/Libraries/IRALibrary/include/BaseConverter.h new file mode 100644 index 0000000000000000000000000000000000000000..378826bf81282be08181e4d171018e72b2167edf --- /dev/null +++ b/Common/Libraries/IRALibrary/include/BaseConverter.h @@ -0,0 +1,73 @@ +#ifndef BASE_CONVERTER_H +#define BASE_CONVERTER_H + + +/* **************************************************************************************************** */ +/* IRA Istituto di Radioastronomia */ +/* */ +/* This code is under GNU General Public Licence (GPL). */ +/* */ +/* Who when What */ +/* Andrea Orlati(andrea.orlati@inaf.it) 24/07/2018 Creation */ + + +#include "String.h" + +#include +#include +#include + +namespace IRA{ + + /** + * This class contains some tools method to convert the base representing integer numbers. + * Initially some tools will be missing, they will be implemented as soon as they are required. + */ + class CBaseConverter { + public: + + /** + * This static method converts a decimal number to its binary representation + * @param number decimal number to be converted + */ + template static IRA::CString decToBin(T number) { + std::vector result; + decToBitSequence(number,result); + return CBaseConverter::binary(result); + } + + /** + * This static method converts a decimal number to its Hex representation + * @param number decimal number to be converted + */ + template static IRA::CString decToHex(T number) { + std::vector result; + decToBitSequence(number,result); + return CBaseConverter::hex(result); + } + + private: + + template static void decToBitSequence(T number,std::vector& result) { + unsigned bytes=sizeof(T); + unsigned digits=bytes*8; + result.empty(); + result.resize(digits,'0'); + unsigned pos=0; + do { + if ((number & 1)==0) + result[pos]='0'; + else + result[pos]='1'; + pos++; + } while ((number>>=1) && (pos& v); + static IRA::CString hex(const std::vector& v); + }; + +}; + + + +#endif \ No newline at end of file diff --git a/Common/Libraries/IRALibrary/include/DataField.h b/Common/Libraries/IRALibrary/include/DataField.h index c20b91070f742c845ad49711a8c53ae1234d291e..521ffbf2e7b257ef24c700511cd32cbc42f5af92 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/include/Definitions.h b/Common/Libraries/IRALibrary/include/Definitions.h index ae3028a8a5014bb9b1101e984e1299b5708dc4e5..8d496a1bdc0b1123bc470ad1eede2cae1e405b94 100644 --- a/Common/Libraries/IRALibrary/include/Definitions.h +++ b/Common/Libraries/IRALibrary/include/Definitions.h @@ -75,6 +75,7 @@ */ #define _ADD_EXTRA(OBJ,NAME,VALUE) OBJ.addData(NAME,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/include/ScheduleTimer.h b/Common/Libraries/IRALibrary/include/ScheduleTimer.h index 7962b5a85e9a0df45d77b6d87b4bf245e05963f6..95089e1a05eadfea197cf8e5793cd060c317e6ca 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; diff --git a/Common/Libraries/IRALibrary/src/BaseConverter.cpp b/Common/Libraries/IRALibrary/src/BaseConverter.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8f94911c31b8bf763880541baf45ee0826a3a57c --- /dev/null +++ b/Common/Libraries/IRALibrary/src/BaseConverter.cpp @@ -0,0 +1,42 @@ +#include "BaseConverter.h" + + +using namespace IRA; + +IRA::CString CBaseConverter::binary(const std::vector & v) +{ + std::string out=""; + for (unsigned iter=v.size();iter>0;iter--) { + out+=v[iter-1]; + } + return IRA::CString(out.c_str()); +} + +IRA::CString CBaseConverter::hex(const std::vector & v) +{ + std::string binToHex="",tmp="0000"; + for (int j=v.size()-1;j>=0;j-=4){ + for(unsigned i=0;i<4;i++) { + tmp[i]=v[j-i]; + } + if (!tmp.compare("0000")) binToHex+="0"; + else if (!tmp.compare("0001")) binToHex+="1"; + else if (!tmp.compare("0010")) binToHex+="2"; + else if (!tmp.compare("0011")) binToHex+="3"; + else if (!tmp.compare("0100")) binToHex+="4"; + else if (!tmp.compare("0101")) binToHex+="5"; + else if (!tmp.compare("0110")) binToHex+="6"; + else if (!tmp.compare("0111")) binToHex+="7"; + else if (!tmp.compare("1000")) binToHex+="8"; + else if (!tmp.compare("1001")) binToHex+="9"; + else if (!tmp.compare("1010")) binToHex+="A"; + else if (!tmp.compare("1011")) binToHex+="B"; + else if (!tmp.compare("1100")) binToHex+="C"; + else if (!tmp.compare("1101")) binToHex+="D"; + else if (!tmp.compare("1110")) binToHex+="E"; + else if (!tmp.compare("1111")) binToHex+="F"; + else continue; + } + return IRA::CString(binToHex.c_str()); +} + diff --git a/Common/Libraries/IRALibrary/src/DataField.cpp b/Common/Libraries/IRALibrary/src/DataField.cpp index 20e1486ce340c64db8de2cf65d8cac5605d0cdc9..ebbe731acd417553445ac4c98361f01fb0cb7331 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,34 +78,38 @@ 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((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 : { @@ -115,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/src/Error.cpp b/Common/Libraries/IRALibrary/src/Error.cpp index 3fac15476d6a6c6df3255ef3a86888f83b734165..caab234a707131a01ab551c22a736a84ab7432c4 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`, 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__': diff --git a/Common/Libraries/IRALibrary/src/IRATools.cpp b/Common/Libraries/IRALibrary/src/IRATools.cpp index 654276b8cdd3453ffdd4e34bfd83c85a9ad0419f..f73c99b39b051d51e990dbbfc1ff0dbea7d1ae26 100644 --- a/Common/Libraries/IRALibrary/src/IRATools.cpp +++ b/Common/Libraries/IRALibrary/src/IRATools.cpp @@ -714,7 +714,12 @@ bool CIRATools::radToHourAngle(const double& rad,IRA::CString& outString,char de int hmsf[4]; double ranged=dmod(rad,D2PI); // put the angle in the range -2PI..2PI slaDr2tf(3,ranged,&sign,hmsf); // convert it into hour minute second and fraction - outString.Format("%c%02ld%c%02ld%c%02ld.%03ld",sign,hmsf[0],delimiter,hmsf[1],delimiter,hmsf[2],hmsf[3]); + if (sign=='+') { + outString.Format("%02d%c%02d%c%02d.%03d",hmsf[0],delimiter,hmsf[1],delimiter,hmsf[2],hmsf[3]); + } + else { + outString.Format("%c%02d%c%02d%c%02d.%03d",sign,hmsf[0],delimiter,hmsf[1],delimiter,hmsf[2],hmsf[3]); + } return true; } @@ -775,7 +780,12 @@ bool CIRATools::radToSexagesimalAngle(const double& rad,IRA::CString& outString, double ranged=dmod(rad,D2PI); // put the angle in the range -2PI..2PI // convert it into hour minute second anf fraction..keeping track of the sign slaDr2af(3,ranged,&sign,dmsf); - outString.Format("%c%02ld%c%02ld%c%02ld.%03ld",sign,dmsf[0],delimiter,dmsf[1],delimiter,dmsf[2],dmsf[3]); + if (sign=='+') { + outString.Format("%02d%c%02d%c%02d.%03d",dmsf[0],delimiter,dmsf[1],delimiter,dmsf[2],dmsf[3]); + } + else { + outString.Format("%c%02d%c%02d%c%02d.%03d",sign,dmsf[0],delimiter,dmsf[1],delimiter,dmsf[2],dmsf[3]); + } return true; } @@ -798,7 +808,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 +829,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 +849,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 +878,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 +923,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/Makefile b/Common/Libraries/IRALibrary/src/Makefile index 943022854b05b4189ba8785c62880eb1bb066d99..c93a3aadeb0e4e6103fad1f2b84eae825eeda506 100644 --- a/Common/Libraries/IRALibrary/src/Makefile +++ b/Common/Libraries/IRALibrary/src/Makefile @@ -36,7 +36,7 @@ USER_CFLAGS = INCLUDES = Definitions.h String.h IRATools.h Error.h SecureArea.h SerialPort.h Lecom.h FastQueue.h\ Socket.h DataField.h DBTable.h LogFilter.h Site.h DateTime.h Timer.h SkySource.h TimeTaggedCircularArray.h \ ScheduleTimer.h TimeoutSync.h MicroControllerBoard.h ReceiverControl.h MicroControllerBoardDef.h \ - SourceFlux.h CustomLoggerUtils.h LogDike.h FrequencyTracking.h IRA + SourceFlux.h CustomLoggerUtils.h LogDike.h FrequencyTracking.h BaseConverter.h IRA # # Libraries (public and local) @@ -45,7 +45,7 @@ LIBRARIES = IRALibrary LIBRARIES_L = IRALibrary_OBJECTS = String IRATools Error SerialPort Lecom Socket DataField DBTable LogFilter \ Site DateTime Timer SkySource TimeTaggedCircularArray ScheduleTimer TimeoutSync MicroControllerBoard \ - ReceiverControl SourceFlux CustomLoggerUtils LogDike FrequencyTracking + ReceiverControl SourceFlux CustomLoggerUtils LogDike FrequencyTracking BaseConverter IRALibrary_LIBS = acstime SlaLibrary maciClient PY_PACKAGES = IRAPy diff --git a/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp b/Common/Libraries/IRALibrary/src/MicroControllerBoard.cpp index 0180d49cb085f72348045575046697dbe2c22ac5..18a766000c1982dbe96078902b727be52ab75e54 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; diff --git a/Common/Libraries/IRALibrary/src/ScheduleTimer.cpp b/Common/Libraries/IRALibrary/src/ScheduleTimer.cpp index 52500a31b3b2da37753ce911dc4ed92a0929fb0d..441e4ed61d38e4dfadd0e380563b9ff7f5f40eb2 100644 --- a/Common/Libraries/IRALibrary/src/ScheduleTimer.cpp +++ b/Common/Libraries/IRALibrary/src/ScheduleTimer.cpp @@ -43,6 +43,7 @@ CScheduleTimer::~CScheduleTimer() delete m_timerQueue; } for(i=m_events.begin();icleanupFunction) (*i)->cleanupFunction((*i)->parameter); delete (*i)->handler; delete (*i); } @@ -71,6 +72,7 @@ bool CScheduleTimer::cancel(const ACS::Time& time) for(i=m_events.begin();itime==time) { if (m_timerQueue->cancel((*i)->id)!=0) { //remove the event from the queue + if ((*i)->cleanupFunction) (*i)->cleanupFunction((*i)->parameter); delete (*i)->handler; delete (*i); m_events.erase(i); @@ -92,6 +94,8 @@ bool CScheduleTimer::cancel(const unsigned& pos) } id=m_events[pos]->id; if (m_timerQueue->cancel(id)!=0) { //remove the event from the queue + if ((m_events[pos])->cleanupFunction) (m_events[pos])->cleanupFunction( + (m_events[pos])->parameter); delete m_events[pos]->handler; delete m_events[pos]; m_events.erase(m_events.begin()+pos); @@ -112,8 +116,10 @@ bool CScheduleTimer::cancelAll() else { ok=false; } + if ((*i)->cleanupFunction) (*i)->cleanupFunction((*i)->parameter); delete (*i)->handler; delete (*i); + } m_events.clear(); return ok; @@ -131,7 +137,8 @@ bool CScheduleTimer::getNextEvent(unsigned &index,ACS::Time& time,ACS::TimeInter return true; } -bool CScheduleTimer::schedule(TCallBack callBack,const ACS::Time& timeMark,const ACS::TimeInterval& interval,const void* param,TCleanupFunction cleanup) +bool CScheduleTimer::schedule(TCallBack callBack,const ACS::Time& timeMark,const ACS::TimeInterval& interval, + const void* param,TCleanupFunction cleanup) { long id; ACS::Time time=timeMark; diff --git a/Common/Libraries/IRALibrary/src/Socket.cpp b/Common/Libraries/IRALibrary/src/Socket.cpp index 01c308498894c06eb810f43d92dd5ad3c944c5c2..cfdb38b67cb604f88fc512b301bfcadbc6a2ae9c 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; } @@ -332,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/src/String.cpp b/Common/Libraries/IRALibrary/src/String.cpp index 754b2ea006bbf030dab4f1bad60f50881b1a1f5c..62bf246ca23b7721391495fe5dc629b29841283b 100644 --- a/Common/Libraries/IRALibrary/src/String.cpp +++ b/Common/Libraries/IRALibrary/src/String.cpp @@ -161,8 +161,7 @@ CString & CString::Concat(const char *add) CString & CString::Concat(char add) { - Concat(&add); - return *this; + return Concat(&add); } CString & CString::Concat(int nValue) @@ -443,7 +442,7 @@ int CString::Replace(char ch1,char ch2,int start) return -1; } -bool CString::Replace(const char *str1,const char *str2) +bool CString::Replace(const char *str1,const char *str2) { char *p; char *buffer; @@ -680,8 +679,7 @@ const CString & CString::operator +=(const CString & src) const CString & CString::operator +=(char ch) { - Concat(ch); - return *this; + return Concat(ch); } const CString & CString::operator +=(const char *str) diff --git a/Common/Libraries/IRALibrary/src/TestScheduleTimer.cpp b/Common/Libraries/IRALibrary/src/TestScheduleTimer.cpp index 08e608f9e9700f1378e0492d68167b2a189962e5..6344adf4e4b973c00cb6e3c4d542fb4c8c0c9c77 100644 --- a/Common/Libraries/IRALibrary/src/TestScheduleTimer.cpp +++ b/Common/Libraries/IRALibrary/src/TestScheduleTimer.cpp @@ -27,10 +27,16 @@ void oneShotCallBack(const ACS::Time& time,const void *par) Runit=false; } +void contCleanUp(const void * par) +{ + long *val=(long *)(par); + printf("continuous event clean-up called, got %ld\n",*val); +} + void cleanUp(const void * par) { - printf("event cleanup called\n"); + printf("one shot event clean-up called\n"); } int main(int argc, char *argv[]) @@ -48,20 +54,20 @@ int main(int argc, char *argv[]) printf("Error initializing the timer\n"); return -1; } - // setup a continuos event...every 2.5 seconds + // setup a continuous event...every 2.5 seconds par1=1; period.second(2); period.microSecond(500000); - if (!timer.schedule(&contCallBack,now.value().value,period.value().value,&par1)) { - printf("Error scheduling the continuos event\n"); + if (!timer.schedule(&contCallBack,now.value().value,period.value().value,&par1,contCleanUp)) { + printf("Error scheduling the continuous event\n"); return -1; } - // setup a continuos event...every 0.7 seconds + // setup a continuous event...every 0.5 seconds par2=2; period.reset(); - period.microSecond(700000); - if (!timer.schedule(&contCallBack,now.value().value,period.value().value,&par2)) { - printf("Error scheduling the continuos event\n"); + period.microSecond(500000); + if (!timer.schedule(&contCallBack,now.value().value,period.value().value,&par2,contCleanUp)) { + printf("Error scheduling the continuous event\n"); return -1; } // saves the current time @@ -77,12 +83,12 @@ int main(int argc, char *argv[]) while (Runit) { CIRATools::Wait(500000); } - printf("removing the first continuos event\n"); + printf("removing the first continuous event\n"); if (!timer.cancel(copy.value().value)) { - printf("Error canceling an event\n"); + printf("Error cancelling an event\n"); return -1; } CIRATools::Wait(5,0); - printf("closing up\n"); + printf("closing up everything\n"); } diff --git a/Common/Libraries/IRALibrary/src/TestSkySource.cpp b/Common/Libraries/IRALibrary/src/TestSkySource.cpp index 03093b3e16b67fb7dbe91a394d8f6a0e173f06fb..7323c2642ab4351cbc52286a992bac999f4ebd4d 100644 --- a/Common/Libraries/IRALibrary/src/TestSkySource.cpp +++ b/Common/Libraries/IRALibrary/src/TestSkySource.cpp @@ -120,7 +120,6 @@ int main(int argc, char *argv[]) IRA::CIRATools::radToHourAngle(ra,outra); IRA::CIRATools::radToSexagesimalAngle(dec,outdec); - _CP_ printf("SOURCE:\t\t\tname %s, ra2000 %.8lf° (%s), dec2000 %.8lf° (%s)\n",(const char *)sourceName,ra*DR2D,(const char *)outra,dec*DR2D,(const char *)outdec); if (siteArg=="") { diff --git a/Common/Libraries/IRALibrary/tests/BaseConverter_test.i b/Common/Libraries/IRALibrary/tests/BaseConverter_test.i new file mode 100644 index 0000000000000000000000000000000000000000..86afb7e5af5df400f037a1bbd7b6ea2822bbf736 --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/BaseConverter_test.i @@ -0,0 +1,52 @@ +#include "BaseConverter.h" + +#include + +namespace IRALibraryTest { + +class IRALibrary_BaseConverter : public ::testing::Test { + +public: + +::testing::AssertionResult decToBin_checkConversion() { + ::testing::Test::RecordProperty("description","check if straight decimal to binary convertion works correctly"); + char onebyte=1; + if (IRA::CBaseConverter::decToBin(onebyte)!="00000001") return ::testing::AssertionFailure() << "Convertion of 1 (byte) is not correct"; + if (IRA::CBaseConverter::decToBin(1234)!="00000000000000000000010011010010") return ::testing::AssertionFailure() + << "Convertion of 1234 (int) is not correct"; + if (IRA::CBaseConverter::decToBin(-1234)!="11111111111111111111101100101110") return ::testing::AssertionFailure() + << "Convertion of -1234 (int) is not correct"; + if (IRA::CBaseConverter::decToBin(-1234l)!="1111111111111111111111111111111111111111111111111111101100101110") + return ::testing::AssertionFailure() << "Convertion of -1234 (long) is not correct"; + return ::testing::AssertionSuccess(); + + +} + +::testing::AssertionResult decToHex_checkConversion() { + ::testing::Test::RecordProperty("description","check if straight decimal to hex convertion works correctly"); + //std::cout << IRA::CBaseConverter::decToHex(-2147483648) << endl; + if (IRA::CBaseConverter::decToHex(0)!="00000000") return ::testing::AssertionFailure() << "Convertion of 0 is not correct"; + if (IRA::CBaseConverter::decToHex(2147483647)!="7FFFFFFF") return ::testing::AssertionFailure() << "Convertion of 2147483647 is not correct"; + if (IRA::CBaseConverter::decToHex(-1)!="FFFFFFFF") return ::testing::AssertionFailure() << "Convertion of -1 is not correct"; + if (IRA::CBaseConverter::decToHex(-2147483648l)!="FFFFFFFF80000000") return ::testing::AssertionFailure() << "Convertion of -2147483648 is not correct"; + return ::testing::AssertionSuccess(); +} + +static void TearDownTestCase() +{ +} + +static void SetUpTestCase() +{ +} + +virtual void SetUp() { +} + +virtual void TearDown() { +} + +}; + +}; \ No newline at end of file diff --git a/Common/Libraries/IRALibrary/tests/CDBTable_regression.i b/Common/Libraries/IRALibrary/tests/CDBTable_regression.i new file mode 100644 index 0000000000000000000000000000000000000000..968102f1b69150969b9436262f333064bc2a0c4a --- /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/CError_regression.i b/Common/Libraries/IRALibrary/tests/CError_regression.i new file mode 100644 index 0000000000000000000000000000000000000000..9b54e1d55ee85ad8c1c1ca55cc45fe50a14f90fc --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/CError_regression.i @@ -0,0 +1,39 @@ +#include "Error.h" + +#include + +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/CIRATools_regression.i b/Common/Libraries/IRALibrary/tests/CIRATools_regression.i new file mode 100644 index 0000000000000000000000000000000000000000..47c78e718c7586a14596b08c5fbc24b48ef3b052 --- /dev/null +++ b/Common/Libraries/IRALibrary/tests/CIRATools_regression.i @@ -0,0 +1,55 @@ +#include "IRATools.h" +#include "String.h" + +#include +#include + +#define DEC2000 "29:40:15.201" +#define RA2000 "04:37:04.370" + + +namespace IRALibraryTest { + +class IRALibrary_CIRATools_regression : public ::testing::Test { +public: + ::testing::AssertionResult radToSexagesimalAngle_badconversion() { + double dec; + IRA::CString outdec; + RecordProperty("description","check the conversion of arc seconds which seems screwed up after 64 bit migration"); + IRA::CIRATools::sexagesimalAngleToRad(DEC2000,dec,true); + IRA::CIRATools::radToSexagesimalAngle(dec,outdec); + if (outdec!=DEC2000) { + return ::testing::AssertionFailure() << " unexpected arc seconds conversion"; + } + return ::testing::AssertionSuccess(); + } + + ::testing::AssertionResult radToHourAngle_badconversion() { + double ra; + IRA::CString outra; + RecordProperty("description","check the conversion of arc seconds which seems screwed up after 64 bit migration"); + IRA::CIRATools::hourAngleToRad(RA2000,ra,true); + IRA::CIRATools::radToHourAngle(ra,outra); + if (outra!=RA2000) { + return ::testing::AssertionFailure() << " unexpected arc seconds conversion"; + } + return ::testing::AssertionSuccess(); + } + +protected: + + static void TearDownTestCase() + { + } + + static void SetUpTestCase() + { + } + + virtual void SetUp() { + } + virtual void TearDown() { + } +}; + +} diff --git a/Common/Libraries/IRALibrary/tests/CString_test.i b/Common/Libraries/IRALibrary/tests/CString_test.i new file mode 100644 index 0000000000000000000000000000000000000000..d761e4facdaa31322310eec1db89bf13d186c7c3 --- /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/Socket_test.i b/Common/Libraries/IRALibrary/tests/Socket_test.i new file mode 100644 index 0000000000000000000000000000000000000000..ec25048781c162a7f716f8b076f5fb3bba0619f4 --- /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 3955805f9279d06a3fed875e3353c341945dd59d..846f79260cdfb678daeb17a4a5c7cc5252a609a8 100644 --- a/Common/Libraries/IRALibrary/tests/unittest.cpp +++ b/Common/Libraries/IRALibrary/tests/unittest.cpp @@ -2,7 +2,15 @@ #include "IRATools_test.i" #include "FastQueue_test.i" +#include "Socket_test.i" +#include "CError_regression.i" +#include "CDBTable_regression.i" +#include "CIRATools_regression.i" + +#include "CString_test.i" + +#include "BaseConverter_test.i" using namespace IRALibraryTest; @@ -58,6 +66,39 @@ TEST_F(IRALibrary_FastQueue,FastQueue_checkConsistency){ EXPECT_TRUE(FastQueue_checkConsistency()); } +TEST_F(IRALibrary_Socket,sendWithoutConnection){ + EXPECT_TRUE(sendWithoutConnection()); +} +TEST_F(IRALibrary_CError,copyConstructor_segfault){ + EXPECT_TRUE(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()); +} + +TEST_F(IRALibrary_BaseConverter,decToBin_checkConversion) { + EXPECT_TRUE(decToBin_checkConversion()); +} + +TEST_F(IRALibrary_BaseConverter,decToHex_checkConversion) { + EXPECT_TRUE(decToHex_checkConversion()); +} + +TEST_F(IRALibrary_CIRATools_regression,radToSexagesimalAngle_badconversion) { + EXPECT_TRUE(radToSexagesimalAngle_badconversion()); +} + +TEST_F(IRALibrary_CIRATools_regression,radToHourAngle_badconversion) { + EXPECT_TRUE(radToHourAngle_badconversion()); +} diff --git a/Common/Libraries/Makefile b/Common/Libraries/Makefile index 98c6a063e957f815a675a5f0c3507b11babe1f7b..fb68f45464c4ded6ffbbc1ecba6c168d57f90177 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 +MODULES = PyACSWrapper PyTesting MAKE_FLAGS = "-k" diff --git a/Common/Libraries/ModbusChannel/include/ModbusChannel.h b/Common/Libraries/ModbusChannel/include/ModbusChannel.h index e789aa2d6796ae67488c37f5d756effa4f3277b2..350392accb6eb147eed205278d9ff17c14db4b80 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 cafe62fc5bf3bf410441059f6b9aa2183128c29f..7f7d4241ad27e1dadc2c6a849124bec86666d8a1 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 aa498e74205c8930b313d950c88d88fbe9dd42a0..6f59f736cd886cf100a0b01c81919a1afbe5069a 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; diff --git a/Common/Libraries/ParserLibrary/include/ParserConnector.h b/Common/Libraries/ParserLibrary/include/ParserConnector.h new file mode 100644 index 0000000000000000000000000000000000000000..f6d787bee77fa55a3c8e32a3f0bd50678b5bde01 --- /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 0000000000000000000000000000000000000000..05b7e7302b2cccfaf1bcd73fabd3e1482acd0070 --- /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 4b00c421b9f79291c1dda73b4a2ebbca3c3405ef..1f77dcfe4fabceace8b94c926fb0e1cae131be3a 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,6 +118,8 @@ namespace SimpleParser { #define _SP_TIMETAGGEDQUEUECLEARALL "flushAll" #define _SP_TIMETAGGEDQUEUECLEARALL_PARAMS 0 + + /** * 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 @@ -231,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); + } } /** @@ -245,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); + } } /** @@ -256,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); + } } /** @@ -268,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); + } } /** @@ -568,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 491fc91a791577671ca1588769e43297b4bde5e6..a9e809459d9fa706a371e76339fb4f9dd2ed3bd3 100644 --- a/Common/Libraries/ParserLibrary/include/SP_parser.i +++ b/Common/Libraries/ParserLibrary/include/SP_parser.i @@ -19,13 +19,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; } @@ -93,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) { @@ -400,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 0000000000000000000000000000000000000000..bb91f5f2c664c906787ccef388e228febb27cac7 --- /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 8591eb5f9df0983a870e591ebcababc213fabf32..e431de1fef7b4dc14a95d36fbf696d8a3268ebd5 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 0000000000000000000000000000000000000000..19762efa8a4a44d7cd2a728fc9b708e7b0e84ab1 --- /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 (count +#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 86370aa704467bce03a81d9b91bbfba888089540..0000000000000000000000000000000000000000 --- 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 3b5e6c818a8b52dcee4a923eb143680bdd4cd033..521c327da11ca2ba2a933959682cec045223f614 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/Libraries/PyACSWrapper/src/Makefile b/Common/Libraries/PyACSWrapper/src/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..3ff43aa525f352e150af4f2815a26e48187d9cb7 --- /dev/null +++ b/Common/Libraries/PyACSWrapper/src/Makefile @@ -0,0 +1,34 @@ +#***************************************** +#----------------------------------------- +# Marco Buttu +#----------------------------------------- +#***************************************** + +PY_PACKAGES = acswrapper + +# ----------------- +# 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 acswrapper/*.pyc + $(RM) ../lib ../bin ../config ../doc ../idl ../include \ + ../object ../rtai ../test + $(RM) $(INTROOT)/lib/python/site-packages/acswrapper* + @echo " . . . clean done" + +install : install_all + @echo " . . . installation done" + +#___oOo___ diff --git a/Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py b/Common/Libraries/PyACSWrapper/src/acswrapper/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..7e0120f0fd54aa3c70406f05b20d65092bcf7dc4 --- /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 0000000000000000000000000000000000000000..923f589829ddd63b939e28696dd55cea74f3b8fc --- /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 0000000000000000000000000000000000000000..8506c05658fe2b921e5896858767b8aabaac080b --- /dev/null +++ b/Common/Libraries/PyACSWrapper/src/acswrapper/system.py @@ -0,0 +1,74 @@ +__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('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') + + 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/PyTesting/src/Makefile b/Common/Libraries/PyTesting/src/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..579a3294758f8c74ce988e693c73e24d2800f44a --- /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/Libraries/PyTesting/src/testing/simulator.py b/Common/Libraries/PyTesting/src/testing/simulator.py new file mode 100644 index 0000000000000000000000000000000000000000..0e04bbce8185458ebcf8b0d370306a00d33d6da7 --- /dev/null +++ b/Common/Libraries/PyTesting/src/testing/simulator.py @@ -0,0 +1,30 @@ +import os +import sys +import time +import signal +import unittest +import subprocess + + +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 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) + suite.addTests(tests) + print 'Running the tests using the antenna simulators...' + unittest.TextTestRunner(verbosity=2).run(suite) + finally: + 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/Common/Libraries/TextWindowLibrary/src/Makefile b/Common/Libraries/TextWindowLibrary/src/Makefile index f6282350fea6c0470c54b91acab7782193a60eba..156a581517d7729a0ddd884bbe664120e26b924e 100644 --- a/Common/Libraries/TextWindowLibrary/src/Makefile +++ b/Common/Libraries/TextWindowLibrary/src/Makefile @@ -208,6 +208,7 @@ man : do_man @echo " . . . man page(s) done" install : install_all + @chmod 700 $(INTROOT)/bin/getTextClientTemplate @echo " . . . installation done" diff --git a/Common/Libraries/XarcosLibrary/src/GroupSpectrometer.cpp b/Common/Libraries/XarcosLibrary/src/GroupSpectrometer.cpp index dea0209532aa0f1faf5509dbe057b13954c44ccf..c6f7d69d4e982a1c58325ce27815c48ac0ae9e91 100644 --- a/Common/Libraries/XarcosLibrary/src/GroupSpectrometer.cpp +++ b/Common/Libraries/XarcosLibrary/src/GroupSpectrometer.cpp @@ -240,10 +240,18 @@ if(doppio){//#ifdef DOPPIO // inserito un ulteriore controllo (i < Xspec.GetNSezioni()) // per evitare un segmentation fault della GetModoPol //while((spec[i].GetModoPol()) && (i < 7)) { - while((spec[i].GetModoPol()) && (i < Xspec.GetNSezioni())) { + /*while((spec[i].GetModoPol()) && (i < Xspec.GetNSezioni())) { //printf("7 modoPol = %d\n", spec[i].GetModoPol()); i++; - } + // inserito un ulteriore controllo (i==Xspec.GetNSezioni()) + // per evitare un segmentation fault della GetModoPol + printf("nsez = %d\n", Xspec.GetNSezioni()); + if (i==Xspec.GetNSezioni()) { + printf("break\n"); + break; + } + }*/ + i=Xspec.GetNSezioni()-1; while((!(spec[i].GetModoPol()))&&(i -p -r -g + +-e: file con i paramenti di puntamento ottento tramite il programma pdplt +-p: file xml con i modelli di puntamento di nuraghe +-r: nome del ricevitore per il quale si stanno aggiornando i dati di puntamento + + + +Credits Andrea Saba (Andrea.Saba@inaf.it) diff --git a/SRT/Servers/DFBBackend/src/Makefile b/Common/Misc/PMUpdate/src/Makefile similarity index 82% rename from SRT/Servers/DFBBackend/src/Makefile rename to Common/Misc/PMUpdate/src/Makefile index 4b7a2d0c09dfb04a8efa619729ceb2e48017fafe..803ff886243353ea30d64bfcc34bc68a2047f3e9 100644 --- a/SRT/Servers/DFBBackend/src/Makefile +++ b/Common/Misc/PMUpdate/src/Makefile @@ -1,6 +1,20 @@ + #******************************************************************************* -# ALMA - Atacama Large Millimiter Array -# (c) UNSPECIFIED - FILL IN, 2015 +# PPPPPPPP +# +# "@(#) $Id$" +# +# Makefile of ........ +# +# who when what +# -------- -------- ---------------------------------------------- +# discos 22/08/18 created +# + +# ALMA - Atacama Large Millimeter Array +# Copyright (c) ESO - European Southern Observatory, 2014 +# (in the framework of the ALMA collaboration). +# All rights reserved. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -9,24 +23,16 @@ # # 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 +# 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). +# This Makefile follows ALMA/ACS Standards (see Makefile(5) for more). #******************************************************************************* # REMARKS # None @@ -55,12 +61,10 @@ EXECUTABLES_L = # # -DFBImpl_OBJECTS = DFBImpl +xxxxx_OBJECTS = +xxxxx_LDFLAGS = +xxxxx_LIBS = -DFBImpl_LIBS = IRALibrary GenericBackendStubs DFBInterfaceStubs ManagmentDefinitionsStubs \ - BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs \ - bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors\ - ParserErrors ManagementErrors # # special compilation flags for single c sources #yyyyy_CFLAGS = @@ -73,7 +77,7 @@ INCLUDES = # # Libraries (public and local) # ---------------------------- -LIBRARIES = DFBImpl +LIBRARIES = LIBRARIES_L = # @@ -95,10 +99,10 @@ TCL_SCRIPTS_L = # # Python stuff (public and local) # ---------------------------- -PY_SCRIPTS = +PY_SCRIPTS = PMUpdate PY_SCRIPTS_L = -PY_MODULES = +PY_MODULES = upgrade_module utility PMUpdate_gui PMUpdate_main PY_MODULES_L = PY_PACKAGES = @@ -124,7 +128,7 @@ tttlll_OBJECTS = # # Configuration Database Files # ---------------------------- -CDB_SCHEMAS = DFB +CDB_SCHEMAS = # # IDL Files and flags @@ -137,7 +141,9 @@ USER_IDL = # JARFILES= jjj_DIRS= -jjj_EXTRAS= +jjj_EXTRAS= +# For expressing dependencies between jarfiles (parallel builds) +jjj_JLIBS= # # java sources in Jarfile on/off DEBUG= @@ -202,13 +208,16 @@ ifneq ($(MAKEDIRTMP),\#error\#) include $(MAKEDIR)/acsMakefile endif +.DEFAULT_GOAL := all + # # TARGETS # ------- -all: do_all +all: gui do_all @echo " . . . 'all' done" clean : clean_all + @rm -f PMUpdate_gui.py* @echo " . . . clean done" clean_dist : clean_all clean_dist_all @@ -219,6 +228,10 @@ man : do_man install : install_all @echo " . . . installation done" + @chmod 700 $(INTROOT)/bin/PMUpdate + +gui : + pyuic4 PMUpdate_gui.ui -o PMUpdate_gui.py #___oOo___ diff --git a/Common/Misc/PMUpdate/src/PMUpdate.py b/Common/Misc/PMUpdate/src/PMUpdate.py new file mode 100644 index 0000000000000000000000000000000000000000..6200f2bfa59e9c34946fe5d1377c2f33701ec877 --- /dev/null +++ b/Common/Misc/PMUpdate/src/PMUpdate.py @@ -0,0 +1,42 @@ +#! /usr/bin/env python + +from upgrade_module import load_error_file_on_xml +import sys, getopt + +def main(argv): + errorfile = "" + pointingxmlfile = "" + receiver = "" + + try: + opts, args = getopt.getopt(argv,"hge:p:r:",["errorfile=", "pointingxmlfile=", "receiver="]) + except getopt.GetoptError: + print 'PMUpdate -e -p -r -g' + sys.exit(2) + for opt, arg in opts: + if opt == '-h': + print 'PMUpdate -e -p -r -g ' + sys.exit() + elif opt == "-g": + from PMUpdate_main import main as main_gui + main_gui() + sys.exit() + elif opt in ("-e", "--errorfile"): + errorfile = arg + elif opt in ("-p", "--pointingfile"): + pointingxmlfile = arg + elif opt in ("-r", "--receiver"): + receiver = arg + + if errorfile == "" or pointingxmlfile == "" or receiver == "": + print 'PMUpdate -e -p -r -g' + sys.exit("ERRORE: all parameters required") + + error_code , result = load_error_file_on_xml(errorfilename=errorfile, pointingxmlfilename=pointingxmlfile, receivername=receiver) + if error_code: + sys.exit("ERRORE: " + result) + +if __name__ == "__main__": + main(sys.argv[1:]) + + diff --git a/Common/Misc/PMUpdate/src/PMUpdate_gui.ui b/Common/Misc/PMUpdate/src/PMUpdate_gui.ui new file mode 100644 index 0000000000000000000000000000000000000000..5f821f44005253408647039e9c74985c0da60075 --- /dev/null +++ b/Common/Misc/PMUpdate/src/PMUpdate_gui.ui @@ -0,0 +1,132 @@ + + + Andrea Saba + MainWindow + + + Qt::NonModal + + + + 0 + 0 + 939 + 176 + + + + DISCOS - Update pointing file + + + + + + + + + XML Pointing file + + + + + + + pdplt error file + + + + + + + Receiver + + + + + + + false + + + + + + + false + + + + + + + ... + + + + + + + ... + + + + + + + false + + + + + + + + + Exit + + + + + + + false + + + Update + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 0 + 0 + 939 + 21 + + + + + + + + diff --git a/Common/Misc/PMUpdate/src/PMUpdate_main.py b/Common/Misc/PMUpdate/src/PMUpdate_main.py new file mode 100644 index 0000000000000000000000000000000000000000..ffb830c338b0a822866bab022c239f5d2e278b13 --- /dev/null +++ b/Common/Misc/PMUpdate/src/PMUpdate_main.py @@ -0,0 +1,191 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# +# Here we provide the necessary imports. +# The basic GUI widgets are located in QtGui module. +import sys +from PyQt4 import QtGui +import xml.etree.ElementTree +from upgrade_module import load_error_file_on_xml +from PMUpdate_gui import Ui_MainWindow + +VERSION = "0.3" + +# list of filed required in schedeule data section file +fields_required = {"Date__(UT)__HR:MN:SS", "R.A._(ICRF/J2000.0)", "DEC_(ICRF/J2000.0)"} +# split_file_header is used to find the schedule data section file +split_file_header = "Date__" + + +class Editor(QtGui.QMainWindow): + + def __init__(self): + super(Editor, self).__init__() + self.xml_file_status = False + self.pdplt_file_status = False + self.receivers_status = False + self.ui=Ui_MainWindow() + self.ui.setupUi(self) + self.home() + + def home(self): + self.ui.pushButton_exit.clicked.connect(self.menu_exitcommand) + self.ui.pushButton_browse_xml.clicked.connect(self.browsecommand_xml) + self.ui.pushButton_browse_error.clicked.connect(self.browsecommand_error) + self.ui.comboBox_receivers.currentIndexChanged.connect(self.combobox_select) + self.ui.pushButton_update.clicked.connect(self.menu_updatecommand) + self.show() + + def menu_updatecommand(self): + error, error_messgae = load_error_file_on_xml(errorfilename=self.ui.lineEdit_error.text(), + pointingxmlfilename=self.ui.lineEdit_xml.text(), + receivername=str(self.ui.comboBox_receivers.currentText())) + + if error>0: + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText(error_messgae) + qmsg.show() + else: + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Information) + qmsg.setWindowTitle("Error") + qmsg.setText("Update completed.") + qmsg.show() + + def browsecommand_xml(self): + + receivers = [] + + fileName = QtGui.QFileDialog() + WindowTitle = "Open XML Pointing file" + Directory = "." + Filter = "XML Files (*.xml)" + + self.ui.lineEdit_xml.setText(fileName.getOpenFileName(self, WindowTitle, Directory, Filter)) + + try: + xml.etree.ElementTree.register_namespace('', 'urn:schemas-cosylab-com:PointingModel:1.0') + xml.etree.ElementTree.register_namespace('baci', 'urn:schemas-cosylab-com:BACI:1.0') + xml.etree.ElementTree.register_namespace('cdb', 'urn:schemas-cosylab-com:CDB:1.0') + xml.etree.ElementTree.register_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance') + et = xml.etree.ElementTree.parse(self.ui.lineEdit_xml.text()) + + e = et.getroot() + + for child in e: + receivers.append(child[0].text.strip()) + if len(receivers) == 0: + self.xml_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("pointingxmlfilename: no receivers found") + qmsg.show() + except ValueError as e: + self.xml_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("pointingxmlfilename: xml parsing error {error_value}".format(error_value=e)) + qmsg.show() + + # svuota il dropdown + + self.ui.comboBox_receivers.clear() + + # aggiungi la lista dei ricevitori al drop down + + for receiver in receivers: + self.ui.comboBox_receivers.insertItem(0, receiver) + + self.xml_file_status = True + + self.ui.comboBox_receivers.setEnabled(self.xml_file_status and self.pdplt_file_status) + self.ui.pushButton_update.setEnabled(self.xml_file_status and self.pdplt_file_status and self.receivers_status) + + def browsecommand_error(self): + + fileName = QtGui.QFileDialog() + fileName.setWindowTitle("Open pdplt error file") + fileName.setDirectory(".") + fileName.setFilter("pdplt error file (*.*)") + + self.ui.lineEdit_error.setText(fileName.getOpenFileName()) + + try: + errorfilename_rows = [] + start_section = False + with open(self.ui.lineEdit_error.text(), 'rb') as f: + for line in f: + line_strip = line.strip() + if start_section: + if line_strip == "*": + pass + else: + errorfilename_rows.append(line_strip.split()) + if line_strip == "$new_model": + start_section = True + else: + # No more lines to be read from file + if not start_section: + self.pdplt_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("errorfilename: new model not found") + qmsg.show() + if len(errorfilename_rows) < 8: + self.pdplt_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("errorfilename: new model section too short") + qmsg.show() + + if len(errorfilename_rows[0]) <> 7 or \ + len(errorfilename_rows[1]) <> 31 or \ + len(errorfilename_rows[2]) <> 5 or \ + len(errorfilename_rows[3]) <> 5 or \ + len(errorfilename_rows[4]) <> 5 or \ + len(errorfilename_rows[5]) <> 5 or \ + len(errorfilename_rows[6]) <> 5 or \ + len(errorfilename_rows[7]) <> 5: + self.pdplt_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("errorfilename: not enough parameters in new model section") + qmsg.show() + + except: + self.pdplt_file_status = False + qmsg = QtGui.QMessageBox() + qmsg.setIcon(QtGui.QMessageBox.Critical) + qmsg.setWindowTitle("Error") + qmsg.setText("errorfilename: generic error on parameters extraction") + qmsg.show() + + self.pdplt_file_status = True + self.ui.comboBox_receivers.setEnabled(self.xml_file_status and self.pdplt_file_status) + self.ui.pushButton_update.setEnabled(self.xml_file_status and self.pdplt_file_status and self.receivers_status) + + def combobox_select(self, index): + if index == -1: + self.receivers_status = False + else: + self.receivers_status = True + self.ui.pushButton_update.setEnabled(self.xml_file_status and self.pdplt_file_status and self.receivers_status) + + def menu_exitcommand(self): + sys.exit() + + +def main(): + app = QtGui.QApplication(sys.argv) + ex = Editor() + sys.exit(app.exec_()) + +if __name__ == '__main__': + main() diff --git a/Common/Misc/PMUpdate/src/upgrade_module.py b/Common/Misc/PMUpdate/src/upgrade_module.py new file mode 100644 index 0000000000000000000000000000000000000000..26afbf083afd425a4fab6063766ce5e5b7aa3da4 --- /dev/null +++ b/Common/Misc/PMUpdate/src/upgrade_module.py @@ -0,0 +1,148 @@ +# coding: utf-8 +import os +from shutil import copy2 +from utility import convert_time_doy_to_string_format +import xml.etree.ElementTree +import datetime + + +def load_error_file_on_xml(errorfilename, pointingxmlfilename, receivername): + """ + funzione per l'aggiornamento del file pointingxmlfilename passato con le informazioni dei parametri di puntamento presenti nel file errorfilename + + :param errorfilename: file con i paramenti di puntamento ottento tramite il programma pdplt + :param pointingxmlfilename: file xml con i modelli di puntamento di nuraghe + :param receivername: nome del ricevitore per il quale si stanno aggiornando i dati di puntamento + :return: tupla (x:int, description:string) con un codice di errore e la descrizione dell'errore quando x=0 nessun errore + + il file pointingxmlfilename viene salvato prima della sua modifica aggiungendo al nome del file una stringa con un timestamp + + """ + + #verifica che i paramenti siano corretti + # verifica che i file esistano + try: + if errorfilename: + if os.path.isfile(errorfilename): + pass + else: + return (1, "errorfilename is not a file") + else: + return (2, "errorfilename is not a valide file name") + except: + return (3, "errorfilename: generic error") + + try: + if pointingxmlfilename: + if os.path.isfile(pointingxmlfilename): + pass + else: + return (4, "pointingxmlfilename is not a file") + else: + return (5, "pointingxmlfilename is not a valide file name") + except: + return (6, "pointingxmlfilename: generic error") + + #verifica che il file errorfilename abbia la stringa di inizio della sezione con i dati dei parametri + #estrai i dati dei paramentri dal file + + try: + errorfilename_rows = [] + start_section = False + with open(errorfilename, 'rb') as f: + for line in f: + line_strip = line.strip() + if start_section: + if line_strip == "*": + pass + else: + errorfilename_rows.append(line_strip.split()) + if line_strip == "$new_model": + start_section=True + else: + # No more lines to be read from file + if not start_section: + return (7, "errorfilename: new model not found") + if len(errorfilename_rows) < 8: + return (7, "errorfilename: new model section too short") + + + if len(errorfilename_rows[0]) <> 7 or \ + len(errorfilename_rows[1]) <> 31 or \ + len(errorfilename_rows[2]) <> 5 or \ + len(errorfilename_rows[3]) <> 5 or \ + len(errorfilename_rows[4]) <> 5 or \ + len(errorfilename_rows[5]) <> 5 or \ + len(errorfilename_rows[6]) <> 5 or \ + len(errorfilename_rows[7]) <> 5: + return (8, "errorfilename: not enough parameters in new model section") + + try: + newmodel_date = convert_time_doy_to_string_format(errorfilename_rows[0]) + except RuntimeError, e: + return (1001, "DOY convertion error: " + e.message) + phi = errorfilename_rows[1][0] + + coefficientNum = errorfilename_rows[1][1:] + + coefficientVal = errorfilename_rows[2] + errorfilename_rows[3] + errorfilename_rows[4] + errorfilename_rows[5] + errorfilename_rows[6] + errorfilename_rows[7] + + except: + return (9, "errorfilename: generic error on parameters extraction") + + #verifica che il file di pointingxmlfilename sia un file xml che siano presenti le sezioni dei ricevitori + #salva l'elenco dei ricevitori presenti e salvali nella list receivers + + try: + xml.etree.ElementTree.register_namespace('', 'urn:schemas-cosylab-com:PointingModel:1.0') + xml.etree.ElementTree.register_namespace('baci', 'urn:schemas-cosylab-com:BACI:1.0') + xml.etree.ElementTree.register_namespace('cdb', 'urn:schemas-cosylab-com:CDB:1.0') + xml.etree.ElementTree.register_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance') + et = xml.etree.ElementTree.parse(pointingxmlfilename) + + e = et.getroot() + receivers = [] + for child in e: + receivers.append(child[0].text.strip()) + if len(receivers) == 0: + return (10, "pointingxmlfilename: no receivers found") + except: + return (11, "pointingxmlfilename: xml parsing error") + + + #verifica che receivername sia presente nella lista receivers + receiver = receivername.strip() + + if not receiver in receivers: + return (11, "receivername: recievername not present in pointingxmlfilename") + + #stampa in output i paramentri per il ricevitore che si vuole aggiornare + + print("New model date: {newmodel_date}".format(newmodel_date=newmodel_date)) + print("Phi: {phi}".format(phi=phi)) + print("coefficientNum: {coefficientNum}".format(coefficientNum=coefficientNum)) + print("coefficientVal: {coefficientVal}".format(coefficientVal=coefficientVal)) + + #scrivi nel file pointingxmlfilename i nuovi paramentri estratti dal file errorfilename + for child in e: + if child[0].text.strip() == receiver: + child[1].text = phi + for i in range(2, len(coefficientVal)+2): + child[i*2-2].text = coefficientNum[i-2] + child[i*2-2+1].text = coefficientVal[i - 2] + + #salva il file pointingxmlfilename originale aggiungendo al nome del file una stringa con il time stamp + + nowstring = datetime.datetime.now().strftime("%Y%m%d%H%M%S") + + copy2(pointingxmlfilename, pointingxmlfilename + "_" + nowstring) + print("Backup file: {backup_file}".format(backup_file=pointingxmlfilename + "_" + nowstring)) + + #sovrascrive il vecchio file di pointing + try: + et.write(pointingxmlfilename, encoding='ISO-8859-1', xml_declaration=True) + except: + return(14, "Error: Generic error overwriting xml pointing file") + #nessun errore rilevato + + return (0, "") diff --git a/Common/Misc/PMUpdate/src/utility.py b/Common/Misc/PMUpdate/src/utility.py new file mode 100644 index 0000000000000000000000000000000000000000..5e47801bafb6ed48fba1abb9693ab7f741fe60d5 --- /dev/null +++ b/Common/Misc/PMUpdate/src/utility.py @@ -0,0 +1,64 @@ + +def convert_time_doy_to_string_format(date_time_doy_string): + # function to convert datetime in format ex. [00006, 2018, 094, 18, 12, 28, 0] + # in UTC time utc_time = datetime.datetime.strptime(row_value[0], "%Y-%b-%d %H:%M:%S").replace(tzinfo=pytz.UTC) + + doy_year, doy_day = date_time_doy_string[1:3] + hours, minutes, seconds = date_time_doy_string[3:6] + year, month, day = DATE(doy_day, doy_year) + + return "{year}-{month}-{day} {hours}:{minutes}:{seconds}".format(year=year, month=month, day=day, hours=hours, minutes=minutes, seconds=seconds) + + + +def DATE(DAY, YEAR): + DAY = int(DAY) + YEAR = float(YEAR) + + # Y=1 + # Y=0 + + if (YEAR//400 == YEAR/400): + Y=1 + + elif (YEAR//4 == YEAR/4) and (YEAR//100 != YEAR/100): + Y=1 + + else: + Y=0 + + + MONTH_LEN = [31,28,31,30,31,30,31,31,30,31,30,31] + + + if Y==0: + MONTH_LEN=MONTH_LEN + + else: + MONTH_LEN[1]+=1 + + + if Y == 0 and (DAY > 365 or DAY < 1): + raise RuntimeError, str(int(YEAR))+" Number of day less then 1 or more then 365" + + if Y == 1 and (DAY > 366 or DAY < 1): + raise RuntimeError, str(int(YEAR))+" Number of day less then 1 or more then 366" + + for N, M in enumerate(MONTH_LEN): + if DAY > M: + DAY = DAY-M + else: + M_NUM = N+1 + break + + if len(str(DAY)) == 1: + DAY = '0' + str(DAY) + else: + DAY = str(DAY) + + if len(str(M_NUM)) == 1: + M_NUM = '0' + str(M_NUM) + else: + M_NUM = str(M_NUM) + + return int(YEAR), int(M_NUM), int(DAY) \ No newline at end of file diff --git a/Common/Misc/PMUpdate/testfiles/PointingModel.xml b/Common/Misc/PMUpdate/testfiles/PointingModel.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1d160d59e1e595b9c2adbfbbc25914c21622c77 --- /dev/null +++ b/Common/Misc/PMUpdate/testfiles/PointingModel.xml @@ -0,0 +1,151 @@ + + + + + + CCB + 90.0 + 1 -2.2957174778 + 0 0.0 + 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.0148610147 + 0 0 + 1 0.0005418550 + 1 -0.0000714987 + 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 + + + + 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 -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.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.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.0008999962 + 1 0.0000846578 + 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/Common/Misc/PMUpdate/testfiles/err2018.116 b/Common/Misc/PMUpdate/testfiles/err2018.116 new file mode 100644 index 0000000000000000000000000000000000000000..c60959584a6dd5b4d4e3851502790862fd7927ca --- /dev/null +++ b/Common/Misc/PMUpdate/testfiles/err2018.116 @@ -0,0 +1,574 @@ +$antenna + srt azel 0 +$observed + 1 325.85199 26.01270 -0.00083 -0.00268 0.00278 + 1 325.92899 25.90840 -0.00002 -0.00230 0.00230 + 1 296.94400 37.38970 0.00196 -0.00442 0.00469 + 1 297.03201 37.22440 0.00118 -0.00477 0.00486 + 1 253.76300 16.26280 0.00092 -0.00362 0.00373 + 1 253.92900 16.08680 0.00060 -0.00418 0.00422 + 1 306.72000 45.70720 -0.00026 -0.00218 0.00219 + 1 306.76001 45.55870 0.00081 -0.00360 0.00364 + 1 247.29500 23.32290 0.00208 -0.00347 0.00396 + 1 247.47400 23.15400 0.00102 -0.00234 0.00252 + 1 226.04700 11.64770 0.00122 -0.00454 0.00469 + 0 226.22800 11.51500 0.00184 -0.00070 0.00193 + 1 303.69699 60.47180 0.00148 -0.00474 0.00480 + 1 303.67001 60.31950 0.00014 -0.00369 0.00369 + 1 221.30701 32.41560 0.00027 -0.00394 0.00395 + 1 221.54601 32.29360 0.00080 -0.00360 0.00366 + 1 217.38200 26.15020 0.00001 -0.00329 0.00329 + 1 217.60201 26.03950 0.00275 -0.00249 0.00351 + 1 199.26801 36.77220 0.00212 -0.00309 0.00353 + 1 199.54700 36.71110 0.00236 -0.00368 0.00414 + 1 166.95500 70.10990 0.00739 -0.00325 0.00411 + 1 167.62300 70.15340 0.00658 -0.00321 0.00391 + 1 89.56100 80.72730 0.00909 -0.00088 0.00171 + 1 89.71260 80.92160 0.01049 -0.00078 0.00183 + 1 16.26810 54.19880 -0.00005 -0.00273 0.00273 + 1 16.17510 54.25050 0.00007 -0.00290 0.00290 + 1 133.74001 41.69470 0.00304 -0.00269 0.00352 + 1 134.00600 41.83000 0.00251 -0.00257 0.00318 + 1 74.94300 56.45900 0.00199 -0.00197 0.00226 + 1 75.02210 56.63540 0.00279 -0.00147 0.00212 + 1 96.18190 41.81360 0.00201 -0.00168 0.00225 + 1 96.34950 41.99410 0.00195 -0.00212 0.00257 + 1 104.67800 35.66140 0.00358 -0.00291 0.00411 + 1 104.86200 35.83790 0.00373 -0.00271 0.00406 + 1 77.61040 39.60620 0.00231 -0.00109 0.00209 + 1 77.72890 39.78570 0.00086 -0.00082 0.00105 + 1 77.32150 35.28420 0.00142 -0.00138 0.00180 + 1 77.44370 35.46320 0.00138 -0.00204 0.00233 + 1 7.29395 24.70690 0.00015 -0.00248 0.00248 + 1 7.36169 24.73040 -0.00034 -0.00324 0.00325 + 1 331.77701 19.44530 0.00071 -0.00058 0.00089 + 1 331.87100 19.35840 0.00018 -0.00234 0.00235 + 1 303.44101 26.46040 0.00010 -0.00133 0.00133 + 1 303.54099 26.30740 0.00043 -0.00342 0.00344 + 1 310.13300 36.34350 0.00114 -0.00434 0.00444 + 1 310.19800 36.20250 -0.00081 -0.00451 0.00456 + 0 259.09500 11.01880 0.00079 -0.00814 0.00818 + 1 259.25201 10.83670 0.00135 -0.00724 0.00736 + 1 303.96201 50.20040 0.00091 -0.00486 0.00489 + 1 303.98999 50.04810 0.00160 -0.00492 0.00503 + 1 235.74200 23.23010 0.00127 -0.00266 0.00290 + 1 235.93700 23.07820 0.00203 -0.00241 0.00305 + 1 231.05000 17.60750 0.00136 -0.00427 0.00446 + 1 231.23900 17.46430 -0.00010 -0.00418 0.00418 + 1 216.69800 31.02210 0.00135 -0.00290 0.00312 + 1 216.93700 30.91260 0.00153 -0.00409 0.00430 + 1 209.63000 68.32860 0.00258 -0.00322 0.00336 + 1 210.17700 68.23760 0.00562 -0.00196 0.00286 + 1 9.11014 56.85080 0.00249 -0.00237 0.00273 + 1 8.98402 56.87990 -0.00062 -0.00255 0.00257 + 1 153.90900 48.97920 0.00259 -0.00317 0.00360 + 1 154.24899 49.05950 0.00287 -0.00155 0.00244 + 1 79.95430 68.44880 0.00634 -0.00163 0.00284 + 1 80.02330 68.62860 0.00571 -0.00087 0.00226 + 1 109.20500 53.67560 0.00060 -0.00266 0.00268 + 1 109.43700 53.84970 0.00261 -0.00399 0.00428 + 1 118.72500 46.97390 0.00150 -0.00387 0.00400 + 1 118.96800 47.13620 0.00298 -0.00280 0.00346 + 1 85.89860 51.65760 0.00192 -0.00286 0.00310 + 1 86.03220 51.84040 -0.00062 0.00010 0.00040 + 1 85.82640 47.32620 0.00226 -0.00232 0.00278 + 1 85.96310 47.50970 0.00270 -0.00241 0.00302 + 1 11.57380 26.70820 -0.00040 -0.00210 0.00213 + 1 11.63570 26.74510 -0.00058 -0.00149 0.00158 + 1 338.51099 14.29610 0.00076 -0.00070 0.00102 + 1 338.61899 14.22830 -0.00064 -0.00040 0.00074 + 1 310.62701 16.71300 0.00198 -0.00382 0.00426 + 1 310.74200 16.57440 0.00150 -0.00134 0.00197 + 1 315.09399 27.34660 -0.00155 -0.00084 0.00161 + 1 315.17899 27.21770 0.00035 -0.00199 0.00201 + 1 306.38800 41.63100 0.00259 -0.00322 0.00376 + 1 306.44199 41.48340 0.00013 -0.00295 0.00295 + 1 246.91400 13.28790 0.00186 -0.00359 0.00402 + 1 247.08000 13.11860 0.00117 -0.00477 0.00490 + 1 242.02200 8.00275 0.00041 -0.00493 0.00495 + 1 230.28400 23.22460 0.00212 -0.00151 0.00246 + 1 230.48199 23.08490 -0.00002 -0.00253 0.00253 + 1 236.38901 60.53120 0.00077 -0.00348 0.00350 + 1 236.71800 60.37690 0.00016 -0.00348 0.00348 + 0 273.79700 75.74040 -0.00284 -0.00260 0.00269 + 1 0.51980 57.85490 -0.00117 -0.00186 0.00196 + 1 176.98300 51.93160 0.00404 -0.00242 0.00347 + 1 177.36800 51.94130 0.00405 -0.00220 0.00333 + 1 128.14000 63.94420 0.00254 -0.00162 0.00197 + 1 128.52499 64.08990 0.00354 -0.00137 0.00207 + 1 137.49800 56.19850 0.00486 -0.00404 0.00486 + 1 137.85400 56.32310 0.00510 -0.00331 0.00435 + 1 95.85580 63.33990 0.00241 -0.00075 0.00132 + 1 95.71370 59.01160 0.00382 -0.00116 0.00228 + 1 95.89750 59.19570 0.00231 -0.00158 0.00197 + 1 15.37750 29.62390 0.00057 -0.00194 0.00200 + 1 15.42840 29.67270 0.00020 -0.00184 0.00185 + 0 23.93110 7.35403 0.00065 -0.01241 0.01243 + 1 346.76801 10.29620 0.00132 -0.00296 0.00323 + 1 346.88800 10.25360 -0.00105 -0.00610 0.00619 + 1 319.73901 7.22189 0.00061 -0.00465 0.00469 + 0 319.87201 7.10303 -0.00133 -0.00029 0.00135 + 1 321.97198 18.42110 0.00134 -0.00458 0.00475 + 1 322.07599 18.30780 0.00090 -0.00490 0.00497 + 1 311.29501 31.14560 -0.00051 -0.00047 0.00064 + 1 311.37399 31.00500 0.00054 -0.00238 0.00242 + 0 242.80000 12.86390 0.00141 -0.00825 0.00836 + 0 242.96899 12.69880 0.00174 -0.00802 0.00820 + 1 254.07700 49.24310 0.00009 -0.00423 0.00423 + 1 254.28500 49.06540 0.00133 -0.00369 0.00379 + 1 280.03900 63.45190 0.00054 -0.00251 0.00252 + 1 280.12701 63.27100 0.00110 -0.00324 0.00328 + 1 351.35199 56.98190 -0.00045 -0.00210 0.00211 + 1 351.22299 56.95410 0.00004 -0.00164 0.00164 + 1 201.94800 49.94450 0.00188 -0.00201 0.00235 + 1 202.30000 49.87620 0.00235 -0.00335 0.00368 + 1 160.00900 70.81680 0.00850 -0.00189 0.00337 + 1 160.67999 70.88280 0.00727 -0.00162 0.00288 + 1 163.67799 61.91460 0.00495 -0.00488 0.00541 + 1 164.16000 61.96720 0.00572 -0.00475 0.00546 + 1 112.74000 74.46850 0.00778 -0.00136 0.00249 + 1 111.12700 70.36400 0.00510 -0.00143 0.00223 + 1 128.20900 25.25940 0.00174 -0.00245 0.00291 + 1 128.41299 25.40450 0.00127 -0.00368 0.00385 + 0 85.86090 10.11960 0.00030 -0.00843 0.00844 + 1 18.25960 33.08650 -0.00032 -0.00213 0.00215 + 1 18.29680 33.14370 -0.00036 -0.00267 0.00269 + 0 31.71920 12.78690 0.00067 -0.00723 0.00726 + 0 354.50699 8.38499 0.00070 0.00280 0.00288 + 1 328.62299 12.12090 -0.00219 -0.00429 0.00479 + 1 328.73999 12.02490 -0.00109 -0.00472 0.00484 + 1 316.58401 23.06060 -0.00076 -0.00291 0.00299 + 1 285.03900 53.18160 0.00105 -0.00373 0.00378 + 1 285.12701 53.00450 0.00173 -0.00380 0.00394 + 1 344.81201 54.80580 0.00035 -0.00270 0.00271 + 1 344.71399 54.75800 -0.00042 -0.00292 0.00293 + 1 220.16200 44.59030 0.00169 -0.00271 0.00297 + 1 220.44800 44.47260 0.00194 -0.00326 0.00354 + 1 276.91599 77.74150 0.00319 -0.00172 0.00185 + 1 276.97000 77.54990 0.00568 -0.00189 0.00225 + 1 201.64900 70.71920 0.00606 -0.00151 0.00251 + 1 202.30200 70.64870 0.00409 -0.00146 0.00199 + 1 194.03200 62.19000 0.00406 -0.00392 0.00435 + 1 194.52100 62.14490 0.00473 -0.00362 0.00424 + 1 143.26601 78.93980 0.01042 -0.00166 0.00260 + 1 144.22400 79.05570 0.01295 -0.00093 0.00263 + 1 141.26401 32.88660 0.00287 -0.00209 0.00319 + 1 141.50600 33.00030 0.00211 -0.00170 0.00245 +$observed_stats + 0.00166 0.00171 -0.00332 0.00106 0.00374 143 153 0.00131 0.00097 +$old_model +* + 00005 2017 335 14 30 48 0 +* + 90.0000 1 0 1 1 1 1 1 1 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +* + -2.2957174778 0.0000000000 -0.0068070539 -0.0016828823 -0.0009974039 +* + -0.0006166724 0.0852021798 0.0925736725 0.0000000000 0.0000000000 +* + 0.0148610147 0.0000000000 0.0005418550 -0.0000714987 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* +$uncorrected + 1 325.85199 26.01270 -2.29699 0.17176 2.07143 + 1 325.92899 25.90840 -2.29616 0.17218 2.07255 + 1 296.94400 37.38970 -2.29564 0.16346 1.83125 + 1 297.03201 37.22440 -2.29640 0.16323 1.83583 + 1 253.76300 16.26280 -2.29488 0.17548 2.21004 + 1 253.92900 16.08680 -2.29518 0.17496 2.21224 + 1 306.72000 45.70720 -2.29897 0.15820 1.61320 + 1 306.76001 45.55870 -2.29787 0.15693 1.61655 + 1 247.29500 23.32290 -2.29459 0.17358 2.11423 + 1 247.47400 23.15400 -2.29563 0.17477 2.11794 + 1 226.04700 11.64770 -2.29445 0.17547 2.25404 + 0 226.22800 11.51500 -2.29381 0.17931 2.25478 + 1 303.69699 60.47180 -2.30041 0.13898 1.14225 + 1 303.67001 60.31950 -2.30171 0.14022 1.14831 + 1 221.30701 32.41560 -2.29801 0.16853 1.94725 + 1 221.54601 32.29360 -2.29746 0.16895 1.94943 + 1 217.38200 26.15020 -2.29751 0.17273 2.06956 + 1 217.60201 26.03950 -2.29475 0.17358 2.06911 + 1 199.26801 36.77220 -2.29726 0.16631 1.84766 + 1 199.54700 36.71110 -2.29701 0.16576 1.84886 + 1 166.95500 70.10990 -2.30502 0.12825 0.79463 + 1 167.62300 70.15340 -2.30585 0.12824 0.79328 + 1 89.56100 80.72730 -2.32402 0.11328 0.39124 + 1 89.71260 80.92160 -2.32345 0.11308 0.38365 + 1 16.26810 54.19880 -2.30139 0.14755 1.35432 + 1 16.17510 54.25050 -2.30129 0.14732 1.35256 + 1 133.74001 41.69470 -2.29794 0.16177 1.72348 + 1 134.00600 41.83000 -2.29850 0.16177 1.72029 + 1 74.94300 56.45900 -2.30209 0.14591 1.28032 + 1 75.02210 56.63540 -2.30135 0.14620 1.27408 + 1 96.18190 41.81360 -2.29861 0.16192 1.72083 + 1 96.34950 41.99410 -2.29872 0.16132 1.71604 + 1 104.67800 35.66140 -2.29596 0.16583 1.87277 + 1 104.86200 35.83790 -2.29585 0.16590 1.86857 + 1 77.61040 39.60620 -2.29751 0.16409 1.77769 + 1 77.72890 39.78570 -2.29899 0.16422 1.77426 + 1 77.32150 35.28420 -2.29760 0.16715 1.88295 + 1 77.44370 35.46320 -2.29767 0.16637 1.87881 + 1 7.29395 24.70690 -2.29610 0.17197 2.09298 + 1 7.36169 24.73040 -2.29659 0.17119 2.09297 + 1 331.77701 19.44530 -2.29476 0.17628 2.17103 + 1 331.87100 19.35840 -2.29528 0.17454 2.17253 + 1 303.44101 26.46040 -2.29618 0.17333 2.06294 + 1 303.54099 26.30740 -2.29584 0.17132 2.06517 + 1 310.13300 36.34350 -2.29624 0.16406 1.85683 + 1 310.19800 36.20250 -2.29817 0.16400 1.86171 + 0 259.09500 11.01880 -2.29440 0.17156 2.25863 + 1 259.25201 10.83670 -2.29382 0.17247 2.25951 + 1 303.96201 50.20040 -2.29858 0.15097 1.47906 + 1 303.98999 50.04810 -2.29786 0.15107 1.48327 + 1 235.74200 23.23010 -2.29558 0.17454 2.11668 + 1 235.93700 23.07820 -2.29480 0.17485 2.11838 + 1 231.05000 17.60750 -2.29491 0.17477 2.19437 + 1 231.23900 17.46430 -2.29636 0.17489 2.19747 + 1 216.69800 31.02210 -2.29683 0.17046 1.97568 + 1 216.93700 30.91260 -2.29663 0.16934 1.97766 + 1 209.63000 68.32860 -2.30625 0.13115 0.86170 + 1 210.17700 68.23760 -2.30312 0.13254 0.86413 + 1 9.11014 56.85080 -2.29936 0.14481 1.26565 + 1 8.98402 56.87990 -2.30247 0.14460 1.26634 + 1 153.90900 48.97920 -2.30005 0.15463 1.51750 + 1 154.24899 49.05950 -2.29979 0.15617 1.51506 + 1 79.95430 68.44880 -2.30422 0.13062 0.85643 + 1 80.02330 68.62860 -2.30500 0.13113 0.85014 + 1 109.20500 53.67560 -2.30334 0.14910 1.37252 + 1 109.43700 53.84970 -2.30139 0.14757 1.36560 + 1 118.72500 46.97390 -2.30062 0.15530 1.57745 + 1 118.96800 47.13620 -2.29919 0.15621 1.57182 + 1 85.89860 51.65760 -2.30093 0.15074 1.43534 + 1 86.03220 51.84040 -2.30352 0.15350 1.43149 + 1 85.82640 47.32620 -2.29942 0.15587 1.56638 + 1 85.96310 47.50970 -2.29903 0.15560 1.56069 + 1 11.57380 26.70820 -2.29694 0.17138 2.05902 + 1 11.63570 26.74510 -2.29712 0.17197 2.05857 + 1 338.51099 14.29610 -2.29419 0.17718 2.23019 + 1 338.61899 14.22830 -2.29558 0.17748 2.23223 + 1 310.62701 16.71300 -2.29327 0.17414 2.20329 + 1 310.74200 16.57440 -2.29374 0.17664 2.20552 + 1 315.09399 27.34660 -2.29787 0.17315 2.04840 + 1 315.17899 27.21770 -2.29595 0.17206 2.04897 + 1 306.38800 41.63100 -2.29551 0.16095 1.72328 + 1 306.44199 41.48340 -2.29795 0.16135 1.72905 + 1 246.91400 13.28790 -2.29372 0.17608 2.23925 + 1 247.08000 13.11860 -2.29439 0.17492 2.24135 + 1 242.02200 8.00275 -2.29467 0.17503 2.27906 + 1 230.28400 23.22460 -2.29482 0.17574 2.11617 + 1 230.48199 23.08490 -2.29694 0.17477 2.12023 + 1 236.38901 60.53120 -2.30295 0.14127 1.14171 + 1 236.71800 60.37690 -2.30349 0.14146 1.14735 + 0 273.79700 75.74040 -2.31433 0.12036 0.58262 + 1 0.51980 57.85490 -2.30305 0.14418 1.23382 + 1 176.98300 51.93160 -2.29904 0.15253 1.42577 + 1 177.36800 51.94130 -2.29902 0.15274 1.42548 + 1 128.14000 63.94420 -2.30604 0.13773 1.02224 + 1 128.52499 64.08990 -2.30513 0.13779 1.01663 + 1 137.49800 56.19850 -2.30013 0.14533 1.28783 + 1 137.85400 56.32310 -2.29994 0.14592 1.28366 + 1 95.85580 63.33990 -2.30534 0.13876 1.04367 + 1 95.71370 59.01160 -2.30184 0.14393 1.19385 + 1 95.89750 59.19570 -2.30344 0.14328 1.18828 + 1 15.37750 29.62390 -2.29639 0.16996 2.00345 + 1 15.42840 29.67270 -2.29677 0.17003 2.00282 + 0 23.93110 7.35403 -2.29376 0.16534 2.28090 + 1 346.76801 10.29620 -2.29323 0.17515 2.26309 + 1 346.88800 10.25360 -2.29560 0.17201 2.26547 + 1 319.73901 7.22189 -2.29367 0.17390 2.28211 + 0 319.87201 7.10303 -2.29560 0.17825 2.28495 + 1 321.97198 18.42110 -2.29403 0.17274 2.18333 + 1 322.07599 18.30780 -2.29446 0.17245 2.18514 + 1 311.29501 31.14560 -2.29726 0.17145 1.97359 + 1 311.37399 31.00500 -2.29620 0.16963 1.97542 + 0 242.80000 12.86390 -2.29418 0.17152 2.24317 + 0 242.96899 12.69880 -2.29383 0.17176 2.24430 + 1 254.07700 49.24310 -2.30011 0.15353 1.50946 + 1 254.28500 49.06540 -2.29883 0.15426 1.51407 + 1 280.03900 63.45190 -2.30269 0.13780 1.03837 + 1 280.12701 63.27100 -2.30206 0.13730 1.04447 + 1 351.35199 56.98190 -2.30184 0.14511 1.26265 + 1 351.22299 56.95410 -2.30134 0.14561 1.26336 + 1 201.94800 49.94450 -2.30003 0.15530 1.48826 + 1 202.30000 49.87620 -2.29954 0.15403 1.48990 + 1 160.00900 70.81680 -2.30484 0.12849 0.76817 + 1 160.67999 70.88280 -2.30611 0.12868 0.76614 + 1 163.67799 61.91460 -2.30212 0.13780 1.09254 + 1 164.16000 61.96720 -2.30137 0.13787 1.09034 + 1 112.74000 74.46850 -2.31059 0.12277 0.63076 + 1 111.12700 70.36400 -2.30818 0.12866 0.78625 + 1 128.20900 25.25940 -2.29627 0.17295 2.08390 + 1 128.41299 25.40450 -2.29676 0.17166 2.08176 + 0 85.86090 10.11960 -2.29512 0.16983 2.26579 + 1 18.25960 33.08650 -2.29779 0.16761 1.93248 + 1 18.29680 33.14370 -2.29784 0.16703 1.93122 + 0 31.71920 12.78690 -2.29444 0.17037 2.24402 + 0 354.50699 8.38499 -2.29367 0.18082 2.27634 + 1 328.62299 12.12090 -2.29692 0.17401 2.25245 + 1 328.73999 12.02490 -2.29581 0.17359 2.25214 + 1 316.58401 23.06060 -2.29662 0.17299 2.12017 + 1 285.03900 53.18160 -2.29924 0.14918 1.38594 + 1 285.12701 53.00450 -2.29852 0.14931 1.39118 + 1 344.81201 54.80580 -2.30034 0.14720 1.33395 + 1 344.71399 54.75800 -2.30110 0.14704 1.33592 + 1 220.16200 44.59030 -2.29857 0.16001 1.64472 + 1 220.44800 44.47260 -2.29829 0.15957 1.64777 + 1 276.91599 77.74150 -2.31090 0.11815 0.50468 + 1 276.97000 77.54990 -2.30810 0.11827 0.51147 + 1 201.64900 70.71920 -2.30508 0.12944 0.77206 + 1 202.30200 70.64870 -2.30695 0.12960 0.77534 + 1 194.03200 62.19000 -2.30214 0.13873 1.08297 + 1 194.52100 62.14490 -2.30143 0.13910 1.08427 + 1 143.26601 78.93980 -2.31741 0.11632 0.45954 + 1 144.22400 79.05570 -2.31519 0.11689 0.45483 + 1 141.26401 32.88660 -2.29643 0.16931 1.93584 + 1 141.50600 33.00030 -2.29721 0.16963 1.93405 +$uncorrected_stats + -2.29762 0.00300 0.14989 0.01446 1.53084 143 153 -1.49199 0.48842 +$fit_data +* + 00006 2018 124 09 40 20 1 +* + 90.0000 1 0 1 1 1 1 1 1 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +* + -2.2964444160 0.0000000000 -0.0070350473 -0.0033545941 -0.0006689935 + 0.0005701074 0.0000000000 0.0007523292 0.0008812808 0.0000911082 +* + 0.0001276313 0.0839248598 0.0909821168 0.0000000000 0.0000000000 + 0.0001042741 0.0016509111 0.0012824635 0.0000000000 0.0000000000 +* + 0.0143946456 0.0000000000 -0.0000148549 0.0001541676 0.0000000000 + 0.0012186547 0.0000000000 0.0001725198 0.0001859237 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* +$fit_stats + 1 1.018 1.000 1.000 276 0.00100 0.00108 4 0 +$conditions +* + 3.85E+03 +* + 6.6 0.0 14.2 19.5 1.5 1.5 17.8 10.1 0.0 0.0 +* + 9.0 0.0 1.4 1.5 +* +$correlation +* + 1.000 +* + 0.000 0.000 +* + 0.942 0.000 1.000 +* + 0.970 0.000 0.993 1.000 +* + 0.392 0.000 0.386 0.406 1.000 +* + 0.127 0.000 0.093 0.121 0.020 1.000 +* + 0.021 0.000 0.018 0.021 0.021 0.110 1.000 +* + -0.026 0.000 -0.024 -0.027 -0.050 -0.057 -0.985 1.000 +* + 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 +* + 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 +* + -0.013 0.000 -0.008 -0.012 0.014 -0.154 -0.982 0.940 0.000 0.000 + 1.000 +* + 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 + 0.000 0.000 +* + 0.159 0.000 0.185 0.185 0.036 0.653 0.072 -0.039 0.000 0.000 + -0.100 0.000 1.000 +* + -0.384 0.000 -0.457 -0.450 -0.702 -0.041 -0.018 0.037 0.000 0.000 + -0.006 0.000 -0.029 1.000 +* +$corrected + 1 325.85199 26.01270 -0.00087 0.00038 0.00087 0.00103 0.00111 0.00102 0.00110 + 1 325.92899 25.90840 -0.00006 0.00076 0.00076 0.00103 0.00111 0.00102 0.00110 + 1 296.94400 37.38970 0.00169 -0.00108 0.00172 0.00102 0.00110 0.00101 0.00109 + 1 297.03201 37.22440 0.00091 -0.00143 0.00160 0.00102 0.00110 0.00101 0.00109 + 1 253.76300 16.26280 0.00006 0.00012 0.00014 0.00105 0.00112 0.00103 0.00110 + 1 253.92900 16.08680 -0.00025 -0.00044 0.00050 0.00104 0.00111 0.00102 0.00110 + 1 306.72000 45.70720 -0.00045 0.00094 0.00099 0.00102 0.00110 0.00101 0.00109 + 1 306.76001 45.55870 0.00062 -0.00048 0.00064 0.00102 0.00110 0.00101 0.00109 + 1 247.29500 23.32290 0.00108 0.00027 0.00103 0.00105 0.00112 0.00104 0.00111 + 1 247.47400 23.15400 0.00003 0.00140 0.00140 0.00105 0.00112 0.00103 0.00111 + 1 226.04700 11.64770 0.00001 -0.00085 0.00085 0.00106 0.00114 0.00103 0.00111 + 0 226.22800 11.51500 0.00063 0.00299 0.00306 0.00107 0.00115 0.00104 0.00112 + 1 303.69699 60.47180 0.00093 -0.00184 0.00189 0.00104 0.00110 0.00102 0.00109 + 1 303.67001 60.31950 -0.00041 -0.00078 0.00081 0.00104 0.00110 0.00102 0.00109 + 1 221.30701 32.41560 -0.00133 -0.00033 0.00117 0.00103 0.00110 0.00101 0.00109 + 1 221.54601 32.29360 -0.00079 0.00001 0.00067 0.00103 0.00111 0.00102 0.00109 + 1 217.38200 26.15020 -0.00151 0.00033 0.00140 0.00103 0.00111 0.00102 0.00110 + 1 217.60201 26.03950 0.00123 0.00114 0.00159 0.00103 0.00111 0.00102 0.00110 + 1 199.26801 36.77220 0.00004 0.00030 0.00030 0.00102 0.00110 0.00101 0.00109 + 1 199.54700 36.71110 0.00028 -0.00029 0.00037 0.00102 0.00110 0.00101 0.00109 + 1 166.95500 70.10990 0.00103 -0.00084 0.00091 0.00102 0.00110 0.00100 0.00108 + 1 167.62300 70.15340 0.00021 -0.00079 0.00080 0.00102 0.00110 0.00100 0.00108 + 1 89.56100 80.72730 -0.00136 0.00037 0.00043 0.00104 0.00110 0.00087 0.00104 + 1 89.71260 80.92160 -0.00021 0.00046 0.00046 0.00103 0.00110 0.00085 0.00104 + 1 16.26810 54.19880 -0.00053 -0.00067 0.00074 0.00105 0.00111 0.00103 0.00109 + 1 16.17510 54.25050 -0.00041 -0.00084 0.00087 0.00104 0.00111 0.00103 0.00109 + 1 133.74001 41.69470 0.00051 -0.00022 0.00044 0.00102 0.00110 0.00101 0.00109 + 1 134.00600 41.83000 -0.00003 -0.00010 0.00010 0.00102 0.00110 0.00101 0.00109 + 1 74.94300 56.45900 -0.00022 -0.00023 0.00026 0.00103 0.00110 0.00101 0.00109 + 1 75.02210 56.63540 0.00056 0.00027 0.00041 0.00103 0.00110 0.00101 0.00109 + 1 96.18190 41.81360 0.00005 0.00039 0.00039 0.00103 0.00110 0.00102 0.00109 + 1 96.34950 41.99410 -0.00002 -0.00005 0.00005 0.00103 0.00110 0.00101 0.00109 + 1 104.67800 35.66140 0.00169 -0.00070 0.00154 0.00102 0.00110 0.00100 0.00109 + 1 104.86200 35.83790 0.00183 -0.00050 0.00157 0.00102 0.00110 0.00100 0.00109 + 1 77.61040 39.60620 0.00082 0.00091 0.00111 0.00105 0.00111 0.00103 0.00110 + 1 77.72890 39.78570 -0.00064 0.00118 0.00128 0.00105 0.00111 0.00103 0.00110 + 1 77.32150 35.28420 0.00005 0.00067 0.00067 0.00103 0.00110 0.00101 0.00109 + 1 77.44370 35.46320 0.00000 0.00001 0.00001 0.00102 0.00110 0.00101 0.00109 + 1 7.29395 24.70690 -0.00001 0.00002 0.00002 0.00103 0.00110 0.00101 0.00109 + 1 7.36169 24.73040 -0.00050 -0.00074 0.00087 0.00102 0.00110 0.00101 0.00109 + 1 331.77701 19.44530 0.00063 0.00242 0.00249 0.00103 0.00111 0.00101 0.00109 + 1 331.87100 19.35840 0.00010 0.00065 0.00066 0.00103 0.00111 0.00101 0.00109 + 1 303.44101 26.46040 -0.00009 0.00202 0.00202 0.00102 0.00110 0.00101 0.00109 + 1 303.54099 26.30740 0.00024 -0.00007 0.00023 0.00102 0.00110 0.00101 0.00109 + 1 310.13300 36.34350 0.00103 -0.00115 0.00141 0.00102 0.00110 0.00101 0.00109 + 1 310.19800 36.20250 -0.00092 -0.00132 0.00151 0.00102 0.00110 0.00101 0.00109 + 0 259.09500 11.01880 0.00001 -0.00442 0.00442 0.00108 0.00116 0.00105 0.00113 + 1 259.25201 10.83670 0.00057 -0.00352 0.00356 0.00108 0.00115 0.00106 0.00112 + 1 303.96201 50.20040 0.00062 -0.00177 0.00182 0.00103 0.00110 0.00101 0.00109 + 1 303.98999 50.04810 0.00132 -0.00183 0.00202 0.00103 0.00110 0.00101 0.00109 + 1 235.74200 23.23010 0.00009 0.00106 0.00107 0.00103 0.00110 0.00101 0.00109 + 1 235.93700 23.07820 0.00085 0.00131 0.00153 0.00103 0.00111 0.00101 0.00110 + 1 231.05000 17.60750 0.00016 -0.00055 0.00057 0.00103 0.00111 0.00101 0.00110 + 1 231.23900 17.46430 -0.00129 -0.00046 0.00132 0.00103 0.00111 0.00101 0.00110 + 1 216.69800 31.02210 -0.00029 0.00069 0.00073 0.00102 0.00110 0.00101 0.00109 + 1 216.93700 30.91260 -0.00010 -0.00050 0.00051 0.00102 0.00110 0.00101 0.00109 + 1 209.63000 68.32860 -0.00224 -0.00027 0.00087 0.00102 0.00110 0.00100 0.00108 + 1 210.17700 68.23760 0.00084 0.00100 0.00105 0.00102 0.00110 0.00100 0.00108 + 1 9.11014 56.85080 0.00207 -0.00027 0.00116 0.00104 0.00110 0.00102 0.00109 + 1 8.98402 56.87990 -0.00104 -0.00045 0.00073 0.00103 0.00110 0.00101 0.00109 + 1 153.90900 48.97920 -0.00050 -0.00053 0.00062 0.00102 0.00110 0.00101 0.00109 + 1 154.24899 49.05950 -0.00023 0.00109 0.00111 0.00102 0.00110 0.00101 0.00109 + 1 79.95430 68.44880 0.00248 -0.00012 0.00092 0.00103 0.00110 0.00101 0.00108 + 1 80.02330 68.62860 0.00181 0.00063 0.00091 0.00103 0.00110 0.00101 0.00108 + 1 109.20500 53.67560 -0.00234 -0.00066 0.00153 0.00103 0.00110 0.00101 0.00109 + 1 109.43700 53.84970 -0.00035 -0.00199 0.00200 0.00103 0.00110 0.00101 0.00109 + 1 118.72500 46.97390 -0.00114 -0.00166 0.00183 0.00102 0.00110 0.00101 0.00109 + 1 118.96800 47.13620 0.00033 -0.00059 0.00063 0.00102 0.00110 0.00101 0.00109 + 1 85.89860 51.65760 -0.00029 -0.00100 0.00101 0.00103 0.00111 0.00102 0.00110 + 1 86.03220 51.84040 -0.00285 0.00196 0.00264 0.00104 0.00111 0.00102 0.00109 + 1 85.82640 47.32620 0.00029 -0.00039 0.00043 0.00102 0.00110 0.00101 0.00109 + 1 85.96310 47.50970 0.00071 -0.00048 0.00068 0.00102 0.00110 0.00101 0.00109 + 1 11.57380 26.70820 -0.00060 0.00034 0.00063 0.00102 0.00110 0.00101 0.00109 + 1 11.63570 26.74510 -0.00078 0.00095 0.00117 0.00102 0.00110 0.00101 0.00109 + 1 338.51099 14.29610 0.00063 0.00220 0.00228 0.00103 0.00111 0.00101 0.00109 + 1 338.61899 14.22830 -0.00077 0.00250 0.00261 0.00103 0.00111 0.00101 0.00109 + 1 310.62701 16.71300 0.00178 -0.00053 0.00179 0.00102 0.00110 0.00101 0.00108 + 1 310.74200 16.57440 0.00130 0.00195 0.00231 0.00102 0.00110 0.00101 0.00109 + 1 315.09399 27.34660 -0.00164 0.00236 0.00277 0.00102 0.00110 0.00101 0.00109 + 1 315.17899 27.21770 0.00026 0.00121 0.00123 0.00102 0.00110 0.00101 0.00109 + 1 306.38800 41.63100 0.00242 -0.00004 0.00181 0.00103 0.00110 0.00101 0.00109 + 1 306.44199 41.48340 -0.00004 0.00023 0.00023 0.00103 0.00110 0.00101 0.00109 + 1 246.91400 13.28790 0.00091 0.00016 0.00090 0.00103 0.00111 0.00101 0.00109 + 1 247.08000 13.11860 0.00023 -0.00102 0.00105 0.00103 0.00112 0.00101 0.00109 + 1 242.02200 8.00275 -0.00059 -0.00120 0.00133 0.00116 0.00139 0.00113 0.00135 + 1 230.28400 23.22460 0.00085 0.00220 0.00233 0.00102 0.00110 0.00101 0.00109 + 1 230.48199 23.08490 -0.00129 0.00118 0.00167 0.00102 0.00110 0.00101 0.00109 + 1 236.38901 60.53120 -0.00186 -0.00021 0.00094 0.00102 0.00110 0.00100 0.00109 + 1 236.71800 60.37690 -0.00245 -0.00021 0.00123 0.00102 0.00110 0.00100 0.00109 + 0 273.79700 75.74040 -0.00626 0.00024 0.00156 0.00103 0.00110 0.00093 0.00106 + 1 0.51980 57.85490 -0.00149 0.00032 0.00086 0.00108 0.00116 0.00106 0.00115 + 1 176.98300 51.93160 0.00081 0.00049 0.00070 0.00102 0.00110 0.00101 0.00109 + 1 177.36800 51.94130 0.00082 0.00072 0.00088 0.00103 0.00110 0.00102 0.00109 + 1 128.14000 63.94420 -0.00206 0.00039 0.00099 0.00127 0.00111 0.00126 0.00110 + 1 128.52499 64.08990 -0.00110 0.00064 0.00080 0.00108 0.00111 0.00106 0.00110 + 1 137.49800 56.19850 0.00121 -0.00175 0.00188 0.00102 0.00110 0.00101 0.00109 + 1 137.85400 56.32310 0.00143 -0.00102 0.00129 0.00102 0.00110 0.00101 0.00109 + 1 95.85580 63.33990 -0.00122 0.00095 0.00110 0.00121 0.00114 0.00120 0.00113 + 1 95.71370 59.01160 0.00073 0.00063 0.00073 0.00107 0.00110 0.00106 0.00109 + 1 95.89750 59.19570 -0.00080 0.00021 0.00046 0.00106 0.00111 0.00104 0.00110 + 1 15.37750 29.62390 0.00034 0.00044 0.00053 0.00106 0.00111 0.00104 0.00110 + 1 15.42840 29.67270 -0.00003 0.00054 0.00054 0.00106 0.00112 0.00104 0.00111 + 0 23.93110 7.35403 0.00021 -0.01010 0.01010 0.00109 0.00113 0.00104 0.00108 + 1 346.76801 10.29620 0.00113 -0.00018 0.00112 0.00104 0.00112 0.00101 0.00109 + 1 346.88800 10.25360 -0.00124 -0.00332 0.00354 0.00105 0.00112 0.00102 0.00109 + 1 319.73901 7.22189 0.00035 -0.00150 0.00154 0.00102 0.00111 0.00100 0.00106 + 0 319.87201 7.10303 -0.00159 0.00285 0.00326 0.00103 0.00111 0.00100 0.00107 + 1 321.97198 18.42110 0.00122 -0.00145 0.00185 0.00102 0.00110 0.00101 0.00109 + 1 322.07599 18.30780 0.00078 -0.00177 0.00192 0.00102 0.00110 0.00101 0.00109 + 1 311.29501 31.14560 -0.00062 0.00275 0.00280 0.00103 0.00111 0.00101 0.00110 + 1 311.37399 31.00500 0.00043 0.00084 0.00092 0.00103 0.00110 0.00101 0.00109 + 0 242.80000 12.86390 0.00041 -0.00451 0.00452 0.00102 0.00110 0.00100 0.00108 + 0 242.96899 12.69880 0.00074 -0.00428 0.00434 0.00102 0.00110 0.00100 0.00108 + 1 254.07700 49.24310 -0.00129 -0.00075 0.00113 0.00102 0.00110 0.00101 0.00109 + 1 254.28500 49.06540 -0.00003 -0.00021 0.00021 0.00102 0.00110 0.00101 0.00109 + 1 280.03900 63.45190 -0.00079 0.00057 0.00067 0.00102 0.00110 0.00100 0.00108 + 1 280.12701 63.27100 -0.00022 -0.00016 0.00018 0.00102 0.00110 0.00100 0.00108 + 1 351.35199 56.98190 -0.00065 0.00022 0.00042 0.00104 0.00111 0.00102 0.00109 + 1 351.22299 56.95410 -0.00016 0.00069 0.00069 0.00104 0.00111 0.00102 0.00110 + 1 201.94800 49.94450 -0.00083 0.00123 0.00134 0.00102 0.00110 0.00101 0.00109 + 1 202.30000 49.87620 -0.00035 -0.00010 0.00025 0.00102 0.00110 0.00101 0.00109 + 1 160.00900 70.81680 0.00186 0.00040 0.00073 0.00104 0.00110 0.00102 0.00108 + 1 160.67999 70.88280 0.00061 0.00068 0.00071 0.00126 0.00110 0.00124 0.00108 + 1 163.67799 61.91460 0.00044 -0.00234 0.00235 0.00102 0.00110 0.00101 0.00109 + 1 164.16000 61.96720 0.00121 -0.00220 0.00227 0.00102 0.00110 0.00101 0.00109 + 1 112.74000 74.46850 0.00054 0.00023 0.00027 0.00160 0.00111 0.00158 0.00108 + 1 111.12700 70.36400 -0.00053 0.00025 0.00030 0.00110 0.00113 0.00108 0.00111 + 1 128.20900 25.25940 -0.00013 0.00008 0.00015 0.00103 0.00110 0.00100 0.00109 + 1 128.41299 25.40450 -0.00061 -0.00114 0.00127 0.00103 0.00110 0.00100 0.00109 + 0 85.86090 10.11960 -0.00086 -0.00627 0.00633 0.00113 0.00120 0.00107 0.00116 + 1 18.25960 33.08650 -0.00059 0.00019 0.00053 0.00103 0.00110 0.00101 0.00109 + 1 18.29680 33.14370 -0.00063 -0.00035 0.00063 0.00103 0.00110 0.00101 0.00109 + 0 31.71920 12.78690 0.00019 -0.00497 0.00497 0.00105 0.00114 0.00101 0.00111 + 0 354.50699 8.38499 0.00046 0.00546 0.00548 0.00120 0.00118 0.00116 0.00114 + 1 328.62299 12.12090 -0.00236 -0.00125 0.00262 0.00102 0.00111 0.00100 0.00108 + 1 328.73999 12.02490 -0.00126 -0.00168 0.00209 0.00102 0.00110 0.00100 0.00108 + 1 316.58401 23.06060 -0.00087 0.00029 0.00085 0.00104 0.00111 0.00103 0.00110 + 1 285.03900 53.18160 0.00034 -0.00049 0.00053 0.00102 0.00110 0.00100 0.00109 + 1 285.12701 53.00450 0.00102 -0.00056 0.00083 0.00102 0.00110 0.00100 0.00109 + 1 344.81201 54.80580 0.00024 -0.00025 0.00028 0.00105 0.00111 0.00103 0.00109 + 1 344.71399 54.75800 -0.00053 -0.00046 0.00056 0.00106 0.00111 0.00104 0.00110 + 1 220.16200 44.59030 -0.00034 0.00076 0.00080 0.00102 0.00110 0.00101 0.00109 + 1 220.44800 44.47260 -0.00008 0.00021 0.00022 0.00102 0.00110 0.00101 0.00109 + 1 276.91599 77.74150 -0.00070 0.00105 0.00106 0.00106 0.00110 0.00089 0.00106 + 1 276.97000 77.54990 0.00186 0.00088 0.00097 0.00105 0.00110 0.00090 0.00106 + 1 201.64900 70.71920 0.00031 0.00131 0.00132 0.00103 0.00110 0.00100 0.00108 + 1 202.30200 70.64870 -0.00161 0.00137 0.00147 0.00104 0.00110 0.00101 0.00108 + 1 194.03200 62.19000 -0.00007 -0.00099 0.00099 0.00102 0.00110 0.00101 0.00109 + 1 194.52100 62.14490 0.00062 -0.00068 0.00074 0.00102 0.00110 0.00101 0.00109 + 1 143.26601 78.93980 -0.00104 0.00020 0.00028 0.00116 0.00110 0.00108 0.00106 + 1 144.22400 79.05570 0.00135 0.00094 0.00097 0.00105 0.00110 0.00096 0.00106 + 1 141.26401 32.88660 0.00067 0.00057 0.00080 0.00102 0.00110 0.00100 0.00109 + 1 141.50600 33.00030 -0.00010 0.00096 0.00096 0.00103 0.00110 0.00101 0.00109 +$corrected_stats + -0.00000 0.00102 0.00000 0.00109 0.00125 143 153 0.00000 0.00053 +$new_model +* + 00006 2018 124 09 40 20 0 +* + 90.0000 1 0 1 1 1 1 1 1 0 0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +* + -2.2964444160 0.0000000000 -0.0070350473 -0.0033545941 -0.0006689935 +* + 0.0001276313 0.0839248598 0.0909821168 0.0000000000 0.0000000000 +* + 0.0143946456 0.0000000000 -0.0000148549 0.0001541676 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* + 0.0000000000 0.0000000000 0.0000000000 0.0000000000 0.0000000000 +* diff --git a/Common/Misc/Plotter/src/Makefile b/Common/Misc/Plotter/src/Makefile index a49124cfa45b009410816cb9829cea5d60a1a963..6d9c1210748d64dd5f01d2df1c3f0893e5c90721 100644 --- a/Common/Misc/Plotter/src/Makefile +++ b/Common/Misc/Plotter/src/Makefile @@ -68,6 +68,7 @@ man : do_man @echo " . . . man page(s) done" install : install_all + @chmod 700 $(INTROOT)/bin/plotter @echo " . . . installation done" diff --git a/Common/Misc/Scripts/src/Makefile b/Common/Misc/Scripts/src/Makefile index 987b3d44ab6300d59284db4a13dd78af28269de6..432fe66698f9db34c63691d85fe694e021e9dfc0 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 #******************************************************************************* @@ -31,7 +31,7 @@ # # Python stuff (public and local) # ---------------------------- -PY_SCRIPTS = data_stats tabbify +PY_SCRIPTS = PY_SCRIPTS_L = PY_MODULES = @@ -41,7 +41,8 @@ PY_PACKAGES = PY_PACKAGES_L = pppppp_MODULES = -SCRIPTS = +SCRIPTS = data_stats discos +SCRIPTS_L = tabbify # # list of all possible C-sources (used to create automatic dependencies) @@ -80,6 +81,8 @@ man : do_man @echo " . . . man page(s) done" install : install_all + @chmod 700 $(INTROOT)/bin/data_stats + @chmod 700 $(INTROOT)/bin/discos @echo " . . . installation done" diff --git a/Common/Misc/Scripts/src/discos b/Common/Misc/Scripts/src/discos new file mode 100644 index 0000000000000000000000000000000000000000..86920a6eb59bf138b99d7e1e154cda58d8227350 --- /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/Common/Misc/getTemplateForTests/src/Makefile b/Common/Misc/getTemplateForTests/src/Makefile index 273465da4dbe71c0c8dcc36cb7254c2e53576054..6102432607790fd49b954a3a32932b266d9cb1c5 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 # @@ -53,6 +53,7 @@ install_templates: @echo " . . . templates installed" install : install_all install_templates + @chmod 700 $(INTROOT)/bin/getTemplateForTests @echo " . . . installation done" diff --git a/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py b/Common/Misc/getTemplateForTests/tests/functional/test_no_svn.py index 1ad0d7a5d2b4e7868eca9c8517d14024d61fab1b..50f37224ca54e5f1a9fb1edea6a15e0ab89d6252 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/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd b/Common/Servers/AntennaBoss/config/CDB/schemas/AntennaBoss.xsd index af5e1ec7fddef8e3f164b72a68f25476d177d0f1..47b0bb869097fa613461e7c751aba3a95b951223 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/AntennaBoss/src/BossCore_prepareScan.i b/Common/Servers/AntennaBoss/src/BossCore_prepareScan.i index 059cc731a7ac2bdb2b5bd9c13eed12fdd7fc33d6..afa85a04acb6dcc98a66b8c53db3c78f9d898065 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 19a47e93008e313f3e2aabcb74ebdcecdae675b0..c285081717e5d845a0356b38d9f415c06be10f99 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 7ed1f34427da916fe384ec1af3d6c871e8c2f9e9..179b70aa5149a619989a75919997532705a9bc4d 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 { diff --git a/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd b/Common/Servers/CalibrationTool/config/CDB/schemas/CalibrationTool.xsd index 75af69ae4c527e917c07294e7e2604ec9f8cd9a3..2d00a930f75af5aa817e387f56865a487b6443a3 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 20af0357f7108f40b02dd71bc1d68171885fac33..4d2365678812d99cb78d0e161b3a889db8a742f9 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/CustomLogger/include/CustomLoggerImpl.h b/Common/Servers/CustomLogger/include/CustomLoggerImpl.h index 3e36afedc287e4cd0531b091248611125f99e70c..e63d571c19776bf98f66f4df026822e0c95944bf 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. @@ -104,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. @@ -147,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/include/expat_log_parsing.h b/Common/Servers/CustomLogger/include/expat_log_parsing.h index bad3131c2a18d43434413c685d19d704f58e4bf6..efd049a934ac7ff3949f2bef452a027eaaca6926 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 diff --git a/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp b/Common/Servers/CustomLogger/src/CustomLoggerImpl.cpp index 7822c61031a68e931d11d893e82e958213c29fd8..1b7595fec8c6d9b8e00150878ce754fdb4b69341 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 = acscommon::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 338ce0ec8daf1117d98121e25b5fe5bcf7053faf..d02d84e1b62f600a766445f8e7bf33d926062042 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 sendException + # # 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 0000000000000000000000000000000000000000..253ea94749ed25825d7adeb986d82add7123dce8 --- /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 0000000000000000000000000000000000000000..b11d75047073122aee41a827c9fa1fc548664966 --- /dev/null +++ b/Common/Servers/CustomLogger/src/emitLogMessage.py @@ -0,0 +1,65 @@ +#!/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,userLogger + +def usage(): + 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 "[-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:],"heut:",["help","text="]) + except getopt.GetoptError, err: + print str(err) + usage() + sys.exit(1) + + message="" + error=False + user=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 + elif o in ("-u"): + user=True + + if message=="": + print "text message is mandatory" + print "" + usage() + sys.exit(1) + + simpleClient=PySimpleClient() + + if user: + if error: + userLogger.logError(message) + else: + userLogger.logNotice(message) + else: + if error: + logger.logError(message) + else: + logger.logNotice(message) + + simpleClient.disconnect() + +if __name__=="__main__": + main() diff --git a/Common/Servers/CustomLogger/src/sendException.py b/Common/Servers/CustomLogger/src/sendException.py new file mode 100644 index 0000000000000000000000000000000000000000..6d0e5ff5e01af813643af0840808be74e2c6c6b7 --- /dev/null +++ b/Common/Servers/CustomLogger/src/sendException.py @@ -0,0 +1,70 @@ +#!/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 +from AntennaErrorsImpl import ConnectionExImpl +from AntennaErrorsImpl import AntennaBusyExImpl +from SimpleParserPy import add_user_message + + +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,False) + + if user==True: + userLogger.logException(ex1) + else: + logger.logException(ex1) + + print "all done...." + + simpleClient.disconnect() + +if __name__=="__main__": + main() diff --git a/Common/Servers/CustomLogger/tests/functional/test_logging.py b/Common/Servers/CustomLogger/tests/functional/test_logging.py index d5526403a3d05a676c36832af552533bd78eceb6..af3a437b659f67cebb0bd48cc42de8d73df48152 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/DBBC/include/DBBCImpl.h b/Common/Servers/DBBC/include/DBBCImpl.h index 8cac004fef3a014784e5ff3a006704827e70ca82..fabe1618c3bab959bac468f71ec1c6b4c623fcc3 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/ExternalClients/config/CDB/schemas/ExternalClients.xsd b/Common/Servers/ExternalClients/config/CDB/schemas/ExternalClients.xsd index 248554d7d95fbfab3a35d3e95ef2601151617bca..483f31cf82d7d653e1cc45d93dc106fc262806ee 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 0956e6e221bfb76955e49cc755296e1aa29ea34f..270e43b29b1ece3e3c4898b300096a7c1e893615 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 ee3294917e793c4ce5105f86be47e2be7d994a46..4bcecc514f8d63068bb33c04777079af5cf9e287 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/FitsWriter/src/Configuration.cpp b/Common/Servers/FitsWriter/src/Configuration.cpp index f7e30bb789f5959f527075fe02dcaf349c8e4ba4..255e2fad6717bd75036d6fd7516428c1b488ed81 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 0923d4096ed51bd344761ce754dd76b6b25dd7e7..40cddc4f42fdd98e78704c6ecfb35876e6a351f2 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; @@ -385,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/EngineThread.cpp b/Common/Servers/FitsWriter/src/EngineThread.cpp index 71a4cc6a2678eeaac0876ab367a94814247ef642..e9efbdd5aa438d20db99da6f356a5bb8330d4b36 100644 --- a/Common/Servers/FitsWriter/src/EngineThread.cpp +++ b/Common/Servers/FitsWriter/src/EngineThread.cpp @@ -188,14 +188,14 @@ bool CEngineThread::processData() receiverBossError=true; } catch (ComponentErrors::ComponentErrorsEx& ex) { - _ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CEngineThread::collectReceiversData()"); + _ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CEngineThread::processData()"); impl.setOperationName("getDerotatorPositionFromHistory()"); impl.setComponentName((const char *)m_config->getReceiversBossComponent()); _IRA_LOGFILTER_LOG_EXCEPTION(impl,LM_ERROR); m_data->setStatus(Management::MNG_FAILURE); } catch (ReceiversErrors::ReceiversErrorsEx & ex) { - _ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CEngineThread::collectReceiversData()"); + _ADD_BACKTRACE(ComponentErrors::CouldntCallOperationExImpl,impl,ex,"CEngineThread::processData()"); impl.setOperationName("getDerotatorPositionFromHistory()"); impl.setComponentName((const char *)m_config->getReceiversBossComponent()); _IRA_LOGFILTER_LOG_EXCEPTION(impl,LM_ERROR); @@ -563,7 +563,8 @@ void CEngineThread::runLoop() ACS::longSeq sectionsID; ACS::stringSeq axisName,axisUnit; - m_data->getSite(site,dut1,siteName); + m_data->getSite(site,dut1,siteName); + m_info.getLocalOscillator(LocalOscillator); m_info.getSectionsID(sectionsID); m_info.getBackendAttenuations(atts); diff --git a/Common/Servers/FitsWriter/src/FitsWriter.cpp b/Common/Servers/FitsWriter/src/FitsWriter.cpp index 37dcc05a31eaacbb2a404083d2420a3adf6c9d88..cc920885501f81378a1d81daee3165eb235cd6c2 100644 --- a/Common/Servers/FitsWriter/src/FitsWriter.cpp +++ b/Common/Servers/FitsWriter/src/FitsWriter.cpp @@ -24,6 +24,8 @@ using namespace FitsWriter_private; #define _FITSW_SECTCOL_TYPE "type" #define _FITSW_SECTCOL_SR "sampleRate" #define _FITSW_SECTCOL_BINS "bins" +#define _FITSW_SECTCOL_FREQ "frequency" +#define _FITSW_SECTCOL_BW "bandWidth" #define _FITSW_SECTCOL_FLUX "flux" #define _FITSW_RFCOL_FEED "feed" @@ -56,18 +58,24 @@ CFitsWriter::CFitsWriter() SectColName.push_back(_FITSW_SECTCOL_TYPE); SectColName.push_back(_FITSW_SECTCOL_SR); SectColName.push_back(_FITSW_SECTCOL_BINS); + SectColName.push_back(_FITSW_SECTCOL_FREQ); + SectColName.push_back(_FITSW_SECTCOL_BW); SectColName.push_back(_FITSW_SECTCOL_FLUX); SectColForm.push_back("J"); - SectColForm.push_back("6A"); + SectColForm.push_back("8A"); SectColForm.push_back("D"); SectColForm.push_back("J"); SectColForm.push_back("D"); + SectColForm.push_back("D"); + SectColForm.push_back("D"); SectColUnit.push_back(""); SectColUnit.push_back(""); SectColUnit.push_back("MHz"); SectColUnit.push_back(""); + SectColUnit.push_back("MHz"); + SectColUnit.push_back("MHz"); SectColForm.push_back("Jy"); rfColName.push_back(_FITSW_RFCOL_FEED); @@ -486,7 +494,7 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq §ionID, const ACS::long { std::vector id; std::vector bins; - std::vector sampleRate; + std::vector sampleRate,bckFreq,bckBw; std::vector flux; std::vector sect_type; std::vector feed; @@ -514,6 +522,8 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq §ionID, const ACS::long std::stringstream colName, type, tsysType; id.push_back(m_channels[i].id); // Section ID bins.push_back(m_channels[i].bins); //Section Bins + bckFreq.push_back(m_channels[i].frequency); //Section frequency configuration + bckBw.push_back(m_channels[i].bandWidth); //Section bandWidth configuration sampleRate.push_back(m_channels[i].sampleRate); // section S.R. if (fluxIterator<(long)sourceFlux.length()) { flux.push_back(sourceFlux[fluxIterator]);// estimated source flux associated to the section parameters @@ -526,7 +536,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) { @@ -601,60 +616,6 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq §ionID, const ACS::long } section.push_back(sectionID[j]); } - - /*for (long j=0;((j1) { - tsysType << (m_channels[i].inputs) << "D";; - tsysColForm.push_back(tsysType.str()); - } - else { - tsysColForm.push_back("D"); - } - tsysColName.push_back(colName.str()); - tsysColUnit.push_back("K");*/ - /*}*/ try { section_table = pFits->addTable((const char *)name,m_mainHeader.sections, SectColName, SectColForm, SectColUnit); if (!section_table) { @@ -665,6 +626,8 @@ bool CFitsWriter::addSectionTable(const ACS::longSeq §ionID, const ACS::long section_table->column(_FITSW_SECTCOL_TYPE).write(sect_type,1); section_table->column(_FITSW_SECTCOL_SR).write(sampleRate,1); section_table->column(_FITSW_SECTCOL_BINS).write(bins,1); + section_table->column(_FITSW_SECTCOL_FREQ).write(bckFreq,1); + section_table->column(_FITSW_SECTCOL_BW).write(bckBw,1); section_table->column(_FITSW_SECTCOL_FLUX).write(flux,1); } catch(FitsException& fe){ diff --git a/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp b/Common/Servers/FitsWriter/src/FitsWriterImpl.cpp index 1e249b2737c999135c3da0d26dbdf7f595901176..aad22a62f3988726174bac8a31768c81e26a4ffc 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 2230056f32db014712dbb8c8eea789fc5f95a9db..f63f23d84e0c81d7d8b2058c466e54e43987922f 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(); diff --git a/Common/Servers/HolographyBackend/include/HolographyImpl.h b/Common/Servers/HolographyBackend/include/HolographyImpl.h index ad273673f8d110570b4aaa2b20ff1bc9e961b028..9e247e5b597f52eb2347fe8adad8d399fbdacfea 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 74bbdcfefe24751b348a23dd22573efcde8d960c..1af4cc4ba02b87345db39cd2074c6ef73a245a66 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 @@ -401,10 +403,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 5498e9fc028d03afb5002aee4b6eabfc2c0d5306..eea5882d907b2f60230b6543114febe8a2f87c3c 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/Observatory/config/CDB/schemas/Observatory.xsd b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd index ce3318669e7b7de43457df11349bb8a83b95a07e..06a07eb93c02dd8375fbe6186575172d3ef2916a 100644 --- a/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd +++ b/Common/Servers/Observatory/config/CDB/schemas/Observatory.xsd @@ -19,12 +19,15 @@ - + + + + @@ -45,7 +48,9 @@ - + + + diff --git a/Common/Servers/Observatory/include/ObservatoryDevIOs.h b/Common/Servers/Observatory/include/ObservatoryDevIOs.h index dbebd7395f37456ee29c399e65c56f958a380e5d..4d062e1ff3edf9d77d3b956129351590526e8fac 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 ca6b999931f61c6631ce1a8a5a966b4616a50997..6da6419361362f4214589de06bc55b9e261dbac0 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 acf8378950e083c44ec98419230e0a99d28f3ffd..a4d4099591f4231c09ac8b009d60350a7011cb1b 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); @@ -241,7 +247,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 +273,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 +300,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); diff --git a/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd b/Common/Servers/PyDewarPositioner/config/CDB/schemas/DewarPositioner.xsd index 7dbc56443eba55dc4d2880ce5ae98deaf4b79125..d9bb3de6496adc73f6f49714688337ba56cc49af 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/PyDewarPositioner/src/Makefile b/Common/Servers/PyDewarPositioner/src/Makefile index 567cb3ac7981f61f966d85ac2a9a2d3e0077fdf5..db65b43dfce972098c0726783b35c547211cd5eb 100644 --- a/Common/Servers/PyDewarPositioner/src/Makefile +++ b/Common/Servers/PyDewarPositioner/src/Makefile @@ -5,7 +5,7 @@ CDB_SCHEMAS = DewarPositioner -PY_SCRIPTS = derotatorPosition +PY_SCRIPTS_L = derotatorPosition PY_MODULES = PY_PACKAGES = DewarPositioner @@ -24,9 +24,9 @@ all: do_all @echo " . . . 'all' done" clean : clean_all - $(RM) *~ *Impl/*~ DewarPositioner/*.pyc - $(RM) ../lib/python/site-packages/* - $(RM) $(INTROOT)/lib/python/site-packages/DewarPositioner + @$(RM) *~ *Impl/*~ DewarPositioner/*.pyc + @$(RM) ../lib/python/site-packages/* + @$(RM) $(INTROOT)/lib/python/site-packages/DewarPositioner @echo " . . . clean done" clean_dist : clean_all clean_dist_all diff --git a/Common/Servers/PyDewarPositioner/test/README.rst b/Common/Servers/PyDewarPositioner/test/README.rst index eee0495554f41f5a95c8592e31a2071571a7e9e1..21e24ef87ba919251ace367bafd9134492e4e6b5 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 Binary files a/Common/Servers/PyDewarPositioner/test/dependencies/unittest2-0.5.1.tar.gz and b/Common/Servers/PyDewarPositioner/test/dependencies/unittest2-0.5.1.tar.gz differ diff --git a/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py b/Common/Servers/PyDewarPositioner/test/functional/commands/test_command.py index 57f264b40b40c4078baa442f131600d954bada75..442b11d891250635a184d8db39506e2f10e3cc0d 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 17e449853bb5dbbc80a20e3b366ee5e665da82cc..cebbb2686e72643818482db666716244adea3527 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 e3771b64e0c05e00e1cc486e5826746958500807..a8c843b113507c6c3a537042bf934844a0ebb48e 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 d528f18dc23b0c0fecabcad4f6d2ee8b3a145a90..fad08263a1602b33c9599641e17cc4206ce0d6ca 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 850cad6b963a0b0c0f7b61e7b3b9212bb409b683..247596f1f942dcaa51d846a928c0dc259001247b 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 9e57d772f016e5ee646ca50f7c3e798b3e865f04..dd7a484e96d9d2201cf359927d451a40016407b6 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 bb581ea5f8249ad58b49fc66c68e4117f0572302..e1909cd5138afab3ea88a00f34bcb5a85acea01c 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 ed0ee4b4f652cf3d7b53f5a4a0b460fbdea79586..c8d8154dd76c8cea02d77a7176ec3b26cf5871f5 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 1f0adc054c9453d340e597bf532064d6d0c38eaa..7246ac762326317e4217b0a3df9092e2d3380ce3 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 6d7f1ff0cd05ebf8ab3c95a50f19faa39f348b2a..d66d84653ccad69e1827c178878b69921a5d47ad 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 bcf88b0b6a08b7b7c355e0fddad358aaf2356071..925b484fa9388325794f1952eced31b370b83e63 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 78f838631b4fa850e6c6c5f148b25437c71d7902..6d4dbcc3b1646c4c8f05a5d1f21724712e71f422 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 ebdc710a80396acfe0e9bba93d8bb8f5ae239089..59434a77f2ad2e25cad2c3b0d579c1b5be8abdf8 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 26bb48d3269346691945a47fc0b98dbffe971573..230495b09b22a6bb0c372db80fea915d36090c7a 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 3b67281fa9047581307dbf81cc9865a999cb47e9..881610a0f4b17560f65dd7c968c7171fead3f1ae 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 6ccd4290567b36bc06c9c9ebdef64f148cd447b2..f0e8ee17d281cd22dc6197ea3806eeb59bac0021 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 5731a0b81c4dce3c2e44242e8714240919ab0688..07ed8c198bbb259188ab009721373bc9f97601e0 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 b2c5066769521d289567fb6a079fdaec531e2c09..6473b49143b889ddfdbeb6af0fbad21bc3f5af12 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 8449ba3081df500a32f7935f3757d00681b5dfd2..3d17ef0d3e87a6bb90094ce6d25d125d5caecb7a 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 8b4653593ced73360c24dde8f3173e6c7fd12fe8..d2d1fc7c28f8abc1171b0a9e340a3dd71e5081df 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 f1005c95278514f352592e268aa2880d82de8520..75381a05e59939cfd59384e5b9aaa9aeee13667f 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 49611cc8948f924e1d371fcc25981aaf296feb6f..badd32ce8207a4e6e9ec1ecdf537069487e17f64 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 8bc99c66768c0add0f7f47c7b43a1062c6336710..e0e4e890c40a6bed0a4325353e3dac70d799a088 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 a04dde9ce97e9d335965762c9e138538590e0251..41b04540349e73b0550831f3d6fa0032b451b051 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 0cc9001433dff3c6bad0f4234c48999dc5858d02..948ef9bcdf0bdd9e1e2559c4e493ee3d4fecfb12 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 abf18e28577479d143f8190ff77d98a9eae9dc27..525718623beaa1b9e845408a13f4af2342363321 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 a0be97ddd6b44252e6ac6897323064af22aff8b9..1ce516429b62152b0ac26dce79014dfef4afa2a0 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 40d46f29611f9d627ce12adb7c66ee79e1f6f121..f360311b9781b5f2fd5b0ef2a8c65ac88ae6b59b 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 d6895293fcacb056b7f1717816a988a1f3dc1b67..0041fc834bd0a0583a2cbec4accd0f0e0fa8f681 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 3bb336ca53f1c86a084965f47b9d157969962c63..4d04bd212f84dba67906761305226a350af0edf8 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 fee8896a85a713e70a9005d3fac18fec6714d221..5d25c11f24870269672a656a72418003717325fc 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 3e87221017f60e1e482db4b669c958f21dfe4044..ad607f5cb43bfb6ce8a1cd83ff7ee8748f01b912 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 300c115f6227cad97763762d96a97618363007ee..c9415f04d20c9da2cff48a83efeb296f81caf4c4 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 6e88932910097342e30f4e1d5060c0bdb79b4370..ff816496c45b31f7f83924a97131e24bd67a92fe 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 cd6e2a8cd5da6645a7f8e6e729e2482b0f86621d..a45640141bdfbca7b0414901b2f91d3994abfc43 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 f24a21a4c36ea44d2e910b0f3fef3c533e569657..498e626e838a381ba06a8b0174ee594c0613c2db 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 57f264b40b40c4078baa442f131600d954bada75..442b11d891250635a184d8db39506e2f10e3cc0d 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 17e449853bb5dbbc80a20e3b366ee5e665da82cc..cebbb2686e72643818482db666716244adea3527 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 e3771b64e0c05e00e1cc486e5826746958500807..a8c843b113507c6c3a537042bf934844a0ebb48e 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 9e57d772f016e5ee646ca50f7c3e798b3e865f04..dd7a484e96d9d2201cf359927d451a40016407b6 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 bb581ea5f8249ad58b49fc66c68e4117f0572302..e1909cd5138afab3ea88a00f34bcb5a85acea01c 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 ed0ee4b4f652cf3d7b53f5a4a0b460fbdea79586..c8d8154dd76c8cea02d77a7176ec3b26cf5871f5 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 1f0adc054c9453d340e597bf532064d6d0c38eaa..7246ac762326317e4217b0a3df9092e2d3380ce3 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 6d7f1ff0cd05ebf8ab3c95a50f19faa39f348b2a..d66d84653ccad69e1827c178878b69921a5d47ad 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 bcf88b0b6a08b7b7c355e0fddad358aaf2356071..925b484fa9388325794f1952eced31b370b83e63 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 78f838631b4fa850e6c6c5f148b25437c71d7902..6d4dbcc3b1646c4c8f05a5d1f21724712e71f422 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 ebdc710a80396acfe0e9bba93d8bb8f5ae239089..59434a77f2ad2e25cad2c3b0d579c1b5be8abdf8 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 26bb48d3269346691945a47fc0b98dbffe971573..230495b09b22a6bb0c372db80fea915d36090c7a 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 3b67281fa9047581307dbf81cc9865a999cb47e9..881610a0f4b17560f65dd7c968c7171fead3f1ae 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 5440fca41b0421bf6551732f2976a2b3a6360f30..8817384623a829e40f08ad623b80a4311a325e04 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 5731a0b81c4dce3c2e44242e8714240919ab0688..07ed8c198bbb259188ab009721373bc9f97601e0 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 b2c5066769521d289567fb6a079fdaec531e2c09..6473b49143b889ddfdbeb6af0fbad21bc3f5af12 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 8449ba3081df500a32f7935f3757d00681b5dfd2..3d17ef0d3e87a6bb90094ce6d25d125d5caecb7a 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 8b4653593ced73360c24dde8f3173e6c7fd12fe8..d2d1fc7c28f8abc1171b0a9e340a3dd71e5081df 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 f1005c95278514f352592e268aa2880d82de8520..75381a05e59939cfd59384e5b9aaa9aeee13667f 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 49611cc8948f924e1d371fcc25981aaf296feb6f..badd32ce8207a4e6e9ec1ecdf537069487e17f64 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 8bc99c66768c0add0f7f47c7b43a1062c6336710..e0e4e890c40a6bed0a4325353e3dac70d799a088 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 bc390944678a60a4ba4d98d5623aa194ad89988a..d6c117b8d7488daf0d37391fb143650f568af999 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 0cc9001433dff3c6bad0f4234c48999dc5858d02..948ef9bcdf0bdd9e1e2559c4e493ee3d4fecfb12 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 b881f3666113e05dcc96bcb03a39a66d270780e7..28a13545a6ce637109a45b0fb7369f54b3443f98 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 a0be97ddd6b44252e6ac6897323064af22aff8b9..1ce516429b62152b0ac26dce79014dfef4afa2a0 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 40d46f29611f9d627ce12adb7c66ee79e1f6f121..f360311b9781b5f2fd5b0ef2a8c65ac88ae6b59b 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 d6895293fcacb056b7f1717816a988a1f3dc1b67..0041fc834bd0a0583a2cbec4accd0f0e0fa8f681 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 3bb336ca53f1c86a084965f47b9d157969962c63..4d04bd212f84dba67906761305226a350af0edf8 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 41362f06f58d1da53ce26b41fde7fdc9732df6e5..7ab44bf319dda7de7e704d2f8cc70b46917f9247 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 3e87221017f60e1e482db4b669c958f21dfe4044..ad607f5cb43bfb6ce8a1cd83ff7ee8748f01b912 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 f180b80b3b93522b7501953fa9a0e168e732ecfa..afe102950dd3db7a961285a267521080e96617c4 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 6e88932910097342e30f4e1d5060c0bdb79b4370..ff816496c45b31f7f83924a97131e24bd67a92fe 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 cd6e2a8cd5da6645a7f8e6e729e2482b0f86621d..a45640141bdfbca7b0414901b2f91d3994abfc43 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 f24a21a4c36ea44d2e910b0f3fef3c533e569657..498e626e838a381ba06a8b0174ee594c0613c2db 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 75144ebb1beb486d4bf8e68b34e81c308b7a4894..825982ed35da0cfae2f4939449fc5433ed9cb5b8 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 6b932abdf28dcfee064a21df8c59ba270db180ac..a9c10c3333fe900c2e9a77a0e2ed87c722806e68 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 26063c465d7a778a6d0aaa3b9db5dd2f92af0e8e..80f657fbac9cbdcd9a16c30eb9972243b3f3705e 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 bcef705b946ad92c8bb44da281f84f318e1becb6..4d7699a145c3ab1430e46c7705cca59b341e85b4 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 2067e17eaba202eb2744596db1902094f677af8a..c1590b2dc293e2915fb4b69f962a0d61caeacb0e 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 7e0e175483885ed2330ce93911bf45fc373d0bd6..a7407ff3c3ee1f5bff953a6bdfd90ea4e0f1f629 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 f6b1e1ae7643f148e8eb4df35088b378102a1672..67e8b8e279de3b1f48afe74de24dc68fbdb090b0 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 5ebe354b5e091e951915f48331d9a8e7e3a4c913..45501810eef4c82123bb84202144b3cadce34643 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 8b532872897cfca09fb673d6b8f17595f1500082..da8b03d24c8eabcb1864b6a10d681f44f8610d57 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 275e9b1ce0971de908c86fe87bf4953092fe81bf..b37d29686b8012ec21577fc595a0234bf49cf74b 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 01df8ce71f6b528da89320ca2538406467a4eb8a..92a102ebd468903c717e5229ea78fac88f7acf23 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 a3f9377200fd813aa498a242ddb4538a5e5c8a0a..b2edc1653233437f0e60defd2dba3d2a67ab09d8 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 ad3185e98d7688dd75bc8c49669399942bd1e889..37642fa7e61927db19ee189547e777e54b5748ae 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 d9fe49f81ee336be132541c08efbc2c6985b9f60..12dc3e8ebf49f883b3ebff7f8eb016f9a3e54c46 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 f30c850ec790617f1d5d20f86b690d63ff8e432d..f5dcf9a9c4ba4b10ce69a25912ae38714b46498a 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 0801428c95b62b9c0f68b0994e617475f92e21c5..8233407580fa199fb5dae97ad5a68b44f1b4e971 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 4f5a8624b142acb22cc570fbbeefa26851d9b9a0..f96d581f2a6a2389d6b83c631999fc7f625d2069 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 91e7f07e8434b8050a289147c5dead2d2275e824..56b6791fbc724310787119d3c26bf3f1990191bd 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 0b11ff1883a2318050c0ef34ebc61e0adec91efa..18bccf50017be4ccb36b1fa220b5b4238c606c9b 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 a9951ef4a9f1e90e84a8588f0951ed0acb5919eb..ff845f5710732cf597d1013b8cfc9c918610c5a5 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/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd b/Common/Servers/ReceiversBoss/config/CDB/schemas/ReceiversBoss.xsd index dcd42e2c915ed90af7953b8a907d29f85f9463bf..8f5d7b79b3ffc990399a93c1e3e832244f3bd1b0 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/ReceiversBoss/src/Makefile b/Common/Servers/ReceiversBoss/src/Makefile index bd15ee2554adabbfca942c924d750df721a12c92..80d83efc42f81bcbcf0eaae8adf9e7d733744ade 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/Refraction/src/TestIter.cpp b/Common/Servers/Refraction/src/TestIter.cpp index 1142ea445c2571d0e43bb8e21ad28e52187fffc6..dfd4e8cf29505aa6d05b643b2b2548995521609b 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 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 2719dbef4635bf013f6667569d6d1d14be9e036b..34e93aebf69527acd60f209a9a3db34e4f9734b7 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 1d977c32049ac05752e92634bfc3ecf4e02b91a2..2d35c37a6648f5e6e85f73dbebb25a362a615fe8 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 96% rename from Common/Servers/Roach/include/CommandLine.h rename to Common/Servers/Sardara/include/CommandLine.h index 822e7f3ab94b2e0904dc86ac89effb3d5fb282d2..0c074805df5f2ffccccec61ae8630f6845ee45dd 100644 --- a/Common/Servers/Roach/include/CommandLine.h +++ b/Common/Servers/Sardara/include/CommandLine.h @@ -13,8 +13,9 @@ #include #include #include -#include +#include #include +#include #include #include #include @@ -73,7 +74,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 +87,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 +113,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. @@ -121,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. @@ -149,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. @@ -160,6 +166,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. @@ -367,6 +374,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 @@ -475,6 +485,7 @@ private: ContainerServices* m_services; Backends::TotalPower_var m_totalPower; + Receivers::GenericIFDistributor_var m_ifDistributor; /** * List the fields of the backend status @@ -640,7 +651,7 @@ private: */ double m_tpiZero[MAX_SECTION_NUMBER]; - long m_rfInputs; + long m_inputsNumber; double m_filter; @@ -739,14 +750,22 @@ private: */ inline void clearStatusField(TstatusFields field) { m_backendStatus &= ~(1 << field); } - bool m_RK00; - bool m_RC00; - bool m_RL00; - bool m_RP00; - 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; + + bool m_stationSRT; }; 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 faebd90b54a1f809abd828327895ec55e3fac403..51beb3c319982fdd1561555b628e1b8665e40079 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 98% rename from Common/Servers/Roach/include/DevIOAttenuation.h rename to Common/Servers/Sardara/include/DevIOAttenuation.h index 75be04de59047d63a06ba8d2c58cc46ee8603be6..40b378bdc32c3015f31abfd3163b1910f73209c5 100644 --- a/Common/Servers/Roach/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/Roach/include/DevIOBandWidth.h b/Common/Servers/Sardara/include/DevIOBandWidth.h similarity index 98% rename from Common/Servers/Roach/include/DevIOBandWidth.h rename to Common/Servers/Sardara/include/DevIOBandWidth.h index 15d5dd378cd96d8bb8ec8e6480830f89b2d20059..38e5f11bf24f08371e55cab967cf8442f28baa86 100644 --- a/Common/Servers/Roach/include/DevIOBandWidth.h +++ b/Common/Servers/Sardara/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/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 98% rename from Common/Servers/Roach/include/DevIOFeed.h rename to Common/Servers/Sardara/include/DevIOFeed.h index a9120c367b4ff1bfc39f9fb9f864fe126de0e6f8..9d96758fffd6dc16d49be37b936f6660f3a929b3 100644 --- a/Common/Servers/Roach/include/DevIOFeed.h +++ b/Common/Servers/Sardara/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/Sardara/include/DevIOFrequency.h similarity index 98% rename from Common/Servers/Roach/include/DevIOFrequency.h rename to Common/Servers/Sardara/include/DevIOFrequency.h index 054d8886675540c4f0e3a769404ff61713fac08c..ae212e709a65699e0a16deb74accb0eac4374c55 100644 --- a/Common/Servers/Roach/include/DevIOFrequency.h +++ b/Common/Servers/Sardara/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/include/DevIOInputSection.h b/Common/Servers/Sardara/include/DevIOInputSection.h similarity index 98% rename from Common/Servers/Roach/include/DevIOInputSection.h rename to Common/Servers/Sardara/include/DevIOInputSection.h index e84fab13f8eda7317a9b87554ed93e426b5a99f2..e1a58d48a39144f0d2ed84c600dbec8b29d1f479 100644 --- a/Common/Servers/Roach/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/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 98% rename from Common/Servers/Roach/include/DevIOStatus.h rename to Common/Servers/Sardara/include/DevIOStatus.h index f7ea7ea3861c64126f8c80d6e6c78570a7e33d05..fc5900d72d10b2026316138d3976c5039fc23a2e 100644 --- a/Common/Servers/Roach/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/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 201c70d42f35a4b384f3dd1fae54202baaac15a3..5b289306cd155adea68c5bdf64108d8efbb91c7e 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 @@ -469,10 +472,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; @@ -501,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 116e08f973f792010c9900814865f957c3b11349..ac37a9152ce3327acfa0a90e358cbaf6288b41c3 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 62% rename from Common/Servers/Roach/src/CommandLine.cpp rename to Common/Servers/Sardara/src/CommandLine.cpp index ae5efbaa288b45202ee12a10dde4c327b15f24e4..3a5248fb8164d843892fd979f64d6c748f1fd23d 100644 --- a/Common/Servers/Roach/src/CommandLine.cpp +++ b/Common/Servers/Sardara/src/CommandLine.cpp @@ -2,9 +2,9 @@ #include #include "CommandLine.h" -/*****************************************************************************************************************************/ +/****************************************************************************************************************************/ #include -/*****************************************************************************************************************************/ +/****************************************************************************************************************************/ #define _CHECK_ERRORS(ROUTINE) \ else if (res==FAIL) { \ @@ -41,14 +41,21 @@ CCommandLine::CCommandLine(ContainerServices *service): CSocket(), m_backendStatus=0; setStatus(NOTCNTD); m_setTpiIntegration=true; - m_RK00=false; - m_RC00=false; - m_RL00=false; - m_RP00=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; + m_stationSRT=false; } CCommandLine::~CCommandLine() @@ -118,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 (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("BACKENDS/TotalPower"); + throw Impl; } + + m_ifDistributor = Receivers::GenericIFDistributor::_nil(); + try { + m_ifDistributor = m_services->getComponent("RECEIVERS/SRTIFDistributor"); + } + 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, @@ -169,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, @@ -188,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...... } @@ -233,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; @@ -254,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); } } @@ -269,34 +271,17 @@ 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 < 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; @@ -314,39 +299,20 @@ 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); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setAttenuation()",(LM_NOTICE,"TOTALPOWER_ATTENUATION INPUT=%ld,ATTENUATION=%lf",inputId,attenuation)); + } + catch (...) { + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()"); + 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 ( @@ -355,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; @@ -410,7 +372,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) { @@ -439,11 +400,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 (pol == 2) { // FULL STOKES newPol = pol; - m_sectionsNumber = 1; } if (pol >= 3) { _EXCPT(ComponentErrors::ValueOutofRangeExImpl,impl,"CCommandLine::setConfiguration()"); @@ -470,94 +429,110 @@ void CCommandLine::setConfiguration(const long& inputId,const double& freq,const } else newBins = m_bins[inputId]; - - /* - if (!checkConnection()) { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::setConfiguration()"); - }*/ - - //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(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); + } + 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 { - m_totalPower->setSection(0,-1, filter, -1, -1, -1, -1); - m_totalPower->setSection(1,-1, filter, -1, -1, -1, -1); + if (newBW==128.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::setDefaultConfiguration()"); - impl.log(LM_ERROR); - } + _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setAttenuation()"); + impl.log(LM_ERROR); + } } } } - /* - 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 (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::setSection()",(LM_NOTICE,"BACKEND_SARDARA_SET_SECTION ERROR")); + } } void CCommandLine::getZeroTPI(DWORD *tpi) throw (ComponentErrors::TimeoutExImpl,BackendsErrors::ConnectionExImpl, @@ -700,13 +675,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); - 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); - } - */ - //if (res>0) { // operation was ok. - 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_sectionsNumber); - for (int j=0;j(j); - if (zero) m_tpiZero[j]=tpi[j]; // in case of tpiZero we store it...... - } - } - /* - 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()"); + 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...... + if (zero) + m_tpiZero[j]=tpi[j]=0.0; // in case of tpiZero we store it...... + } + } + } + catch (...) { + ACS_LOG(LM_FULL_INFO,"CCommandLine::getTpi()",(LM_NOTICE,"BACKEND_SARDARA_GET-TPI ERROR")); } - else { - _THROW_EXCPT(BackendsErrors::ConnectionExImpl,"CCommandLine::getSample()"); +} + +void CCommandLine::getRms(ACS::doubleSeq& rms) throw (ComponentErrors::TimeoutExImpl, + BackendsErrors::ConnectionExImpl,ComponentErrors::SocketErrorExImpl,BackendsErrors::NakExImpl, + BackendsErrors::MalformedAnswerExImpl,BackendsErrors::BackendBusyExImpl) +{ + AUTO_TRACE("CCommandLine::getRms()"); + 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")); } - */ - /* - // 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, 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("RK00")==0) { + if (config.Compare("SK77")==0) { + m_filter=1250.0; + 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("SK03")==0) { + m_filter=1250.0; + 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("SK06")==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_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("RC00")==0) { + if (config.Compare("SK00")==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_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("RL00")==0) { + 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_RK00=m_RC00=m_RP00=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 (m_stationSRT == true) { + m_ifDistributor->setup("BW-UNFILTERED"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED")); + } } - if (config.Compare("RP00")==0) { + if (config.Compare("SP00")==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_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("RK00S")==0) { + if (config.Compare("SK77S")==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_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("RC00S")==0) { + if (config.Compare("SK03S")==0) { m_filter=1250.0; - m_rfInputs=2; - m_RC00S=true; - m_RK00=m_RL00=m_RP00=m_RK00S=m_RC00=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("RL00S")==0) { + if (config.Compare("SK06S")==0) { + m_filter=1250.0; + 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("SK00S")==0) { + m_filter=1250.0; + 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("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_RL00S=true; - m_RK00=m_RC00=m_RP00=m_RK00S=m_RC00S=m_RL00=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 (m_stationSRT == true) { + m_ifDistributor->setup("BW-UNFILTERED"); + ACS_LOG(LM_FULL_INFO,"CCommandLine::setDefaultConfiguration()",(LM_NOTICE,"IFDISTRIBUTOR_BW-UNFILTERED_CONFIGURED")); + } } - if (config.Compare("RP00S")==0) { + if (config.Compare("SP00S")==0) { m_filter = 730.0; - m_rfInputs=2; - m_RP00S=true; - m_RK00=m_RC00=m_RL00=m_RK00S=m_RC00S=m_RL00S=m_RP00S=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) @@ -1011,90 +867,55 @@ 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, 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)); - } - - 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); - } - catch (...) { - _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CCommandLine::setDefaultConfiguration()"); - impl.log(LM_ERROR); + Message request = Command::setConfiguration(string((const char*)conf)); + Message reply = sendBackendCommand(request); + 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,"TOTALPOWER_FILTER_CONFIGURED %d,FILTER=%lf",i,m_filter)); + } + } + ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_SARDARA_INITIALIZED, CONFIGURATION: %s",conf)); } - /*try { - setDefaultConfiguration(conf); - } catch (...) { - ACS_LOG(LM_FULL_INFO,"CCommandLine::setup()",(LM_NOTICE,"BACKEND_ROACH2_INITIALIZATION ERROR, CONFIGURATION: %s",conf)); - - }*/ + 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) @@ -1161,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); @@ -1209,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()){ @@ -1260,40 +1078,50 @@ 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()"); + att.length(m_inputsNumber); + for (int i=0;i0) { // load OK - att.length(m_sectionsNumber); - 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 @@ -1387,31 +1189,59 @@ void CCommandLine::getPolarization(ACS::longSeq& pol) const { pol.length(m_sectionsNumber); for (int i=0;i0) { // load OK - bw.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); @@ -1717,49 +1571,16 @@ CCommandLine::sendBackendCommand(Message request) void CCommandLine::getConfiguration(char* configuration) { Message request = Command::getConfiguration(); - Message reply = sendBackendCommand(request); - if(reply.is_success_reply()) - { - strcpy(configuration, reply.get_argument(0).c_str()); + try { + Message reply = sendBackendCommand(request); + if(reply.is_success_reply()) + { + strcpy(configuration, reply.get_argument(0).c_str()); + } + } + 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) @@ -1770,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() @@ -1902,8 +1684,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/Configuration.cpp b/Common/Servers/Sardara/src/Configuration.cpp similarity index 98% rename from Common/Servers/Roach/src/Configuration.cpp rename to Common/Servers/Sardara/src/Configuration.cpp index 93894ad3f3890c3504051032bc5d4287c345dd43..dab8fd0abbdab2865e7311c1b3ac55199ed9eab4 100644 --- a/Common/Servers/Roach/src/Configuration.cpp +++ b/Common/Servers/Sardara/src/Configuration.cpp @@ -166,10 +166,10 @@ void CConfiguration::init(maci::ContainerServices *Services) throw (ComponentErr // read the configurations IRA::CError error; try { - m_configurationTable=(CDBTable *)new CDBTable(Services,"Configuration","DataBlock/Roach"); + m_configurationTable=(CDBTable *)new CDBTable(Services,"Configuration","DataBlock/Sardara"); } catch (std::bad_alloc& ex) { - _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"RoachImpl::initialize()"); + _EXCPT(ComponentErrors::MemoryAllocationExImpl,dummy,"SardaraImpl::initialize()"); throw dummy; } error.Reset(); diff --git a/Common/Servers/Roach/src/ControlThread.cpp b/Common/Servers/Sardara/src/ControlThread.cpp similarity index 100% rename from Common/Servers/Roach/src/ControlThread.cpp rename to Common/Servers/Sardara/src/ControlThread.cpp diff --git a/Common/Servers/Roach/src/Makefile b/Common/Servers/Sardara/src/Makefile similarity index 90% rename from Common/Servers/Roach/src/Makefile rename to Common/Servers/Sardara/src/Makefile index acafd7a11be62f5244ff4b518c46dec3bfafc73d..8cdc7420afb53bfc7eb095fc8dd33171ba5c9e2e 100644 --- a/Common/Servers/Roach/src/Makefile +++ b/Common/Servers/Sardara/src/Makefile @@ -58,11 +58,11 @@ INCLUDES = # # Libraries (public and local) # ---------------------------- -LIBRARIES = RoachImpl +LIBRARIES = SardaraImpl LIBRARIES_L = -RoachImpl_OBJECTS = RoachImpl Configuration CommandLine SenderThread ControlThread -RoachImpl_LIBS = IRALibrary GenericBackendStubs RoachStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs \ +SardaraImpl_OBJECTS = SardaraImpl Configuration CommandLine SenderThread ControlThread +SardaraImpl_LIBS = IRALibrary GenericBackendStubs SardaraStubs TotalPowerStubs ManagmentDefinitionsStubs ReceiversDefinitionsStubs BackendsDefinitionsStubs bulkDataStubs bulkDataSenderStubs GenericIFDistributorStubs\ bulkDataReceiverStubs ACSBulkDataError ComponentErrors BackendsErrors ParserErrors ManagementErrors \ DiscosBackendProtocolLib @@ -114,7 +114,7 @@ tttlll_OBJECTS = # # Configuration Database Files # ---------------------------- -CDB_SCHEMAS = Roach RoachSetup +CDB_SCHEMAS = Sardara SardaraSetup # # IDL Files and flags @@ -208,6 +208,7 @@ man : do_man @echo " . . . man page(s) done" install : install_all + @chmod 700 $(INTROOT)/bin/_send_backend_command @echo " . . . installation done" diff --git a/Common/Servers/Roach/src/Protocol.cpp b/Common/Servers/Sardara/src/Protocol.cpp similarity index 100% rename from Common/Servers/Roach/src/Protocol.cpp rename to Common/Servers/Sardara/src/Protocol.cpp diff --git a/Common/Servers/Roach/src/RoachImpl.cpp b/Common/Servers/Sardara/src/SardaraImpl.cpp similarity index 62% rename from Common/Servers/Roach/src/RoachImpl.cpp rename to Common/Servers/Sardara/src/SardaraImpl.cpp index 6b1a92eded0037052dae159d12d5810d0fe58f56..8741ad1c4db984b252213745bca1abe4df20683e 100644 --- a/Common/Servers/Roach/src/RoachImpl.cpp +++ b/Common/Servers/Sardara/src/SardaraImpl.cpp @@ -1,6 +1,6 @@ -// $Id: RoachImpl.cpp,v 1.1 2011-03-14 14:15:07 a.orlati Exp $ +// $Id: SardaraImpl.cpp,v 1.1 2011-03-14 14:15:07 a.orlati Exp $ -#include "RoachImpl.h" +#include "SardaraImpl.h" #include #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,14 +116,13 @@ 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 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 ); @@ -179,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; @@ -192,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.... } @@ -234,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) { @@ -274,39 +233,38 @@ 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()"); - //Backends::TMainHeader header; - //Backends::TChannelHeader chHeader[MAX_INPUT_NUMBER]; - THeaderRecord buffer; + AUTO_TRACE("SardaraImpl::sendHeader()"); + Backends::TMainHeader header; + Backends::TSectionHeader chHeader[MAX_SECTION_NUMBER]; //DWORD tpi[MAX_SECTION_NUMBER]; CSecAreaResourceWrapper 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(); } @@ -319,46 +277,52 @@ 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(); } */ + + 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()"); + _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(); } #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 { @@ -373,17 +337,17 @@ 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(); }*/ #else - for(int i=0;isaveZero(tpi); // start the job for the backend..... - /*try { + try { line->startDataAcquisition(); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -395,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(); @@ -418,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; @@ -445,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(); } @@ -456,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 { @@ -475,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(); } @@ -487,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(); } @@ -508,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 ( +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::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 ( - 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); @@ -555,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); @@ -577,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 { @@ -605,25 +553,25 @@ 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???? - 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); @@ -634,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); @@ -669,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(); @@ -692,17 +640,17 @@ 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 { + try { line->setAttenuation(input,att); } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -714,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; @@ -741,12 +689,12 @@ 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 { + try { line->activateCalSwitching(interleave); // NOT YET AVAILABLE } catch (ComponentErrors::ComponentErrorsExImpl& ex) { @@ -758,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); @@ -781,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); @@ -804,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); @@ -826,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); @@ -848,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 @@ -876,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 40cec9d2dda61b5d1572370e52f28f199950353e..2e27c0145cf83477144fe69091a2d2c6f755d83e 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/config/CDB/schemas/Scheduler.xsd b/Common/Servers/Scheduler/config/CDB/schemas/Scheduler.xsd index c5be4399a9944fc2f5aa6431c6d095beb074f6c4..a319070d3d7b668286ade15a92b7d4aadfa56133 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/Common/Servers/Scheduler/src/Configuration.cpp b/Common/Servers/Scheduler/src/Configuration.cpp index 1f7b37fb9139044aebf2b82540e26073588484d6..a9d76238ff4672cbf1ad31e6e6e98e10444dfcae 100644 --- a/Common/Servers/Scheduler/src/Configuration.cpp +++ b/Common/Servers/Scheduler/src/Configuration.cpp @@ -10,7 +10,7 @@ } \ else { \ FIELD=tmpw; \ - ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %lu",tmpw); \ + ACS_DEBUG_PARAM("CConfiguration::Init()",DESCR" %u",tmpw); \ } \ } @@ -214,7 +214,7 @@ void CConfiguration::init(maci::ContainerServices *Services) throw (ComponentErr counter++; if (m_minorServoMappings>=MAX_AXIS_NUMBER) break; } - ACS_DEBUG_PARAM("CConfiguration::Init()","Total minor servo axis: %d",m_minorServoMappings); + ACS_DEBUG_PARAM("CConfiguration::Init()","Total minor servo axis: %ld",m_minorServoMappings); componentName="DataBlock/Equipment/AvailableBackend"; counter--; for(;;) { @@ -245,7 +245,7 @@ void CConfiguration::init(maci::ContainerServices *Services) throw (ComponentErr if (m_availableBackends>=MAX_BCK_NUMBER) break; counter++; } - ACS_DEBUG_PARAM("CConfiguration::Init()","Total available backends: %d",m_availableBackends); + ACS_DEBUG_PARAM("CConfiguration::Init()","Total available backends: %ld",m_availableBackends); if (!CIRATools::getDBValue(Services,"FTrackPrecisionDigits",m_fTrackDigits,"alma/","DataBlock/Equipment")) { _EXCPT(ComponentErrors::CDBAccessExImpl,dummy,"CConfiguration::Init()"); dummy.setFieldName("FTrackPrecisionDigits"); diff --git a/Common/Servers/Scheduler/src/Core.cpp b/Common/Servers/Scheduler/src/Core.cpp index 2444ee0fe1ab94098efde8132197212ecd333ebc..7a09fe24551137196a19e6537c34c61ca0758509 100644 --- a/Common/Servers/Scheduler/src/Core.cpp +++ b/Common/Servers/Scheduler/src/Core.cpp @@ -111,7 +111,8 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: m_parser->add("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); @@ -178,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/Scheduler/src/Core_Common.i b/Common/Servers/Scheduler/src/Core_Common.i index 926a8106d290dc144cb07fcef3cf9e697f5f146c..af5e519a2d8e84d00351bcf23a74ff61198d65da 100644 --- a/Common/Servers/Scheduler/src/Core_Common.i +++ b/Common/Servers/Scheduler/src/Core_Common.i @@ -36,7 +36,7 @@ bool CCore::checkScan(ACS::Time& ut,const Antenna::TTrackingParameters *const pr try { //antennaUT will stores the estimated start time from the antenna for all kind of subscans antennaAnswer=m_antennaBoss->checkScan(ut,*prim,*sec,minEl,maxEl,m_antennaRTime.out()); - ACS_LOG(LM_FULL_INFO,"CCore::checkScan()",(LM_DEBUG,"SLEWING_TIME %lld :",m_antennaRTime->slewingTime)); + ACS_LOG(LM_FULL_INFO,"CCore::checkScan()",(LM_DEBUG,"SLEWING_TIME %llu :",(unsigned long long)m_antennaRTime->slewingTime)); } catch (ComponentErrors::ComponentErrorsEx& ex) { _ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::checkScan()"); @@ -177,7 +177,7 @@ void CCore::doScan(ACS::Time& ut,const Antenna::TTrackingParameters * const prim try { antennaUT=ut; m_antennaBoss->startScan(antennaUT,*prim,*sec); // the ut could be modified by the call - ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"ANTENNA_SCAN_EPOCH %lld",antennaUT)); + ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"ANTENNA_SCAN_EPOCH %llu",(unsigned long long)antennaUT)); } catch (ComponentErrors::ComponentErrorsEx& ex) { _ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::doScan()"); @@ -210,7 +210,7 @@ void CCore::doScan(ACS::Time& ut,const Antenna::TTrackingParameters * const prim try { servoUT=ut; m_minorServoBoss->startScan(servoUT,*servoPar,m_antennaRTime.in()); - ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"MINOR_SERVO_SCAN_EPOCH %lld",servoUT)); + ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"MINOR_SERVO_SCAN_EPOCH %llu",(unsigned long long)servoUT)); } catch (MinorServoErrors::MinorServoErrorsEx& ex) { _ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::doScan()"); @@ -241,7 +241,7 @@ void CCore::doScan(ACS::Time& ut,const Antenna::TTrackingParameters * const prim try { receiversUT=ut; m_receiversBoss->startScan(receiversUT,*recvPa,m_antennaRTime.in()); - ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"RECEIEVERS_SCAN_EPOCH %lld",receiversUT)); + ACS_LOG(LM_FULL_INFO,"CCore::doScan()",(LM_DEBUG,"RECEIEVERS_SCAN_EPOCH %llu",(unsigned long long)receiversUT)); } catch (ComponentErrors::ComponentErrorsEx& ex) { _ADD_BACKTRACE(ComponentErrors::OperationErrorExImpl,impl,ex,"CCore::doScan()"); @@ -395,7 +395,7 @@ ACS::Time CCore::closeScan(bool wait) throw (ComponentErrors::ComponentNotActive try { if (!CORBA::is_nil(m_antennaBoss)) { m_antennaBoss->closeScan(antennaUT); // the ut could be modified by the call - ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"ANTENNA_CLOSE_SCAN_EPOCH %lld",antennaUT)); + ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"ANTENNA_CLOSE_SCAN_EPOCH %llu",(unsigned long long)antennaUT)); IRA::CString outstr; IRA::CIRATools::timeToStr(antennaUT,outstr); //printf("tempo di chiusura (Antenna): %s\n",(const char*)outstr); @@ -432,7 +432,7 @@ ACS::Time CCore::closeScan(bool wait) throw (ComponentErrors::ComponentNotActive try { if (!CORBA::is_nil(m_minorServoBoss)) { m_minorServoBoss->closeScan(servoUT); - ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"MINOR_SERVO_CLOSE_SCAN_EPOCH %lld",servoUT)); + ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"MINOR_SERVO_CLOSE_SCAN_EPOCH %llu",(unsigned long long)servoUT)); IRA::CString outstr; IRA::CIRATools::timeToStr(servoUT,outstr); //printf("tempo di chiusura (Servo): %s\n",(const char*)outstr); @@ -467,7 +467,7 @@ ACS::Time CCore::closeScan(bool wait) throw (ComponentErrors::ComponentNotActive try { if (!CORBA::is_nil(m_receiversBoss)) { m_receiversBoss->closeScan(receiversUT); - ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"RECEIEVERS_STOP_SCAN_EPOCH %lld",receiversUT)); + ACS_LOG(LM_FULL_INFO,"CCore::closeScan()",(LM_DEBUG,"RECEIEVERS_STOP_SCAN_EPOCH %llu",(unsigned long long)receiversUT)); IRA::CString outstr; IRA::CIRATools::timeToStr(receiversUT,outstr); //printf("tempo di chiusura (receievers): %s\n",(const char*)outstr); diff --git a/Common/Servers/Scheduler/src/Core_Operations.i b/Common/Servers/Scheduler/src/Core_Operations.i index a85f42caeb0fd86aefe1bf9897451c9f1d686251..5ec3b8f2e105610b7b5135dffbb5376e6115e65a 100644 --- a/Common/Servers/Scheduler/src/Core_Operations.i +++ b/Common/Servers/Scheduler/src/Core_Operations.i @@ -1,51 +1,58 @@ void CCore::_wait(const double& seconds) throw (ComponentErrors::TimerErrorExImpl,ManagementErrors::AbortedByUserExImpl) { - long *done; - done=new long; - *done=0; - TIMEVALUE now; + long done=0; + TIMEVALUE now,check; IRA::CIRATools::getTime(now); ACS::Time time; time=now.value().value+(ACS::Time)(seconds*10000000); m_abortCurrentOperation=false; - if (!addTimerEvent(time,waitUntilHandler,static_cast(done),waitUntilHandlerCleanup)) { + long *pdone=&done; + if (!addTimerEvent(time,waitUntilHandler,static_cast(pdone))) { //errore - _EXCPT(ComponentErrors::TimerErrorExImpl,dummy,"CCore::wait()"); + _EXCPT(ComponentErrors::TimerErrorExImpl,dummy,"CCore::_wait()"); dummy.setReason("timer event could not be scheduled"); - delete done; throw dummy; } - while ((*done)==0) { + while (done==0) { if (m_abortCurrentOperation) { m_abortCurrentOperation=false; - _EXCPT(ManagementErrors::AbortedByUserExImpl,dummy,"CCore::wait()"); + _EXCPT(ManagementErrors::AbortedByUserExImpl,dummy,"CCore::_wait()"); dummy.setOperation("wait for an amount of time"); throw dummy; } + IRA::CIRATools::getTime(check); + if (check.value().value>time) { + done=1; + ACS_LOG(LM_FULL_INFO,"CCore::_wait()",(LM_WARNING,"Timer precision outside threshold")); + } IRA::CIRATools::Wait(25000); // 25 milliseconds } } void CCore::_waitUntil(const ACS::Time& time) throw (ComponentErrors::TimerErrorExImpl,ManagementErrors::AbortedByUserExImpl) { - long *done; - done=new long; - *done=0; + long done=0; + long *pdone=&done; + TIMEVALUE check; m_abortCurrentOperation=false; - if (!addTimerEvent(time,waitUntilHandler,static_cast(done),waitUntilHandlerCleanup)) { + if (!addTimerEvent(time,waitUntilHandler,static_cast(pdone))) { //errore - _EXCPT(ComponentErrors::TimerErrorExImpl,dummy,"CCore::waitUntil()"); + _EXCPT(ComponentErrors::TimerErrorExImpl,dummy,"CCore::_waitUntil()"); dummy.setReason("timer event could not be scheduled"); - delete done; throw dummy; } - while ((*done)==0) { + while (done==0) { if (m_abortCurrentOperation) { m_abortCurrentOperation=false; - _EXCPT(ManagementErrors::AbortedByUserExImpl,dummy,"CCore::waitUntil()"); + _EXCPT(ManagementErrors::AbortedByUserExImpl,dummy,"CCore::_waitUntil()"); dummy.setOperation("wait until an epoch"); throw dummy; } + IRA::CIRATools::getTime(check); + if (check.value().value>time) { + done=1; + ACS_LOG(LM_FULL_INFO,"CCore::_waitUntil()",(LM_WARNING,"Timer precision outside threshold")); + } IRA::CIRATools::Wait(25000); // 25 milliseconds } } diff --git a/Common/Servers/Scheduler/src/SchedulerImpl.cpp b/Common/Servers/Scheduler/src/SchedulerImpl.cpp index 78ca17d0ace4e618a021b5d708c1682c1bdfa418..f7de822b2751f24e501377c98c4184f9bb8840c9 100644 --- a/Common/Servers/Scheduler/src/SchedulerImpl.cpp +++ b/Common/Servers/Scheduler/src/SchedulerImpl.cpp @@ -12,9 +12,6 @@ #include "DevIORestFrequency.h" #include -static char *rcsId="@(#) schedulerImpl"; -static void *use_rcsId = ((void)&use_rcsId,(void *) &rcsId); - _IRA_LOGFILTER_DECLARE; SchedulerImpl::SchedulerImpl(const ACE_CString &CompName,maci::ContainerServices *containerServices) : diff --git a/Common/Servers/Scheduler/src/testSchedule.cpp b/Common/Servers/Scheduler/src/testSchedule.cpp index 09ed4a3dc3bb1963e0c0d4086fd8997c83a1b750..e678e416e017ed32de6e5e3cd07ab318092f8c49 100644 --- a/Common/Servers/Scheduler/src/testSchedule.cpp +++ b/Common/Servers/Scheduler/src/testSchedule.cpp @@ -116,21 +116,21 @@ int main(int argc, char *argv[]) tmp->otf.lat2*DR2D,(const char *)toFrame(tmp->otf.coordFrame), (const char *)toFrame(tmp->otf.subScanFrame),(const char *)toGeometry(tmp->otf.geometry), (const char *)toDescription(tmp->otf.description), - (const char *)toDirection(tmp->otf.direction),tmp->otf.subScanDuration); + (const char *)toDirection(tmp->otf.direction),(long long)tmp->otf.subScanDuration); } else if (type==Management::MNG_OTFC) { printf("%u OTFC %lf %lf %lf %lf %s %s %s %s %s %lld\n",rec.scan,tmp->otf.lon1*DR2D,tmp->otf.lat1*DR2D,tmp->otf.lon2*DR2D, tmp->otf.lat2*DR2D,(const char *)toFrame(tmp->otf.coordFrame), (const char *)toFrame(tmp->otf.subScanFrame),(const char *)toGeometry(tmp->otf.geometry), (const char *)toDescription(tmp->otf.description), - (const char *)toDirection(tmp->otf.direction),tmp->otf.subScanDuration); + (const char *)toDirection(tmp->otf.direction),(long long)tmp->otf.subScanDuration); } else if (type==Management::MNG_SKYDIP) { printf("%u SKYDIP %lf %lf %lf %lf %s %s %s %s %s %lld\n",rec.scan,tmp->otf.lon1*DR2D,tmp->otf.lat1*DR2D,tmp->otf.lon2*DR2D, tmp->otf.lat2*DR2D,(const char *)toFrame(tmp->otf.coordFrame), (const char *)toFrame(tmp->otf.subScanFrame),(const char *)toGeometry(tmp->otf.geometry), (const char *)toDescription(tmp->otf.description), - (const char *)toDirection(tmp->otf.direction),tmp->otf.subScanDuration); + (const char *)toDirection(tmp->otf.direction),(long long)tmp->otf.subScanDuration); } else { if (tmp->paramNumber==0) { diff --git a/Common/Servers/TotalPower/include/TotalPowerImpl.h b/Common/Servers/TotalPower/include/TotalPowerImpl.h index badd16902820c9e5c810abcb6421b5a31fdffffd..91daaafbb3b93e26813f7c0d33a4ad9d45787c94 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 @@ -490,10 +492,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/CommandLine.cpp b/Common/Servers/TotalPower/src/CommandLine.cpp index a3d52a6f182680f8bae9478453b854f15a2c5bb9..5088a2a3c6553cbbe59d2eb2217c02c7c98f9e7a 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 b0671d6d90365cdf1388728d42ff04520c30a579..bc911a4dfc6eaa84bb292982610fe41993302206 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; } diff --git a/Common/Servers/TotalPower/src/SenderThread.cpp b/Common/Servers/TotalPower/src/SenderThread.cpp index 8f550cf7653726ef91189cf3d4a8ee9a1ec34210..be57c2e59cd9cf0df6e74ac295b4ae1f968421e8 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 b0d2892620a2d94e83394d885ccb90f8fb4050d2..a34842b9dad1cefa9d4d56540892b1abb75cf6b8 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. @@ -494,11 +496,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/Makefile b/Common/Servers/XBackend/src/Makefile index 54c276b630653db51a522a2d46442cdb7942f9d7..4b049c3be5a2dc6935e6f5a9e408d1013352cf48 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/Common/Servers/XBackend/src/XBackendsImpl.cpp b/Common/Servers/XBackend/src/XBackendsImpl.cpp index a883b4bb521ce21953d424f365c1af1654b4d827..c47c82c4369a27eb6afb04f423cf8f2a96c98d0c 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 { diff --git a/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile b/Common/Simulators/Hardware/ReceiverBoardSim/src/Makefile index ee0daf8b49bc1292f5e9701cf2152f8b7c1ee4e7..ac5108a9d8466f1194c25aa279c2e3a1fd43f832 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 @@ -31,6 +31,7 @@ clean : clean_all @echo " . . . clean done" install : install_all + @chmod 700 $(INTROOT)/bin/receiverboard-sim @echo " . . . installation done" #___oOo___ diff --git a/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile b/Common/Simulators/Hardware/TCPGenericProtocolSim/src/Makefile index e0653e1be12d3f1db3fa5aaf15693aaff1fa9f7f..b8d75247325aee2e1ce303a9e637d5fd0119023a 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 @@ -54,6 +54,7 @@ man : do_man @echo " . . . man page(s) done" install : install_all + @chmod 700 $(INTROOT)/bin/tcpProt-sim @echo " . . . installation done" diff --git a/Common/Tests/test/cdb/test_procedures.py b/Common/Tests/test/cdb/test_procedures.py index 9cf4f118965d368aa5d317892f96382f820b466d..fa6c6b3fdc8391d56f396afce310150e337cb94e 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/Medicina/CDB/MACI/Managers/Manager/Manager.xml b/Medicina/CDB/MACI/Managers/Manager/Manager.xml index 7a192ed1fb6bf0effbb2a92888ea5d9f11fd8a0f..78350a0f654b82925c6857d47c6b345f9c18e74d 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/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Medicina/CDB/alma/ANTENNA/Observatory/Observatory.xml index ac128824537a2739442cedb0eea49bbaea64d276..7e8c02532b9b6534b759e37982e95341cb2184e3 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/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp b/Medicina/Clients/MedicinaMountTextClient/src/MedicinaMountTextClient.cpp index a30b945e949a742cd7d382c2913ddc86be297e37..c04127d77b1ed0928b0a6f8581f530b59f9f3858 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); 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 f3c345f73f9ac48cdbfc69019d8a5517502861dd..581ce3e1d5e178cbeeef677a839d951962522c3c 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/MACI/Managers/Manager/Manager.xml b/Medicina/Configuration/CDB/MACI/Managers/Manager/Manager.xml index 3d6cf5327291441f82b1d1536a9a62de141e2d43..cdb694a1053cb0f9048bf1707f9d20b9568622a0 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/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Medicina/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649db65179e7a346d79a708ee1e6730113..862a844f9b3657c0a2f2f213c04949a650b9c699 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/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 1abd87436ef824dc6ea03c76c3b065ca5eef3943..6c39010261320d36af4c05f27021472bd89ce5ed 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 775ba242067e8b312c83b805bd19c63506734dae..83bb0ccd3cd3c45ab4a23fce9ac4231f670a1405 100644 --- a/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml +++ b/Medicina/Configuration/CDB/alma/DataBlock/Equipment/Equipment.xml @@ -21,6 +21,7 @@ - + + diff --git a/Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml b/Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml deleted file mode 100644 index fbb230453d72adbc926cbc2993f99d7d1cea8e24..0000000000000000000000000000000000000000 --- a/Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - RK00 - 2 - TRUE - GREGORIAN - 1 - 1500.0 - 7.0 - 0 1 - L R - 0 0 - 0 1 - 1024 - - - - RC00 - 2 - TRUE - GREGORIAN - 1 - 1500.0 - 9.0 - 0 1 - L R - 0 0 - 0 1 - 1024 - - - - RL00 - 2 - TRUE - PRIMARY - 1 - 1500.0 - 10.0 - 2 3 - L R - 0 0 - 0 1 - 1024 - - - - RP00 - 2 - TRUE - PRIMARY - 1 - 500.0 - 10.0 - 0 1 - L R - 0 0 - 0 1 - 1024 - - - - RK00S - 1 - TRUE - GREGORIAN - 1 - 1500.0 - 7.0 - 0 1 - S - 0 0 - 0 1 - 1024 - - - - RC00S - 1 - TRUE - BWG - 1 - 1500.0 - 9.0 - 0 1 - S - 0 0 - 0 1 - 1024 - - - - RL00S - 1 - TRUE - PRIMARY - 1 - 1500.0 - 10.0 - 2 3 - S - 0 0 - 0 1 - 1024 - - - - RP00S - 1 - TRUE - PRIMARY - 1 - 500.0 - 10.0 - 0 1 - S - 0 0 - 0 1 - 1024 - - - diff --git a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml b/Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml similarity index 58% rename from SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml rename to Medicina/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml index ff91bf433edc63e42d34d889ff26744dcd6e92f1..177d103b2019c9625e5a1745976dd32b1fe6e0a3 100644 --- a/SRT/Configuration/CDB/alma/DataBlock/Roach/Roach.xml +++ b/Medicina/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,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,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/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile b/Medicina/Interfaces/MedicinaAntennaInterface/src/Makefile index 3aaefb5203513a7c43c6f1832ef4c9d69c0290ac..03f19c1146b5a1f6c522ecf9c6a1f24618453906 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) # ------------------------------ diff --git a/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile b/Medicina/Interfaces/MedicinaWeatherStationInterface/src/Makefile index 2a1bb7f0370381feff75ac058061d8033f52410b..74ec9b8999200534bac6da2803657b01877d156f 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 # diff --git a/Medicina/Misc/MedScripts/app-defaults/discosStartup.xml b/Medicina/Misc/MedScripts/app-defaults/discosStartup.xml new file mode 100644 index 0000000000000000000000000000000000000000..e96c70deaa7155b90c419821cf7e76cd406bb947 --- /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/Makefile b/Medicina/Misc/MedScripts/src/Makefile index 322d155a449f58ddb99e0255ae40de3ec765d5d2..279ba8e7c000c93722a17eeea8cf3fd02b5ee1e8 100644 --- a/Medicina/Misc/MedScripts/src/Makefile +++ b/Medicina/Misc/MedScripts/src/Makefile @@ -85,6 +85,10 @@ man : do_man install : install_all @chmod 744 $(INTROOT)/bin/escs @chmod 744 $(INTROOT)/app-defaults/escsStartup.xml + + @chmod 700 $(INTROOT)/bin/discosdown + @chmod 700 $(INTROOT)/bin/discosup + @echo " . . . installation done" diff --git a/Medicina/Misc/MedScripts/src/discosConsole b/Medicina/Misc/MedScripts/src/discosConsole new file mode 100644 index 0000000000000000000000000000000000000000..aba7e14ab85de2e603b9a5a870b835485f899a29 --- /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/SRT/Servers/DFBBackend/src/.idl-compilation-end b/Medicina/Misc/MedScripts/src/discosdown similarity index 100% rename from SRT/Servers/DFBBackend/src/.idl-compilation-end rename to Medicina/Misc/MedScripts/src/discosdown diff --git a/SRT/Servers/DFBBackend/src/.idl-compilation-start b/Medicina/Misc/MedScripts/src/discosup similarity index 100% rename from SRT/Servers/DFBBackend/src/.idl-compilation-start rename to Medicina/Misc/MedScripts/src/discosup diff --git a/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp b/Medicina/Servers/MedicinaMinorServo/include/MedMinorServoConstants.hpp index 6a91fb3422997916cc1c10365a6f54050cf339aa..1abd618c42f7b1322605345bd0cf1743f5c137e3 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; diff --git a/Medicina/Servers/MedicinaMinorServo/src/Makefile b/Medicina/Servers/MedicinaMinorServo/src/Makefile index b1d5120930d4b20ed65fdfc370e084dfebd31654..8a4046ad64b6a7fee9a0eae0e8b3f6127df92d8a 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) # ------------------------------ diff --git a/Medicina/Servers/MedicinaMinorServo/tests/Makefile b/Medicina/Servers/MedicinaMinorServo/tests/Makefile index 70dbc6b7f24775239dd958060788dbe5b4cb1991..e4bc5220b072e3aa0d82003b46cf845b0096778b 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 diff --git a/Noto/CDB/MACI/Managers/Manager/Manager.xml b/Noto/CDB/MACI/Managers/Manager/Manager.xml index 3d6cf5327291441f82b1d1536a9a62de141e2d43..cdb694a1053cb0f9048bf1707f9d20b9568622a0 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/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Noto/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649db65179e7a346d79a708ee1e6730113..862a844f9b3657c0a2f2f213c04949a650b9c699 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/MACI/Managers/Manager/Manager.xml b/Noto/Configuration/CDB/MACI/Managers/Manager/Manager.xml index ee6d2558217163e7c977af9d5e1c5fea4e4fe571..649d76c05dc356db07c56eae18e02315dfe75645 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/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml b/Noto/Configuration/CDB/alma/ANTENNA/Observatory/Observatory.xml index 0a9aca649db65179e7a346d79a708ee1e6730113..862a844f9b3657c0a2f2f213c04949a650b9c699 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/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml b/Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.xml index 16f3a9952ff70555d6e5385611edbbe02e431f50..b13f6468fda38f8e3b94e7a369f1e66a0d798852 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/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp b/Noto/Interfaces/NotoActiveSurfaceInterface/object/NotoActiveSurfaceBossC.cpp deleted file mode 100644 index 08e7dead5d5d4496abaae4108a35c53ad216a379..0000000000000000000000000000000000000000 --- 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 c61820223e9203204a2f10c1cdae39a0ef74f717..0000000000000000000000000000000000000000 --- 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 0a6bef02f8720157a14a4ca768faa89a83d9c74e..0000000000000000000000000000000000000000 --- 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 b23c68bbeedc136dc307f4e094cad3bc2ffac6b0..0000000000000000000000000000000000000000 --- 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 f828d625aac0fc5704dbb35c9e9d7dd59fe14cee..0000000000000000000000000000000000000000 --- 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 */ - diff --git a/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile b/Noto/Interfaces/NotoActiveSurfaceInterface/src/Makefile index 0f4f51d6e84632b06f79399b38a70c19a28bcd1f..bd5ef11443ec465ee0433f29e9660e95bde3a08a 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 # diff --git a/Noto/Interfaces/NotoMinorServoInterface/src/Makefile b/Noto/Interfaces/NotoMinorServoInterface/src/Makefile index acde9649345bb23ae4c701ca1852146ad1c5ab1c..e7b950fbd14cad9d3b25e6ee83c7b8eec6492ccd 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 # diff --git a/Noto/Interfaces/NotoReceiversInterface/src/Makefile b/Noto/Interfaces/NotoReceiversInterface/src/Makefile index 8e5c044b7c2a9d97461e00b8f2be5c8fb85025e7..6b2f6caddc643f51c451b91e9bb6acd3f79de2aa 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)) \ diff --git a/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile b/Noto/Interfaces/NotoWeatherStationInterface/src/Makefile index 47e1465a48da99fb2b6d137f8a5409e769c1ca0d..876406d86addd4de7f5a5faae4f9174b69821aa6 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 # diff --git a/Noto/Servers/LocalOscillator/test/test_commandline.py b/Noto/Servers/LocalOscillator/test/test_commandline.py index 2698e868ac95a808d6b36f02ef7b2cee33b8423a..9ed783632f622196e768a085a8e2eae438049e50 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 a9951ef4a9f1e90e84a8588f0951ed0acb5919eb..ff845f5710732cf597d1013b8cfc9c918610c5a5 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/CDB/MACI/Components/AS/Boss/Boss.xml b/SRT/CDB/MACI/Components/AS/Boss/Boss.xml index 43cfdfe93b757c1bbd4859c4e413b74c2ec8ae15..5b2c6d0784bb23933d06dc629c21aee7240749b4 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 9b292c4aa7616f2642e221b140d38ec1623b45d2..b8dbc9227e2bfa573313e41cf381f7d502f11321 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 2170b472f7b0d921eaf825948324baefc6b34d0e..82f99db407bb2f3187c3eb2e133c59ad95c852c0 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 002fb668fa96f57db409faf27dc02010c0692c82..ba5ddb777746fbd08977449739d94d53a07ab852 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 9e7ae1493ebcfd7afb5d340e61cefc69c2c87255..84caa1bfa9e728c451c7d92457f074b5f81ec3c4 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 29be0c7ad96fbfa0ef8004cae51e52328d4f6801..650338981c2fbea1f7e80853b2215acde07119ba 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 a8a8791df173174535fd937349acd96fbfd4f06e..57de25eb3328042b4383a5b46494e472fcb83165 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 762cedcbda1b6e0c5a443611b4f8a7171eaac8c4..82ff950b480fa7b69c0909b5bba88863c47735f1 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 79e6e7300be90b111a6eacf673b98616d0255d5e..011386a54d08177c22e3f5fa8ca57fa1b18b89ec 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 5cc5cf030a6987699a0f60d3fc92516953094b43..43118cb253578e4cf0bb4a792e2459fd9ec19184 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 00b765eeb13f0b37511f9347d96831b312936649..60351c5c7453c923679d46b35c080f42219835f9 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 1d9163f23aed3273f388b47f97ccb428f4e8c00e..c0952684d0c1f4f817afb66a676e3f66038c6ce0 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 cbb6a18c906639218e84a813581e2dbe510e22f5..d6a8424b4dab70ca3ad6e3c24c27ace9612de3f9 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 daf087f56c97b163f2ba116e34e1762b6aa7e885..a20521ca5df01ebc7a8ee53333062effeaf166be 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 b888896ac6134085d90754f91d23292e2bf6f9d1..0c71d0ecf2ffbba163b78b25752f8ccb4791860f 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 3a84cf4230b085118da6ccafcce305ec31ad4c86..8324ddda56022c0b5e2c4c346da029f168bda10c 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 476cb7d4d6ddb02ea619968c4362d24b493a4e80..214aba999ad6ce98083e6dfc7e24af65ef171779 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 c8c89a5276b2393dd4ee5348f41d23ecc2f5cf12..4de96dc340cfd038791a7f4b497e298957a2b03a 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 7166e86ec7a346869a78b91a861867c40c07bef3..5e7d21604e8c560690dd954f096713460dd2464f 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 1d5f7dd1f36ca9a09c25d6ece7bfdd52478bb039..6ac7b2ab8d6162d5f93c1c382d49994f6f7fe067 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 39002990596229950a81c0fb605fc455717dab13..fd232a4480dcc49e3987e73b0362593ee5eabe4f 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 3c154bfa199b67453bf4ce09fd4c833a457f4f50..d2030bc626d1108f2f614705f48ca8679c848fb9 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 4b7c08ad855434b2adcfdca719ea336216e0261e..9ebe4cde057be07d198ac0a32a32418caf935017 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 5ff72721819d3167a299abef6c03274ea20b777c..223d0603839a55ad45850bd3d8f9dce714c00d2a 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 636811771c7cf1539115c3a857f23766f27b1ca2..ea4d0eee3273f56444087349ccddb10cda406230 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 629aed9bf2693fbf9e68e7dd07cbc299d8838396..6dfd8273245d3b7a2f528a0d4a744e31db894c00 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 0df31f2f8b430283950dd47f29501b3e02f9359f..9d0ed32d84ab4ea41f8f7c2184301e742d3b1f94 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 77b0122aefef47061de138de425937524f411e24..ae357d4b9ab831d32e7ab5beae058333c7b5de6f 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 4852fc2dc61c6e9044592243b21a207bbf865de4..5d70b078087288efec48dc5f1efd39d4e7989b45 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 185ac88c5348db4ea0d841b69c5def1bb8c408fd..ac0effa5906934ca7765f751c4150b6ab40779d7 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 67a77081d37afde887f1e57b69816720cd3114c5..9cd492df475ecc780b6b5c3f745cb1fc45b2b203 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 c4d970c2d2cd8e5b8205ec0d5dac39d3753614b1..be254e6dcff17e98a8005e976d63619b2e282317 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 22d799c8b8f9b7509a915cef876d58dca617fc14..41fbca03b763811ec1e243c6a7a9d1c3fbad87fa 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 9e91af1a7f707606ad2b7a2f206c6cb543471b58..19137d61ff23045a1bb8fb71711e53e01720af86 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 a454976240a50364bd21f377792eabfbfbaf36fd..32905bf8237263cd0286bba1bfe91b681271314d 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 a78b5ccfe082ab3dbd6b962e47a7d4d2370887b3..252d6e917017ce331f3b18b5791da8f7344a0285 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 dd28fd1fc2611bf71378f3c5fa0749a03b15380d..0ce612780b9475235ecb744d24d0692b4c5ad9d9 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 904199c5d0e8716b5af44acc3197c8dd56605f30..438930bfc0c6dcc9b8d3f1566914c3833663f9eb 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 483eb9e3bdcbe233dbceded1460ee28adcda1c41..c9f760e3c61a29a30bf63bdd6893dc4c5813476e 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 1b6b153a0760a128b2f8679cfbb63c0921a9cd8b..cb936d990d943a7ca994d852c1f50ec6bc85f342 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 2fdd6f0d8bb0906266f5318053d8ceb798d4db76..1a6fabf026ec3499eebe27773d40d3f06794b1a3 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 b51da2bac7097eb96a7429fa21f536f695c0b910..4444e48364e3ca28f5a74b9aa10a57e2df793fa0 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 0249a2565cafb9b00ef35d6041a109b0ef47ad2d..af7b8e93d95daa6ae08e1874d9cccef11644f4e0 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 3742222070eab8488bec4d79739378de8b88a167..e9a97e904a64daf4ab2b229cbed67c2c71f79771 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 3b149ae3de5b298af5879877654283574b99c08d..2a7ac65cebf79466cfb826e46d796dc923fea1f7 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 93bb152f3d93ce4dcaf487d50264c4c9767d45d1..e0410eeab4bd6f0c91fe4cf3ff72d14308a9d26a 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 7c85f39acefc08356d89cf82758262ec0b4b0a74..d2fea9193754f7db0e2ab70dc215a43c8ef34288 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 e37cc193c85de33de3e0484e89725bba01f2d5bc..8c48edc84b72be8b6cc269a01a8b695cba6386fd 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 5e008b6fbbe77674cb464e2c9e331e75084798c1..1129fa37b51430594c5c8d2d6a0c91a760c3ff53 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 30813718182d4deae8ad030ff75251466f04822a..7b992a8bc4d51b4aad6c067a1f0bcafc92a06da5 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 72a29f5ecea910153b58b76f4fede2b38d82f0d9..1ececed81cb874587361c110e2ac1bdd8873e20a 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 2e4acd1b71a37d484443bcf424bdfa3691a7d368..941c3e8a779939772e6a431b8de290417596fee3 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 0f3435a0dca74349d3264f3175678a058a62b32c..44fd202f7dee397b0388f94095c6cebbe0fa7b22 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 28c739c2f555742dbfae0fb79ddaef6b5dd11105..e94f743ed656d93170471581836d0d6a1a781389 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 f980bece3961698bad03dce4a0c8143e1fb47cac..a2190f6d518d50b6d021db358020d04256ce6e70 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 7adfc4829f6f6c0c1d7cdc6f181f6396580758e1..e47703bf92f49cc04f90ab52aeb735b9c5514536 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 96f46b6c10774c857dd9235f3cf4d7a33dd44b98..c1436632deb63e87e144da58a5166a4208bce7ab 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 19c9dcf5299df2b307e3e0e52bb70ca17614f6fe..caa379a5cb732439e0f34465684e5e718f4ba738 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 695bd1dbb4de7eca45a0b49fd8a008fbaf05f74a..04fc3047f155f78ca2cc65912b392bf8ff64b2c3 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 878dd03d0f98618f9b0841f61f745a0cdcd7de35..001ad0233318a7ecfa607eef8305aee11049eaa2 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 ee3261f391b865af84351a25bc478ea96cd82af0..2ba23b321ede1b4b28a1ae36eee7ce87c21dc457 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 146d3fb29a8a4d8eaf2fad9166a8535e59a9520c..6ee5a5ed619e9e938e64e18173194949b9f2b584 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 a41d3abb0776d82e098e89e4b06904d3bb02c8b8..e9c99530f54c611a8294e89f51c0c154d2da8c72 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 59b5489246b8d59e7d731465c447ec343743566f..b5c964e83fef92f20f9e74fd8548f5d871926083 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 d8920e77b981ba98dbb4a47112c2d40679010f55..2f8b5a9bfd3b89588144c79cbd3af285b6c5fc42 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 54524d5cd3227d9f18bf720c51e5a9f5ced00529..07db0cfe64279e38731694df360c284c4d069bfd 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 e987b25419ba782ea4d4c0ee9125aac682f252e8..b276baab7f0acb58b274d4b18ec02171439ea4a9 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 a692599d431f7814919669534d271456741ae6e6..b347181395a10d7098a72dcb193ec87a71bd8050 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 d4f10ec24e29c575e8c935d086c0409c2557a3f2..7e8ba8edc1176c06dbe658c903ab921d6159142c 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 528e4939f3bc84ebad8261b1fcf897cfacbb2eb2..b30681a67f645368d792a680338274318406ab17 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 84fdd93818023e1917ff33196da3f79f5135cd4b..4cb635c6f61ebc2f8cfbbb954ffbd56e24107e41 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 4701aa115a4ec3bb4866d40ccae02f3b3fa0f919..60533d14bacf627de600479dc0e14d14674b5f42 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 08cbbca1b6f48996790087f65ae4583e4ccc3da9..6457e0cf97fc0cb2df713a954188eff82709d9be 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 c76f60b5ed0415d68b68f837059c947df82b6337..cb37f3a22f9b94379417c54eaf0cb86a6dfbd34b 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 302f3f68862c6e089fec3978382e3d81c03417cb..ea90e773f15ad1c624ea92ea9119734557afed2c 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 ab6d21879c99102c66f9631fa802dc391ab62784..d686339e6721300138c0565e84631aca16efba96 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 f45f571aad134b060895ff380a8550b8163eec6e..34ae7de8c731ad3e593fe827e450457d8d8affa4 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 54da12d0920647a4e5f703c9aa60fa0be1fe1648..ecb1b167253baf23c492fe2276e4dddd4ff2da8f 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 e156d974ec6b9d65e2295c23f8b463b275a347b4..d0ca118eb15891d07c9005f24ab58bdcbadfad22 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 0db8d62e4301cf17e7040a5071e0c82179ec1dfd..86d6f98fa33a45a49202a8d959a52bbfe3e58868 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 e2113f0a25949238136d1df1c156a4423a2f8171..87bfb1b877252c9dc29f3ddfcd3833232372badb 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 af329a7ff73565b8bfae04068c690779c2aa7215..401ebfe8c22bdd48c0729b80ccf69f9d072c63cb 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 6140bb0eed065624cf22cd44c834b00c14156d9e..d836e476e152de5aacc7676b9687afc7548fb69b 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 0534ce28c0f9859f4d27faf66d8b95a8883ff215..7ab1b8b44d53b44eac38e79d55f2fe7473e6cd42 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 98f489929709f7fdce84e8efe3e5700ef51a9c99..02cc96331d8384f6c772c07cbb33e73ed25d3122 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 e6fb587602846af0097e5546e0b9e7516b11cf54..de67f1103d81f0774df472b5c562d8168b4210ae 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 a4bb64c7782d158bb433d4895d11ab9b45acebf5..c02365ac2d1800e807d882eb57d041dd91a09db4 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 64d9fd25b318fc41600266da170b16ef9b4a89c1..b2a4b70a05ad6e05e066a8e98637003b5c9e283c 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 fc7545f21bee1df54d963d73bed628d7c08c9aeb..6cdaf6e8df80bf61b80f99c6484907c0b6dee4a7 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 ccf10ce384136b62c49e9f820173064706718349..01b4138a82a9bec8c4d130eb585ca10c99b1b5ae 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 c7e49e7ee2414cf0b9cf586a82a878e65c60eff4..6db7a0f417ae198b4d7f0ad5603df91bffbece59 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 9a7557dba3ffad36185b986ec2f19dbb66a7ac2c..dc725c8ec7b784e43e80e7203e4e3be44359d5fe 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 c6aadea7cbfce2acad9c1cbc4264439955103b98..d3dea002922209001fa02bb8ee733e98b84207ef 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 096c2c3369caa8a1c03fb6876d0737122d042470..e61ac3152be707cc538768e1eff353d867f7f106 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 8eaab30932e662c3833070b82ea357749c784369..696dd9859f102409545d64865572d576fa2568e8 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 c23c3c6947bad3e79ca0e1f7ab261758f69ce6c4..73fee34f8dddff19fb0a8ca6a9a3893acd03bded 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 aed4949bcbeb871fd2b9beaad2bf6d2784423b1d..8d7ced638cd9f0adeaeaff402d6b7250c435c782 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/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/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 0000000000000000000000000000000000000000..42b5b7832dd5148a934fb81b7851fd1a057d8d65 --- /dev/null +++ b/SRT/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,18 @@ + + + + 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/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml b/SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml new file mode 100644 index 0000000000000000000000000000000000000000..a960e46549ea345764e60423ca8a7eac94492a89 --- /dev/null +++ b/SRT/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml b/SRT/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml similarity index 100% rename from SRT/Configuration/CDB/MACI/Containers/RoachContainer/RoachContainer.xml rename to SRT/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml diff --git a/SRT/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml b/SRT/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml new file mode 100644 index 0000000000000000000000000000000000000000..75b8b71c05b60e3ccbfe3485d0385593a79ea875 --- /dev/null +++ b/SRT/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml b/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml new file mode 100644 index 0000000000000000000000000000000000000000..6563a97be273ebaf5e0081e044894672271110e2 --- /dev/null +++ b/SRT/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + 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/MACI/Managers/Manager/Manager.xml b/SRT/CDB/MACI/Managers/Manager/Manager.xml index 2d98b97d3c0207615a808ebd39a16109e079ad7e..89a110563349da1b04a2d6ef42d675dcac526df9 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"> - - - - - - - + + + + + + \ No newline at end of file diff --git a/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/LAN01.xml index c6e78919bb794a5895cc5d2323d216f8c5d935be..b6fbe43e50a659150a6421cfa352739e38afa493 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN01/USD03/USD03.xml index 250c12cbdd89e8141449c0bc3884edad7aa527f9..9b124ce63890cfae89f9ce2a2ce6e80cb1713223 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 428b571cc59c5872b22062d26bbb8e844d1d4ae6..dc197824976394e1adfdd7d872823f5c0f7b3b96 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 ca18d7796e4fd62025d16e6b8ac6f301d6641c5e..c55b6df728932de67640c32112a89c4202bec2a0 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 a972f962fdb7e63c61e1760d0e5292015d2959ef..f8fc9a8840533039256dd6b0a942cba6a5572be5 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 424ab806c3ea2ee51dda67b63ab07c732e83412d..6fe60d5c896250b6ba2a1164232fd09eeb203b30 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 44b03e537003c079eca11f1607615e5ad78c8f29..706aa210d460c16f456a65c3cf707a2d6bd8cee3 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 1af5513610bbd3f5fb79183d030c0c99da495df8..6e7c0c70ccd9d50f339272c353c34176e05de2a8 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 c6308c2a2ea622c4829376adaeb215175144114b..28a9226a68462b835e2ea7b00a74d546208dc7b0 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 452496b6134583bc3057cadf7b74171997d83081..2ee48d19cda450268a05e64093b725679f80fb94 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 2a7603c0136cd921fb12248d0a0ad814ed5b5db2..993dd216bf1ec612162af44cae2b460ae0ae4bdc 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 738328385f7e5a69120cb0e967a14612e5ebe83e..8616d23f5ba8b5ed79e809674c7c9f81c519f7e7 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 5a56351d6be4ea1f24dffbf21386cd53f0c63a71..acbd3d0f45ee51fcac65c3fd2ece8c90b53c784f 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 d052293217fc327699d6f3b690f0d7f85ce0c8b3..ecedfb056a75751d2b1aef8d2b62b08a8403890b 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/LAN02.xml index ff2b9b85d798f61e35c5e879e60bc74f269412b3..1b334a0fa47bd5aabc49c079f6d58b0eb15f9b39 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN02/USD07/USD07.xml index 9db612b36f5e0b150a9913ac67a7a9bbfbf8db41..39e879672fbd9cfa08860b4f8fdd46f78cd2d256 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 cac4e40e96c4092ad9c111daaa9e588481dac311..970dd0d27920f425780e0a3638624a03c1ce757d 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 b11a85332e37b5f62c2eee80de6794227a425fb2..8b27d8a7ce0af54f79a022fde3e4583ba1919656 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 e97a385ae77c6a5dfe99848bce563d2d34c0d75d..b9ab2be23dde79131352d7aefdfc652f8621dbfc 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 e0bb95f8ab01fffd6083335546ee120393f53911..12501b4e88f6f30f16aed7ad11e9ce8fd2438bdd 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 7e7cfffbae5d27f52cad975e81ffd58634248a7f..e46898a463954bf725022bbf3fcf66c02189b5c1 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 7583625dd47a7fd45592dbefc982c7da34dad8f1..b2211a26fe11fedb122541a2bf4963f1f9fe9822 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 afd3e71ec830e9033a7482a96de4ef9b1dea9d1a..05bebff982a01cc9de2e955a82ffa32de60754a2 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 5ab31b86fd798c54512aa4b5968f8f298e7f420f..6684c8c252d3ba3c3e87c5df89556b5a84653f2d 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/LAN03.xml index a358ec0f7a79b45b72cd2b4eec016ba8a4978196..91cdfe7d5e6e206343ebe7eac3559144b96781ad 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN03/USD01/USD01.xml index 9ca7789ab1a2738da76eccc5ca3c03c1c3a38ea0..25a9a467819a115e04fdad98abf4c50aae873592 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 8c8e6bec76b017c5d288993a356a65ba8e7858cf..7907cf16ceb677136ea7c1609e14446ea53c687e 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 58ddd0ccb11534ce2053979fcd85e0e2838f9429..75b53090f0ece396b316f6c3d1ebaba9fa2f4603 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 b45565f196e6a1153de3c281559ef7245828040e..0d570f1bc7be1413851da99429403f5a32525b03 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 9d71893a158b4fa1e4fd7276cb627b4a8a06831e..7b45bcf5efbfa6cefcb4d506c1a00ab8ad9df767 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 1324f614f9665696aef846bee779c63860b850fa..4f4c08e0edefb45afdc4fb26c7c35f6bba104ba9 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 1bece4b7d040f898de3de85c3ad1643c8c460797..f1b5f67fda52cbdd8d28479620238a85eaa7a13a 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 c61a06474441df68cd001f801977c27baace3f13..b20fcc3acd2fa066e16779184b4e47f4f2f09009 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 683f74077b7dd77c1ffd0285b6a34bbef0c95f61..4040478a37c39ec781accb283fd756c20bf23844 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 80115aea5ab60317f78a9c836429188be4ac451a..cdefff549ba6e20c216a9c8ff8ba511387d752ca 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 3f01004e04d4e243bf7adfe56d47c04e3a9b3dcf..08892bd57d261a37c9e36043db11d1e9b6585ee8 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 7bf9f8bd88e77ce2b5aa534cad520f0b377869ae..32904fb01142b0433a2c4cc101982a4cf0adc2f2 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 f0bec5c9480eb0611153579314fea0d5fbf26a46..46869097517d70d9a4d9b0605dd1be733046b5bc 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 1aeffca322212ece3c5632f6accf50ad3eac852d..40872d90a204656d16f13ae020bf6b29a669d92e 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 229fd6cb1ed3345c292d68ec8e2a8ce2c75c29ff..5528ed99bf63afc193f841f26da5f6e00db56411 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/LAN04.xml index 0d991d5538be0f06e1209c6f712c3770e6e0e3a8..efb60ef7f392d55f2cfdf8d49b9982d5811324f1 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN04/USD07/USD07.xml index a3d648f2cae4c4214360a43692fa904cb6049216..bccc057d50f3309ac89e3cbfeea0c0875e60977d 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 140a5467863e0c9e53ad338181054d84f5ca1287..e6746f13a273d0191e5c42932b8e5be9e87a6cd2 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 d04e8adcfbd58c29a20ddf114859c68cc6599333..1723af6bbf960c73ba2a2265700906f7c4e43b47 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 12cb4ca6fc73df73a9a73d38d39933af0b599a45..299ee8870dd437a0a407b94795dde85d31f76266 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 765a03f098712bb91a6fde529dd7e81b3620853d..d324d1be7cae8f285ca4d79a84c800845bc07b55 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 b5dbb97e045a6b9ff9a3852a213551a885ecf84d..a68f529394d133de2e1c0e20aac6772cad0e480d 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 4a6ad8c8c854095d296d37230a318dc846e0f85b..16b66f5bc312d00230ed34dac97bbb3f3a1b242d 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 66f610d98d169e198e14999926d167369d1c7a4c..91b8278855b4778e8dfcf589ec4d4948c859133d 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 09d0f677b9877f852a60f6129e6e68d2fe7689eb..cbbcb30ab26731a41e9ae7b7f7eee4cc066960d5 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/LAN05.xml index 804316e03a67fb7b9481df603d977aec5b040e0a..1a8419940be0d10943b37f0079df20fae2fb46b5 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN05/USD03/USD03.xml index 59521136826a168a5b5fe1ac9438e763c1274f27..dd325d2d4cae0d0204e7d529b42b2b7a868234d0 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 5ea7e7de2e2ef25a72282dea8c18cce60ab6c0fd..d5cc38264f67a1769957ad09aa2111b80ab93b95 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 d33b5760f93768ce71d4d8a4a97e850501ded097..f0e0c9c6808d28a5fa69ca232300df1e36616c4b 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 93e3cea0d2464b9e5dcf7863ce2eb220611bf40f..80e126a6f9b2b0f5a5d4b6704e9697eaf844af02 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 0467d9b0ad9c9b8b636a04227b141369e802dbde..94d08a6cb081eaf829ad955605cd81a550f95e90 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 99f99ebfd4d1cef181a9341cc3ea2b5077edfdc9..10d787dca03b9af162a5cd89b07811194df532f5 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 60361a1f2c6c43ae360202a2a523c47c6928e510..29163b7625da5e59adf2e03f3fc3c6f9508dbc82 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 29f21cfeae4a77643643a61746b7020b3813f189..b4b3c3d43b3a359c22a39e269d417214a07cc939 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 1d80e52a8080a30d74fef41ded7c98106f31f473..40a2abadf1562a3e9b7bc4fcd8aeba574e7905f2 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 eca54a343a657c3494292b21fa0932071f30eb7a..b82f41a90fcfe673a4105162f43a398918479b8d 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 8127ab3b90be00d7ac8539b4e628521681e9eae9..c9c7d6f00218019c8b26e2018ec68a698de1f5f2 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 1adb6a7d4702b46d3e317eda4ec3cc91d811eeef..ba215ffa7ac10a7948146df8bf7aa236fce85132 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 55cd006fa6ac7056594a6d5ef14e661d6c08f955..8fdf87ddafd2dc0ca2693ef4b1a54546d8e6d900 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/LAN06.xml index 83f4d17740fb94501767ae40f53d6671db507e8f..bcb69e43fff5197a38754b89c411c460ba7fe8f1 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN06/USD07/USD07.xml index 07cf47d7001a51e16136cb9630b6eafe7840d392..50482a3084b5ac7f12eebf4ecedac55d6db56c34 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 8f4c0185ba61fffb92c0ba231c49979d63f02eb0..64625be4eee841aacbe49edbe06c2900f7cbb4e8 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 244f6438d942a6e1f67d88ddeb53c647ec308bff..954ead539a58ef01dec5a64f25c7d5db86300b57 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 85fb3161c0a4d272b40a8c70849255e2b0ff1173..e5e0d9e4c7c802e47d25f9fa814737ae2835321d 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 6da5a97ae5f717a58ca6cd2262c5918022a05035..6aa023d7f18708334fbb94560706f22f538d4179 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 e369ab8301efceeda83fc6dd88dea813f25744a3..65603c3650f5de735914f452b4f6b4f9ea9ae63f 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 6d80216e92dc4070916dbdf542db339fe52e09b3..856616eda0fb32aba9ab4d47678e7f4d7c0a276d 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 f115780fcdbef003b9a70a259b8879129516e1fc..1d7f598830217f102f60f3bc0c1d1079d10a1ef9 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 f6683e7cd0908e04658d332e382cbf9b069eda96..2bb87b05613bcf18d7bfb847778dd0537f1f9a2f 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/LAN07.xml index 5b7d6f9ef75a48c84e45ef6d5a34489f7c0f14c2..d968e82a95dac513a3a03e706d6a40cd6911a9d0 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN07/USD01/USD01.xml index c7501330d6579c07aaea51dee19265b68d74a2a3..3281586c21e4ceded06c34176a9bebb8935b80bb 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 8ad7aaff7931bbe799e6e73bdca4c8525acdf178..b9b863d67209c830e2fd283d5a2054421e5cd53f 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 0398948fe5d0943abfc512a986731a9858ec7d6f..0a7c3afcebff88bf803932b46ca234fe4db141d8 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 8bfcc830ff8b7480d4f3f3cf4f42d132a0b2bb0f..85527172ade5d899343d7c159ce55619457700b2 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 c109563e3106a1321e028b718f7aefbc01a5a6eb..88a3596edcd4edc3f5308c582d630c78aae362bc 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 2824711e8020c8908118dc2fc5d83a08ed8d9d82..0ea327a9b4fb18ba4a2d0a40a32ba2e0655d931d 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 c86190c8d8ce5ec610273b27444f4fd8f9df6c7f..7879f5191e672ca992f639bb489f473514970bc3 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 de0151af21305af38ff9d4f9b3a2695291b39b00..1dc3ea416d155b5f892e0bd223cea217114fad65 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 ca3bb691561b2219fa9d7d120f5cb4f870f19172..e2ba2f3d1008dc8acb7e420f2d3e8e7fd9e27ba6 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 717590e83ce1a65382b1c327c7a94286875f7f77..c2a405f494e43abdbd6620a1a6173abd6f6175ac 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 7000bf905eb943c655e6cc379d2dc7b58c41ef79..d46a6cda35c141ecaca16f51be6b401a48b7ec01 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 a83ec9e2f0bc4913f92af6048776af66e0a0d6d0..53992a2d084a5aff9dd865058cbb6b8654db452e 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 25279cc8993d77ee2d401832234b6f7d89dddafb..0ac2bfbf0cd1f2acc2847594b94c0e07e7b17b7a 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 12de12f33bce64e72ff85ade8c930490a8042172..62cd8cf5f33a98a67f726ce6127929ebb229b7b8 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 d886ea9091af28d4d40c71e8a2447c39cc9b3666..16202f395d58384fd1a1c6ec0ad186ef5d07c8e8 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/LAN08.xml index 001f905be9bca7c1e35c1e2a08f9eaa7f0fe900f..ff0db82c61fc041c2ad81c8176e09ce2e8c05eeb 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN08/USD07/USD07.xml index c533d14405c1637f9e5d6bdaeef42ee6843c8c26..04c14b796d9792b6e214c7966543db6a0ab7665b 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 d06ef0653a41c7d0062d286e527fbe075281cd0f..c04559b69a81f6e6fc4fa1d97d247fb0f7890788 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 d839a20bfe6ff026f6256764fdac2ede032c23ca..3375323b07ee6f4db4955e5e7ca273836e77f7c9 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 cbb3fe0d8e119b94dca8ac5919efbff3f6f81c74..411ff34ec1976330d8b550ef6ab1229a3ddb6cd7 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 8cfcb248940f588016280bfd0c3ccd075dce46c8..9d2eb76414b31f2ed3d38e8b0f8cf3649acd0021 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 7b3a51035c6c225e4422cfaf9851db4b034c244c..a3150f0ee3dad947f82712a14d54f1d7432cf158 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 43565ef0400a3847c0a72c6daa6b1896f3d39ef1..b349b715be6fe4685a40e33639ca9f487c7ea4f8 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 f0580646c7b785bd800b8afe935f3054f9a2a215..55055fb003208bf4383453c9b44248feea3e5de7 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 5653207fda666a544085e426ebf39898beb0e49f..27600d4275e0ab79e3a5399a134fd8edb12490a4 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/LAN09.xml index 8dc411b7de7535c7afd35c747eeb608ae7431ea0..31ffa7f95df2be046e7d08759e1431cbcdc2a945 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR01/LAN09/USD03/USD03.xml index 4f8f824d607f3ca25030c64eff00097a2a1a96dd..8e56529997b59747469aabc77bbda2786115111a 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 337a6ac1e3d60d4467bbc5307a9cb1da61a69071..d767de925dc9116216819b947d8856d379f51eb0 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 6de8079a421463053fcb6e97d00aae858c67e46f..78b59ffa39ed70871315a9d624bb7395769f4e3e 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 1a03dbbf973800e2245e65ff4b9370e07834240c..b85b54ead06cdd831692bdb4c7e18cec84590078 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 c9fe3e78fa3d0a94506b965596bba00480fc56c3..deae534daabc11906eb283901bc78285091108a8 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 f18b65c792d8f0391c41066452affb334bba9791..fdecd38086e96e4727ff1ffc0e38b40ca3502bcb 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 e19324a630590e94e8db6cb815be0678a70b9db5..a006e79b33d0ee7531c9b045380d3454a803c117 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 bbd081ce43e702acf4413e942894cbbf8c0e835c..6c8c8de7eb20953bc5f0486dce6a7c2ef810808e 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 b2d5f95c2e0235de23bd4e64a1c147bf280ef7de..44a745472d63fea568751aeb1c59cec7915c409b 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 5599e2b39cfeabad863f0776f8c02bbe462f6a41..bf28cc6da98cd9d0b19a9c4c7e366925bcd42125 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 4aecc3d2eb64c8e0230d83c1dd274c0fd5870132..707c3d18ad6274d4cbced6b3dc48fe4bcecb785c 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 b04caab5cac54d1e34936965b85cf40995de525b..2f806de04d81eb61e3ae0a11a9696f90775c2bd3 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 b5b6b5fa03f344fb8ef8bbb9321e2dfdaa002caa..df2d453cce69795f1b50dde396b5093ef31e6887 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/LAN10.xml index ed23e6c91d95b93becb68d792090ba6b72a33e54..a19bbe92bf4cd3b6037ac3d71a720b197e9ddb5a 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN10/USD07/USD07.xml index 267a481ad0d95f54bbac34e0023cb4b2480a4947..b3a404049b1484fbbe1ced967ba55ac7c79d568b 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 6defbdf6e8d0a0c1c1fe9687bce41e0bd93aa283..a72c3bee1cef716b855e041136a98a5f07d987e0 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 bd4e98ffc9c725c4d8e2e15e5db03a8578e0689c..a5bcf5b9c0f42bbb0c85a85180d48764032e7bf4 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 5fa22c228ed3471c7a89ec31640db1735beafdc7..17cb86e3a764c9d2f35a0d098f9eb5685b832cb4 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 43f902810d152254ad5dcb3fc12c497a4374606d..fc9a141f37d1ea11634cb78a90c8a2d42e420e01 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 8ef9207a06df7b63beb45a95643a9f9014dfe9c6..2ec3686da9f1f36d94ff0cca803d01a0286b473b 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 e40745cb2ca7f676532e4a0e535b4771da5ef6ae..7985a7531e8f0c5d207bb5cb630f393007ab3795 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 54ab9d788128f032ee67f8ce41cdafe9384fe6ef..285d8bccbec40c3524b61bd41f32dcd45c5f8b3b 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 00b590d4d6db222bd34f39e94b0069c795070290..417a3b6b5c83cdd0b296ec2176ded50d9884c16f 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/LAN11.xml index 4a7b01682ff4d012bf6400338460d0e7ff0d8f30..8636caa7c9b968358642cd19893354445a09d25c 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR01/LAN11/USD01/USD01.xml index 8b0013ee4c96431c430ed6692c353ec20a18d72b..3f7ac913d23aa9fcd23d082544785e7fb23f9500 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 2a10069128f4052bbce3b0803a8a8d6eda6e0848..9fb72b4022fefcc46804b49dfc2f8f81e4ab5345 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 8f2512059d71fc246538204b6d2f1331afb22b85..bd2c668ff30ccaaf2b11bc8e06b9b1812e33da70 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 671414c9d36ecba5fd2cd714c9c07c17cb2d38c2..22ae97905175e0adbdc2fc88065c9a821f57ca2c 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 62f1b205bb0da2ac2fa64bcb72247abff3bd6b70..cb150a9577aedadb32db88100548ac2a4bf686cb 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 ad1167866218640b77ba11d8ab75612d7ab54fd6..c54cdec236e95f2b9033414219bc2152e53b500d 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 3183c2db56f5c1d1dbe3f0ea8b56323f6f12ccef..3c00aa5fe4bd21684f443e7ab4bd0c1fa319e65e 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 b9f241c1872fcc1842a7f3478aad9b081380c954..037da69bf6c4347efb9a0f0a14a5e7f88ea3610f 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 117fe408bbbec5eca66006f8a58db2b41fb02be9..1d4aadfd8afd8fb40771276455ed25b4b3ce62eb 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 f9376c4a0d748ccf57a9ead3b9048394c5a94a66..5008b63d708a1976b859f19ab9a54d32ae15aef6 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 dfd501982df56b14119d624d7026c4f0d9c9f57e..badcba83b7de80726ebe5b83ab99de9f16bbac19 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 49d7bb16fccc6dddfc393539a470cd973fc8f1c5..befc75c1281c40c45e24cf1193ad75742ea33a86 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 f95f4115f461eb5951437035e3e57bcc79f49d53..b031c595611d8fefb3cc9c59436e7127fbd057f7 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 211fd1e7bc490bf4ac59ab737d66180290cbcdb2..c25fbe706881190235bf736606e04c25e4e8dff4 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 826d59d37d2644cfc13a320ecd15265fac77e3e9..77436f22705b67a3bbab22a9a3f0de940081f0cb 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 32bb96a63f7f1701a66b246388635d7f04ee236a..7e121fff4cf729fe063f9e6aed5758a04ee833c4 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/LAN12.xml index 708660361788f5245f04d82ed16de2b2196a1438..8fa8b7b4b0b27b53fff0af4ca0ff05656ade3edb 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/SECTOR01/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR01/LAN12/USD07/USD07.xml index 784a7eaf48e411c244fbb2d417bb07d13676bf94..7562eec43fc1675d36d18cedc2d51668ee4d37e2 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 429a2e578ac1d306e4bbf56cd0e79d9c581cf784..8726f7d253b9b28d09189d11f2e026824cdd4ce5 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 553bcc7912f1ebd5ee6c4098de67c3b0e6a916f9..1a9ba009a0fc4565feea04b0e15fc034762394d2 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 1a5372671ad6ac1b6bd713f56c702c423253a9ea..092301af5291afbc453388e6962e39a84c4234b0 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 47d283dac6f57ce0be90d12d7746e52b1d67ecdb..44c1dc5a983505eac8ea611a69ee85b6e2f42f5d 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 92da9f88ee8cc93c8e73136abc9b8ac868ba2eb5..16243bd41fd570de85bea9f5707f4b81dd65417c 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 2b866979971d5bf1c013637788e7ede39aa5f31e..0098300e6544f18493ed1fc6e07a41b5b711f8e4 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 51391a3868e76dfb584a7fcf415efd794f92f14f..ee463ac9135e4b0ace7c7e57c9475c05dc57e582 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 ad818510e6530e15a8018a8b4618b800620e2e3c..78cc9fc92c0e075170791195127e12586d8540a7 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/LAN01.xml index 6e9615e90ee682a2c346b91e772c7cdb277db77d..bc5ded739558774c893f5e23ac0335bec1b747df 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN01/USD03/USD03.xml index 71d4eca4acc1195c6e3fbb2745f851f2ebbf27d1..dc0d06587890e80adc4e200d606db7f7f1632dbf 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 eac1a94e3b83f8f024aae570f8847f963813644f..68dedc3572f23e32e6c213adbcfd0b834ac23968 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 ca9f95886126bdb1e4f6420ee1b2f3b2dea70123..3c19fb1e961922398880e33610d34109b0b5feb5 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 0c1ef01c5528192072ea970e9038e67009613a1f..b0a4f7133841f63a8801138f6baa1806bd672d61 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 cbf5b8bb06c6f8b94c548cb16f4c43c64e49dc8b..d57af061ad13230629c9a50dcbd62dfb52b307b8 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 fcd257ce6c1ca636be2fca003bc4bfcc3b8a53f0..3f88addf2bef868191aad0b449d8d2cb43de5efb 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 03051d838ae1098a7e734dfb48996dd364496afb..d4682a5c482e712f66df39cdcbfe2964aa534d1b 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 d17fe968aa5bf681f29b3a6eeab3eec899a2977a..32880d0910c4f64727a9f0a3ada08a57114ea528 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 7247973686920d23ebd38eb36b6e40b8c2419ef5..9f9a0c972264d3fff07f58ead7f0a7a1bb603fa9 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 7492e743699b47080671665b9a3a0ecbf6b9d62e..8ebe99b32d8c256b064faa7b8cf9f32803db1e6f 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 4cdca52e40dfd37e055779babde035edbecd16ad..bced4f4b7f051165ebacaa5af11365ffa2d94cbb 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 250bf2c653e84c77ed8e1e8c91890db6bf77f354..87eef4fe60628a85e77e7805a252888509ba495b 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 00f43c5689b0e39a81b1ee07ddc48957fa0e23be..c25170053e2e02ce477de1f30bedacf2358f1652 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 0b85bc8c7302964ccfd1e204093dc418bfe9fad3..7309338f7c54ba5dc6f40f75106694186e25ca87 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/LAN02.xml index b5871b1f2709062bee9f464919f603e44842ae1a..463e72c4a297c0c58de66c2d00fabc286f08fa1a 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN02/USD07/USD07.xml index fc78333c1dba0bdf6b063feca34a8f45f5f84f7d..2d2d52f2d1a46c10135ad0b29b826568bae47183 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 63e2b3c16c7b7282426dd2d3d7ffc724eb500afc..fe8cce91d87dc9aab6fe3c480aec752d47da3b78 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 9dc7fbdc8ac7f18067a28c083440f2fbb5018f13..9fe81b854319715251e067627afd9da9cecc0d49 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 01180182186e62eee996789b4da1fd5a155fb880..8556fd451f59b9563d1e1d775fa3ea3b00fb7c43 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 d6318221c24254de7442cf1662fd4088f1596eb7..d58075bfa32f3c62537ca92d84d70b51fc466894 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 3da119142892691bab2d8d70b211fe36b6d2b3f0..cdc8fccf78423a4b12f9ba8100a597512543af4f 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 83d000804e5b9ac2b71694206fd413c30513a032..6a28ede242b36329efdb1e34ce973b4e76619533 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 ba84557c7437f68118d3913b3de59f9a90781efb..c9b3feea742fd4ec6366a1cf6a83e4d5e0a03bd2 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 c86e86058896b9f809bec95955e22f3ceaabf58e..a25fc4eba85eb20ee089b8afeb0d70c6852a9eda 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/LAN03.xml index c18bf5039b268767bf10a64299b371ce8cf06dc2..9f2733eb1a5833c63e1d4a2c62d22375ada246a7 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN03/USD01/USD01.xml index 8ed8e983205d9501dfa9fd0557bbc7e16a32126f..93b7f6feacccd28dd564472642e050f744329a94 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 aca99932a691d9fdb3d1e1695e60349dbea687f3..81e6710fdf98e98e5d81b59ef1017d4d2b683d8c 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 16da21217ea59b616375da77421219b396e9c1f6..0abd242888c886fc26ba417c49c151dcc3ad2e75 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 e12232e7aee87da25a87138315c2ff632c7c1e87..96233bfcca53d8a76265eaca352a34259a074dad 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 34241f0846f2be981b486fe7166db4b5a9b6fc22..73d20c8d23fbe7807ce446424d011a4b91e53aef 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 135fe7ebe2c969228ed35cc4815580d77de66709..df934178fdf66404d59daa022562dbdccde08982 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 35c5a38c1c86786b7e5a107b97ee241399fd7d4e..1936f8997e1b55625d38aa0385cec77489704a95 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 beb5f0518d02220e6e0b2df8b689f4740d475290..13f3a867370f816e95983ce5b8394a561480ec9d 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 d8dcda3e3884369e6bc2632f96868633537e84bf..2246145d9810a145411a72bb7b072cde12a44bf8 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 d02d7cb8f482abd3ac947bc8b29a0ce1e86e6dab..9f500c4b05c9484e0d0792c189d46ad36dc6ffa6 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 c425ac3375f0e0738421e0701761bb4ff5e4dd0a..3ea23e27c3e0711dafd3229ea4a369b7ffe2c7a0 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 dddb9d20a4ca3f1eb5c9fd9b1b59c6cf5530b7fb..85c61751f1d138c7a57e4da0e668cceb811ad960 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 91958db43ab2f7a4091853defc19d1d4b0576b94..edcdf100efd9a0dc4925bbfa470ab4ae06786ad9 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 5080486c77c72ce6ab66628da823f805ce54362a..beed2f1ceb5880c338791c9f268d2a45ffc5b569 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 0bad36dd9cc1cea4fe3bf9499379caeae9b729e7..468812fa5b675f966b53def4655f298c63bc09b9 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 1da9a853a2c589a9da52d330982152a40c15bf0e..0aaa7cd73036aa4cbc21cd8cc10a5bb021a41036 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/LAN04.xml index 1daf83e9d03887cbd40757271f4b211c4e8cf329..2623793635da9a7ac0b7517808006d2463f094bf 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN04/USD07/USD07.xml index 793081878ba6eb69da73696a44e34b00169897cf..956b961c01596e75e53a1f41640d6d5bc20fba86 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 71f8921a8b2c799eb119c1eb41eeedca0e463cea..085efcc3efac25946bf6d59da055ae790b199f78 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 993cf48a5aaed9ac91b13bab69570241e53381e7..bb1ff34d889189947d78092ef0f0a591d7724fd8 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 5e54ed59e191f5490b32f26e182cc6545027aaa2..edd5e4209562cc75fe5e92bb2c77b745a25f2e5e 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 84bc0f7448297a872b07ac5aae48c3dc05d2cd74..fb38792901ad13c22e415dd4cece179163d0cb1a 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 80e33cba8adccfe1770a5f7c872334f5d1f6b6f6..d0e360d8b53995edf6ca4c1efa9f39a692076c12 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 43d5adc829020626a9acaa1a66c54ad52e14ea2a..ec72741a98c76bf1bc3ab03594c6ed864742c6c6 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 224805ce584de2ea0fc87d80def3efe7c7eec39e..e1dc1bc724df507887ed12b1eafc02a42f566238 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 a8ac655781b00481f460ea1c9b8b5bfa72777ebd..a980d26ce4214a2849ccd535bc3a56f8dba10025 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/LAN05.xml index 97ef8a2c8d2b9e50f93a269116cf3ad79b1361e5..6409b16d20b9adc3dfc3d64a4887b441f593bc22 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN05/USD03/USD03.xml index cc35b1d550ea2a6752b8aff30baed8512043f922..68920591a67d024cb07c57a66194eb2bd1112f6e 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 0ea35ceae86f6a01979eb44e5d1d6e92f639430b..e7e38c553a8b403d72a7057ed609cc48b35a79bf 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 9fabe6b711f9dfe5e2bc3b84d02145a19b9709ac..5696f9668770acbb831a80346454fdb3f67471e1 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 99d6aa7136f0e25bdeb2c19643507cd835b1ef08..6af48565ea5ed7793e637496a45b40ea42223a83 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 e5257abd0de18496ae30584f91a1822bf4662570..dd645bfac64e62dcbbf4090bc27a97b796761374 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 e337d9129c8f0b2ebb4b8da991bc6176ee4691e2..99db19b0d208642806c9dd873fe843adb62c014d 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 034c287aa070407d7e777ff86c9dcb555b98168b..9444007a8fdaa23537258b862e1194b604421c30 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 20be4a6dd2dc2a40721ad05926f19ca89823bc63..a324162cb003d0add5c2c7c4a0f2f6531fc831a8 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 2693c50321a810e49d9b08e6c608738b1d8845f6..4113bb304e874ee43f3ba0c74a4cfaa49aaaa30f 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 17a14459d9edde351b8425b46fc794338e7a02eb..6ec172439b5089668c5b9bbb04d1875da4277890 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 0c85063a61d2e33a079c45f0612c0e768e915049..fe7fae49215221d279fd8ebcd34a0a33107b78e5 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 3001e010d92c837d28c1e74497e9307e37a587e3..ce12b214a5e46a798dfe79c1a9d193474f6efc23 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 84288da299c6d7e852c40d2adb5d0f4dee89a58b..30148e55ed5b5bcd9f87f4b4772aa0163d09e30b 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/LAN06.xml index ce01ca44f75203d7fd1fed4da2d658ab8331276f..ca5dface088155e27b26f40cd071789bb018c1b8 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN06/USD07/USD07.xml index ea1ffb9f4dbc9e08338dc451d54ee67d8b20395b..3aba096637d21997015f01616a1ce039a6a936bd 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 7850f4a667bc4e9c3efd803d881260ae6e81786f..76875cdee9173f1949c74337a433b84dbb48ad76 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 55ddea99ce484d3ab5b1b0a9d2500e455a7764d7..2c1830d907c58efcfab7d17e1881f67004998dcc 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 483460a3e767a09f40a2c396747a57b3503f99e4..34d0f3c5bc2365e85bcc71f4261a9414c528d30d 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 fc303c6b5417036bd676d7b3bf15e1cd3dfe520f..25b5134a93c871296050e5967abd01c88c9c41a3 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 4af491c5a6650f1ebeeb1371c94d955248b96160..52c2531ddedeadfec7e19eae168a242c29e66ff4 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 77bdad829d3da1af2f26d65e356fe498a7fd0d9a..32ff4cdd4047bc166f710111797ab74c077c51e1 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 dabe902e1d64c3774b92187e30712f4462ac09dc..70d4d768179bad9d068cca208cebed53b395a94e 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 f6c9870428eb54b1c826f7fb9ce2f4859bf32beb..b6410ec9c4df937e61c54b519df32ba4491b99fe 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/LAN07.xml index 51a9687e68577577517dcce1de7dbb9410140f8c..61aefaa52a50abe67b5676c0d638c1b6b483aad4 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN07/USD01/USD01.xml index b4eaf3750cbea57a76b2b87ebb000787d1a2656f..0cc2a8838724a96121791bbbad1d6390e5deedf3 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 5eae755e764e63c2cdb507a9409b802d1c42a74c..0fd47c80da9c1aef249e9d053f8bf39f8efb9cb9 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 5eb84f9b291f3a5c4595bb9d9167b32e9752bf2a..638130950df14106bebeea6842b34cd63c24814a 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 b406e5bd9bd9426b4391c1ad3219efb319594294..ab4c087f11ac147ddcfa1a0e6207042e33bb7e29 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 ec238d079af70cbac825203d5f8c6e26e1e14e43..25ef662fd08b1028275dda9d25f123c18f1ef781 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 15f7534980701053e180d0ff32178422bd699972..553c571a0e2486cc738ef8e212b35ff2fe087974 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 b61ab4650f68b2e89d360c3ed49497f9ac414f9d..994d3955471af848b2aa59e3ca776fa3e84e6435 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 4c4d5a07ba1baa765ca38ed2a15b411e7647ba01..d66090999f36124e8a528ea0fe47785685a42604 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 436664476e7e9db384c6ac18d63382a1dcf8f936..731693b78fbf6d6bd58d17ba0786ca5cc8e90745 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 4cb99cabcfff770ecfd8d47d66c8c2e3e3a354f8..4e95a0283f83a6c3c80addedb672c438bb5d2e15 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 3ac1846865f97e07c25010cdc3e6e0490e8bc984..e218a81b0649436561ce78ef2f5f31cac6b4bff9 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 4139cf8c2657451f7a839810b29ba1dd2e1c6623..022fae27ff0e54a760feac9b17631494c4203687 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 93ee24aef1ba1f4dea119718acf434a3f23799a9..9b9860f87094d94849802ebdf07f4194bb20a977 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 61ff7842b2816f23140f6e049389efff6a4d448c..dfa4497efda73d76ab679d278da4b0dbd1c02fcd 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 c9d5c2ea6e9088b5a980ab17d1f4e4e75c5d7e64..3ce52f6f241ba483aae0804ab46de673b7517caa 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/LAN08.xml index 4f0307c06d0210e7d6e9277275fb0cd351dd3b1e..e76b7add38271480f684a3131b6e11143f519af4 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN08/USD07/USD07.xml index c91316174c485c69a1f1cf55e79a90dd6bdb4929..41e24086f43e14587c148a9b81dc1e71e0f12f6b 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 d7ae5b84b3be6ea6d86009fa001ff2b2a8579406..579b4455c6e51209c42a78ba1d6245f756877247 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 e80f5c3c874959bf745d015e738bd2f4912f1f6a..a790018a39270637df7703b21d16c08f8f18f093 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 2945a9b07f69101c6f76f2a371e7a9fca247291f..7cf20449ac2ec137883935f68f691d7548af5ea5 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 28985fb546a01983b8060aac5ac1bd9aa5a4074f..8c54c6ff503f127f4a8fd23d31b4bb26a2fb0583 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 7e75b288875f6adcaf2fd7e60ec48a9e5b6c754d..b4adffa58b2c300c424e247d391499fb45f4bbaf 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 c7f5203d20e2c4b94387e3784a2442a144abe8af..040b1225be3863b2ffd8de110535680527f1d527 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 d23b2d460ae0364d07b738ff8868906bcab8c1ce..19c9116ebb6f479d4cb54eaee650827ae377a131 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 3c7855ccf7a3f51dca46ff3bc052bdc29433822a..8e8706fb1f3afa4623c8f7d99776b1836fa7067d 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/LAN09.xml index 27540c4083ff7bd8f1d7c661e84d5d7b7a365827..923fda867b0ad5a883d2ba52441cacd7355cfddd 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR02/LAN09/USD03/USD03.xml index b3297e2bb6cc1fb03081867858d0c95dd4465751..1226125a7ff156ebae962517822b0bf9bf231dc7 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 38981ab185d9ade610ac56f906159c060556cf69..3a3b0e0d875faf6ee416b6e35755194f023b9def 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 1b8f0e43ed38656d599c41f1491bd4993da6f25a..5d0baf598b87fcef96f00a59e908cbd87aab9dee 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 b4ed291d265d436e6a6046f88af654fdfebe6dbd..0aa0490752d55c18a5c46c41cf3a7e5ad1073d5a 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 8418be2061421d7c6f6471aff9013994a3a37a4e..7cebc3481af1a48e85a47d54ba34b2e1c8248e6c 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 c002cdb4b64278fbcb26d25c9b872257786c1aa7..34ece3502897c98a77f073fbfbb8b122840bace4 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 8fcd520f263e8c5c4637f60429ba9419ab813c3c..effb102f89561af9d8b540994258d7331710d03e 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 dd27d0914c6f31c5ad25ba5c81c3dd1159e95932..859eb114e34c99312e589818ff5d895b11ee0259 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 426c4f63e61631774caccf61e194fdad5c0be92c..092e20ac84161140455001f55bf1c39775d7709a 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 3b02278b662ea6bc0a7b2bd68e7a525606a7674e..066783b0f7a0520b507c1a8eac428028382827b4 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 317cc687a436115fed1d7a4d6686a04a9bfa7197..ad48094f3af81bbe28f42f02587826f3cd5984d0 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 2905e2078b6ffc83f20df123d7553a4d826b1704..636c7710a696ae9c835f3f6a76998edb4bf235c9 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 20289c4b6159fee5fb5be62e750eeda8cc61db85..aa7d2b816c25f66a7cf6fdd29e9dc5ef53dc59c8 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/LAN10.xml index 4aef189f3997c98abf14e9e2ceed6ff4f640606d..d1db3bb05848bb013540d2f935f4f5851f5344fc 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN10/USD07/USD07.xml index ae54d88d3e78dfb17e0dac4c549680797f169647..ceb990cb3c63f0fb89b0773200b489738db52a96 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 993671cac8074dc3b1a5a47ec7c2c4177e70d6aa..4dc1c88b76aeba70263aa373aed3e1018b653469 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 e32c60bdfe4ef99103318860b8cb15544c1acc56..c30b459088c9ed4057091bbe684098bfb3ae9b47 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 6a83a8536b6ef9869c6c08449e79f397cd844406..50184a05deaac7baf35c15cfb0ed99c8690e0a89 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 870bb411b0ee96305e0b69ff4478094665a64220..49f87fd1fbe97a504b82db7cec63f5397f7dbb5c 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 f7ea1e98f8d62872113e087fbc6218c6ff90c52a..d9783fe61c3ea8902cee51de4a5a474bff064740 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 384fdb27c311492b315af1330537fabaf607397a..5fe447501740cfc5e78411126a3d2d0683d4d780 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 1d4e022d7832b5221e7249e44af16239f713d093..dc13b0d79296a5614e93766f7e313e23e0b2ed44 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 1a4ada2c8e6259d809eef2403b31f8bebd17a4c2..8223c139a62407d61ec7e1060b732376db849108 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/LAN11.xml index 6ce66dba960591282a0fd55037ae2ffa6adde0f4..7bda18efdf29ed3710f72ade266f42d8b549760c 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR02/LAN11/USD01/USD01.xml index b3899e45e9d4cce3735adcf170773b3d0297663c..c83cedea799c08a17c468571e64627fda5ef294f 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 d4f2601609a5537def4df8000ba5623e6895d31c..8a9952f3f90ce6e664f681b251d8b7a3aca8a5f8 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 63dc3cb61fb26ec6f6fa871639b11124d2e4ed39..3ec43953963fe88e7800b6bd72a314f2cf9f1f2d 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 e0f8e85b3e3e2e631d435a621f8c9b98dc98035b..a7396f3d2717ef992dcbea7f46283d6ef21cbd89 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 5975bd111ff3850ee5fe52652c7d8e04f2dc47dc..edc35651b7729262b320b3a110df263c33e81c5c 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 e5c996e7f27955e482527b8b8bc0ff9e35417c91..efbe90931142500f3d4118561b1774e2c018b2b0 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 facd7d052ad7eb5f2dc95902586803a4c973b27c..7ebb043a13850dd1d829b52c6d51414a28ededde 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 1991d3170436ebfd9d187ed7bedd305d1f552ceb..33ebe2bb936050c6f12f75069bfb15c5ec4074d5 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 616aa6f2b0b047fb0b016c226ba06462bfcc4f97..8c5d36a40baa9ff66cf7554a4e33bf03fced1a79 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 6872123ab6f06e221acf275aa04bec989c32f682..32c82f89f8ce3bac340f49b63486464d83799355 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 8c6fb324d05090126abd73fd56fa53876ba8d4fa..f67881e1061e1fb82c4ff30438812fb9ecbeac99 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 2eec847d62202f191180f4525074ad9d0d3aaed5..3f28837107c700723e72c1153c4e966e2649f4a7 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 878b82a19a14b1f6dc9a2f2603431c236c35dc8e..21dc5f823084019b5cf7d885e757ff6af635f8ac 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 0a5d282c7bc0e93c0ecb8c0671fe961f33d99a72..7ce1daa5a92ea090bc58a203d1727cefe840a199 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 1d05c7d5c8f4a70cd4d473b1b0d68a5fdf632efe..bb1fa90fbc65f5bed8bad2de5ff81bf1f89326ef 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/LAN12.xml index cd565af4ea44aa8984ea12a5d0879d64890f42b9..343fd97c8f25b62e400e165bfef52d371b68ac7f 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/SECTOR02/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR02/LAN12/USD07/USD07.xml index 7d828953e425ecfc03dfd4ea50878427e4ab5db6..c5d18d68c85356eabee16363c74c0fac49b088c6 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 ccd5a8a6a22085205b2b48069d6207533330b3ef..97d3694a30f8bfabf65da9c17cc140e2f0b08a6f 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 7c8d38c242f94afe8803c051dc8365e0747450e9..c312ce4f4a28b1f97a5a76efd005e9305cfbb751 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 006d1063e130b081af056f50e58b2f1d42eab77f..dc8589ed2d372e454cccbb0be90d2e5ecdfcdb16 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 12819012a8c17324b7f627455d681a26361a8644..2ef13ae128f84eaf204e59a26e23d89579646c49 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 145025abb17b15653bdbe3b597069f209e9bf11e..5dbad267670640b572ad7f8d61881acba140e9f8 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 c47c0169739f4b61925854a3e1e8efe671861cd9..99f2c03b35b53748deb4016393690ab08faaaee8 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 704ab86a98953c45d3e47d4a6bc81da9c9887744..f5e8e4cb9275b353915bd93b3e3a6961c7d58771 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 a7f2d4e86774c0e6757007dc52083a0ca54e803e..79e8637474a9c1573412cdc65bd694f88302db9e 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/LAN01.xml index 3c7f138e75b206a13db5b58459955331c5c4c856..814dad5a55c19366758bf488a331d7b08047a389 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN01/USD03/USD03.xml index 6d7b7af7966e5ac4357ef3de31bdbb1e56edae52..8a7888f81185c19ff69e84182fe81deed97800e4 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 eceee8f1722b748e2e689dcf2d7b881cd41c4b2d..b18ef1433e2e68d7734f0a93d305fc6cc6844428 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 49d348a0ece269167691cd3c4d880122e97c8e72..41990ed94507ad28c7c6a69266ffaef84297e37c 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 bb4d1cdc8cb7ae2e31404498d825e6cd43729cc7..6ff83d3dfd7a5e7d91818f8f40ca438bf0d41fba 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 330bde58a4141ef1b8f4282b25800c29a33c7fb8..f25c7f5319fa4e75f07d807f43a8cc878824515d 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 8a92ef97f55a76752b6d060bccd7b8008dfa22e3..6e9b859cb7216a83e8328570e672db1a299a0ad6 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 3908f846be63720d0ff93db4550807dc5f5ecd3e..539cfec9fd6d844d596c1a964c931f8feb3be633 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 ab000082cdf859f45ed51b2e0daf2de7adede485..8f2030c020fc1bceeb4452210dee0aedde0343c1 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 39f907fe754675b158adaa57fe5f4582886a3bd4..d6db5af94f6da2ebd221f6b80245f3824e608fb9 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 05c15e30c513bb8d9f449fc826e4598e68ec0d52..254fac67932bc2d6aea97080fb0b2998e3b54778 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 55dd7604f64e7ebc04cd966f27e294fa06052343..30ed47db21dd3ed7124b1c412021a4c793e39471 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 7fd754e562130c4256ed8d2173772cc8c7b24e54..70a1d6fe523aa119c456cd1eeb0bcc1db659a0a3 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 8b7e1eba6a4dc909afcaf2d2e47974bae0c2232c..0dea9b37f08fee27b74edd8dcb031dbd9fb34acf 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/LAN02.xml index 8550d3ede69d257cb319a4697f3f911fdeff432a..1ce052daf4394aa3929e01ca12b8b5c7e3340868 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN02/USD07/USD07.xml index dc459d2a7f8ac58deedf3b0aad0ae0053e53129e..99dd3070fd7d67d9dfa8c40f46284446d5acbfb3 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 cd8b5efd49a0d2276d609445e5dd4a18b5131c83..b3d7692e8f7d61afa412ee7a636b877fb67ce20c 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 6baa223878c5b18d0793c1ce8de237d1121bda96..3e0a8b4ddcebd877222d5dc44263ec9c19a8d485 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 7348799511ed4d1b068f268b96808632228a5b70..b3de9850448b34b1f08669c327f365608d6d48bf 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 3beeb2a2678932d2912e799778d1bb4cabc76858..d06760052f54afa1b96e56f43f174618c9d5161a 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 f4f1896cae0962915d27a05569de7a7ab0581e33..38d83911ef8f121d94294c584151a20d7f5d7e8a 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 7d3bbca8075ae2a71f927b01622b3295b124e5d0..e5defe05eb31a86b61023162c0fc9dac6f1272f6 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 5ce4c2a59d024e050272057aafcef692d6bf0517..0c3d8bd77ca1a1f5e197ca0db38ab9b193f00ecf 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 64c3fb1263556422a882a87e0e4b866f439cc235..0c80352e969ca4e865bf13e7db829a69b631a4e8 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/LAN03.xml index 8e79d1a21a17ed3cea5c9fbd591276bcd4231071..8cfad836c672efa22b9a9b66afa896d1fab98f45 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN03/USD01/USD01.xml index ab93309a6cf3508e92b77d9094fe07e6a15d3171..82377a9f1c5e33079648b4d7266d407884c58aea 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 d11698dfeb7c2da8ee62c96ed6c43c4cef9eb8dd..795eb861242906fdbac4457a0d1483f5e88ad334 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 f22251b80cc8781b235655c5b8a902f57beec411..02ed9ee72feb3116c9bc42bf1cbb2b2c11ecfe87 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 2a6fd2fe472c4e900366651a22a0c6ea60bbc998..b5f6c323f8d22edec2a8ab09bf3a81caf85c8210 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 0fab99be84cc2c0ac1578a9b48c64c02158a8713..08480e30d272440d81e1a7cea341e60712114844 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 080f38aeb3429b3b327463293ba8346d7cb2456b..00db6861e2f31e0c3025d401822988ee1ada1a00 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 4a5229ab44dcb0bf9ca679dd56e6d3a4dba08252..02996598d50502ea9761e32aa688590c58d87a21 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 20914c787f6f54e1ffcb6ba8111cbe1e29640ea4..5370bf5877ea33527f1e6c099e106035d7c34d7a 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 c577100245e8fbd5b079bae96adc8bc5e039210b..b6283e21b6c26eebfaf25092db7db100ba218bcb 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 684353a33c0aa9c94174956f0bc27e27571e8292..3fbda4a0b76f7f3d3c9039508a64196dac64fd1a 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 a174fe617b399b53694754594ee1dec413f2ab77..d9ec9be6446d7c6c99ee920d36dc70c6afbf7ff8 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 0cc30373c164c50a35bb41ca8114e0ae2652d22e..1547d2a53b407a2f240e8100ff26ad7558a45672 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 9cc8f61eecdc1d11e46c97ccaa5791f6bc50a784..c0b9fbd7a5c16fdb773a374714857afcf98af249 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 34b9d951f1a32c38f0054ca6f17175ec6bd7c7c2..a2acd36542e33b5ada3797fcb6eeba60c99038e0 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 a642537cdf62874a7865318ab4677e207eecd997..082331a2c3305072f04be732fb29061e7d481a19 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/LAN04.xml index 58a5dd914e9e323aa46263fe36df8a1517ebac62..61ef82add938cfc998f02f61a52cea534083d151 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN04/USD07/USD07.xml index f13a50edbc15a9201a9b1eabcb799a068404ae40..59bf7869818db2b10a262d99bfb0e971fdc31a57 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 bc7e5ee9e5a1efb79744f18dd6a50b100ffbcebd..8ee040c962347cefcf12f91c5aacedd778020e80 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 0d8ec6a49e742bc0691e4bceeee6f5f30f8af413..cf9c641ef7fa27dc42eb116c2ee6e3e63daed601 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 2c8e151c97ef9d576071c26980b64961f0f84554..f65b4f03eca85e744c737d87b83f002faf6070f4 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 da0ff91c4422fb277f02769cfd796592d502c306..b6eb4e38900b3b30b4ff9ad0cd55071e1a78b3cc 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 8a7c7de563745b3b9084aab7408059e3cbf31f0c..14318b75336a065e8d7f39f85c96c0a882d40939 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 93e3ff367c9b6896dfcbef8ab9af4f8b8b48a990..5b8673bb1b927265a0d8a74c8186a9b15249aa15 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 a2fbeb6756ae0846931831563a1effa5a9b8d826..dd8878f22c5d32bfa83d93a04f4c468deb74e744 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 0dbd9de9fd98b38c29a68bd96ddd1076c74a302d..7684e74914fd0f21cb06806fe95f761ba733aa4c 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/LAN05.xml index 5575a1ebbd05c85c29adab8e0f1d8dfa77b57086..6395b2c788364fafc44a6dadcd5a4b8b2ea678eb 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN05/USD03/USD03.xml index 69c415717bf7a2ca5f775ac4ae26303d39405fa3..856b45aae2da626ffc785665972dfa332b1d4c9d 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 c01dad7e3cb0e6ce7bff89c123213ad7b3ed5cd2..5afc2acf06f6c2b7282db498eb62b38a202844da 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 5c4d3575937391f5c4e1dc4daec84422d6536f84..290ce49e590c25fc8bc0116b324127357dda38b0 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 86e1099d5293a03bb781ec54adf50e1422e41990..70a88362c6f120d18e9f462bb6d785c828cc25c2 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 b1beb7cd6ef6f23c7471028e54a37bd793e42037..0d191a52dc5b86ea2c256fdf3ba1baa364780938 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 9fe35321e5b17bfbd252f49a13d50c3d265a5c6f..9aac0f88efddec1f1ce843582ae34a810945d82c 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 927a81a2910206b93217d15d36804314f79a90d4..7d4a8cc88044d729bc3f07ce77e27d7b43f77cce 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 dfc7d2082f6b5796b3f2193fd12a002f1d1f9f15..20247b3e52b1b5aab663a1e4532dfa042106c8cf 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 40fb6f149fdd953832b982bce6aae62c11918049..6bb1bbef5ea81e56eee76220b8ae8a91862de4a1 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 4a6ffd840124769905bc99733c7b0cef8ae0fac1..259c330962ec0989b28e99d1cee8d0012dceec05 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 8935b410162ad19830f3b09430654e6fbf43fcbd..e3b4354239999e29abac4f5fddc1467548b5d7f6 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 7a96940d7ce8c110a7fd0768a88a4266e086a66a..a5372ab2506fb6aa9522e1cd88b3c60cdb2df594 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 1386a1aef1e5164910a899578c63a99801963e29..3461af442b406d21c46ea043c3f85567454f2454 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/LAN06.xml index 63d86d2e926594df7b1558a0f9cf68fed4f6295b..52ba70ea255a568035586566a0d01402bb8b987f 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN06/USD07/USD07.xml index f20aeb7b04e1e1a5ff7b8867c2d0c7ea7b082cdf..69ec4cb8ffc488607ea853e440ddd305f13db739 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 55ab75c498fbf383a2d3c987d52af43d3fe27b59..bfcc8c6f836d6c3d1027027a2870be678de11a46 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 9cf5cb2929849e2f87fd76893708fdad0a4e3f9a..a2713e1997b5763d8c271afe70946b76232b20d9 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 57c31e760b63da4d4c651a2fb53a47b9e7947fba..5786a169d8924d82af4dd4e8ce91ab7cec11e05a 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 e19860424703326e53ed8d35f078d2cc4a784380..1a93c9f2104555747cf81194435780139b8817e5 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 4037634182583258848910cfccc01a9087a6bf92..4f79cb8475ee41af044017d1d6e43cb82357d93f 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 2501bd6f1634f7a8de18fb3557547f387f1545df..3237e5119cb7287e42e9c27f5bdf0eba77e8733a 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 9d4e2d5747c542c384114a4d72b63c32e33dc5f9..9b7cc7929501ca81c8d7ff93da4bfd67bb0eeca9 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 1f3e56d6cdb0bf427a34e0a87746646a48a0686c..0f1bf58f2f830b0236131eed10f4d5897cd7bc12 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/LAN07.xml index 03f72847f6b9b211e0b035ddca2b44d321dbefa4..2a095afc4d36c3a3e68855c3ff9f44491bd05a0e 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN07/USD01/USD01.xml index c67593944e8fa4374a324a1694f35122c99450a4..914e761572acc13bac65330ad9b54d8f33504298 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 a83b2e7c7416c75d817ea0d9664b76f966e4386a..ca6bfd6d4db35d09b4a017edce90268b5abe23db 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 e5a2e5a881ed120e9f858b29f08f812c07235064..2fed7ee5760c46637cd3616fb7f166de2767cb9c 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 00b412e37068fee756a19d7bc61c60d8aff30eac..4286be0791f121e9d177785b5ed2372af4f0f2d2 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 6bed861be0a39d3bd21bc7b6cae8cb2c6891f19c..77fd186304f5d70b964e16f2217316ad6fc9ab24 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 c65f33ae69556589cdbcd893611370f47037474b..bee4665982628f65df9efcf05c2bd62989bd0166 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 b59acb1f7dc93f9abed08df63d0d711e32bde4f8..c0606e4c63c53aaf472538af14ed660bea1d9820 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 a6723d5b895311c3e45f7213f23eeb57bb8daa37..4420429e2d96634121ab406c2f30c37b53d2649f 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 12bf8609c1d0d1eb3d19a3a9596d9ada29fda6cf..0c73242c46ac4effbc3fbcc6127fed0c8938e003 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 b997582ea02d9ffe3ceaea2a206d0fb4b8e9c372..d7d4d5ef67d71193579e58dae046e209a46ec842 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 bd2076493aceae6b4f470057b1910a5c7a0ec73f..b74ff5a74a7e4c100f46dc9778e2fb9da4b274ff 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 d420477d9fceddb0faf71b533f992153a27313d6..bb91cd266ba8afa7bf0aecaf60f987b0d0f00605 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 b19a1d4583d6139d36c28b69736427207e7b2e77..8bcfc5f99b000eac1342cc12c93a043f43742c5c 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 0680915a8bfacaffd0ed8ce25f6da442d2336f01..24d125ae327aa84e49fbae44b10a5d965c978508 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 003e4f52336ac7eb59d9183906af05d27430dfa4..c65c99f996b24a65478d557b530aa44e774f5b97 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/LAN08.xml index 422a4c1e54456b25c45d805392b655eca0e770b6..a4a38120d64a6521ddbe969d39ea577a9b945c77 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN08/USD07/USD07.xml index c2a53271addf87172fcb81e9f0296ee5837ac61e..9cb30eff0e86c1b1958eeade2fca324f69089aaa 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 e42e66562a67e4f53c627a0edf555ae3c96db5a3..0f9af3f5102ff1445b44ea574e5e0b4ecbf87072 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 3d8b7d31dfba9411dc2aac16a16844366a6b55f6..fcf75d855cedcbbfcb26655abc938a3f5abc322b 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 6e16d441ad72309550412270523cf678170616eb..4dd1126768e2a57f155446d8c393cf493e38a45d 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 1a272c2d94727034ee102ad9c7a5987159c94578..2468372d6418ccddf1b1789d80aaf36d1a6aa69f 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 d205b737fdca7195c922d26155d237d32c4408d2..c8b7dcfedb29701637725ca77b5c9fb9d0b946d9 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 c5baed2dcedd4a4500bda600ceebd149adb656ca..46dd40936f41875b0297c30bb7d2a0892b2e5dc8 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 009f1371bfda191aaab2a79e788538421773a3d2..710108d9075f261f9747bd1ef670bbee6436e60d 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 2bf63784decfe71ff06b7d5d6428151c1145f980..ff1f0f91c987fecf740eff4866d2c0e9d7e22725 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/LAN09.xml index 1582453a3d89a8040030b7c31be72d86455761fa..0632947aae1599db640c7c4824526c44902983dc 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR03/LAN09/USD03/USD03.xml index 6c924823457ff0aa45cbaf7904c4e73d97fa956a..ef8211ecc07e29c70745252cf84bc29c170d8aec 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 025d96e3a1fe7e8ec5ad1fc6f4f92a91b6989cb5..d3704dc69a662257616dc9d55568e8759e7fd4a9 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 ab26f4eaf33d7cf8546c6462d7f35708bd5bbadc..d56d63cfd3583cd736833036fdf7f5d9d85b1efd 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 4d4925f5794488e0ceb1b0c891de984cad0ddaef..29fbbca16588e3e6abfd379469bfcb36dba9ce81 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 0a7e1b7e692b321a5659309b90f29f58acae49ba..0622fc712e636c8c21e18783c89bcbfcddf1ea97 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 682c422695da47205892cfa760b5081d82e62c0e..574d3d3e74f8f658a0159d18fe8de614a0f2eadc 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 0c615cfbe99eb92989975b918bdcec85b01cc0f8..ac0e93c758165f720673bfe1350be1095fdd74ed 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 c2a52bb9f4f2e691fc35bef41b0698d3bcb78238..f88c929b4c27288b05250e9e044240a928053aac 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 906b8d8ad7bcbdb119dcd590d03d3ae62d996bf1..02d469cc533b3eb0dd4c2be1f04a02791ad94027 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 fd9ff3fe974b4c7115bf8dfbb607965aa8edf8cf..1dcff7168beabeea5fb0111dfe057f3e37727e71 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 b16f0b80c60cdfbb06f23bac8108c076e876c58c..af386507e4563ca5216bc1a2de9ac1d2374ffe7c 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 b44bb7eaa28f7bd1c81580136b56bf603209b490..4b35548fedcb54f9f3fb003f674a2c89276c1e05 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 1e89836e9a77940592f20ee40758e21e3b351e4b..94257c4a5c59e2a490a1b3b31eec875f35ed729b 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/LAN10.xml index 724d911504ae5cc73815e6c98c48da4f4678ebdb..2453e073caacb0cbed1d768f55f46f2f175a4b60 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN10/USD07/USD07.xml index 9d9d29498a9c7da041e08d99dc43c4580b0ab8a1..88cdb027bfdb7374d6f7f9f9d4a1070a739224bc 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 d1b9886218882b892d2c75c12ca541f882375f64..4cc86742b4f60880e2567c7428e52782fb3dfea9 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 e4e1f7ad7e9a70c85f66bea7c354af2b779b8ba6..f81f633a6f8b73739e9919b47b6dca671bfeaecc 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 c0e101c9cd69a040a0f6a3be0e54cc27de3a4d9c..9003300f0adabe9346e791b53dfb712542a7e454 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 f2ce64769feb94f76e2356442134e665463f1061..9c72432ed9f86d13562e0fee142339b2d6e71c95 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 f749c9fa3c9ae1227dad33aede2ce5de7fab0376..001a6d975c73a25cbbb05a5bb429b8574fc8b878 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 a12d06a3fb419064ca2f9dafff4a5c4cfc248e42..81aeb9029fbab4bcda9faae7a17f8517f5249298 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 807299aa0203f18affcd4f1a907480dec6b22ef9..242fae620de8e50a020590c50ca138734abb4b9a 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 672d0d409b5c865504add38c1daa357529f385f8..6c31c0e25f301742b89b36fbc237f9f598a88ef2 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/LAN11.xml index 8e684d85f910df901d6142fe0ee173c34c716baa..515a4ce0a5e4cc030935c0e2dec1f127b7c85de8 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR03/LAN11/USD01/USD01.xml index c5959bc8af9b5db14ceae0c82b723381b7a18a24..c32142242fca2649cc008a622edb1cabdb694dc6 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 8be562a0bd67f24861f5adb2a98ba7a26af33d2c..25aa9cc88bbcdd4ac637ad151262ed6b455a0244 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 27d067cd78c748e1282643ee674f828568e1e3c4..41ba6b9e73f0106c95bac11df9e9a3b8150e271b 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 e20f63d6def9922c9228814879c61709882c74a9..51c9b085d5ba865c51ca9d245032814c6f3f023d 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 47513e7f94687cda4f0403af765c5e1856561757..21058170f0222fe74ad9ad60672d138bc0d6740c 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 77d5855a152848c6867ea9653825eecc0648ed91..c57e7dd220111fd21f7b76828de8e743f000eed9 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 ced36243c141f97b8095bfe88710c771b6aec415..a3afe165ca0384847afdd2725681017f364ff126 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 fb21e265ce7ffb9ff0777ea1fd3b0fd91bf80c38..77752c31fc0f6a2a37ad80ba70f814864b9c3e74 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 ccfc71a2bd28eecdc0c6d4442b27d36e68456a13..0063d26602437a240571bf109635c6916c0bccd2 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 cd28089e45c32c04e98c3fa9a29df6a7d26983fd..16b0ea085a6b9e5701166a013d051cf46a2ccdaa 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 e796755b7e98efded449d3f074d97304f85c0d6a..a912622cbef9fcdcfd1e2b14becf35bb4e959bb2 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 73bd57e0f7da45aa382d4e6656009124938b1e43..4e0094704e1595b35d60ee94714dc37d5040fa59 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 72ed5a9f89ca7ce3fb42f2b51b83bb760567fb9c..5e680aab7f694278083f314f7de242864b563ce4 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 224815c467055923bb591643146a13bd2531074e..8666c4bd15e4469a33fb3fe2df653010a5581e53 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 189c33fa900199f529aa8b4f77cc90f4cb260c8a..758cefa5588ae53a74bd20be458eca07cfdeb82c 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 1b2fb7d512b6bf463b45fecae5da3d76c9a89817..67753effa2681d460fc85758a71c8e828378a74f 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/LAN12.xml index fc94e064fb6df511692b953d9ca62d28146d737b..63bec5c01b93c027646ec3b6f88390a13203640a 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/SECTOR03/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR03/LAN12/USD07/USD07.xml index 082129bcee0b5bb061117ec8572e00564e5bcd87..19058ffa934fb346c5afa331451f50705415242f 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 a60b453cc6193d45da74d42d7ee07ba0a1447e01..d7cadc2f441cc348f7e865e6d72e6b0281b284c1 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 114a5c1ed5decd5ccc2b44570eb70480e6666917..b43682b806a881116f2aaa00fde336bf86f5ed41 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 e6fc8f40b46c801520e3c096e0ded0f1c6fdd979..0f26a8b5c1736426cffe908e691a01c4f47d830a 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 57f0ab3baa8a4e313c8a5f623f272ef2cd877bd4..209b400d6c005f5fa44ff99e04ae4cd71fb36f6b 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 555fe4d31e49ac6088fd4aefb74b45f3316dc2f6..b8073b0bac3d79d43c68a75dc8cfd3548927fa76 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 e46ea8799ca15d5979a5b27f8d92aadfc7dc821a..761743e05f64ec40a7369361a82ba7cbf828cf2b 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 df38f34c7ef65ee52d9c184b7a607208bdffc98c..0612bb052905c275f4d775ac27a38fd014a29abf 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 af26529f116c80cf3ccf3eae7f8185c903504bc3..7939a0c616681c71d3e50bfb5cbab9bdf7f32c4a 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/LAN01.xml index 2b24086e434356ec5a7f99bed6639f1900d89da2..44a849520329af92118609ca91b2e8ff454c0d65 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN01/USD03/USD03.xml index c8af52fb44b5843a1e5caf8c45f02de81c4a9a0a..b16ef361ee03375bf9d9dcdb4f313519a5fe712e 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 8319aa901a248afe10915f32e1823b5e3bffd02c..dfedf4190360d1d99c0a2139058c3555c1ab2c17 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 81582b199e5280395459b0a1e7d5e049ee52057a..8e3e064bf4e38db5cca56f108528bebeda308ed8 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 7a85c05f74eba7f105c2ff1102e9fcaa35f7c17f..801554d538a8353f4c0bcd19a60d0cdf0a5cf12e 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 e15ae111a9c1d943b00b5b50eb062b865b5187c4..d546ec54455b416c921de7f1dae33a143035c784 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 52c34aae3a741b04a199b9ab31581835e54b4c77..1f272d594ac1e907e538a31db7bc473c6d9986bf 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 887f23bc59ff319c689f0abbb788546ad1bada2e..d6e25432af192094520f03b3640c340d8d0bf6db 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 d23dcaafc26b25292c9e710a5a161f0ba6d045dc..23d360eb5c79e7233c85e987c9c6e11a66304f38 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 2954123e234d2d53f189d24bbeb5b74a339ce0ac..a04809122501443a0f48aa80067f0843beba0f08 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 1ef9196ede2a2cc37359f30663cb255f63277ebc..6f124c44dfd1ceb5621fce7e130d484096d4ef41 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 d1599d34d75cc22326bbcd94d8a075da16c5d813..2f4d67b8bab87bc4df1441c106073ee5536dcffa 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 f2ff8f11beade8f5ec9316760f9bce1ea71fab33..e415bcbd8a6a1d63d8ba72798cb373ca6cf117bb 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 63060f8c193178e113d8a0c79fc165de133f5b64..65a0c12610c21e8215cc6a5383394c03341ae7c3 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 15f27f7872d4060aa15fd2d3b246be3707382482..3b912740a35a3adf640c7f8dcbef6717b258c178 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/LAN02.xml index 8c613c6e17c4430be834dd3436bc6f10608f6fdd..d2d3347ba324f87336e71efff763938bffd578e5 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN02/USD07/USD07.xml index db3f277897e2bf12247d6592d7986b79543ad46c..9a41d329b1640f1971bc057a8c5319509fe0386f 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 390f899e495e7acc80c6fa2047ddd43b37870548..92b9cfb949b1abcaa643044cb209ed04b1397dba 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 8bc42d498ab91e2483bbb1ace85f5ceae999e14c..550d29731548bfac3048b51cec429f95d9b2ad3e 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 ef15ea9909a63dd1907ce7de790c402691c9866b..1c84cb0be79218df8664fe635341c3f6dfbc8401 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 0ae4e71f40b18f4708665c17dc3375e0147cb184..0f06d01f493e5bcae973a5534c3feb9e5d2c15a5 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 75e6a1f3ccb3ae194298a5d29889c8bd7c83b379..45567b30fb8ebe7c74a5f612034dd63f753c5ed4 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 bcf57184171bdae94548093a68b5ce8b71283100..b4404ca975379465dd485ba2ba1791c67dcb893f 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 7c7aa44add539847f8303ba08e68af04d8be558b..a9b9f09d5aea896a4ae35d6b15ec0b4a957a8f25 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 f5ecac669f9408b916c1d44c7d1b0960429a98f0..997cfbf9a60815e9bafe63453795a927880a91ac 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/LAN03.xml index e4a570adab527c45f80cab6c4b24a2d239741caf..26994b0a1dc2ad5c3a659d428b5678b0e466c1ca 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN03/USD01/USD01.xml index d8b222794e01f2662084114e708e4460e0306a2f..3b3c249bb4e9ffb3088eb358453ce6edcb2fa878 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 23b851c831d98e61c0ce3f7a0687783bd45a8a06..4ec3121a7b1eee7a8b1796d6b055342e53e648da 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 46da23c851794799ac36759c141d3b6cac3f2ee7..1b842582be7616d9d3c67076f16b22da76d524e9 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 59c01cb3fb0e517bee0d923e83a6b70cecab0616..6c510d8cfccaee94051ac40f9b0a0b4f6649fffa 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 5049520a5ad6cb57c5145a64a47323d26808c8f4..f37478190033e642d139225d6a73f4156108ffb0 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 aa5b7a30ae0d32d35ab1be632b8dde2252be90ac..4e88b31a62483e70b699f9439664b05e7e39e8f9 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 5cd650be3eb3ec12c6140b3a9b2622a5fbbd5e1e..f75608d73f549de3d160ebc9a7d4df7d11387926 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 6eb20e52c33198f20938827b9112c78b1ff5424a..cdbe8bee8a4f4085ad577fe8df0f646287ff3e29 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 57ad9afd24cf04e28f09f87488c39c34b631ca72..a48c219101470b6ed1ea5f4e2063c000c1f83209 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 dd45be6378d4043a3e5da25f34a43bf4a49a7a5e..4099c0e0e09f93017ce088b472f7411d04c58a40 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 bd8429a508cb28ffa434688fcf99ff056fe0b6fb..ad318c144d70dca7855f1f6564477aa9ad7c4ee3 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 fc5d316d5e6c4f8d1aa553360449961e3e8849e6..ed56a34f26526ae1ab7ea64ce1442f55b5263ea3 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 59ffcd8e0c67b437e6357650044508b3b894cbdc..5d4d40da2408bb21e7a1db01fc660a8adb37a023 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 49f1ad57fa5d54dfe5ac62ff6ceac7d13b6a59c4..6b88506a4ba6183d2b2e607f3c2afa0f9bf6210f 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 1d9609f132e3c25c62ff25b4e40453471f6808e1..e124110817b9f977df946e0aedcb2e8a31c775f5 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 380e97abdfd58f16938d31462c1a2cd182fd1b91..70bd86bd5260491e09117d511376291fe0b250b5 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/LAN04.xml index ffcb24d777ba3adcea94f7b76d10e26f9201a613..b1f5677b633865ad80d2328a5cf679db1c257b42 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN04/USD07/USD07.xml index b6625a7f589facf2f210f57f60122890e56f1dba..6a02c62619616b0944983134c321e8bdf8296d28 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 efdceab50c76ba7521741cb6b31321f24e0551e7..1afb66c302fc9f5cd071dcaafd21e07761d4dda2 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 67b1ca7f57299a62932f43093b60760eceb9c963..afd110a20580afacd133e050c9b94cbdbc8c6fbe 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 779f29e7f7def5f8261a4825d5934b8b00ef4ba5..aa79877ad9d53f3bfcde40e702ddfc363fa349f4 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 efa135f3bf599fa942686cf9a5e36c5654db8ca8..a69d76d832191e92bd7cbcceb8b37246c5d6d24d 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 9aab8809e62d380ba72cf4528f7b9e220bd4a0d2..08253727a0d9319b53a7763ccd98bd588b807af2 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 979e62492ab31fb9b56c1f48e29e3438ff1eb706..87ac38b7094baf7023e108583a6a699a2c25cda8 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 a921cb86631c02390702ef0f78bccbbe30f23756..ee2ffb6686f3406746a479e3f4483cbac8bafec8 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 b02e4e98491482f7e6d4788a2d24c3c7fe74c85e..18d16053b1dbc58fcce14a571ed04f422f79e38a 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/LAN05.xml index 76118cd8a3b4c7e42f2ecb969bc8c19c863ab6fc..b2acc61e57c3a1993afd48e489a4ab1125227004 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN05/USD03/USD03.xml index c1b643ba4264f021a84c9840f317ce73c0ff9964..812ad25f5bfc72bdce2605f96ff6cf7c454426cc 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 07a134014ef6e4904d8880f9fa1fde02596a3531..a237b2b16dc9a7ef7c599675dac8cf89a2fea690 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 35f4a8769045fed4efaac41c15f8c14cb55fea06..85c192d62ef4b8003eb46941383f1848d686cf9e 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 2cad0463f87aeb4f343ce9f11db718dfebd8f32c..6531220bc3a52af845f62b901546856c94d01b31 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 947ab282141f4753e0b594322abe0e78d271d998..44af1570990ec652183b228a3d90eb8724f2602a 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 f6ebdbbfbfb9d51cebdb21f69eaad771facf584c..397987045199af9f237528723126ead602c518fa 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 8813c6ac85f1f0609c9d448a58c15f31a51f7f37..69d587483181ae78c405a0c9d1923334bc5dbf8c 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 a21c1c0f802699341a668d595865d7cefe9a684d..8175034cc6fe3569bb2b1a946881d7dace02d837 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 b5af29595e26df250aee2d7144ca85406cc5aab2..336d9d5989c45537638c5eac4de720d6933b9315 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 12941a9ec059f82942a38450aa81cfb799d6abcb..2a0dd62adddfe6a50811efe37988433d20a482a5 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 c1f8daeb02da08ec3c18f4d336c5f185f6af1824..559e0c620ba0ccd595c7830302a2548019237ece 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 0df8f5fedfe292541fddbedaa5697de58a36d84c..22cf16757c349b299e176e4d2ff68d6a4ab4ea5b 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 c875e0675175be172bb993ad1feebb42746ed29a..c6717139585b82c784930ac76a76a819d8b7b58b 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/LAN06.xml index 6948d0b788d083a042e791758aa3af34eb91d7bc..9f9c417f096a3c6efe6007bdd22f46b180db9537 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN06/USD07/USD07.xml index 5ddd669f7d8a27cecced6ac51d508618205a808e..70f9181f9a721514e47f6574f2aad4708a122544 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 28ba9fd0018b6c1d2b8ebdc18749e643202e4eac..c5d754fba4ad95db722412591554845542dae2f0 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 a11c704ac166d5103bb3cc24f209928627eba0ec..b608a567c2205bed2539223ba0628a5781a49d88 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 054c569fa252515bffce2d6c7aac792a6ec936ac..e63f873a9761fdf30929c70719bcc9ae31d888db 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 752fb03f9a49ac042260c3377cdfa354c61f38fe..be0ceabc13703f7487aec39736481849b1f6eb3e 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 a56a2c56c1ff774b7e0775a978614d9d9a244232..8a768ba736407891c75bd7413fedf37b6878f687 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 f90e7e60214790cc67c0b286c976ed27c653a90f..785ca3cf850b30dd0082046af4e0bcb995c6966c 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 febffa4c2bee2fb21dd160fc937c3cbeb120467b..38ce1866ac300020d15d8f671e027432e0a51a88 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 6363b1803284cfed7629efa2914924bed9a3ae0d..2bba8b555c7382dac3eecd2a4543084127012434 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/LAN07.xml index f6b4b549819aedf1b08bfdb4944a8232c5364005..47c499ccf7db0d2e27ddba4054b4170391e7e043 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN07/USD01/USD01.xml index b139030bc84796d6a752e6b41702c584eba93835..31e690afa6a94c9bdfec11d4c1be97d8854efdab 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 3dccda7685b6f513720afa0fbd612ec05dd49669..04d68d791eb60cea8300d39cb76b5c429b799a2f 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 5488d37ce8cdb6440c11b08e64e0acbc61640a52..f8f37767f03adad63d65e904f2d864eec2a9fab3 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 b7c19207f7a9f8abcf2941504bc6e8fe61377eb5..1debdd6ccf79ab112eb6cbf584265be83b2d6e22 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 2c908a3fda465677c4d651d80f781cbb57c0899c..cf4701d17507145ded420753992782434cb1ee62 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 909a001f336e72d97bbd141faad2121bc72a91c0..1f81d63d8a96f92456e826501d4a914f519a1119 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 7e52d8c7fb504f9c5087a68a91758584b0c15d88..d668e43f7a3a938e2f47930a425e7d91f1a7f420 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 a81b58184243a34898917fa056eed5321f67bcf7..e1408dd2e5bf392bd28b9977a848f412bcea2caa 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 12ecdb2d99cf8457d3853941ba0daf24dd10f830..d408353d01e9b4d77ae4a623658812a062371654 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 2eaf3c37384c91165bd12c2bb1fffbeeb83f7fab..1bfa906e0c020dfa8bfc23ccbdf04538355f3f4c 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 150ac8d5d82b410c203360dac0b7336d75532d25..35217483d1ac0360dad1e78adbc01980ea17b782 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 ca41c62c0ecdddcc833e0f7cb266660be96283e5..c1754291fd35df00f392f900033f00b6e2a970df 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 39e94412a7588184c0af6bd214c106aa162bb66d..e545be6bfc0367a8e0f44e104270aebd622fe98c 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 75cf9644557b882a517a98b4a30022e8f321257e..f88ca0c4a5fd35f034ef4260d18691b943ee010e 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 38700e74e2cf85416be53eb077015e2e372c378b..e03ccaace81a7ace977bcea21c373466c60b9dfe 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/LAN08.xml index d85fa01a941f446f9793b87a609803bf12dc417c..1b28b012755169054b7851fac29e905ada11f0c5 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN08/USD07/USD07.xml index 0d395cfdce1638c3c883a08e65ce7d7150a9b835..9570076f5029c49b2efa9a873540da5d632395d4 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 f83cfd11b5ac1d8890a4272dfe8d9afa369f2d70..b04086f52643a1410314ce09e956111eb77ac576 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 f5a0fa669968ea7ea34769d80c2367b67866d276..91451d205e550600accc618569c352167b1395d5 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 fea0f7f88605eeef1f80abd46ca82b0e16922769..b714bef00084d181ea11888f1e0b248c23d79ecc 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 b22f05dec95dc1f3dd609d1977fde60193073e47..469dc26f4e042b589c711edc0df036e8d43f8ac1 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 477db0546d0034cbd0c94f5fa3af66b13789ff33..4f5cef55ccecbeb59789b8383f6408874bc8b0e1 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 d254ca190451244ac9cd2849b7a0c70f2d732ee0..2819c1463cc78f5a8ddd81f6394aa9ad00aeb4cc 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 9028c00ac8db31b7c4be7509fa78dd949b02ae25..279397a7f6b326f145511e71b4fc987d3f730150 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 abdbbf1a2a602f56c98bb4bd9a6e409e5642656a..de157f2f52f0083b9be8ae3c2ed41ead320acd54 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/LAN09.xml index 01f381a9db0007e711a1582f34b90ee8810ee7b9..dfbcc97e40793c2d085e4c2963a9de053ab46f14 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR04/LAN09/USD03/USD03.xml index cca8fb8ceff5ed0059b4117f735e0a92c07fec27..8c374e001636767caf763067e8b7068f0f1f48ae 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 ff6e619605ec51d5609ff67be7d6656600e5e163..c02010ac98b4a94e039f98ce3dd468ad757c4b21 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 b1869b711f0d54ee951cc8ba9c41f0bf6324e3e3..028a578da0f1f6fa2ea9b7dd367c652a057b84e3 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 4cf010cf20cc14d21f0f5e39472c0a2d3267e7d3..72a9a97e25291e2fbd4b4d35ae7ccea439eed5a2 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 7b5b6c38bc1166712ae6163a833a380b34d233e7..2f59dbdec99547b50811b36efd07d3ad5b1738aa 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 38fc9c74bbab44ece52a17a9316c4bf069fb84c7..b9f4d16096066fdff30b75084938985fb9e79ec7 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 8e91ea48e0161f31bb04b650a7c8711edac20737..ec546c02229cc398a0b39f28e9c20d305b425f42 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 26ded8d0f1b40147c7cdd19d52a612bfe0ab88f3..897bca77505aa35e1e66ec56c2c34ce96e8713e9 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 23e3dec9331caabbb740b294a21ffa9e847ba4a0..6aaef7116ad3e6905a0e588d245c8a07a7e8770a 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 2767cb2631fc52c4bd4e6e5d232145a772f35660..47401dc472c903e9e48049df93d9e6323612b78a 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 91451e8019610298a2283d8e3427ee974759d1fe..f5de231f3d7a1a047b01e672df6938f47a9c7431 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 eebf68c9d460a9f81941c2e2456e1f87b273a663..9679d184f5c83e98752d2c1b5dde51be4a8473a8 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 6bf60d72679c35ba5192482eff47ef0f18e7283e..ad6c2b5b6bc519e77369416866cfa0a0a7852f7d 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/LAN10.xml index ca9d116c4fc6f7d273dd25c20dde2c8fb4045bf6..ac8fcc6e059bfe1693c0e793a979fc3f7d2c377b 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN10/USD07/USD07.xml index bad7a9172096771077c2a2f8e8a17099ef5afa2e..d33f17fb8cc204cbe5de600b7849ce61f921a70b 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 1f46c0a8e277dc6a195bae18ae799854cd99dcda..65f40f45bb378349849ae6603c4f21ef30409b3e 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 df920bbd93c5133239d86fb0bd5a73dd6f6725bd..4f808de4b09da04955a38be481a906b2e17f7903 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 1fd1972fad3a723fb94ae999761e5b411c0cc476..c6305dc4415ba11d5d38350efe1b0a76d64da077 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 41048ca5264415db202f1de92a342ccbf0917b3b..2a58a27f66fc6339d883efa03ad83544898e6852 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 99a53e8f7185fdd2c6b9dd01bb33e6809dc5d775..5580cbabed3324d2c98a8d4c4754ccfdc7f79e9a 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 1bbb74b0706b664a8f3fd91fa3cf93bf51142279..847d40c942d2be51cb6cccdeafb6bec60c8f2dee 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 efc77264d56d48864ee9cacc95c672afb44bb53e..13158502532d4acec39a08af900c388816c2e742 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 df5dcda08db225e007eb164ae2003828d1818519..057bb192b6d7f82ccba806b8c6809b4947439db8 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/LAN11.xml index bae5f051bce2add4af205508cd70e37b03f5e91e..2984d70ba2bde9676211b7ce6c2d36984266e4d1 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR04/LAN11/USD01/USD01.xml index 502e6aefda9bb67e6aaddc4bff151b7b8aad39a3..20269143b14f52a808063418e706d8525b7f5f22 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 4fead851ab77805e3ec999cdbcda16fd29f832fb..0b3865f27d392158aa328ed972249fe7cfacb8c3 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 10917d9237683c2640109072579cdb38c6497d26..bc5304925ee4849bc78de8d3fd096aeb0fe5370a 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 3f06ef0fe4e9bc3787ace35f490eebd2ffb2e455..2fbe458de441846f6188bf927dc776d395ec8b6f 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 c0c72769632a5390fb49b2ad6dc3200e08ee3874..1bf6938bbf432ea282a263a1706fe395341eb825 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 9780f9e2570dc83b9f4daa32d5be5871bfff2af9..f094814db71b172fb3d959d63fd49c5928303cf4 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 9c624883b519cb6bc33e2eef63692a65ff2a442d..440f1ac479749b5e613abf1dfb905baef1d2a46a 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 8c23b06fa7b84ac89669b411ae526d0d7e28ddea..291dc8239b694296e9a0ef40f40318ab3cdc6908 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 a6cf4d6cbd808f289deb8470b68d05ecd056f420..877773f8fd426fd6d30c4eaf3af93b24707764f1 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 5c7d8a0e57c8ef267ea3de4cbb264f42e5f29cef..310a8a6b3b64f68bf69db39942658ed1880263af 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 102dd5b4dd019e803952174f2281b90859a1e641..f5989f625c4da9c7a9f50c8e3f667e0f82ab9b79 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 cb94e2082be796dca3fc7a0e1ce2d9504109ddf0..be73aeec1a5a3ad43ab082357c8d04ef855905fc 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 0633ab63984bee271d510dcc7515f9b5101d1f2a..3683cb304328416e022c64e9b2676d04934415f7 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 f884d74103cf2b2d0c58a34a5b3200cd601255e4..698263a891e7512d1c52549f6e5d9206fd867750 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 a0f12fc2d8ea5d165351b655573928d78ddf9951..d6775efc17e3f2b01fa9fd38ca625346ed696bf0 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/LAN12.xml index a76e7617c076a284f268b81521569855274cf8ee..5bc2c3dfa970d6e136400be9bdcc155075cd8fc8 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/SECTOR04/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR04/LAN12/USD07/USD07.xml index df238337320b6355c0017830d74d3e951e5529af..4366025f09ccc672438a6f700878191565d2d4b3 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 e8eee7babb9523bb6fba48ee8fd9f0029075c8c1..98385bbce6f532611c16dec3f87f23afa6e08c28 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 71fbc2488f82435ecf9106c2e91367a3be410d33..c76b5cd8dcc5d38894fe4c32b88a363eb989ebec 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 3c18d9d4708e140213f7c4f1b9005c25837a0fc9..6292aa4c3c26e5dbfb1533178fd181410c4857cf 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 823d3e6038fee61504f2c3c1b869f4ac30c900ff..88321e110d9c1a4432b21b47662e9ff9b96fbdf1 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 a35df4168735d9cc11ef648a0dd46e1412be0312..d4238772eab9e7e6ca3bfaf27b74ca9e97d3bd73 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 4acb38a9463618148c521ca8f32d192acb29ef41..e5b06b1ce169965a90b61ee2ece635922df98175 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 bd3853f09770d8a303e375af59816699dbff14f4..dcd7b7a0e11ac71a776d11c022c4d2399eb473cf 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 4ed2472a3fa64ae885bbd40e9ac573446849c50d..f6a3c69726d9f049a6c63bf8b245d2d2f6fd6797 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/LAN01.xml index c9719047636e0963bc3864a5a42bd01daae5d2ad..efa6493fe3c65c80dd327597c047df957554bffd 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN01/USD03/USD03.xml index b74a0f240ddad44c2381f5f0ed66b49a0828b50d..a222c2bce88befa93452d00b003840a09062f9ae 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 8d99fea09ed0a36d7139f8dc214b902a5072f51c..b4395fca50f628f374032dca4b6b794aa8edbd69 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 b7aa2182a7a101f631b2b246318b2db34d0ba941..605427a7d71dc343065c57949c3de9b88febedfc 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 8fd0c3172d84c31ce4e8a9dde727d67a3f6bf71a..c6f779569f34457c96fbc4d288cb31c7b5b2cfdb 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 d98728352ced47d6cda6664b816833ac84636ed6..46c45c76f9465aa3dcd120c62a79a2ba481be821 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 f1ca60d090a46e7bd0021df8f6b7df29722d9fc3..0ef77977a771cee3b29d2f983835af49de8d4d35 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 3cc03a379f89147807cfe2483394083ff741566a..5d4ed3da9322d91ec19e4c2066a59215c92be544 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 33ae10371170f82e1f28ed9a67a7be86c2a84b99..435df5a022deb68cb614a9382218b58ba2044e48 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 95090b22fc2b54daa9f207bca2c0b72654bf6a5e..8730772383ccd3193d7264b7e02a9c36c46a6433 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 32360a320887fa8956933b173c48b689e62cf6ba..273c72dd21d7d566757ccff26c12bf41b0f7957a 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 ba031b43b9a1c1fd5bc8b3b766d944d4687eeb7e..2b4791a116f6f63391603f9db708aef6aa53ac67 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 59c8eb04bdf14e349729b399d13b4c67d8fe2516..72680a98751d8cc0b31439d11cdba6a43e691d92 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 6253a97f0268f5757a3618b14251f3ba5ef0d7e9..1cc0e6b2b11743745e5fff9d4246f97f1eaf1481 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/LAN02.xml index 27318bc2745eaa5113019d8b5f00d2a5d9e1a983..3c82af50ab79987cbc3449c6893de405459e4f53 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN02/USD07/USD07.xml index f6b50a72ddc0510d519afce708e7e5d571927e6a..ef54fe45d0a6187c2862ef248310a31165216c26 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 c688bbd0433d73bc7bfc6aa1d01566026087cbc0..8438f1e065da9e1029a78ef6a12ccc1de0c3583a 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 70381663083baf76dd12f0008e7226ad59b6c42b..6a39cd9402ac33617069b049dae54b66eb46190f 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 4a4be821e5130309cd6dba913f201ae24f00bb62..0e42e3546455fc1b357d7537856c6bc17839996b 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 8e0e7d4545d1464a5d5b0ed47bc1dfac796f30e6..017608d70379140443282a703098f08a20d8459d 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 7feefb63182583f552fe1e8f9e625f43ad8a7de2..ca6cdb43d8b68e5312fb5222a49c5b593de85cde 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 8c7039801097658d9cb37e092348ccd99ed15912..5d0cf07d3d5d83269cfa92e00b02a528752fd7da 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 2d26e4755d7472eeddf92786778810646d877173..e77a4bee70a478165866de9eaaa161894d7c2698 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 7d0e19580aa3fa3be42bf2b528621e59e702f9b7..2cdc6ef21fdc9e1af67aea0f080f5d5fdd072b2b 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/LAN03.xml index 97f755a747d1cc2de13cf46c3077074c1138cf5c..38106c2d163ba4c63ec9604c3b66cce08b6f0c80 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN03/USD01/USD01.xml index 7460607edd7baf0b0f9096fca016322d1d82fe4f..88c2e4703def06851303c387480f3a8b776f9467 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 09e0b486d44d0eb99e77190dd9e77ebd69a27dba..e5e64d1421faccd85419b83aee4a5d5ac1e44a41 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 7530f005c88526341310ebc2a5120f59a3881f18..fd55d989c663bfd6a253352766dd515cb8a47b79 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 6db2653a88b96a31060079c0233d6b4208526b13..2cf1ee6b5efa061745ad3f073d88a4bb89d44345 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 41922997e70d0acad105db23f0f5c29514426b53..753ee66c55c7a8e4c47705443654468dda85e6ad 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 8a8bd470bc4d3eb7b9c54312e88dfa163b2ce983..1ad5d4d5ff8604680be487fd387ade54b40b270f 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 54035a1716cd88fbd9cb8c0cf40e8650bc7d4038..0e2a24936dd15fb17ba66b0802a03b397a19399e 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 833415613a38a44d83df16b94f377f0824e1b79c..10da369bddb382df7a546eb61fceeadc9217a848 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 8215cf321f936a333a515bfb6019296bc6996a65..08d9b9cfb70d6f13bcd8cdb5f36e4865d3713949 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 88f2ae25217434a6ce33c69c45bdff8e966ef432..b028df313edffb86619d79f7719caf1e731272d4 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 c9a9d3be37c6a577c0c28d1326dc612fdcda5635..f99926fc0152bed9224dc7dd91ed024dcb0c85a8 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 3b95d90afcb3ba90fea323a2a76c86bbaa7516d9..74b1afc2e5828b7ce7e2fb5d7151d02f5d5b4ea6 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 d03300a8cb34cd58b53586c5f115ba461f45107b..5f97b40d48eee588af82ada4364abe614bca03cd 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 0b31db9be7bed153b9f51780a3240bb4e9f40a5a..5a8b9e80a7457f4fe476f6e587a513e34e45d4a6 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 1929d477fbba65c8e6a64646c8c56a4ef67984dc..d21715468e8596a18fb030b44c89e50a49fcee41 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/LAN04.xml index dbb5cc5020957878733bc7138deb9f010a1dbfb6..23e239b410946eb61bb73f16953e3394cabeea85 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN04/USD07/USD07.xml index 9fd604f1824244399f25b4090f6cf56aaf809086..70e3d770386adc82a5db1188105cdd6f3b7eb353 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 fc96b95fc2749b83555a06d1394729405bcd86a5..5223be83f41800cb1e4452d09323fa4b02fd01a4 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 fcfa9973082723f9f3f74795568173fe57f62bcf..3dce914a5166b1601671ca5f964d4518b165f959 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 ef1ae03bbf2bc420ac095cb7149fac886fbdaf21..c5e10028c4ff6b65d4f15b64a752eae135d26a62 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 f11cd1b10caabe14211b3aa5197e978e17b09d67..99e8ddedd069880e4a9dc476854878aff5da63bb 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 04a71536471fbf94d20f3767861c7e79755b4e8b..ee7f63617b9d6040058e86cbce1d9d79a86dcee9 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 b2febde88c3eb9d35a3c767b90c6c75ab60409d9..6f90c4e087223c81cf7e6b94e67334d1411efbe7 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 53689661ac3f895a85499906dc9df217934a397d..5025638787dafc476540796a04050ee7e3d9319d 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 6cecad02f9e35236c76c8ac12b5139bbda76ec2a..fada36e5f18136f0cec082d497026b100a172ec0 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/LAN05.xml index e4b10b9127657608516a91d8fbca562dcd19824b..744eb3cdf3600db59a87d2d8ecf5661b725c57a8 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN05/USD03/USD03.xml index 37866c1c68a2b21635b8db616da143fa8f454c69..12e919f755a7051910aa00e3b04037bd68166456 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 cd24f47f2ff6229959f9e27ca14e959d6180b812..f01fdb6b49613f6f3eb23fa4466c47b47511761b 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 69407944e968930b67c73c873eff6800e6cb70a3..79fb2991e7f06df41daa76109dc83542f0950426 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 b8164c24268a2ae7cbb013adcc5d6378461a570b..80062efea98ad21350d5c8ba25792906734a8347 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 eddf85a230c2a28b2fc7ff1a91194613234f9880..8de029aacc54f4ef14299e8ea6c28d9c7ea6f019 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 62f640743cdd9ec3ef473a6cf22312dc9a976e54..4a7ab0c224c957b1f02e00d8250fb3b8b8a3e3cd 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 eb1c8b1a1d13f487af8519f61e257892aa3b4e9d..a24e7af68f412ee8fc3b827b271bc68abf639965 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 91cab2e9c4a816a01914eccf9a44a52bd8cfc145..ccf8f250e3439e9c6326eda9e5b4fbb448a5ab46 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 42ac6148a94fae64cbba383432dca6f6fb4a7dc4..e1664e200f64292719e51f983f2b38f7305d63de 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 f1d4550efbe7930562439e627faaa6edc0e453fb..8a5c4d7311315315d039a56c5225fdcd6e5434e5 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 d5d0b330d7521e6a3e53824d9db16f41a85b6558..2e1e03d094b4f4eff313903f840246307f1f966e 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 64125fb20441f1c70a26b6a19112c908cd14c71a..47c34e8cecb69ccfc8d6e61e3e7a6660c2777f5f 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 a5e3d2a9ea0a312c623c00341d3ef4eb851a0e35..59e13d2977713b93f3cdf38b1c1ed01757dd3979 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/LAN06.xml index ef2737428e68b78f4e52da19f1bb566f618b1dd6..66be5426225d5b0f3576bbc29e2d0a9f792375c4 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN06/USD07/USD07.xml index c1034367de7a5131af6710f6b2e45b16f0af212f..d0d297f1634d60d19977f3856c46790c6e6650eb 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 768700e109f4b8753697e285c85af7de760ab11c..37f6385412b1b3c70b01a25d3b1a6b8966ff2f50 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 035dd68fa8507c8f11ebb6c5f92163c4720c6e91..f35bbc369eb42bfaa9b076a160f770aedbcd827c 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 a286e8aec92ab6fbd54d800ff1efce4bfa6074e9..b5f7def5612258bac2370c48cc5a42e42bb8b029 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 a0a6e95bc7996e3a4fb38c1a76c7f9a2cdcc4b2f..d7460aeb424e064567419ee55f729084bfabcc6c 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 c7809fa4855527a117ddbed8f4b98d970fc670bb..3433c6818eac2cf4a5bfe92baccec8b190895f08 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 0488a9b95386fd740d68067d9435b543ce1eccea..c6a8a74d9b6c6d2d9a2d0b89877f6952fa62dbf4 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 da89d55e010f24c403bc3cb2b573a646495c953d..8840ce33bb93d5341afcf120d4a1c4184a19280a 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 5d654f3926685eeccdbd4debaae8c0d26c497e0e..c00a0b0ecc3b5dd9a01464554b790e394fa7857a 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/LAN07.xml index 6fec9b29d21318750f8efeca38e5507add8e55b8..860588cc8c3f8e603d05903a72613895d212cc20 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN07/USD01/USD01.xml index e992723a7ae1cc79936c884ea9e136bec2356f2f..3bb5a4d17716b39ae1925a7646bc6dab2d355141 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 5b57ba2c5e7bb909d2eeeb360559c773b00e356c..bc45afa35c742b199239b210c83aa6ebf28fb35e 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 16ba4278120c341f9522c2a8c910a6ddcd2a9c68..68252f11e2dc948f8cdd2e5d8adf627e0b4bc6c7 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 89ffb06e12d310abc349ba2d3f4e2bf59aecc825..ec3d2e322a2fef7c70521078e5bd29e5bce1f391 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 d75d0870fcd268cabd9ece433f0a31e56ccdee40..8b4717b7bbbd6de674e261d842097f22dc1c2ecf 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 28760b56081fe4398907a196cdafd82f46451d34..5f3edcfec4a89b382ae39e7302e9617a8161d40d 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 dd37ebaecdb232057653baa06c840f4144e0e318..b34cc34a740cb586fbd69613036b5b2ef12d4f06 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 92a43721433cb12e967d9fab7d28bc8fb3929c51..1abc9b273a504469d70beb0936f29b6101082a1c 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 da53cc623a06b5775a7e4526df30b8dc7bff981e..3ce8552c0c947042a9c712efe5dbb47f91cac0ff 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 cf3fae68059b3a0b9f860389962d33a0d86be6ce..172c8a8c509a7422a3eb866584cbc9bc4a80323b 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 f77dc4f2ed0c6d4259fc28ffc73c2edff4af4bf2..27d776098a55fde7e3d2c7e7f064e4adb92deb31 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 41844759b5761fc9b75b3e3aa82bc343622a7e59..05deac4d8cc1a929c4771691c270fb16c3f01b18 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 8c269cf2ef81c98b27d60abe02593bf3eaab4d2e..98ae59ebac55794aec190748a784d684a1c6a817 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 490511e860cac3d8b9489f714a470974fc018569..17fce05bb8c63e62d90c1f787e7934b70e5f3eab 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 e00d4bf75ac7c2466a3f51a449a3dc0ddc06c58c..622e93d83dbe12754d9b754de709b5819ab55348 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/LAN08.xml index 8259309e6c4124aa0010a6053ac330e4dae9c67f..092e7e6a76092ae9f1ee466f3eaffa7936657a57 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN08/USD07/USD07.xml index 679ac5e35785d814f2a3c05dde8f0aea185c5b33..b79dfa5d78ae52142e40582bf6413692b288dc42 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 51f7b214e50d0e53136f83f211618680227cc506..29403944e94ad7ac4a384ddcfc1e442b0948012b 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 8c8b8007b45c0f5158505be0b495e0a0328956f5..dd984712422023e77bb4b882c3f23c313d03ec5d 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 1d64a692b37e90a5182e37a24d01b9fea12686ad..e18e8a0d60338741c0688c5bd18ab51503c6ba94 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 172075590f81439cb3ff2aa5d23f6e4ada9d999b..18584e6b351492fdd2e7761003ea54970a738365 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 c705f373ce169a295caddfc94136719eff2cf79b..435afa948120cd4f3372871c40e14259d9fd0349 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 36c3150d9c626a05269fb0829215da9322502383..3895f3794b8f0a6dd8cf9d0d602a95ae1aa73d80 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 a9e671cfa286b5d42f330fb63952f662f6d51925..bf1752c951499a0d5d176d01bbaf68e94cd38007 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 3f8ced166bf9712b83db520d95cbddcef81d3a29..4c0bcf3b596bfa4bb4197a6b3cfa39302bbd9f06 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/LAN09.xml index a388fa369c63b9a453b2271386e6d4ea3d770046..7ee775d25bb0a350f194dd039ca33b13efdbb4de 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR05/LAN09/USD03/USD03.xml index 88a6dba6982621f043802ab05041cd6eca84a23f..94daf080ddcf815592fc30ee8ced1172a2a509a1 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 e139e47106bcd82af1a4dc1912b132d976f79585..26a534be11e79a5fdb6d1c0b30b00344217b0c6b 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 13b19e0f82940a89962f1a865f366f35fe19cf05..f70b0e88325f8b33e47b25da3a3e76a8cc7f1422 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 343f96f1e90fa6bc76245e4e3ec47eadb5c8078a..03897fac4402574bdf9ef02bc47aea43bfd3eebf 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 e2c6809cff6ef5765de5900196a0314804f14115..1a7e033b54a78138b2b80fd5f4141893150b1bc4 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 1a4cc5387011788fc72f1fc312bf1a4ab555a93d..0b10e21c59f11ed3ebf2be312a4f2ec1e636dc08 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 24392a13d237dece4254225976848b69bdd72ec1..1eb6f5dfab14c80a02a64d9f87b9b8acf7f2b639 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 5c75a37b286b1a716e39b392f187499c947e06d7..84ed443b3023961958537ffa1b2be75c740dee2b 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 47573867a0cce2f3f45e007dbe1d9cb48a15644b..d103e619dc7edbca7f2f955bdebc2a9a0a527003 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 898a761012a10b2030374a74dbdd3da4f68a4a94..ffbdb93366f382a2c5eda2bbd018878c8596f7c9 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 1e70c3db13666639aac5bdb406042a40d4996567..f150c391ffb6b115dd41cba2b85031ebd93c9900 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 6fe69f7afca9e0db30ec0f2e819a40d41a4c2f82..050d9ae4d6cb2533665c2a7e98700fde85520ebf 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 6e1f2c8f128f7a3dc438a94dfe6b2bfe09f1434b..6ad30fc07e48e9f9a5c4d8cacbbdaf62295aa7f4 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/LAN10.xml index 1aff7327d891908402ae2221196fadb660c0c35d..4d8ab48c1e9827739f3ad56e18ca908b176ca4bc 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN10/USD07/USD07.xml index ebafac2ca1215bdf2bb61a2539209016b14ea4f1..85960e9dd947e010782dd2ce859f126bad51a1f4 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 ab7f068a3f47c11b8f845a9b7809a87c3a54f14f..02059dbea661c2fee0924d73df445a4f4eba0e08 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 81481fd0f1ebf5a6395d3c86321ebb42b0e8e533..dab194cf9d81071d82df6e32c449812f947f8d81 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 abb56e4f81b849e3a5311650ab6b722d18cf9733..71a0284337dbff0fc3399b203cdda28d4cd95702 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 5994e715fff80c5cc3631b2651e3333242451f15..ef170de3cd23c21e6c2051664ae73447dcd028ec 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 5797150b2b0e8e01db5f6d2440327091ab90b30a..d22a97fac921d527479164f9a33ec0f37df1e789 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 457cf2ab40225e0b7d31ae9cd3e517eb3f4a76cb..974fd5b3ef4d53e11e2d6b2af52648a1fc68e05b 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 f8f2ba011487fa33b3b981e90998a1bf3db1dd62..4d32de7afd54e980b1d370127cfb63a232d53b64 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 4cecb89e1a9f528ae6f1034e3bc5b1a6371da83e..3dc1b7b6b11d990c2caf18657360d362ccaa8357 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/LAN11.xml index 9dc77055998a968f5695a91483202fd45d12c2ef..9b8774bb81933ce61cd521476e60dbaad9d4bbca 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR05/LAN11/USD01/USD01.xml index 72176fca1509ef1fe40fce27308d04c6c0afe36b..0cc8f8553ba1f4400869143de81b435848b64aca 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 bc8602d80728c2038a8fbcbd97f82275935ad9a0..e87fdf9a9111c93a00e79b3480c6e0b02c03f1ae 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 a8cd19f93c575e796fc719ed7b87f4e89983d937..e9559e936f62e8d0bf8f96e161eaa2164b709e70 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 5ab04165a4fba8ace4828a1f8374cf00f98e8891..38910f3f3a6e6df256332dd67c5cfc7caa86cf39 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 83ba8762d2cc8c95dfd4e540f770497a9b902a64..a7b13be58869c784443d49c197d95e7d92032114 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 3d3755dcbdba1d4ac2ada454a6fa5cd988bd9da6..e2bece01033630de6909c0b00aff9e68f540012f 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 dd413ff9e374179346166145c61f06c3ec9c525c..6db44e814a4b4119095fb8caa8b85625fc2c49b9 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 8432fda6b92e4dc604b2071ef0435fd4d0b8e164..5281b8379a9cb9a0bb34f2d6a018bdf07b61fd33 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 54c1792ab5daabbe1affc9047224585ed20aa839..b14e7afe78df6435975aa67762bdda408d8e51da 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 cc6c96b68efcc38e3c2c0911c4109117f8019c38..f0ceefd78dea39dc499896659f166a91ef8e9962 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 a06b063d8e0fa8edd561c2f7411a64b9cd3ddca1..c0d30d62a67c54a0853d29c4defa6d7a94bdf1f1 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 f8a1353ca98250fe4b264fcabb44905c63e03222..3d81393b686c6b73b8b801a99cd73597a460bd79 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 8e1904fdbf0c3bd965696ec00637a4538f9be32d..ed5f0463b2a5095c0d4933eb9f068449eaab4ab3 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 b654b4ab7a4de2c5106e2aee981cedc4d3cd6982..307a075b3a67e39fa6a481333a309624afba782c 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 6346ffb890ab71e2c6a3f60b3251506033205279..af7bb315e5093b26184a9c98febcb721ea03ca1b 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 597c8f1db1f8a2c3d20ee8a75b296d9db9042c44..96f6e0542caa167ecf52945630c9888b92e506c3 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/LAN12.xml index 8b9ec1d2f4e426457790fb5fae7b04dce7a0be3d..e25e8c35dd3e339a58c7f75ec427e4993284e0b7 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/SECTOR05/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR05/LAN12/USD07/USD07.xml index 1d37d2a359a6928f1bb2b83c86d7c3a00f74b650..3e6e8da533e0f3d75cccaec3f27a850e6f8e0c34 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 6ff1a407543f0b47ab9c960cdfc8535be59e84c2..fd6e7eafe7009455c9402a41dbdd60c0648d993b 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 348c0c9da1834269e7efbc20a9fdcb22352d8b72..041419c1f288d23e1008524c4f35f6eac3a0df19 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 a1728fb6fa1eb597d0f75831fb5e9c6728e67847..b2cca04deba3fc49a34daf2a1716f7a347939f3a 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 7ef9dad7d1822ac25e8849a13f540f59d2ed0e6f..2ca857e7993157d98ce82688bdc3306267ecd990 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 b2111457569fc28763307be121df1b6e00c95d82..b2f43b13db405cf5bb1830b41b7c7caa9c8ea30c 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 b0e0ab424efb25e80a7e03354b474b83f2e3639e..d47119e1b2a9fb940954aa69084612f23735174b 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 86d2e360f9fd5c11ab6948bcc7ba6a6d8677939b..8af742d2d2123e2602a9321d0a05a70f50a1fe96 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 42ee6bcbc3f83a84823128a21f2ec076ae00d987..3b2532fb0b76c2b2250a3f552a789a4b45a32ddb 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/LAN01.xml index c0e5f1fc44b0bf07f8a66b3dff001d8dad60942e..e1e2d030d38bec237b50b1a7372c30d618b0a7e8 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN01/USD03/USD03.xml index 75159f28300ed771c1108432b6978d764b1fc267..e6ee8bf9319d97605236facbb111b5f4dd869356 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 84e59f1c650f4f2a8a854f2fd710fbfd5ec13a62..152415fb43f2319570d2adbe16189cc817f8246f 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 0d187009623ccbd9a847b99124081e3c40188ed5..86032e9c68392ee34e6259fe5b14c6c4b85b1008 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 d036a4f712133f9f507d74e1e61bfac63508b574..d5173c3fe909dac24e0d4b90f6e00b445c881ed3 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 ef650def8eb94c29a6b18f4fa2fb9794bbd4e1ac..92144dd6e6f87ecfb4bda0fb54d3e6d35b605623 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 a865226ad21527efa81e899aec32ef365fc3fff8..d22e01271d277e30cd506ffc71510f97a1d5decd 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 4ea1994ca9abcbd2dc9d9db0ce5c12bc08e4c1b7..663fc2fc6d2ef0ef086de4620ea601da146f904a 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 0f70d4d7b526d48a746b633d5c03c3b6b0eba038..880919724c8a2719d2a79d98da9db4dbbd1c1215 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 1c33adcab20e4226180bd0c4b11f192e2989dc41..eb9af50a3553d752aa9593b381177e68467d4dca 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 5dd7b1ddc2df45a2a01b6cd41a2d5b8b5a7d9968..d77c961b42567868a06085fdc042912d44585ca8 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 1116b6e7e015b20d59dae2574036f04e697648d7..9a401be72197688cd1fe8f6f27340cd493b2b36c 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 c0d9e23e1d908eb19e14af29d7cd0059a6d63e59..513245cbb98df89d110d9e7139b79c0173c4809e 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 3d817791c96ee70bd00b1786ea2a1885afc151a8..86624ef6a9470ba6e7d01d56bb92a0cbf261f362 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 1c5b3f5b2add1103dd6785950500f2b4b0351ccf..0ee54d20f127d17cf235052a6434e05005519828 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/LAN02.xml index 086773390520399ff16218a629ea6ddf1960dcb4..7c066cf839dd1baa2f85340e555d8a632d538122 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN02/USD07/USD07.xml index d7171d7a0510bb7c694463495bdc89f480e3fd83..2eea2fa0a085dd363517d2ba959bbe758b93ff6a 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 f4d52708ddd7d97ecb55e8ce5861078e3e6ef27d..df448d1daa3763b4292109f2a1fde3c13d3488f2 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 73fc1be7d208ba13128638484070752fc9f5be2b..ee4c88ff3bfde527875a4b2724e87add9ce434dc 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 6ba059275e21f5df457f6005a5000180200e62a5..e7db88ce881129608797abb0061e1451f6112328 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 72e71df470d2110dbe15a7e12a4b45999dc96046..886795027284c4cca6ce3f39e154ce1371315b00 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 1a5fdd045ceb7c79126c95f5263edc9cd791f978..89454925cf6fc6460ad236931e1c345bef571caa 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 c72bb1174979ac2d524e10c385cc2d26667bc504..7bbf62d613073d6e59b89afc0543a27a31d84126 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 a19ad1ee927f34a293695a4bdabfa6c0258458c7..4bb2eadcd3c3f10ec67ae31c805d1e026eab0812 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 7c89a3ec835eecb3997f975b7d3086c2c1552148..48b969b05820072d517b1c07d44dd57400b0915d 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/LAN03.xml index 639b28b1e4757120e4225cf014933e8d7a88082d..2a31785fd623bdba1b47324c587bc1b11b7f2c15 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN03/USD01/USD01.xml index cef1d88c2c00b7fe5afd7bb4bb90cfa99289b758..c5821ae4d1b9a73a46bdb705bc21c4c837ebdda8 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 6a8588d71cf6ac3346961945145a2addd6831235..a4880b1b1f28b35de326d1a303cb05abf99bbdce 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 67ce062a84de1db198d994196c9af718774cbccb..ceb9fa5a2f2172f5deb53731df2178c07dae7294 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 c04aa292523cfe2b597a3cc0759ad51109ab1afe..70ca1d6a4de2479fc9c34acfebd24395b3be1d73 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 5c34486ae918994a185937540d99b6041bc48604..3c48a68d05522427ed78b567a29c6ce43ceaf2ef 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 19de7530f410485b636619152e24ea6e3be86388..4ce19e582eb62645eeb7a192fa272c28738b5a74 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 4381a0f6cecaf625f70348b24ef3a880d9c1e299..ffc675c54a537513c4a43897fe1b0d652039e496 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 0a503b11710b75b24ac566bcf0cace5aa7ccb439..2c8e5ab73f7b82f7210690021390c6712dc8765f 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 f9ddbef45feee03908a7e94b36047c3072a143bf..cdf074c55c8dd8bb801abfbe22d55fba2575046d 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 15bd77e2ec73d7dc0cb404833f3b43692a72d768..474924aae0aeaef8cc734baf61533d181cdc2641 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 039d5b148eabc5af9c28eb95f8889b5608aa0fc3..c73b29431208dcdf07e1aac2c12f2f6f01d244ff 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 aad35ff5261e61fdfa68ab388e0040dff39526ce..dfd9b7c4da91354e3a5805803205e87cee4b7db2 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 57c3bd3babe17691837a397d7828fa157762c150..bec90d405374e4e5b3eb93ef74fb15342265a309 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 d234f3b35ca132be2e52dc8eba61572f7a773b4b..b06144805a2992ad0f0b85352d737cbd73141394 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 8452594c4e390ca511890972eb605c0876632909..6eef28ac1c569c6351459164f666b53a921ee1bb 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 0af2ecffb1684132df539565f6f33205752ec2da..523ad67bc277dfe857f0df34aabe9190c5119f6b 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/LAN04.xml index 8278af8fae6a8b57326ffce0f04b06627cab288a..0f4b8b0793378446a39b06bde5193f1c9f94aa78 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN04/USD07/USD07.xml index 1ad4fd062165cf70d54c2a895551187529e9ed4c..ee5c97f2cd778bb14753ce29b22e5b03c4a7021f 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 bd50e65e5f715baa85a61b471c926d9482939df9..bfd9151d755e03d2ec0f643020a672a05f0f0508 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 b5dcb4cc1053c9f74eaad9e7bfd95e3586c5ab00..854801aeef1d7f9a3de0708fd603f6e0d5da09ce 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 173e0edb98f767e725a3efa670817913664b9bb7..b0cc41d492e48555cd63121c6ce3322634647066 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 1634922da246c772d43c367939487df63aad8ac2..7d2ba78fb0f2da52143b92efcf03fa1ce4b83558 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 98e2a4de8dcfc6e43ab4a8ab92d722a60e5179cd..5e0c445365812b9117fd9f96ffd87e107f95eb36 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 39980d9a25b43a32cc3b2772c828a2b8aba51d3c..80bbcc889f891625ac049f09ee56056c41577e1b 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 eb46d8631263dcfcaab83482726a951200536619..cc041ec3e3761cc801f39d07f0c8f9acc943f155 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 4b10bc05498f5ef60c8467f4e63d266865e98c38..4bc2722e62fe159f6b93c533861984628673f85f 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/LAN05.xml index ba3995b1dac3b19e054e26cfdac069011186b9b4..a532e474aaaea33f4c0f61af20d3b52df50d83df 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN05/USD03/USD03.xml index 8fded99c114aeb15c465e0670656525250863e7a..88a353750aaea7814f1e2e65bbd923f488366306 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 79fd993095fe12c7d945cbd62ccd1f209b64a962..786fea4fe67b42d1237b6ef7b0c5b5515d2cc807 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 ef39150b2cd5cb48885db43db393dc72b9bcd976..123235216e15866d295e64d225104ac8a5c792f3 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 e0d7e596c67a42f71ced2b38dcd34029353e84ee..fbc5717a107bb39cecb8cfb4d78451c674b20f82 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 6512136f591b685e9781b4ec7ce0215d7e1df90d..704653f6ad95f6f56245f8b75a9750c4f3eec1af 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 e6d979fbb51f7d3ea833fb081fce72c793820067..2f6cee4c54ce767c55e7c5138dec1fe1bb37164f 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 6597bf311de6e9259693e72b215d2600a092005a..79eacfcfe0d99f8b245b72756135b9a2b5fc6a07 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 5d517242b8567316ca13d154ded2ec56e75c9e1f..08e1cc4b0bfc4936ee5786c0f90ff12993d32ce4 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 c06ee7c26b3756a4d4a86ba7fe8e91dd1f897797..6346581e330b8f89b97174a5f792865e11610a9a 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 ef89e3bf08761d1cdd197f08c991278ac29c95bc..1cf6d94aa993f494db07121e696d76e855e48063 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 7b6971a655c4e03de196e0a3b6e0757c22f3a2d8..9b3fb09f9a04b8a46c319052ce7146da6241bd61 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 fc0a0dc68cd58193e31a6c212db9d3fa6cac6664..12cb144ee16a0b4e57d0a8ad6d4e1f2ce4f088e1 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 3c8de5b27278d3e0b77f03a1190b0e650eedfdda..06d0dc9d5e6b928e0d1afc4ce472cfb1039e4764 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/LAN06.xml index 7c3dce3478f2d2f5379add62758f35bced0a66e6..b14cffacba1092f4865d3fdbf7cbb8646b69d130 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN06/USD07/USD07.xml index 312e6759e66fdcadb5302e0e2baa7c7cf32ae4b6..b5c2d8130f847ba964af38c649f4d25149a48ce3 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 05c6f93281be37d9a08f5d889fd1211561fd68ef..b78925bb1fec1483af9c5bba0ef909d7a3026d67 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 5a503915d82511034675e921919b9dba563397ca..cb4d268ec985b87904d911147bb06714b1406d13 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 55cde54f4f389870e8fc4d757d511f3c9159ffda..4596c329c68186b6e7f17a7fc0b17471998f4393 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 d8276a2ea8e1540b10fcd2a587bd142ca1e0916a..a8022fb7566997c7ecde998552a32af985c7afe0 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 69f264359a663b874bff6595eeebc4de179a373a..78a58af33dea53641a11d69ada0ab25c36c7b2ec 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 862083923441bc23f46185a24cbcc1838206f292..6277f2ce5f2765d65a82f201e53579963d258f59 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 e2cb92aa97c7207b5f788a8d1611d54116cb5652..77f2738b76f8e5306adedad5deda0b8a9f2c4743 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 db240b50cb77d74c17cc0def6c917edcc1e6f939..c4bca815397db8f541e584d9f52a02a5ecd02ab5 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/LAN07.xml index fe63ce08f2a3693e7fb6088a001f4c0bfeb492e9..9d51328036e18429d206324ff2e186e2a6b51890 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN07/USD01/USD01.xml index 7c491b4c3a8cbd4d7d90fb500aec8e1d6ae0b12d..73321a583c65eb7c4db8da11f500e2ef7b3fa1ce 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 1a7a3785ec78d08b1edf02d71ba012032dd6be84..b61a22f40fb100663469ac3994b07b956eacb789 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 cddf76783ae6d6a0948a44d46429d4dbb8af480b..b0a3a2b4dec513bf300b0cf30638b64ad31972a6 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 e0fd5c495cdee4973e6920b892e0a137d013f62b..67d065ea77e441b023793e2c61b505aae9164ceb 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 dc19eeb8ef173a8598bc1d67f16aa1c7291bca07..68326e6fa78d4ecf11c3f29372cca64ee8f7a5c6 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 221b7f262703005ea72357603c8a1af0a072ab21..c6b87e5a7f2be00aa61e6a9a581dc13c4d960668 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 aa777f2bd6f8bfb047cb4e5d1d0b048586a9e758..277a386fbd916e0866f06fbc35fb32169ec9a00b 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 a603673f3e479dedd63c9b0560e0bca4f0504b09..b0b662f5dcbf1dd6e277aac3eff4fbec7105ec10 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 10e6edd48275aacf398f9c4b34b35cfd46659da7..f297dc38b4c892331ce9df4a4e8b44817aa5bc9d 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 3a63bd1c1d1b36bd1b90169e6483f6ef0eb38c72..67e775f0322f7b30360b2460915d77ec13341ed5 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 690a021a48b7589e19fd4dad8642c9dab0b50964..9c55d064fed96e8c036ab8bf1d47bc8c78df9cdc 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 36f4f4773228f0370faa97126fed163f756a8e40..07a6ea8f6cf500edcb791182e6726bf945f94e95 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 3a90d427ba1c403c6a310c8c7a635f08dad3cb46..fdb1400c67f0356d9314a90b3a6b4b0288a18b51 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 f90411d605730f510cbb6bfc8ac239e06e701df4..cdff90e9bee8c80e4f19f46a0e38780263a95058 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 79eeec2a70911436dad2fc65df4760842af9a9d8..ffc54036111a5b7f6c445960f5496be24a55dad5 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/LAN08.xml index 58b779fb1a5d1a5eac8bd8ac89126eff08271c1e..dc433e7894d7b59a23b049b4b2eb19748eb1d129 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN08/USD07/USD07.xml index cda55261e02ca8250b82a323404aceef1bc7a5b2..0d2d7f71584ae170395a9bcb712957d7254577bf 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 38336683a71639511660aebf6fb5d684d02d9465..67d742f3bd6f29768359c4aeaa1de168d041cc51 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 194b2d44fcd0dc1bf0f680563bc15c6e29d305e1..d5de282a5db373df6a7131c70525bc26537a7728 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 a21f4f0cbc55de9fec50e5d37172c200a26f2d4f..812e1dd5dacfed0a03af73b70e3d10b9ab3bd807 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 dfc23f93144117d7fb9d4d7b80ea6a667ac029a1..3f180d436e81618b2ee0f1087cb4acdf9908a1e1 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 cf649e6d6de7a1d4f450488e44f1639ac0147e92..d415491fe9e4a0c1cfc037b3ccf3ffa012ce75fc 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 b51ec490fa7eb03493673ec0cae01c7cde447990..1cc3022a49841bfa961cc723b3a89d7228f2ab78 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 5ccf002798aedbaf3c685e83c479585722ce37b4..9a80185db5a9b469459e3efb64be47781d86287d 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 2f89dcdbd3c6072345297185b2d84efc5fd13b9f..9487c9fbcba965ff594937b86039d5d2c7b5f6e8 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/LAN09.xml index 8750cd8d8ba5f6b12ed9f48266b202d0b810a146..620455fcab6bbff59b7aa0d2935e9c7734246381 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR06/LAN09/USD03/USD03.xml index ac2f2998f2a7797802ab1f07a5f7859694f846ee..422182d871356ff91731b8cb355f9c98a8b1e247 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 261817f1f8035fb34a4af9c90692ae358012209d..38634a43fea4dc9a3f6369991af7baafef603206 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 d22b5744082142af3bfcd92a67cc69b42534967b..f171fca7bcbade04e4df9fbea57a15cd4df95d24 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 c5857412bbb95267a144dc2d42b890e3da491c64..c8326e8838cace98094ecb464ef2d7a796d6f12e 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 9f98946cfa8739fd6983d73b6a00302455b49ee1..318677190e9a76a4a5eb522190257c5c866defa6 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 9be58f671bba920ea151de8475f05d9a7769e2df..65a4e3ccb6fd2d7467e9a1ba434d2a3cb40cc7ac 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 09c930c6b9c88aedfb4bd056558bb881f100e42c..a9ee3f1e32f21b06f78eb19f27f3a36db9ac0dbc 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 e3ab842e2da6921b3a9b0ab420b71f969a36138d..4284992ce4ce2b55d5b4c9708026667ab4658295 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 68fc0d59d5f64f07fbadaa4467df91300b011d3b..22d58a7c4e00e5a919983d8f8e1fb6d69ef522f2 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 cf4649dfa3a3eb48eaf80718f29e77d1fa59b8c9..e21ee2c014e345b9db1bd857d9bd0bf39465c706 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 85d424c39399cfcd7dbdecf4fa353c5fbdb950a3..25f35f66019498a6954d36a793c540f4705f983c 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 8a89d60c8e480cde3d41f026e20c10ca2701a5ed..42d0889878a643d8a3bf658c6d8bab700bbfb073 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 5f72904db9889d48a31d62e9223946f7dc894c0a..d75745a9f012a4c773bf1ee4e2f5c538d181cba6 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/LAN10.xml index dd27bfd733e1290fe57f61c0ad342d5fe0936f61..e997d2d61a9e52e24c40ab75605b75ca97faa50b 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN10/USD07/USD07.xml index 738665e51e30b559aa3d47f6bedc5dae5644dc80..4c23860ed4f8fb7a7e673518688d00044fa05119 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 fcf769c59b36946545bab5d4c77187145b5b4d12..118869939f2cd57ae828ad101bcbedfb28464009 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 f6e4a509848ba8291ee0218e78317472816ca147..18a1d75cb7d58a1243e55ea3aff18845793c96c5 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 1c41a12de09be7cba3b8ab222df070246713350c..ce761160c1fba37c64a4f59abf3ce9696da97afe 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 4e94076b7c0c10c95d60f570fe49f382aaa66953..fc1451e9988caabd71e890cb847798be624edd18 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 cd9bc2a377a6218959cff09e3b4063017720670f..dd7571da1ed7cac40f98065a52ae741b177897a7 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 28a3fcb5873bbcdde72589cdbc3f32d99562d557..f540805cf6ba2417018ee394e36d7b07b6bcf6c1 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 7498b520e291272b674319da7ca0f68f8be333a2..79542f744ca3f0f39310b839a617714540eeb5ef 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 3706e1419ade558060e94ea38069f6c03ab70be7..0de4989e365e2fcb68512b056c3b211fe6458e6a 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/LAN11.xml index 39aad2adca3f25ccf9c0ed341ad793729f3782e9..de95069c34af3ab2d7d34a0f89e4ca86534046a0 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR06/LAN11/USD01/USD01.xml index 27337638ef02dc1ce5651663d644b3094e12d4c2..3fec4026074bb77f679f1231dab97a9d1fcbf529 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 4321a85f74fd9d8bdbec272078fd95176bf2f33d..261459d975f5284bc818b5a9ccda71b9eacdb296 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 07c37215e051d981ba32be2d76b5640ed2fb3b39..7ebfd60d378703e89447a15f2d67bdefb3b99be9 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 1d6e8d4669c8d6f8567d8b69fb5d605079c2c3e1..518c9dc7a719ce44af163292549d4d668252979f 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 05b2f1df4893e3b700b7308c894f45c85ad79e32..bbd6d79e0ae39fd253fd7ace1b764040327953b9 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 b9a5addad35a549a39dd014e4d622d09ba3ac081..b695ee06b10599acb266b6566852ec06743faa9b 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 4ed778831d655199a8e5def4483b14f525c80930..74f91cbb234f5d5c1dbe202ef50f3c404367106e 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 ec1f1c40e032ee45af14d567d36dd6ccdbec8683..385aec85c2af68fca3b92739df592b6f18993841 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 040e3700bedc33e1e80a971427177a7886f66914..39c0e96f689c5459433cdd5fe60df1e4273c65b1 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 d878c5df815e07f4e5c7a9a6239d08dc513fc27b..61d7385d764d724e2f65bb01882bb59d0af81169 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 97da6c98426f724b8c5863a98e19bc78e4ea4b35..0ab6ba19443dd675c96d37ea7f7cd5701ba4f2a6 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 7d31d838d0bdca0a06adadf3dd2025bbc2db2b3a..083c90cb5edf86395df3b7e7398efadb83dc23af 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 e139c425132592e7dbe795876db020362a52f291..f2aae916d9ecf0a6e57b4e2675a9fe2d8b88d2e8 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 d85446e02bbb1315a15b82e73a7798296bf52e31..cc726197a2a480c466a3e17d44c0b42bc5d8dd6b 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 c99df61ebb7b6a8adeaeff954a177ec585798319..6013be8d54f29055a657cf43c71ecd015e02298c 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/LAN12.xml index 12374d1239e5241d0a1faba229fd5c9236a948ef..126630983864e59e581b7ef5f3bd5611d3b36496 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/SECTOR06/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR06/LAN12/USD07/USD07.xml index 43ff0ca788a5d74b227522ad03d5c78cdfada0cb..7dfe2d4395cc944f4f46731ad3576eab6e6b4b69 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 ef57e7ad3b14306aee09b61c6e994732d18e8ebe..b7b65ebc43df9df1ade8d09f218abf82bc95fc02 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 6a6beae439c97fadfc9896647ff94d8078ae0239..32139e7719e122f35858f009d217b6a361002450 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 48bdd0c1846db356c92f1d7aaf05c53a1721b1c8..21747c81043cc828f05bf40c5c691439de6c5347 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 2a5a9cdebf7e9159ef3397e1239a7eedfe2fb3ba..ed863c62503d6a372a104f450fadca59b73ea869 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 0f8be62caabdde32af921b2f16820131d201f3b9..677329cddf6308027447b3913231cf065fe49d04 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 638f48b73d82e156dfb15507e53815a5c05bf3b5..1a99107b359f1e6a0d74a4ae860670f6b4122932 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 2921aed15efba1cf5d83b858a9f7fab0273db5ba..028903053dff40947e462dce6103543eb4e355ba 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 cdde5a37aa7a4efff9c93abc1478da4ec62400a6..bcdf67b177161a3da9b8aa0543213c69c4c2d4e0 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/LAN01.xml index 971b7a901b83c4b6982038753d25bad90516f841..e13a89dacd49a88da82432e81505d5a74ee6317a 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN01/USD03/USD03.xml index f8f17d0a39bf74799c6c53297152ed6754315f29..f0fa1f81006ca987fdf95872f3a303ae19405814 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 fe268789f11f8adef611d04891e45d215caa4c1b..df88ca076a4e5c19111e7ce085161d9a38d2f698 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 b68398bd9d413de8b9e9f84b10fe926e8259d08f..43aa047f99f01ad0b9b0f146a65e970bb4fbd984 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 6287c818cf5b4c46da680cee427e27ac07c87b6a..fab9a30d6763dd8d67b108a93131af6ddde27ce6 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 7b77f4e0becfce1a5628d8a5fda9beb13b7dc034..efd3088c01f43e130ae4170e57b17b02988beb63 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 33b67e010fb4233f33da20b1662b488df2d537a7..b6c681ebefaa3be27cc0a73d103c9cb26d00f3f4 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 d16449900a1086c30b1431820d3493e3824d2b66..021d96604d3b584bb3dfe396dd58ed2330a277de 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 80768c15616eb05114c80d6ab8784d32519ff857..abb2aae9714dcc6e98dd46efd4ca4e5246241e25 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 f7796107634fdba48a0930532bc3bddb632cc00d..b43dc67eb54efc1ef4f6243181828d9d959cb638 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 8d2dd050850bc78b49c21b9bcba15141b4433b41..f8032e3f2df32b693a1d49227518e8381843f8f4 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 4fafce45aab6256f12c71c584920498f80ee894b..d8a61acde599f56d6b8afa8136b34beb032db03f 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 b74bafb4c98ccf5d09142697901084ff24b270b5..e1167fafd02a9c9589b2aac6762e35a9872d2256 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 86a341591b04cb7be988144a96e59431f49ff2c0..be48373ec7ab62fbe9ede631f677cf1fbc3c768d 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/LAN02.xml index ade15d1c4d8f5e24e8d5427486c7465b12f6df9b..7ee59bfb4b33f8aecc786567d4242753e5d818af 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN02/USD07/USD07.xml index fca2e0c3d100567c38255091586d2f908a1bbfe1..791bce064f7d542523d209c24e64c1734627baee 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 856634d71152ba6932a2630e0d2da1841c1bd070..ccfdd6c05d2cfed1b9c4ebb54b9a0ae97ceeade9 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 648e746a78edffb8f747f58cce0a8c0a10f9a85c..f38abb01ced46cd9695c3710435ad12cc1980591 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 bc9dc434cbeab702785232adee70d6a85437a1d7..2c6eced38411235844c00b5654bd37aeb0180608 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 90b8c99f789055e8d1020cde4503613c52812c16..def55e86f64f03703e8ddb7124e4d88fa4ac557d 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 181476094994ee4ba7d29e1e356c35e39cdc3103..f267c233cc71a6a5fc3d05b887d62a539a4d9015 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 97b11fdd07b44a359a66917466bf2cfc263aef0e..4e0cb9577dd458cad644d7be3a14651df8e2d92b 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 0eaaaa34803609b8e88b6aae0d5f3b242e02fb9b..ea158e29816acc50cdb0dfff4c5a48d5fbdad2a9 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 1d29c9e3c502ea1c8ae68ede89f499db4f32073b..faaed24cc1d04790d5d1a2561fc425cfdfa74305 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/LAN03.xml index ef5ba9c1e6499126f0a2c9cc0966f4b7fdd3d483..64c9560ffce25a07359b2a3f161df5b87ca9ccd7 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN03/USD01/USD01.xml index d37524d1a20b6324aa8bc0d7dd2f4d29ddf7cf1e..6a1fce5a823c92fddf523f98f8eca4b5db285cb7 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 897c44cd5f09b44f1d34cb145d59ebf5f56716c1..c6f1fe576e5602deddf1f1fe2105aaf27ff4f11b 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 afad2a9a646247d04fc3adb848b2784f763ed064..ebf91042ee90f2e0975757aab8c1ded31fcba179 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 3dad368a4e9bc15b78c66efcb354c12446853e15..27112ca13c9c7c15416bd8d2aad243a58abe8e62 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 18090d8cb54eb43619afa1e75452b72e698a15fb..ed33ae8b6167e1cefb4b1387e87b193b8dda02b5 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 7dab977f0c652fe1d33bd7af23c9dd0b392fe5c1..37b12cac4ae26a8573efb2a742ca631170ff3298 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 34ed512d878826e47358a4d82e33f2588f8945fc..cbcc82af8568ffa953bcdbb94f5c6f562a68a7f6 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 1079f8f738a74c8ac1d45e68626d5685c81adc46..5e14057b1667b142ea716f63e0d0b644702a8b40 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 51d79fbc494457f0a8060dc7d1a089e97ca33e7c..1fa1e107c278db9182bc88ad28dc2c5a73676c43 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 110917b9b78b002fad7e69613596d0ddfe819f62..45e9687e7b04e8c34e5113422edb68815a2ca93d 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 3c7d1c1f3a6c16fa1cc3c3d4d9204786375dd580..0a9bb0835aa5f8c8c9c2444c017bf15e894fb1aa 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 475c0c98ece197e4ff54d79e77288b669926d4a8..705e709dd08f6a6e1441f01cdd61cdb38babe055 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 6e804d9565ad79bb58e1665427482930b47a7fe5..61992997c4facfeac547eecebda22a475fa8515a 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 61a37be6e06a751cbfe7a9658711f4f071b627a6..0fce1d99d45dcf31dc82a6cae86a5288f711b4ec 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 ef629585b1ab3a4ee9d0c455dcaa4e0e1a7929ad..714b3ad245927367c2aa3e31cfd55cd4d7fe6c5e 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/LAN04.xml index 5974d67e93a6b5275b5bacbb361783bf3d9c2445..a13f1e62a9753a604278c829a5c86bffe0725c44 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN04/USD07/USD07.xml index 9847c500202296d2533519a9fa2dfdab8fdde6ea..a1fe3718c8ab0ae425f2dc11a7ca336ad620bfa4 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 2fc9ad94491d86c0f3a4c19ae44bf1566110a99b..4afa0fbe675852bf9cb13d25926553ebdce55127 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 f83ee364ca1292c1a26d0af76f8c23bde697003d..ef5bd78a2fb9eb274e67822a999dbe7a3b98bef5 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 dfabc1fdbb60173c3fa265620fcf199da75dccca..207ba482ac4b0047281aeebb156e6bc0e145c608 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 c0a565dfecfa4c9fd145c8736ae7d4e1fd13c1c8..ec7a1679d793c47856130ba7d4f1a6b3dfcabc81 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 b0bf723b68dd9bbbf5675b56e8bf07f94e9eebef..f166aa1b667d84d5e5ee74551cca3fa8743a71c9 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 a9eda1a00d474dd7a7e40bb22e521d150ca75f12..f28319560fbc24d9503cb81f1838c0007a8c391d 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 9f8e0796e8da554b0e00a4bafd850a3f5690a67c..d40eb06463b9894b50a5acbee2068adde1197209 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 05b49a39bc9ece0eade34ded1fbbfbfe48e0d338..1f191288ebee7f1283450438cc1092113ea9ffae 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/LAN05.xml index c39f891bd80684f3fda91c34d28552692b863dff..1443fa83348ddaab382353e116d458d3e427e98c 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN05/USD03/USD03.xml index f1ab30b11e39d955efebaa4e843ebc9c8a6d6703..67780bce88c96347019baf61dd00df0598c7445a 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 5cd478c694b886d85b7f9d8db4aa4085f6e284d6..92e68188286c248f9d4e8e597ef6188322d306bb 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 ea8cde7c2a61921964a3c38d5a0d340c3df3fc43..252841fcd6510c84b662c71e08d3fd448312c635 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 c953d8115733ffd3788b61bfaa3e39cd410881fd..7b2ed890f63397b399dc8762126963338e2b860e 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 3eff8c11c4816994cc8703aa5604f1b0ce25d810..6921548aa722f023533bef4f475e7eac433ebaf1 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 d0d7d32249022d064cfe97a165a3e72b40a37eda..adb8a7135cee44a8b9201f03960fa03120d4bc1e 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 4fe36d2907625cab5cd0508e38a2d5ff7fcd87ec..c3fecdaa800e189106513c87d13cbc8d648445e8 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 e8b40dc353cabdcc95fbf8df4add31e126460ef5..c8040c08d476539db5120d908c83581b918b0190 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 1badf2248b28b6d9ea83504e1191a1d896d680f1..de8cb7c8f90698a2aa5d319889edc3a426316581 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 fb01c72146fe7a208e8ee47d39a5a7a66eb58a75..5ceb0bbe1137cddf8ed9457cbe1b8154b273ff32 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 b9c9fa4fe27fbbfd770eaa1e2215bf20b9cf73af..4cc84cc86108ba8611920b3f9cff286208ed10e4 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 cccab0dab1509062c6efa2b1e256bd2139ce55b7..80653ea472be8bd22d3a51c2d7196b0bd66c70f1 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 748fb7509d86e97a5270d8c923195905d8e1d96e..7a5da4db1f72595143ecee6738857fbe29e5ed84 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/LAN06.xml index bb5c2419b63530e0013c9ba1a62c527e45852ddd..1f8fa317e8a60fdea928ce945e1c115750c05f32 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN06/USD07/USD07.xml index d4dadd9df9ac6ccf8e5807ac04341a9b21434ba1..e9c7ec2c8ba7d0df17ea30bc83cc0fec7da2a1d3 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 4f04a2f53ba251a84829e03651c9b6c776f89322..96869c1d35c8b1cee9273fb40a6a76ade91065a5 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 57689a17021d8684ebbe3dccee7e2657eb326858..175adbc9fe1847b9a8e9c63ed2282f61efb52446 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 afdd730d23b8175d363e3c83890e471a04d4bc87..81e278c0d0a745a73beb4329807eaa2fc42cd759 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 63211eb27b8d8d2829689ac876797c1d2485b17f..414fbf6e46f76c0374de71a5a978a6a26f396066 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 0e32791806f910c3b3d9a17cd2eef89e53f065ae..b336ba62a9b55be913502932bcc1e5446ed3eba9 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 dd1dcb7521bde28c2e22128631032b7570b80a51..b4e6f7858778c707f3def57a329f2b27b97fd79a 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 695cf8d587e46f0d3ebf9b7f95f17562eceb2cd8..d0b61df38e718f9ac6f395410a493a6b71e2f618 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 c981fd56834e2180a24247472162f877fe4ed316..1f1b26bc291ed469c2b3c027c9f734b538514113 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/LAN07.xml index 801b8db5a1d004f82eb1d17bce82d5e2623e8696..63114dd0a906be4be0422289eb70e8fcaab8d81a 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN07/USD01/USD01.xml index 70960be3019bbacd85cd322b25cf36ce7e1d86cd..ba3a46fd64186edacbeb2a91f6f61625143ccaf4 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 0d4946433fb9332bf78b2ae8158aa9f07deb2825..409dc2ca0c4da4135733c59aa2ec8d05620fc653 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 6fe44f608b9f7165e3012d8f24e2499b5cae634c..826414173f393123d08485ef89e8d997a87af9d6 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 45b9c745afcd7992ade273cde331b2d326063cdb..a61931f0f3d7339413b12feb28da4fe1c2cd9285 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 24ce70f1eb2b7e475c97f13521857d1ee92d0000..969dac10dfb7aac130b2862dd11ad262ff38c74f 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 0f7786c6809d20b48a19dd863cc5e692c2cbb2a2..658bd274713addf05f4364da532bf4cb85cc2ab8 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 568c05b01d93b2e9d543635afc0052ed3f8848e9..70f94723e81999e7bf21688d540002f030673e1a 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 2246fe6ab7402815fae14562fcab111dec16d4fe..90bb931fc07c4dbf4c31a4267cbd7ca06b3ce723 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 bcda9320809c382626180f13a4a1a1826fa35367..07ff45672b17b3a7a99a896bf89fbc6bf4c3032c 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 af844f3fd4a4e349f278fd1ca08c6e60fda41137..8e3fb928c93b341014a3a78e5b67d1e674588c95 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 7864e3e7ce36923311facf60856501068e33a2d5..c4af3cab1d0b748be93eec3715521e71cb7dbf67 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 38c74e4dd5be94f983faad8be2a50431de9415d8..611a2c2f435b8e91a2aa89cca28c54a08fcba783 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 2c8f69074c30f1e47c55ba1b2ef878a8310f10c8..2b231a7d6c183ffc829635eb006a1dbdad174719 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 3d7adb68f6ceefc1b9e9e1bab506ee5660f447c4..611db079b7e39dd5c1f96859cb237f79fcfb59ea 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 da6fb595dd8d93b16421cf767145b9f27bbca3d3..f0b9f3dfa24e263b7f35c6655a1af74bcf119d1c 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/LAN08.xml index 4473aa28befbadaf14d2073ea91b71e7d0375435..731512eb1deb056ffa02ca49abc91ceb7b6c581d 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN08/USD07/USD07.xml index eff4ffa7978ff52a8f7049238d5ca951656e3644..cd36f2518446058b5d1c4b0dae1bdb86c85cb055 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 9cea45b6c61cb72a40648f3014c90b7c7c19ade8..62f4f7b45c129e7f108b5bd21558bea3a8024996 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 b2c1a3f32b7180b96097ea76cce9c92ec506eb12..1e63fc52b609de1d8758c6657544470145eaa32f 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 757442b4c58ac4a0147bd07f7da3ddccb34952f0..a03dbd2971c9a6088bd36e8d63cd7fe417ade529 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 758ec81d01bda7e718e9cdcde31e29ed046f49cf..d9ee5cd8edafe69a1fbb2a709786c569a031779b 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 dbfd41c82b2248fe3e070f04c927aff6a0e72bfa..0d9e166fc66d30ed12258ddcf48f5b40378de3f2 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 6e090b77735b79b71ff39bfce86a1f7b3526e498..b759cc771cae564506eb54e099001c7fad189317 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 14a91d307e5359ed64fc8880fc48ae4e8baf8498..97b09142f59661542006968b50db84f30175ee8a 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 94cd4832839358155015533ba704380ebe43b2c5..9ec8500a8254a7fbfb01cb8906bef7ffacfdaf60 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/LAN09.xml index 501284a20af5322738e9f48511b7a27c856ff58f..169fc600f691f44d040fd48c38705fd43d9498de 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR07/LAN09/USD03/USD03.xml index ba0274fdc8026cd0c2c5f9cb8e66c7119141d878..159d9ab618b1d050cb4d13f530ca3b1221d61202 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 e6a26fad8fafdb8b2d7a778c648beb48dbe82325..901f41c95ba07cbf3355362af4eda8b8eeacf6c3 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 1d65725a7c045e7ce891baecfc9b935724d3719e..b97efd8981fc70569ac87d6eb2ed507367ce583d 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 64eb6d7fdb1d43176a9f6474098e91ea4f851080..2a64623731dc89acea56a4d8e5f47d42f2af284f 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 b67d5241cc80023d762496665b10f947c188ebdc..cb1ce998ce3f15ec8e3868f924debed04d0d7a2b 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 8d1bce2baafed1a763a037fa45534b3f2052ad7d..d20476f9334c22aa71559d922d8fe1383c0eecc1 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 a3078d702fe5bb18e4385406ece38dc3a6b4e33d..68df4d5edb4742ffdbe1f3015e0c973d5ce73205 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 4338195205b9ad3cb2f51374ab9d71eda1b3a959..66b6140ff8293ff6dabe87eee390f56f22b216d3 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 788b57d4f0c14ea93b7bc6eca1c4986b362c73f3..97357ab36256bdd76cd0d4f31eae852d1dda3748 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 70e510605bee6580fb3a590083dab45d50170f1a..523d6c801d3649280ade5f097b98d5a3e6972bdc 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 316e6f55fd5eeb0b1d3cba4d4ce507a30936bff4..897d3b72b2426204a7f5d016f72b2f0d06496f6d 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 837063b8dbe85171b68a70e4e6bbacf7a12fd7b6..ee0e5d8d29ecdc3b51baa97be070407df1d80096 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 b88844029117d6c51983e81b2002d807ee91800e..d1fbb2dd5e0f500fd13c8bd92e82140b3c00e50c 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/LAN10.xml index ea14c5b30ba22564cef8897a9a4c067c87ded93e..9ac2398ba0da8ea689cdc4dfa242c85ac8d3ddc0 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN10/USD07/USD07.xml index 80be25c502671b4a4b06d5c8e736ef3757ac14cf..623fe44449bb263078a97e825d0f9086e80650c6 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 84ca6bf9ec614d7cf1ffe9c0d9d17149a7fb03d7..96814cae6ba5f8dc2d5720a61495bee02fa8c689 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 9efda0b307118d4c0681db4e969d4005c9f5dfb4..b0c37ad9a83fe1b5bc8611e936e47c9b2f386fd2 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 c9bae4aa1223ddf5f417ab6262af201d7530dd2a..936d6a84bb3b52991b64b86316b8b2479857c6d9 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 53c77b48751459211816c70e9d33cfce3dfb511d..5318c0b5eec4acfd96817429fe2f812dde20f99b 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 e06c44246d3ef30b237b563cd932049589f9fe2c..e4ec298615a2e8d5f79cb60ef08f8e54ebb48812 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 9650d13d3194be5bd4322434d27e92a5f2a83e54..3f011fca51d854f470040e26c2f24afb4e7b2b42 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 bf9bab2400c9d0e05fb1a0f74e9c5b18dfd72499..f65c5cab6de15e82925829a73f6d293597b82c37 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 28cc343c1ed95a860cdcf951b291c81fa3334eee..ad714dc8c9d33d915f54e0dc996d74076e17e76b 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/LAN11.xml index 1f01dc74de001d6763af83300aca0e6745195bc5..c881a1bae25d46480c2838dc6cec40a6572489bb 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR07/LAN11/USD01/USD01.xml index a4e57242f50a2ffc250e670548df1dd1b2dd0f91..f6aaf3f1d5864152ea41f7e8b8f9dcae7cd21a5a 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 f2083adaaa6b74f14e60f918249a7a87219d26c0..080beaea6a93bdf13e3ca340f3e5e4ca03b1a494 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 a43904a8d15e8801e383173e03003088e87c4524..cb82652d8e54f4311301568180a5b48d418c57db 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 b158de700ce8c681dece54d857b762915e070b9f..10e50aea88570ea0c63fb0f41f5189ed412f3001 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 f70aec411d85e76ab07d8c4290659d07614ad90f..8fe883537e9b2eda1d138b853c0894139dc0c242 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 5569e5baa0541a4976e6f8123e4ca56a85b654d3..13f3f27923216e711dbd59143bf0f9d820e2a7bb 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 275fa3f3a0c195a0883601398d99cbc23e9db011..7dc1b961e11bffb233a415bee9a6716e221cf85a 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 a00c8148dce73572678c1e3e62a57e3c3218798a..72ba5d050c04ce793796310ad9bdbb1389800165 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 5955f5b396ee23320cbf2e60d782aae94af66850..574f242c17e17895944859ccea527bd49a34d8b0 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 47258525b09535f597f5335488b8c286a7370254..c0b1497d348c8b2febf615174fb8b91af79af3f3 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 80358aba5ed91c73e21afe4eefc22de63c12c773..b1dbd847d2fb9bdfbffa6f59d37bc51711e632d5 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 8f2b7cb9b39a8754d2e65edc58ce174c1b0f1e27..9020b28eb3473668fb7f6caedb3336b40943fa57 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 c7dbdcafd26dc9f66d7e4e4c2dbe425ac1d564ed..dcc82e178da839a83fe75a1218bcbfe9281e25dd 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 0e6c346b0ac5156d32abc921e63535abe34ae04b..b2959f87f0b3db275c24c47aa4ca2d636ac59d29 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 334203380618192b40d09d47539a3b80a6b377f8..cfc12bf8aff7ba7b2665bc2527808ab6741ccbc7 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 c6ab9b326c369a48e2ffc35463f72a121527e9a1..ea3fe4c71d20700a5d09d0159055c1225c8ceaa0 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/LAN12.xml index 938aea2922d45e0fa56c9dcaeaac227236941e2c..dccb61c28218581881d71e159aff40d532e81ad3 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/SECTOR07/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR07/LAN12/USD07/USD07.xml index 3335a683b4923824d5a6de341078d8977bf2d082..496df9c58d35eab63c799c4967f89f30da3dd1cc 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 bdd5750d978973a7747cbe661ea2a3726439ba85..ab354e14f7725c440aef836fce6d2def8d9745df 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 01fb88bcb5132a10aaac1bfd1eefaeea12d3ab08..6a72afbdb79f3dc37e16c4ddd8911593254caf7b 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 61538f14c82afbed63bd4598e42aec10031a691c..8b8c7586a640f22b26ae0e281eddbef915da7f66 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 e7c6c7dcd94f95b923b2d556d9c05317894a9dc1..aac53e92a11efb18de5bfd7c4c21745cccfa73fd 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 35a68608ee5078cf6d91ff03cabcbe4f8d24ca29..9a36e3ff65324947b5e6b2e2b66d6c0ef52ea8cd 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 f3be2c400675842c30d9ff1361d00b1c970dbbde..b1aecfca207207075bf9fb62cb761d8ec641955e 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 d1acb01b2fe59dff06f9e370ee265601d692da7b..17f6a8849de64543f396904fbc2389b8c2d6a63b 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 c17933bb6d5f23504c6941370429917352e7c3b2..be709bea2202abdf5d7e2cd7edd4b09ac3db7f59 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/LAN01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/LAN01.xml index e25cefb378e1a29b1a71ad508e1074ee73dd9287..c517655ed6d365ffaf48b2795cc1f0294912823a 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/LAN01/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN01/USD03/USD03.xml index 4cf698bfb158f61a137d03d8ba31106963fc638f..6faa4ac4439b47d76818a71b350290de7295f9d9 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 486b0985a1f122449d9bbfed9f71d618d6a79452..0a46191302974306892cb4b68ba0b8b129dc9e4e 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 f8990f635d702b94931193f47732845cc0b7df07..ef33a05391f865c543d1c6a986328f712fde2343 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 119aaadaf8e8d5b4dab1af4815fb26164cdfae0e..c9d920b67dcd41df701089f7bcf4560f35a9ff9f 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 c145fa82d93fe693bf383c301fe4bdadb769dea9..55f2bf733361d02640e8041fb32f851e0cec0a3e 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 23bb4a3b12fc202491640bbad83210f0ef1edfbe..fd83c90aa179196c091fc430214ad2d0b9741627 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 353357915263d5aca8bc07b3c4602a0f6efac4f2..8c26c12c7aae2aec818dc9212b332a53f9a4bf9f 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 a40e0ac93edba7c8bcbb5d32e158702343aae9c1..a6ed74c8dad134d0c6a97e180023770c7fdfb483 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 8a69097dc97ba6a12bb43c400ab241b25d542d71..bff0335a39df573a9420b3861b35763e05c368fa 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 aa2a03b19e49c2e206435c37c0b31eda173c5143..4ffae87177fd70a2dd465cab42de9b4e01708848 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 21eb91265fbd5f2de75ea7d0368631bb1b135dc9..a0df0fd07a0254041df4ad856cadf5ebf52db967 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 ac9b0f5dd57a6ce93d276b2a4bc89e24cff89720..82645b55a2ee4917c6aa6265498ef30b6f13ad4d 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 17bd246b753af36e48e1b50a3b03d5c06738a668..0d1386bb10bca30873f7c9fa594ce207576f51a6 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 f75415b081c3ee066600cffcc5de1b071365cc58..000efea65e1692d3bec6a1f06098eb88047cfc89 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/LAN02.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/LAN02.xml index be8a07fa335ba3fe8f0a6574d8f2e8c7cc3cf3a5..e64cafab0c87a19b05438a030d4a1965e2f5d511 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/LAN02/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN02/USD07/USD07.xml index 24fdecc63f05d34edea21c518bbb426200dcd4db..cf2d82be7b14d01b7dc6568fde36f816a12d2c61 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 335bb99343b508ce956526bb15fd4c71820e3896..8091876b599946c1e07334de2cc60a7f08200422 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 558aa70f0124bc29ea0dc922f7927261d6db4b77..95386ceea180bcc27c6016ea4402da1425316c82 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 137905e31d8f7de74b49a50a16a295c73557ba85..3cdb810f4e3d2c1fb3febd884f43619520240cc9 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 f778f1f1a947fe4d560e1464669328528cdc40ac..fcc7feed78b2567b9ce539099eb0b07bad2458de 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 5bfe37a26087a0425028fa6b9ea6f82a421121d9..60d6481264fbd187eedff077a23baa4dbbb6b8c6 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 d417c472dc0b3fe2bae198d5cb7d97fcd9a7aaa7..01f7f23f115241442c0d4ff9c76044a67ea74495 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 ae2ed88e2d3a0ce4939279da9dde775065a7eb47..24da77483e3d50c647a75cb50d2b381ff81ddca8 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 2adf5ff5effeb0c1a0cecc75bd6a672925530bfb..7fa793c73be39294d79a0811fd76a26f20c8d806 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/LAN03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/LAN03.xml index 8686c1de37518d0c09189a19c2067f4d3156a9dc..3123425f43026dbb603d8a47034dc981cf28578b 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/LAN03/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN03/USD01/USD01.xml index 8b9f0eebd419e14f18ac4b0a2b02852c67493296..12b7a4432d2f19f2c34ad4bc27026b487ab2eb25 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 58af38dc3b98063744900e81cbb6ccb7f0b459f9..35d79c39b5ff2e35cd332418e8b38fde1fd58f4c 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 a5670e079756dda112bdd93b896169bc12a99715..58a465767c4a798b2f46d0992a3f59d353860a01 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 9775efa3614ae7eb2a11b08d096e93e52350e34c..3df696165b6b0b9c23cce17d99a7d052ad8f32d3 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 389fb8d5982f93bd7c6caf3e688aa1b2427cb85c..08b3af604c555e1ab8f9b9c92ef612aae2f0110f 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 d73802be629b45d708fb931c887f90aa4df96371..76bb670d5c0cb1c79babf3003fd34b2679659ce8 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 e0b117692d8e7eb1ecb7ee50a865282ae35cc805..6f90b742049853f90855d979cb34a6e85a800ffe 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 bfc90ae5063c4900f6290c069f40c63fbdfa44c3..16da9880814f6495c7c64e5d3f1539d2b84be791 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 be163d50c63fff4df4f4a327eb960394f5a73203..bf3143c88f5b85d3f75b9db219d13d962c57e85c 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 9b0b85616a590dc7ca8ae6f521871e9fe458075c..e71d27fa9b5d3f47f8202e601ae11243a5ba20e0 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 7d34d17c33461990c96c75d41a522f068c865e0c..803e8fbbc9c82a3a077eb6d2e1dad39f50077dc4 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 7fb23b2e732c83c55673b96e90058275a5940484..9f7a5010573f2b12c6c52916eda0535c189f5f09 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 d18af5d9a9c94cbfa16ec2935ebfe8ff626bee53..d812b11fbb49fd273fc218e96ac537fb160b2313 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 17f5856108e57ff5e4c9c7a74119969f13c45c8d..560fc85e3b61dde473c82e0e905150d072f30f30 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 ea202f67556af6db50ae8a1c821201487e73889e..6d5642dd516bca8773187d3343e9aa263ea677da 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 82c16649b3b3471375985eb813354297682558d0..a44b60d3cbd29202976365401432db6f201b4181 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/LAN04.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/LAN04.xml index f4917029f0b2e778c09e817e976a9cdcf6afe4ae..35b97c495cf1336e1ef547feddaca92dd9441876 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/LAN04/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN04/USD07/USD07.xml index 8a2679e3d2392f21ddf84fbee9b60672bedaa356..2b11a56ce5b8a6fae0b1915b3c3047007b48cf48 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 ebbd5f21d3487746a358e5cfb615995c5df88984..c2b484d04f7a8cfc7c668daecee5c2eea0d5f216 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 f85b9f6a46db08749cc46dbce64f9a8e15711ca9..a554bf4ee358261f026954016e0edb61718bf4cb 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 ca8c55fedf4766f1feef268649f133b1bbb63c9b..d5c786848857201ea80f0df01a1de05a9eeec015 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 be2f075ca6056cff45d09b71eb6668990ba7b099..d1b4d826b6e69ede035983f98684e2b554f4f812 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 e315e58aabd490d56666c8685183b05cf2b03329..3aeace2f3203915ad19bcf6ddb2105b9b5361a36 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 c1508634d4a2f0b81d64f6fe439108490510418c..b685fed3b07c536d18a63e243bb9904f31e9c9c0 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 9dfbc3492e1ffc666b8adb8febb2803d295551db..e32a58120ae0266fccb1bc42f2f2d6f92999abf0 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 e11fc29aea324de9ec7b4d2c0833419871ce76cb..a5c1d55f980d0e5c777df1850bd5884f0ae1e42c 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/LAN05.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/LAN05.xml index 78de4f955bdf5d566f87d897115ceae1ea3c5e5c..b993f07bebcf8f1c37092abf21fe07da4eff29b6 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/LAN05/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN05/USD03/USD03.xml index 56de32ca7c208b28ce1b1358153474bec041183e..57d16c2cd11c4b72ef7be2785e0e478d3b9e8c99 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 2a26af7192a21c2541435713e4786001f1bbebbd..3cb3bdc1d38dc3a61e022b0f33247cb99c9352de 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 8e8fab31e928ef471407098d9890e446c2d07041..c4ff15a9f89bfe48331d03e9fb18f192d25ccc55 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 a7f0d83d6899d7c49e08db4725c8fc97e099de20..385008433cda63234fa1de9a4899200b09720d44 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 9750ec1a07a669e6b86a3a1d37ff7d81944d57c5..d5e4b05c29439b204e9363d4ab8a417bf309dddc 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 23d1f03c0f00d131d4d3bdbdc9bfc7921ed8d093..98e3b8795054a54b7dae424dad4c48f770d7133d 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 420701e226c7d726240d8aef9d2dff12ac52e50a..13bda20469f20b7be4900e11d7897e0b2fe10ea8 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 88dc9ee89b5a07705929ca0b3069023de8ff720d..c8e928c558ec638f804f49c506bf4b519038d558 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 5da33b6adb706ef2ae0edac9d9c0399e6f2e1117..333d370f44380bfe824415523a2f872e61ae31ae 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 3167b81fbac59f435e46f7964787ffa02e2e9b05..f8310b7bf0353dc5d79a87f5ad538a0f6e9b01be 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 6ba63ea4fa41a735153126763d3d3737978f2fcd..7b984ff1017824740a91cd463d8dac4515e75727 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 b4da0c12716ec4a410797f04a76121ae0fc27966..4a589bba68e833c875c47a51d5f9cb53825d02fd 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 232640644c2c6682fd1564ef9b37656cce2d7769..2fee934380526e9bfcb6a6e38a320edefe6da470 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/LAN06.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/LAN06.xml index 3ab74e3aec0cee62f5c05f64337a48bb544b7925..32ac1643f773b461234b7a60cbe83cf1dde70039 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/LAN06/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN06/USD07/USD07.xml index c983408c19547e80be713b0405676065356bbfa2..6d639c20c81b688ac4021c02e78e021edbb19670 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 f5820d6ab0187492fb7304999d632c328b65521d..072e31dce190b4a8f32fd180667d9bb20ce0eb67 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 c14984f2fa6a81b899bf6c59726ab81de9166e6d..50fee485d3db92d28c727ef2eec291dd25444727 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 d7fa62be7457bba67f99f22ee59876d63889de12..8ccb95ac779aae88056acdecc0700f546e4b8095 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 376848f12a70d280f5d2d1f5a97f43befdc36d3e..5749721ed16430c8366acfcd9b3f375db3849ecd 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 bf8bc7980a5a43ca9d8e3349e336907d00e528ed..f2b1418bae7076507a19f87aa7045659985393fb 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 8be70119252fe87957726d0ea56cbc86dfd73d7b..478c10e475a1e4fa6c1ce237ef377b93bd907134 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 dd8b9b76bcb8b9fb98f5c3ac204d9d17d85e5460..138122e3b88c4e32155852a2ac5f07e5e5a49350 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 0d3c1e5689de7c64fa4a45886f077041d8a82266..05e5d5b23b0e397471740feadb45574770cab55e 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/LAN07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/LAN07.xml index 5856b36ab662052d3c5ff13406bc72510b27418b..4bb566b293ed05c4a728479f7ca1bd109b6d57d8 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/LAN07/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN07/USD01/USD01.xml index 4a6028ac1bead59c1a8cb2199e1781594bf56526..12e6deb3daff6108c15778cc313750dd0b93572a 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 5bf6fe2c0c45b374888651e2374cf2fb72f7f764..df860fd949eac5e5ff17b992bb8a864a3ac981b5 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 6c64d1c306ed846536ad329ba9089e79501fac4d..b40dddb6834ad2d90a95fda0cb3e7c7302709888 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 e324b53101577f273300cc824e17fcb767fdbca3..07bae3bfe4f5cb9a4f0d09d297a55389c86ec2b7 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 c156d83e6fae07109a8e386c36c2ae1a73b98302..4b779139a43820d7fedc26180c63708e27f1d2d0 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 15684a5eed480d6f72a208f44a7e1486c878a42e..8198c4dee5f80d5b9ee712c69d6dca54a0c5b782 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 c762c13cb98b169ddfc48ccbb0b632cb2f38ed7e..a58adbe154f20c3d7af4d2d417a4a6fb201b2235 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 23cc796ec7334f98efc6d9e0de64eac7964694ac..cf63df429509401e621ac99d7550674b0e4eacff 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 3e9312b18d7b67cbce4531db428f2b7adc3cf9d5..17f568519e9fa886e4e51d562d84e85e717b8843 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 ef37cd087c87eae4824d9a300fc2f3495ce1bf58..35f92f1cdc893542329469a62606f5d7b33daec1 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 64deafa046d8410ecc4de17a6042e2fef1c6197a..2cfff20459c52b4fa278d4051444a9a52d84a4b0 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 d636f777a3cb8052b8f22c4f46407475532b3027..47472275656c892fd7dfc8db3dea4b8beebf16df 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 fc129ae28f99516bd6f24574acc71766ff17a9c6..097d39a9296e76a4fbc5751af7af36b5f3a9d32d 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 daacce83572f06cc555ceee3699f6d5e579eed75..2f7f0db97484563563b32a222305fa66e62420a3 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 328cae2eb74ae63ceba639a52532074acd00e6a0..5ad868bacd6949277c17064ddb186d609d2ec323 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/LAN08.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/LAN08.xml index 0661903dbc3a00eada00c1f29bbfcedfe92604a0..0050f8a7bc88623a1a1b1b957bab392218af8281 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/LAN08/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN08/USD07/USD07.xml index dc25a85d5f4b61b16be49351b8c54d2e5fe31e9c..1b83d5a8d066aebff37c855cec881a039a70df16 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 ef4c51e4d2fa5b0871e9ee776357b360f4a1a63b..d31efd392f9961cf082815cdb16915e3c34a3107 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 f0c32117b6bd4167fe1d2c852f5345edee55beaa..cc9c1f5141361772ce195c514b7d8f1f47c779f6 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 ff9c70d7b56fd369ad74a694845a16fe7c244204..621d1ad2bfe8701d89c99748aaafd6922e24fac2 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 1a75c4baa26154aaefa60f9610b007f3a2f2845b..825b20655eb23a6c0d77e6d68eb372a8188898ed 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 5b6bed66b6e8ce841eb90df2dd94ff93791e319f..b12c7202ae2141d9f184f511fc9ecd9af2b6f7a3 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 beb59d4fb2a509eacf45a35e901b415433c49e45..7ebfbc7f77de79d17c4ae16f46ab536f0da23ef4 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 4f8c5b6a14196147f73f776ee853ec87310d3dc2..d100bbe54e1648299f6c3358ef138a816638a003 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 70afcfea04ea47b8f9d1ee70ea1863db6cd30106..265a53a762434eb05fe96bee0b3b9c8001325bf4 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/LAN09.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/LAN09.xml index 8cc32b2e7559ce3ea36b4e072bb5bc950ac09395..aa3fa6b8bd91cde733bf39dfdbbb943efb0285e6 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/LAN09/USD03/USD03.xml b/SRT/CDB/alma/AS/SECTOR08/LAN09/USD03/USD03.xml index 0fa4dd8de7fa2cf792e4bc3a3b3cbddf17f63d3d..edd8ebb437364465947d7900557f107dd7bb1601 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 ed7faf1121008226b0c56b0c098994c592d60625..68777d970861ca2c1d7224d0929af3492717f17a 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 50877b1e01d278736fe158681ba2249e59b323f1..7806348562f73192baacb39e6064a4e144764ad8 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 0b70b6f0838cccc5ce879e05dc53f554615e5a2b..94d1e6a37a458a4b6b10b7cb998e4fc2895e4f93 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 189eccda1d3147957ed43dff6894c6d83ebed527..119948b22ee9f3b93ee5042ced8d40d0b714c69e 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 e102196bb85c6579ee0936e870d530be984e9e6d..1e617fa2de066e77565cfc48afc9214ea6276b15 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 5c3e1aa3c0dda22554e5ab518ccdb350507d194c..5f2ec2c3f2fc474ca2d6f3fef382b7d043e1266c 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 ba9fcee27cd8be13dbb60fec57ffae240f004639..acf6f04a6cc84e49a6518437afaba75cc507dc6c 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 4cd0e8266ee633d7f1711d9d95a39d09a537cccd..8b912835051b26e0e0ced976b2620d5d7331bb33 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 c90af7bc68d039ed95f5f9f70ad7b7027fad104d..832e677d437c8c2739a64ff5043059ad8c35d77e 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 e0c4c9ba7efe04cab1e506e15f971eecf8db0e38..d2cdaf8a62befd54adea00a79bd5d459931f94a4 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 5135c71b1c20c6ba618325cc226e5ebaef0ef917..f134a6590643efebf388f9945fefaca607790170 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 720c800320c7c35e7677a03eaaded571c744156c..2935c7b04ba45128ebece2188af11c3a82234a06 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/LAN10.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/LAN10.xml index fefb3f07106981e4f12f1bd8623323f7aeca21cb..625af5b23d4ef39deee82cdf5bb56306ff2beeda 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/LAN10/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN10/USD07/USD07.xml index 977cfa641c7e2563815603a4b7984650b165b883..232814e4064302b0ef84809697d66305ded5b4c5 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 e2eb0df32157181bc581ef4ab549c0f5c29ca562..0256ff8a25bf2a7db79e8d6d594e772ccab0b1a1 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 73d467247cfc19ac308802ad79e9e91678ab07c0..b9cf4ae3efc65e39051ad5581d8a491fd32bb548 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 e36a40e8d31ca055e2a951aa2a64831876ff7fd3..e4a71e21f78d3922d7f87c3ba95b84e58f002d5b 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 34d7d246f4643e082089a16e2e9b6f683fe0d106..b72e07cce48f5d072ddd925095d4d6c226466d5e 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 7d65941c4e2b91140ed579eaf30b23b343d086e9..29d8c8e7c5b2713e2e46672ee76807eb8366fad9 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 309b1f9799bac83115f558c7b7eb3773e7bf2c83..7447d542bb6e3e9a7fb34e08d8dc1a548cbcc201 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 e01585347cb2ddd08da9160a642a433d2d0d7e71..5d98a78c83675a5a3a04057119e87c832c289a54 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 c0aacfa045dd27fa82f2f803b1a81407be797036..0adf6697c14184eb5c0cb98334e4b7b5229509ca 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/LAN11.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/LAN11.xml index dbd752722f504d57e428e4e3222cf49d2f93cc9e..a11a99811ffac28a1dbfcc0548b5c4e5f4148283 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/LAN11/USD01/USD01.xml b/SRT/CDB/alma/AS/SECTOR08/LAN11/USD01/USD01.xml index 5cfee8afc09793e8563ca972b046958288c65885..733b21506a19c799f9354009b33cb54ba62840f5 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 4abb6818a8ddf5f602e8ab90655af03cb1693d80..a2014e898d894c9027d25c4e6a6bcaeeebe2ab77 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 cbe61ad69773847cd91356991bb05d8a031292e2..cd2b6353972f898189d81c40764d01130ccecfc4 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 98f82cc23c23246a2315aae6ae46052a7cd4c2c6..573fb9be85e397b679f5afb14aa7c7037eb62a48 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 886ed8171da706766ce2658edf9518fe74636f05..4506b29566a23e84f5da9f6cc67be8360ffb7611 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 d632863b6047f220627a9f6ae708178a8625642e..e7332ac8496ac78f6307a54d17e5b86494082189 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 274f0bf3491f7d8cdd4efc16388a3fb96464974c..7a77c88b4ade383fe92c45f09768ae3b53c29ecb 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 d2ea11c87a869672b74580e2a45415a44ee029db..f9e3d08c2d34c992bb08f9d8070b679d98913274 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 92c16b20669bb567a46ed4c0cf2bb659b9a5106b..32b2394857a7403bcb9ea8e0eba45fa54e58cebe 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 eede3fb88ec660cbcd43639a7f29004b02fccaff..f96829e6c6ea876b595c4d4ff462834af544d4e7 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 cc1c97b3acc4ce51e4058e9e78a7837725be644d..deae2f66779e399e97dc9257d9cf67ec0e8f6932 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 3ff4d9bbedce95122ae2fc32c44f0e984a4dce75..64b9a5185de3968d2cfc57fd11b78b1a0f4dce4a 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 2a1d80343cdf23c5c01d3716fb0fe04c7c9834db..025c5536c3618a7e5efa2c2c4fdb74e6e7448ea9 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 7a082459fee44c79fb8cec4e26627ddb9f8efc0f..200b0bcc089a07a41597e4bf51cd2c17a1eb4cc9 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 c0252cf79f5e55546005c9c09d610f01b8290367..d52a2e2e06e8ea613885e0877620fb6ae12c77f6 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/LAN12.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/LAN12.xml index 4bc6db52fd2482d8e9135f6965facdfbcb2812a7..c3dcfbeec999f761491d3b195a5274eb7e6d5ca6 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/SECTOR08/LAN12/USD07/USD07.xml b/SRT/CDB/alma/AS/SECTOR08/LAN12/USD07/USD07.xml index efe40f4d51626c212030645b885aa6c12e16cea2..98ea4bb8c59efcfc220d34a29bc285b7d5e45ed1 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 0aec43224ffd8b598d8c54a499befc988e486dc7..0faba50f2418bda7ee2797503ebe3a8e2e2d9eb0 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 08bd8c3f46da6ae8bc7190036f65ce53368cd975..a8f16bb3f38e3e72c40d927d92577b9a57dec634 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 86c56123262d522eec9e2c4acedcd7f33827ae91..515360c6e76984f32cd4c9ebb45c2d79ecc8c604 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 6594dda96af33729e45d27e79d3e56721f728d84..5754242d0e7488286996725ec1394b738276aadb 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 b7b10056fc7ae7ad16aa81f60dd9687ab14a90b3..b38dc70f52b28e3e7de55a02b7d6e126779ad7d2 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 48f6eecf697e8b9630c64d790af890beb3e664cb..667fa9c18723d7b0fad17d1661eed4ecf429fd5a 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 46997138f092d1ad47d0ea9518ff72912c4a6b3b..96f572f5a9f69ea515e7d07bdb8672f57813aa8b 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 705059c85f8fdb1efd059b302db2f03e80f67760..fbb4ff37c5e613b7f439aa6e0a9b135b9632c994 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/make_lan.py b/SRT/CDB/alma/AS/make_lan.py new file mode 100755 index 0000000000000000000000000000000000000000..42b27df15cbc422cd282de82e5439328e85234e9 --- /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)) diff --git a/SRT/CDB/alma/AS/set_calibrate.py b/SRT/CDB/alma/AS/set_calibrate.py new file mode 100644 index 0000000000000000000000000000000000000000..1bcddca13854939cca0b714b1774a6db91d5db7c --- /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.") diff --git a/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 9a3a7ce7849377b07b3f7983b3eee9301dc6e7f6..f055702654c9abed0bebbd68b8c9e2d710f08ff2 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/SRTIFDistributor/Configuration/Configuration.xml b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml new file mode 100755 index 0000000000000000000000000000000000000000..51fb4fa2cafdbb9a78e2dcef41b2e2bd2b72299f --- /dev/null +++ b/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -0,0 +1,61 @@ + + + + + + LO-DEFAULT + + 0 + 1 + 2300.0 + + + + BW-NARROW + + 1 + 0 + + + 2 + 0 + + + + BW-MEDIUM + + 1 + 1 + + + 2 + 1 + + + + BW-WIDE + + 1 + 2 + + + 2 + 2 + + + + BW-UNFILTERED + + 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 0000000000000000000000000000000000000000..e4b6c1bf2a3716931742f8250d02883bdf33689a --- /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/DataBlock/TotalPower/TotalPower.xml b/SRT/CDB/alma/DataBlock/TotalPower/TotalPower.xml index f582d499a8fc25fbb6b9304d6ff55b2b4acec113..5197057b37c1d4e85549afc05313b7dad4dc3c6e 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 diff --git a/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/CDB/alma/MINORSERVO/Boss/Boss.xml index bd5ec39c93dec70594b92f6598b1c653f30aeee0..8d218cd08ca141ff56cce8780b12951694d3c665 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/MINORSERVO/PFP/PFP.xml b/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml index 7b9ee1231eb3e04fb2eb886718f5fa9235e30e9e..e27a57e23ee65e32e0139b1780f1569c71362c5e 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/Procedures/StationProcedures/StationProcedures.xml b/SRT/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 1794c26a8e34f91dedb8c2c10a36b0c90d02df8e..13aeadb6575d0292654c0d93329056e696a8baf0 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/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml b/SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml new file mode 100644 index 0000000000000000000000000000000000000000..88a7f0bddf0befdd7f3e039ae125196305616c66 --- /dev/null +++ b/SRT/CDB/alma/RECEIVERS/LO_CBAND/LO_CBAND.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml b/SRT/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml similarity index 100% rename from SRT/Configuration/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml rename to SRT/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml diff --git a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml new file mode 100644 index 0000000000000000000000000000000000000000..d91a8cd087b868033ab0f7384f31a749be9ddacf --- /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 0000000000000000000000000000000000000000..bf284b212e0fcca42ed5f3479e118b2304c1cf00 --- /dev/null +++ b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml @@ -0,0 +1,8 @@ + + diff --git a/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml index 83f09027999c8bd1aa5898ddece34c002bf085ba..b51f1681cb3aa3e78db63c239bf74c9aec84cb36 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/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml b/SRT/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml similarity index 100% rename from SRT/Configuration/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml rename to SRT/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml diff --git a/SRT/Clients/MeteoClient/src/testserver.py b/SRT/Clients/MeteoClient/src/testserver.py index af166d63ba38edf8a2948324ba8e192b6731ac8a..7ff17cc92c3d8dbaa7c030875d7f499b7179794a 100644 --- a/SRT/Clients/MeteoClient/src/testserver.py +++ b/SRT/Clients/MeteoClient/src/testserver.py @@ -2,9 +2,9 @@ import socket import sys from socket import socket, AF_INET, SOCK_DGRAM -data = 'r ta02' +data = 'r pa01' port = 5000 -hostname = '192.168.202.68' +hostname = '192.168.202.66' udp = socket(AF_INET,SOCK_DGRAM) udp.sendto(data, (hostname, port)) received = udp.recv(1024) diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile b/SRT/Clients/SRTActiveSurfaceGUIClient/src/Makefile index 839c9d6a14720aa9e0f32561155381fd0ce9a718..0c906031be76b6a119c4452adbf855f1883a8083 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 \ @@ -302,6 +301,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" diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp index 0c2ffdca5120c73d265f327c3dacb185ef7aa8dd..5b8fe1653b43d06d8b915c20851ea9f7a70b28ce 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 23236745a41dc5ff95536a21828de5323ce62f7e..2bce96583d8ffa6a158e73c8028efdfeb4f38abf 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 d5d300002fba4b0809705155c05142d575924304..50ba4bb31935a56d02f1db14540e2a5898cbadf7 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/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp b/SRT/Clients/SRTMountTextClient/src/SRTMountTextClient.cpp index 707b3ad26217062350f2652ad20bba85863c7b1d..12ab787992c62d56ddc783eb4ed50d649b0dd4a2 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; \ { \ 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 f3c345f73f9ac48cdbfc69019d8a5517502861dd..581ce3e1d5e178cbeeef677a839d951962522c3c 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/ExternalClients.xml b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/ExternalClients.xml index 6bf67da1309a39cf02905da9952c9158314bb039..58f24085516306c8d340f9083b4577b0a0ac7688 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/RFIMonitoring/RFIMonitoring.xml similarity index 84% rename from SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml rename to SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml index fa1cc995c8afd56ce5f82f033ac0fc57a5c4012e..99a6359be1542f0e985e16c980f34573356aa1de 100644 --- a/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/ExternalClients/RFIMonitoring.xml +++ b/SRT/Configuration/CDB/MACI/Components/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml @@ -8,11 +8,11 @@ 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" + Container="RFIMonitoringContainer" Default="true" ImplLang="cpp" - Autostart="true" + Autostart="true" /> 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 6286603311aa0a79dd2e056617512759d871621c..fd19e1383324891cd6a1afa6d0bbab18bfa0f31e 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="LocalOscillatorLPContainer" KeepAliveTime="10" Default="false" - ImplLang="cpp" + ImplLang="py" /> 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 d62dda1e8a8387c38cc7bf3f3c8105b77b57cb18..eb9a4c43a3444834af72354f9b447ac762a70227 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/MACI/Components/RECEIVERS/LO_LP/LO_LPSim.xml b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LPSim.xml deleted file mode 100644 index 9f839e29157b2d9599547f25286eb689334625b8..0000000000000000000000000000000000000000 --- a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LPSim.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 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 0000000000000000000000000000000000000000..42b5b7832dd5148a934fb81b7851fd1a057d8d65 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,18 @@ + + + + diff --git a/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml b/SRT/Configuration/CDB/MACI/Components/WEATHERSTATION/WeatherStation/WeatherStation.xml index b414a456080b4f3e83b7c011847fd0ac14262110..16d8cb2cbb2b4bcfaf1bd363d196bbf9bfc45120 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" 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 0000000000000000000000000000000000000000..a960e46549ea345764e60423ca8a7eac94492a89 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/ExternalClientsContainer/ExternalClientsContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + 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 0000000000000000000000000000000000000000..8b6e502bf5b9d681d6fc9a68abb47a7ed32f6dab --- /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 0000000000000000000000000000000000000000..75b8b71c05b60e3ccbfe3485d0385593a79ea875 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/ManagementContainer/ManagementContainer.xml b/SRT/Configuration/CDB/MACI/Containers/ManagementContainer/ManagementContainer.xml index a960e46549ea345764e60423ca8a7eac94492a89..4fcb583ec2bff7de34db21bfcfd40fcf4d226aa2 100644 --- a/SRT/Configuration/CDB/MACI/Containers/ManagementContainer/ManagementContainer.xml +++ b/SRT/Configuration/CDB/MACI/Containers/ManagementContainer/ManagementContainer.xml @@ -6,7 +6,7 @@ xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:log="urn:schemas-cosylab-com:LoggingConfig:1.0" - Timeout="30.0" + Timeout="150.0" UseIFR="true" ManagerRetry="10" ImplLang="cpp" 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 0000000000000000000000000000000000000000..6563a97be273ebaf5e0081e044894672271110e2 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + 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 0000000000000000000000000000000000000000..a960e46549ea345764e60423ca8a7eac94492a89 --- /dev/null +++ b/SRT/Configuration/CDB/MACI/Containers/RFIMonitoringContainer/RFIMonitoringContainer.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Containers/SRTActiveSurfaceContainer/SRTActiveSurfaceContainer.xml b/SRT/Configuration/CDB/MACI/Containers/SRTActiveSurfaceContainer/SRTActiveSurfaceContainer.xml index ab3091da5ee5bbf8142d3491741359f80fd6ab4b..30f7ba30f30a2fe79494483d7d92d9b04409460b 100644 --- a/SRT/Configuration/CDB/MACI/Containers/SRTActiveSurfaceContainer/SRTActiveSurfaceContainer.xml +++ b/SRT/Configuration/CDB/MACI/Containers/SRTActiveSurfaceContainer/SRTActiveSurfaceContainer.xml @@ -16,8 +16,8 @@ + + + + + + + + + + + + diff --git a/SRT/Configuration/CDB/MACI/Managers/Manager/Manager.xml b/SRT/Configuration/CDB/MACI/Managers/Manager/Manager.xml index 4a42246fc3b4923cdbd0b126669f3cc306f0a169..2b019586d2a886858daa2121598aec44618ef176 100755 --- a/SRT/Configuration/CDB/MACI/Managers/Manager/Manager.xml +++ b/SRT/Configuration/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/alma/AS/SECTOR01/LAN03/USD10/USD10.xml b/SRT/Configuration/CDB/alma/AS/SECTOR01/LAN03/USD10/USD10.xml index c06bd0adbcdc2492472bbd1d85390192c3f76838..6ce88baf6f87fa413dc1d0706308d6a27280b00d 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 c6963dfe68c9a8363e3967b3011ea463446ccc19..a6ca94bc9d60e1c630d6e0ba0cee104ab642cd03 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 d08fcb28c342db80b3d8cc2c712f85ca1d783ebd..7d7730d16c40f3d207a78d3e69467fc83857efef 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 6c7d6f47831b92c3065c95b9ff2027e84f0a2b6a..236097ce2772f5866d88ed90a3db3b412b4fc9f5 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 1e84081400494ef954b862b69f1521a9f828f4af..14eea798d53cae4bbc558e47abb0d9fa5a0dc77f 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 + diff --git a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml similarity index 67% rename from SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml rename to SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml index 5daf7c92dc83df0c3f79b42932db70c0fc819f7a..193dc0f536d72010a4e82d3a7dada8100ba13634 100644 --- a/SRT/Configuration/CDB/alma/BACKENDS/Roach/Roach.xml +++ b/SRT/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml @@ -3,27 +3,27 @@ - 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 2f7952d28bcc4373d15526eeff1fa336f0f7d621..4e13421870ddefb224427d9d95918bc04ead8ad4 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/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml b/SRT/Configuration/CDB/alma/DataBlock/PointingModel/PointingModel.xml index 7ad2f0a0320af327ebcc8dd5e9f4ac95540080ad..a69e8b4dac57d459e46d0227f4ab729445369404 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 @@ -113,6 +105,40 @@ 0 0 + + XB + 90.0 + 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.0008999962 + 1 0.0000846578 + 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/SRTIFDistributor/Configuration/Configuration.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml new file mode 100755 index 0000000000000000000000000000000000000000..51fb4fa2cafdbb9a78e2dcef41b2e2bd2b72299f --- /dev/null +++ b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml @@ -0,0 +1,61 @@ + + + + + + LO-DEFAULT + + 0 + 1 + 2300.0 + + + + BW-NARROW + + 1 + 0 + + + 2 + 0 + + + + BW-MEDIUM + + 1 + 1 + + + 2 + 1 + + + + BW-WIDE + + 1 + 2 + + + 2 + 2 + + + + BW-UNFILTERED + + 1 + 3 + + + 2 + 3 + + + + diff --git a/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml new file mode 100644 index 0000000000000000000000000000000000000000..1d7bc48b42319e483b00855a41284a919b50c5c6 --- /dev/null +++ b/SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml @@ -0,0 +1,222 @@ + + + + + + SK00 + 2 + TRUE + GREGORIAN + 1 + 1500.0 + 7.0 + 0 1 + L R + 0 0 + 0 1 + 1024 + + + +<<<<<<< HEAD:Medicina/Configuration/CDB/alma/DataBlock/Roach/Roach.xml + RC00 +======= + 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 + 7 + 1500.0 + 7.0 + 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 + 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 + + + + SC00 +>>>>>>> latest64:SRT/Configuration/CDB/alma/DataBlock/Sardara/Sardara.xml + 2 + TRUE + BWG + 1 + 1500.0 + 9.0 + 0 1 + L R + 0 0 + 0 1 + 1024 + + + + SL00 + 2 + TRUE + PRIMARY + 1 + 1500.0 + 10.0 + 2 3 + L R + 0 0 + 0 1 + 1024 + + + + SP00 + 2 + TRUE + PRIMARY + 1 + 500.0 + 10.0 + 0 1 + L R + 0 0 + 0 1 + 1024 + + + + SK00S + 2 + TRUE + GREGORIAN + 1 + 1500.0 + 7.0 + 0 1 2 3 + S S + 0 0 + 0 1 + 1024 + + + + 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 + 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 + + + + SC00S + 2 + TRUE + BWG + 1 + 1500.0 + 9.0 + 0 1 + S S + 0 0 + 0 1 + 1024 + + + + SL00S + 2 + TRUE + PRIMARY + 1 + 1500.0 + 10.0 + 2 3 + S S + 0 0 + 0 1 + 1024 + + + + SP00S + 2 + TRUE + PRIMARY + 1 + 500.0 + 10.0 + 0 1 + S S + 0 0 + 0 1 + 1024 + + + diff --git a/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml b/SRT/Configuration/CDB/alma/DataBlock/TotalPower/TotalPower.xml index 98975c9538f8db3eabebfacd164559bb524393d6..5197057b37c1d4e85549afc05313b7dad4dc3c6e 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/MANAGEMENT/ExternalClients/RFIMonitoring.xml b/SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml similarity index 94% rename from SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml rename to SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml index e07e01a730d746dbb5ac0e5be8a3b055a5c9ed4e..1157ce77f56246560db0ce7618b33c95b806914e 100644 --- a/SRT/Configuration/CDB/alma/MANAGEMENT/ExternalClients/RFIMonitoring.xml +++ b/SRT/Configuration/CDB/alma/MANAGEMENT/RFIMonitoring/RFIMonitoring.xml @@ -9,7 +9,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" IPAddress="192.168.200.200" Port="40000" - ReceiveTimeout="10000000" + ReceiveTimeout="10000000" ControlThreadPeriod="10000000" SuperVisor="Gavino"> diff --git a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml index bd5ec39c93dec70594b92f6598b1c653f30aeee0..fa26b570923cb7d2bbc96363dee19beb9cace73c 100644 --- a/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml +++ b/SRT/Configuration/CDB/alma/MINORSERVO/Boss/Boss.xml @@ -39,7 +39,7 @@ @ 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); @@ -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 = (-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; + @ GFR: park; + @ SRP: TX(mm) = (-1.5); + TY(mm) = (28.256852219272844, -0.002707044952, -0.009870218853, 0.000031617958); + 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); + @ M3R: RZ(mm) = (860.8); + " + KKG_ASACTIVE=" @ PFP: park; @ SRP: TX = (-1.5); @@ -68,6 +91,18 @@ @ GFR: RZ(mm) = (1323.5); @ M3R: RZ(mm) = (860); " + KKG_TEST_ASACTIVE=" + @ 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); + 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; @ SRP: TX(mm) = (-1.5); @@ -119,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 b0f3ce3c79334fa989546a70dbe724f5e159c2ec..c5f176b8adb03de365dbe765053a77d5f5488cac 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/Procedures/StationProcedures/StationProcedures.xml b/SRT/Configuration/CDB/alma/Procedures/StationProcedures/StationProcedures.xml index 75a6e3a73e8c3286413fd6752477e854f6e160d5..13aeadb6575d0292654c0d93329056e696a8baf0 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 - + @@ -77,20 +77,34 @@ - + - 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 + + + antennaSetup=LP + servoSetup=SSP + receiversSetup=CCB + chooseBackend=TotalPower + initialize=PPP + device=0 + calOff + restFrequency=0 + antennaAzEl=0d,0d + + + goTo=180d,89.8d 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 51fe9dc0e218e03a9cdb2426136ace891d02941b..88a7f0bddf0befdd7f3e039ae125196305616c66 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 --> - - - - - + + + + + + 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 d8351a7e5981de5e9ef51366e2de5962924c79b7..4c3814682e692bae36ac5d95dede862281235f59 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"> - + 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 0000000000000000000000000000000000000000..438c631be5ac90b829c393fcb4f9de541a6b8dc3 --- /dev/null +++ b/SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTKBandDerotator/SRTKBandDerotator.xml b/SRT/Configuration/CDB/alma/RECEIVERS/SRTKBandDerotator/SRTKBandDerotator.xml index dd91780c7e877148255147bbb07c9e27143f8748..4286fcc68dd2420497a19b0958230850a5f67be7 100644 --- a/SRT/Configuration/CDB/alma/RECEIVERS/SRTKBandDerotator/SRTKBandDerotator.xml +++ b/SRT/Configuration/CDB/alma/RECEIVERS/SRTKBandDerotator/SRTKBandDerotator.xml @@ -7,7 +7,7 @@ SensorIP="192.168.200.50" SensorPort="4002" SensorTimeout="500000" - SensorZeroReference="660918" + SensorZeroReference="661013" SensorConversionFactor="0.001683884" IP="192.168.200.50" Port="4001" diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml index 0fda5b76a73afba420e20f898e856b4bae1a32e3..2aeec11a9f113723a5a4d469071d1a1f7be4b68b 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/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml b/SRT/Errors/SRTActiveSurfaceErrors/idl/ASErrors.xml index 16f3a9952ff70555d6e5385611edbbe02e431f50..b13f6468fda38f8e3b94e7a369f1e66a0d798852 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"> - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + diff --git a/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl b/SRT/Interfaces/SRTActiveSurfaceInterface/idl/SRTActiveSurfaceBoss.midl index 9524343606f3a7d0d738a029823e962a7e9b2185..ea7e1c3f6398b9190c9beba99d4ea6c0f3589ea6 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/Interfaces/SRTActiveSurfaceInterface/src/Makefile b/SRT/Interfaces/SRTActiveSurfaceInterface/src/Makefile index 5ca84e377999bab93bf79f8ee0cb2170a0c38469..50728f21a0817f139ce7c8e12b528e6475916c23 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 # diff --git a/SRT/Interfaces/SRTAntennaInterface/src/Makefile b/SRT/Interfaces/SRTAntennaInterface/src/Makefile index 287045949aef20d3d5eb75ce1bfbeed7e458d973..1630634b1c92fef3009830d345aa30a4a0177f95 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) # ------------------------------ 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 0000000000000000000000000000000000000000..e11b3cd5da59440640147f44bb1c1aba4cef9dc7 --- /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 0000000000000000000000000000000000000000..20cd627fe4f9e6a3cc3ce0bca543d9d8f43c082f --- /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 0000000000000000000000000000000000000000..411850f955628c7c5026774ae52feacce68d65a5 --- /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 0000000000000000000000000000000000000000..edbdcf3a3b8adbe2f4153698664bc16a5f0177fb --- /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/idl/SRTKBandDerotator.idl b/SRT/Interfaces/SRTReceiversInterface/idl/SRTKBandDerotator.idl index 225fd18a1635791577e8887c22cdbb1f7e713b38..2710d184fc46ef629f62b9c9d94084cf4ae4fd25 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 * diff --git a/SRT/Interfaces/SRTReceiversInterface/src/Makefile b/SRT/Interfaces/SRTReceiversInterface/src/Makefile index 39f2df01263f3609ba0d3d4766e74ddecd39e9e8..7d6e85583a51c2a142ec8831ca3260d817cd8fd5 100644 --- a/SRT/Interfaces/SRTReceiversInterface/src/Makefile +++ b/SRT/Interfaces/SRTReceiversInterface/src/Makefile @@ -1,18 +1,28 @@ #***************************************************************** # Makefile of Receivers # ===================== -# Marco Buttu -# Andrea Orlati +# Marco Buttu +# Andrea Orlati +# Giuseppe Carboni + + 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 fb248b8d5608266be4b920749143aa9a512cd357..7adcfaf6ffa77cd069539221875d485288462edd 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,13 @@ 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 700 $(INTROOT)/app-defaults/discosStartup.xml + @chmod 700 $(INTROOT)/bin/discosdown + @chmod 700 $(INTROOT)/bin/discosup + @chmod 700 $(INTROOT)/bin/receiversmonitor.py @echo " . . . installation done" diff --git a/SRT/Misc/SRTScripts/src/discosConsole b/SRT/Misc/SRTScripts/src/discosConsole new file mode 100644 index 0000000000000000000000000000000000000000..6e9b4ef75fbedc04e5b3dfdef0533845e98f06f5 --- /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 0000000000000000000000000000000000000000..8574fc21c4ee147aca4ee68e739f7feaa81f6160 --- /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 0000000000000000000000000000000000000000..66a95ca53fee639ff00c221d0794ac2bbef0b52f --- /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!" + + diff --git a/SRT/Servers/DFBBackend/.cproject b/SRT/Servers/DFBBackend/.cproject deleted file mode 100644 index 1feba50be46637fe8f74824f10a93289bf8cabc8..0000000000000000000000000000000000000000 --- 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 50afa5cc0493af64d33d9be5898a068f3e410f47..0000000000000000000000000000000000000000 --- 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 bb2ea57082612bf22353736fdaced24ba4b79663..0000000000000000000000000000000000000000 --- 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 a6bf091b522213900a055a4eb1a126d8732a01fb..0000000000000000000000000000000000000000 --- 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 5e1eeb248fb76e9026b5e6207777d5d2d3d67587..0000000000000000000000000000000000000000 --- 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 92d26b31b536b0e9292c3405a8f7d3aaaff804ac..0000000000000000000000000000000000000000 --- 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 df7ab42aff4950aa9e92c6048f915c731b04feef..0000000000000000000000000000000000000000 --- 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 fcb4559d05a90bbbca150263c354486619af5e15..0000000000000000000000000000000000000000 --- 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 2aa96952cfb2b4a621514491cbc8babecba59857..0000000000000000000000000000000000000000 --- 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 ddd) 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/CommandLine.cpp b/SRT/Servers/DFBBackend/src/CommandLine.cpp deleted file mode 100644 index 287e1cd3fdba05e2327ae65202c771605df2b999..0000000000000000000000000000000000000000 --- 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 ea3dd8a49598ed64870fd427f9c74e53e4c07b13..0000000000000000000000000000000000000000 --- 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 dcae8f28f8ae8cd53adb9d86e5b7bc1cb7cf0d31..0000000000000000000000000000000000000000 --- 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/Makefile b/SRT/Servers/Makefile index d38ba4173f40e4b418ca1f3291579a286d0b0460..d8f18c92fbe573f55ff372544b5380db8dd7125f 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) diff --git a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd index e11733fad2f9aa675c2c280056323eb55122093b..b6895e7c45ea45871613500442f8813a3bb2185c 100644 --- a/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd +++ b/SRT/Servers/SRT7GHzReceiver/config/CDB/schemas/SRT7GHzReceiver.xsd @@ -19,7 +19,7 @@ - + @@ -37,7 +37,9 @@ - + + + @@ -95,7 +97,9 @@ - + + + diff --git a/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp b/SRT/Servers/SRT7GHzReceiver/src/Configuration.cpp index f71d54b35b4f7734f087721b59df721e75a50dca..65cc04fea14ed047544e37cea63cb1c14711ca66 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 d536e765dc5ab53253b86b99992bdd245a72a12c..1e677b915968765b219de3e157952b7e45765065 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); } } diff --git a/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd b/SRT/Servers/SRTActiveSurfaceBoss/config/CDB/schemas/SRTActiveSurfaceBoss.xsd index 4c39d0558b8f7148233bf7b968ccfec13edc76dd..54aaadcf2ce787831b5a2ad6634bd8017a7a285d 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/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h b/SRT/Servers/SRTActiveSurfaceBoss/include/SRTActiveSurfaceBossCore.h index b0fd5aaf392f2ef9e48fac063443851bcfbe9ca0..50ff151439fb54b5ce286f87b05c9d7f3b462380 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,16 +152,16 @@ 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(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); @@ -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 93b434447c6e48c6376ea2a9defb1250e8d8cd6f..777124bc6f8b42f8059c760e0c131117d4c92592 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,13 +17,13 @@ CSRTActiveSurfaceBossCore::~CSRTActiveSurfaceBossCore() 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; @@ -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]; - 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]; - 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]; - 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]; - 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]; - 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]; - 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]; - 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]; - 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)); @@ -1655,48 +1655,46 @@ 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) { int s, i, l; - 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,35 +1721,32 @@ 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; 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(); } } @@ -1770,11 +1765,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); @@ -1794,15 +1792,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"); @@ -1812,6 +1812,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); } @@ -1819,7 +1820,6 @@ void CSRTActiveSurfaceBossCore::asOff() throw (ComponentErrors::ComponentErrorsE ex.log(LM_DEBUG); throw ex.getComponentErrorsEx(); } - disableAutoUpdate(); } else { printf("you must set the profile first\n"); @@ -1830,7 +1830,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 +1916,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 +2080,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,11 +2088,11 @@ 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")); } } -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 629069ce907ca3e130b0fa68c326ff0088fca851..8783ac242277841b7c03cc21cb2d0c099d8530c9 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; @@ -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/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd b/SRT/Servers/SRTActiveSurfaceLanServer/config/CDB/schemas/lan.xsd index 66661b19bbb834347ee59838787cf64533de5048..94fe40eb371cdc98e497ae1a41b70b06e9950a9a 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 110e97dea073016d5716f9be3ce62f70e252fc15..50162a561248c63844621d69726bf0aeaf23dd16 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/SRTActiveSurfaceUSDServer/src/usdImpl.cpp b/SRT/Servers/SRTActiveSurfaceUSDServer/src/usdImpl.cpp index c5257253b510238dd7b9cc6c8ba86c28683b1f2f..af93e344e090e6e28f3d60c94cbd0a5716c6faba 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; @@ -616,6 +616,10 @@ void USDImpl::update (CORBA::Double elevation) throw (CORBA::SystemException,ASE // } } updatePos = (CORBA::Long)(updatePosMM*MM2STEP); + 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; diff --git a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandDerotator.xsd index 80665066e5919bf9a900a4e210cb1a0c1603c16b..1e63b2f810023266e808ddaba4da029a09a293aa 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/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd index e7c38d2d948d23b89c908ad2922d459e2c248676..dbcbb8177d57e587dde77f01cc1cf7093d7de937 100644 --- a/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd +++ b/SRT/Servers/SRTKBandMFReceiver/config/CDB/schemas/SRTKBandMFReceiver.xsd @@ -14,7 +14,7 @@ - + @@ -33,7 +33,9 @@ - + + + @@ -131,8 +133,8 @@ - - + @@ -151,6 +153,8 @@ + + diff --git a/SRT/Servers/SRTKBandMFReceiver/include/utils.h b/SRT/Servers/SRTKBandMFReceiver/include/utils.h index 278a80af1ce5993866930d8bebf8d5f0bd9186e0..e3661d053eb35196e3e72e7e41fbdd443f9f0acc 100644 --- a/SRT/Servers/SRTKBandMFReceiver/include/utils.h +++ b/SRT/Servers/SRTKBandMFReceiver/include/utils.h @@ -38,7 +38,7 @@ typedef string::size_type (string::*find_t)(const string &delim, string::size_ty int hex2dec(BYTE *buff, int idx, int len) throw (ComponentErrors::SocketErrorExImpl); -void dec2hexStr(unsigned long dec, unsigned char hex[], int len); +void dec2hexStr(int dec, unsigned char hex[], int len); /** diff --git a/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp b/SRT/Servers/SRTKBandMFReceiver/src/Configuration.cpp index d552e255ef105aade3bdfcb344c1d68d763a3f67..cd2fa4ca49b6418eef84ca11fb5238ba84952abe 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 fe0b7d1e05daad94fc25012ce1648052d9dbe5cd..7ad8c692407e99dbc9cf56a977f2485a37aebc71 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 6d80cf97da08c5c4617b30f8bea7869c2e025c8d..e50331b834a11148b69822b4c95a561a72d0a2c2 100644 --- a/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp +++ b/SRT/Servers/SRTKBandMFReceiver/src/icdSocket.cpp @@ -11,6 +11,7 @@ #include #include #include "../test/icd_response_test.h" +#include // The master device flags a new command for the compact drive by changing the @@ -281,37 +282,53 @@ void icdSocket::setPosition(double position) throw ( double sh_position; sh_position = m_ICD_REFERENCE - position; - m_icd_summary_status &= ~(1 << W) ; - setCmdPosition(position); + //printf("sh_position,ICD_REFERENCE,position: %lf, %lf, %lf\n",sh_position,m_ICD_REFERENCE,position); + m_icd_summary_status &= ~(1 << W) ; + if(sh_position > m_ICD_MAX_VALUE || sh_position < m_ICD_MIN_VALUE) { DerotatorErrors::OutOfRangeErrorExImpl ex(__FILE__, __LINE__, "Position out of range"); throw ex; } + setCmdPosition(position); + + //This code as been change during 64 bits porting as the communication with the derotator was messed up when the absolute position + // to be commended is negative. The negative number are now stored in 64 bits integer that overflow the buffer to be sent to the + // motor. + // Should I apply the same patch also in all other piece of code? + // Revert the rotation way - if(sh_position < 0) - setNegativeDir(); + //if(sh_position < 0) { + // setNegativeDir(); + //sh_position=-sh_position; + //} - if(sh_position >= 0) - setPositiveDir(); + //if(sh_position >= 0) + //setPositiveDir(); - unsigned long dec_steps = static_cast(sh_position/m_ICD_CF + 0.5); // No shifted, rounded + //printf("sh_position,m_ICD_CF, ratio: %lf, %lf, %lf\n",sh_position,m_ICD_CF,sh_position/m_ICD_CF+0.5); - unsigned char hex_steps[ICD_CMDDATA_LEN + 1]; - dec2hexStr(dec_steps, hex_steps, ICD_CMDDATA_LEN + 1); - int i = 0; + //unsigned long dec_steps = static_cast(sh_position/m_ICD_CF + 0.5); // No shifted, rounded + + //this should be 4 bytes long in64bit platforms + int dec_steps = static_cast(sh_position/m_ICD_CF + 0.5); // No shifted, rounded + //unsigned char hex_steps[ICD_CMDDATA_LEN + 1]; + //dec2hexStr(dec_steps, hex_steps, ICD_CMDDATA_LEN + 1); + IRA::CString hexstr=IRA::CBaseConverter::decToHex(dec_steps); + /*int i = 0; while(1) { if(hex_steps[i] == '\0') break; i++; - } - - int k=0; - for(int j=i-1; j>=0; j--) { + }*/ + //int k=0; + /*for(int j=i-1; j>=0; j--) { buff[15-j] = hex_steps[k]; k++; + }*/ + for(int j=8;j<16;j++) { + buff[j]=hexstr[j-8]; } - try { // Make a conversation to and from icd. The response is stored in buff make_talk(buff, true) ; diff --git a/SRT/Servers/SRTKBandMFReceiver/src/utils.cpp b/SRT/Servers/SRTKBandMFReceiver/src/utils.cpp index ddbc7d3ed55d9f41b554a8607eb8a997024cc72b..ceab7b4ff4c8472d7a92b7e125aa037aa755c2eb 100644 --- a/SRT/Servers/SRTKBandMFReceiver/src/utils.cpp +++ b/SRT/Servers/SRTKBandMFReceiver/src/utils.cpp @@ -39,9 +39,9 @@ int hex2dec(BYTE *buff, int idx, int len) throw (ComponentErrors::SocketErrorExI } -void dec2hexStr(unsigned long dec, unsigned char hex[], int len) { +void dec2hexStr(int dec, unsigned char hex[], int len) { - unsigned long quotient = dec; + int quotient; char rev_hex[len]; int remainder; int i = 0; @@ -51,8 +51,9 @@ void dec2hexStr(unsigned long dec, unsigned char hex[], int len) { remainder = quotient % 16; quotient = quotient / 16; if(remainder > 9) - rev_hex[i] = (char)remainder + 55; - else rev_hex[i] = (char)remainder + 48; + rev_hex[i] = (char)remainder + 55; + else + rev_hex[i] = (char)remainder + 48; i++; } // Reverse String diff --git a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd index 867cbe072f7b3f1354aaa62246f4fff6b17add79..fddc898df866ba64747b15d992ee39a45730f00f 100755 --- a/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd +++ b/SRT/Servers/SRTLPBandReceiver/config/CDB/schemas/SRTLPBandReceiver.xsd @@ -14,7 +14,7 @@ - + @@ -44,6 +44,8 @@ + + @@ -117,8 +119,8 @@ - - + @@ -141,6 +143,8 @@ + + diff --git a/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp b/SRT/Servers/SRTLPBandReceiver/src/Configuration.cpp index a210c6a5228377f2964828a98f7fb25bb168ca14..aab4255d91750602e42fd7b505d0798a828a738f 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 @@ -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 diff --git a/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp b/SRT/Servers/SRTLPBandReceiver/src/MonitorThread.cpp index ae97ac608ec0c5510426693ba261f5d15784ad85..d79431f8e4b76c0d0010456175878f3b5e2731ff 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); } } diff --git a/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py b/SRT/Servers/SRTLPBandReceiver/test/PyLPBandTest/simunittest.py index d91bd88e5d548bf0b11d9c7cc959920f30bf4bdd..5e21424e54a6ad36a3ffa639b77f1935d67ee2fd 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 ef00d3d059efbfc46e4f67f33b153edef3f1c41e..10bb36ec137ca09487fef1fbc16a8f379c29fba6 100644 --- a/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py +++ b/SRT/Servers/SRTLPBandReceiver/test/functional/test_lo.py @@ -3,16 +3,16 @@ 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('TARGETSYS') + telescope = os.getenv('STATION') @classmethod def setUpClass(cls): @@ -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/config/CDB/schemas/MinorServo.xsd b/SRT/Servers/SRTMinorServo/config/CDB/schemas/MinorServo.xsd index c1e733c3176a6497b30faa2f6ea379ab3c28f08d..9aba347092aba2e7b66857a0ae685874e0af2f76 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,20 +133,24 @@ - - + + + + - + + diff --git a/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp b/SRT/Servers/SRTMinorServo/src/MinorServoBossImpl.cpp index ea0f2066f1c1b12624022586bd61eaf665b79fb6..e478eb3ebc32bcea1b559ee9e8f3cd787e0a8fa3 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/WPServoImpl.cpp b/SRT/Servers/SRTMinorServo/src/WPServoImpl.cpp index 27caf0ae5dc4d5adf7cb29504766209bead2efc6..6ddcfbbe51124f67dcb2be8b52a5eea3897cc0d8 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) { diff --git a/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp b/SRT/Servers/SRTMinorServo/src/WPStatusUpdater.cpp index eb4a85bad4db54ab3fd260d436a04ded849bf103..1db3dddc2faa895dc7cb1d2ea622bf84dc9a03de 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) + )); } } 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 0000000000000000000000000000000000000000..c9c4c36b529806d1af59701f0dd8b2dd885b7a2e --- /dev/null +++ b/SRT/Servers/SRTMinorServo/test/functional/test_container_crash.py @@ -0,0 +1,53 @@ +"""Test issue https://github.com/discos/discos/issues/143""" + +import os +import time +import unittest +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 " + + +class TestContainerCrash(unittest.TestCase): + + @classmethod + def setUpClass(cls): + 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() + + def tearDown(self): + self.client.disconnect() + + def test_get_and_release_component(self): + """The container must be alive after releasing the component""" + 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__': + if 'Configuration' in os.getenv('ACS_CDB'): + unittest.main(verbosity=2, failfast=True) # Real test using the antenna CDB + else: + 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 13a25edc8fff9aa72595141f2c9b3ae4894a4c74..d3c79233afa6fa6cc2d34d44fede605daf664018 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_failure.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_failure.py @@ -5,24 +5,41 @@ import time import datetime import subprocess -import unittest2 +import unittest 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') -class TestFailure(unittest2.TestCase): +class TestFailure(unittest.TestCase): - telescope = os.getenv('TARGETSYS') + 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.srp = cls.client.getComponent('MINORSERVO/SRP') @@ -31,6 +48,7 @@ class TestFailure(unittest2.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" @@ -81,8 +99,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) - + 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 6ed8b8a1b1786ecf7b2e46d1b5d2ac45ff69b0a3..17a7cb5084cbb2456aec4ee3f8f8362eb556b3e1 100644 --- a/SRT/Servers/SRTMinorServo/test/functional/test_setup.py +++ b/SRT/Servers/SRTMinorServo/test/functional/test_setup.py @@ -4,8 +4,9 @@ import math import time import os from datetime import datetime +from subprocess import Popen, PIPE -import unittest2 # https://pypi.python.org/pypi/unittest2 +import unittest import Management import MinorServo import Antenna @@ -13,28 +14,43 @@ 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 " -class SetupTest(unittest2.TestCase): +class SetupTest(unittest.TestCase): - telescope = os.getenv('TARGETSYS') - @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""" @@ -90,7 +106,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) + 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 old mode 100755 new mode 100644 index 8c101110e1f1f8c16c9066e5d455da94755cffa0..aeaa665504d26c1b5735150343a0a4c5a8e05b14 --- 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 import Management import MinorServo import Antenna @@ -15,15 +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 CannotSetupTest(unittest2.TestCase): - telescope = os.getenv('TARGETSYS') - +class CannotSetupTest(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.pfp = cls.client.getComponent('MINORSERVO/PFP') @@ -33,6 +49,7 @@ class CannotSetupTest(unittest2.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""" @@ -81,7 +98,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) + from testing import simulator + simulator.run(CannotSetupTest, 'srt-mscu-sim') diff --git a/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd b/SRT/Servers/SRTMount/config/CDB/schemas/SRTMount.xsd index 459411aa3d6e2be83c75c53d79b6e7d25f2b21a1..d55c6a7622cf88db0aec33271fa0130284276fd0 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/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd b/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd new file mode 100644 index 0000000000000000000000000000000000000000..d1ca3f3673a3d1faa5bbc5ad26291a038be9dc8b --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/config/CDB/schemas/SRTIFDistributor.xsd @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/IFDParser.py new file mode 100644 index 0000000000000000000000000000000000000000..266012c1883f23113be333e2d528418ab710b7a8 --- /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'] = 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]) + + 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 0000000000000000000000000000000000000000..a376a6fc7a68c80a7e0cf134ee3111d2b4d1cfcf --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/SRTIFDistributorImpl.py @@ -0,0 +1,508 @@ +# 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 +import time +import copy + +class SRTIFDistributorImpl(SRTIFDistributor, cc, services, lcycle): + + def __init__(self): + cc.__init__(self) + services.__init__(self) + self.attributes = {} + self.configurations = {} + + self.LO_board = None + self.freq = 0 + self.lock = 0 + 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') + + 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, config_string): + """This method performs a complete setup of the device by receiving the + 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 config_string: the desired device configuration(s).""" + + configurations = [c.strip() for c in config_string.split(',')] + + 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]) + ) + + # 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(float(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 self.t: + self.t.cancel() + self.t = None + self._is_configured() + + def setDefault(self): + """Sets the IFDistributor to its default values.""" + 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 ', '.join(self.current_configurations) + + 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) + + 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() + self._set_LO(self.freq, 0) + + def rfon(self): + """Turns on the local oscillator.""" + 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). + + :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) + + 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. + + :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) + + time.sleep(0.1) + + 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'] != float(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_CONFIGS', + '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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py b/SRT/Servers/SRTPyIFDistributor/src/IFDistributor/devios.py new file mode 100644 index 0000000000000000000000000000000000000000..b4aae519ec858daa460457da22e4963b5b81ff80 --- /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 0000000000000000000000000000000000000000..ee09f4b133686889404b049415c9b87fe42781f5 --- /dev/null +++ b/SRT/Servers/SRTPyIFDistributor/src/Makefile @@ -0,0 +1,43 @@ +#------------------------------------------------- +# Giuseppe Carboni +#------------------------------------------------- + + +CDB_SCHEMAS = SRTIFDistributor + +PY_SCRIPTS = _ifd +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 + @chmod 700 $(INTROOT)/bin/_ifd + @echo " . . . installation done" + +#___oOo___ + diff --git a/SRT/Servers/SRTPyIFDistributor/src/_ifd.py b/SRT/Servers/SRTPyIFDistributor/src/_ifd.py new file mode 100644 index 0000000000000000000000000000000000000000..4fb14a37d7a0250ca33e2c1832de85aff3fc81b1 --- /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 diff --git a/SRT/Servers/SRTPyIFDistributor/test/Makefile b/SRT/Servers/SRTPyIFDistributor/test/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..6ca36519088d1e592517ba2f9ffbc448372df639 --- /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 0000000000000000000000000000000000000000..aa58919afea31f350f25d8e8874d7e30f8a026c9 --- /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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor/test/functional/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/functional/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor/test/interface/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/interface/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor/test/pyunit/__init__.py b/SRT/Servers/SRTPyIFDistributor/test/pyunit/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor/test/run_coverage b/SRT/Servers/SRTPyIFDistributor/test/run_coverage new file mode 100755 index 0000000000000000000000000000000000000000..2a6d2c446edaca7449c2940d6eace841ad76d8e1 --- /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 0000000000000000000000000000000000000000..4ede878e4e2937e579085ba2ae1afc2b12036fec --- /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 0000000000000000000000000000000000000000..c292225d7072bd9f26e3ca8498231a108e397bce --- /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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor14/src/Makefile b/SRT/Servers/SRTPyIFDistributor14/src/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..726e7acb556d9c61bb04fba9fbd695f846b3adfa --- /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 0000000000000000000000000000000000000000..56eb1df5bf1b88730ab3af31602287362373d29d --- /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 0000000000000000000000000000000000000000..aa58919afea31f350f25d8e8874d7e30f8a026c9 --- /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 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor14/test/functional/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/functional/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor14/test/interface/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/interface/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor14/test/pyunit/__init__.py b/SRT/Servers/SRTPyIFDistributor14/test/pyunit/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/SRT/Servers/SRTPyIFDistributor14/test/run_coverage b/SRT/Servers/SRTPyIFDistributor14/test/run_coverage new file mode 100755 index 0000000000000000000000000000000000000000..066cd16816b936a3bc9144c2528badfacc35e593 --- /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/*" diff --git a/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd b/SRT/Servers/SRTWeatherStation/config/CDB/schemas/WeatherStation.xsd index 56f9b144d42c086b910a8b94d6136115826de009..5b5039648d551811d7e863773480cd8abeafaf59 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 @@ - + + + diff --git a/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile b/SRT/Simulators/Hardware/SRTMSCUSim/src/Makefile index 709015de9effc4ba9c1653bd86256d058e26882f..c611e823e73dab3260e7eb21fbcc48c34e7da7c7 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 diff --git a/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py b/SRT/Simulators/Hardware/SRTMSCUSim/src/SRTMSCUSimImpl/mscu.py index 9f755ab1e33ebd538b737104abeffd2608a048bd..fab94e917828434bb5371615d325f763e0695883 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() @@ -56,8 +58,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 +78,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 @@ -128,21 +128,18 @@ 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 - # Close the connection try: connection.close() except KeyboardInterrupt: - raise - except: - traceback.print_exc() + stop_server.value = True + connection.close() + sys.exit(0) # The child process *must* terminate - # 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 diff --git a/SystemBuild/install_stable_build.sh b/SystemBuild/install_stable_build.sh index 373ac26aeb85ba8a9f993a811f75ca3dd67f65b5..867e82293efc890624dc643872b05d1e31d838d3 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 93191529fabe1ff8975e065af2a683e100924d0d..82abb0704a6b6511e74840f75438c1ef538547cb 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/Makefile b/SystemMake/Makefile index 1c807281d56bb20c024fb68bbdcf58799e48ad29..83e78db0924a2b50e239b8528d54117e75efc405 100644 --- a/SystemMake/Makefile +++ b/SystemMake/Makefile @@ -30,16 +30,18 @@ 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 \ - XBackend PyDewarPositioner Roach #DBBC + XBackend PyDewarPositioner Sardara PyLocalOscillator #DBBC COMMON_CLIENTS:=AntennaBossTextClient ObservatoryTextClient \ GenericBackendTextClient ReceiversBossTextClient \ SystemTerminal CaltoolClient CustomLoggingClient \ SchedulerTextClient -COMMON_MISC:=Plotter KStars Scripts getTemplateForTests InjectCommand + +COMMON_MISC:=Plotter KStars Scripts getTemplateForTests PMUpdate InjectCommand + COMMON_SIMULATORS:= TCPGenericProtocolSim ReceiverBoardSim SRT_DOC:=SRTDox @@ -49,7 +51,7 @@ SRT_INTERFACES:=SRTAntennaInterface SRTActiveSurfaceInterface \ SRT_LIBRARIES:=SRTMinorServoLibrary SRT_SERVERS:=SRTMount SRTActiveSurfaceLanServer SRTActiveSurfaceUSDServer \ SRTActiveSurfaceBoss SRTMinorServo SRTKBandMFReceiver \ - SRTWeatherStation SRT7GHzReceiver SRTLPBandReceiver + SRTWeatherStation SRT7GHzReceiver SRTLPBandReceiver SRTPyIFDistributor SRT_CLIENTS:=SRTActiveSurfaceGUIClient SRTMountTextClient \ MinorServoBossTextClient MeteoClient SRT_MISC:=SRTScripts @@ -70,7 +72,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 \ @@ -78,10 +80,10 @@ ifeq ($(TARGETSYS),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 \ + SRTPyIFDistributor AntennaBossTextClient ObservatoryTextClient GenericBackendTextClient ReceiversBossTextClient SystemTerminal CaltoolClient CustomLoggingClient SchedulerTextClient \ SRTActiveSurfaceGUIClient SRTMountTextClient MinorServoBossTextClient \ Plotter KStars SRTScripts @@ -95,7 +97,7 @@ ifeq ($(TARGETSYS),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 @@ -107,14 +109,15 @@ 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 \ 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 +132,7 @@ ifeq ($(TARGETSYS),MED) 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 @@ -139,13 +142,13 @@ 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 \ 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 +161,7 @@ ifeq ($(TARGETSYS),NT) 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 @@ -168,7 +171,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 +207,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 @@ -221,7 +224,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 @@ -234,20 +237,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 +331,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 diff --git a/SystemMake/README b/SystemMake/README index a88ed457a9cf022e11f3f3b0ae4d9eefe7a4f1c2..80a76e64d53bfdec074a7ee7d24a1edb178ee1fa 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.
FeedCarier boardBackend channel