Unverified Commit 6fd795d0 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

fix issue #597: messages of errors are all ported to the shortDescription... 

fix issue #597: messages of errors are all ported to the shortDescription field in xml files. (#598)
parent 103d180f

Common/Errors/ClientErrors/idl/ClientErrors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
	<Member name="Reason" type="string" description="Reason" />

	<Member name="Reason" type="string" description="Reason" />

</ErrorCode>	

</ErrorCode>	





<ErrorCode name="CouldntLogManager" shortDescription="Manager couldn't be accessed" Description=" "/>

<ErrorCode name="CouldntLogManager" shortDescription="Manager couldn't be accessed" description=" "/>





<ErrorCode name="CouldntInit" shortDescription="Client could not be initialized" description=" "/>

<ErrorCode name="CouldntInit" shortDescription="Client could not be initialized" description=" "/>

Common/Errors/ManagementErrors/idl/ManagementErrors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ 




<ErrorCode name="CloseTelescopeScanError" shortDescription="Not able command the scan close to the telescope" description=" "/>

<ErrorCode name="CloseTelescopeScanError" shortDescription="Not able command the scan close to the telescope" description=" "/>





<ErrorCode name="InvalidRestFrequency" shortDescription="The rest frequency is not provided or does not match the number of backend sections" description=" "/>

<ErrorCode name="InvalidRestFrequency" shortDescription="The rest frequency is not correctly provided" description=" "/>





<ErrorCode name="ScheduleNotExist" shortDescription="Schedule could not be found" description=" "/>

<ErrorCode name="ScheduleNotExist" shortDescription="Schedule could not be found" description=" "/>

Common/Errors/ReceiversErrors/idl/DerotatorErrors.xml

+14 −14
Original line number Original line Diff line number Diff line
@@ -8,35 +8,35 @@ 




    <Code name="Communicating" 

    <Code name="Communicating" 

         shortDescription="No Error" 

         shortDescription="No Error" 

         description="No error condition found"/>

         description=" "/>





    <ErrorCode name="CommunicationError" 

    <ErrorCode name="CommunicationError" 

         shortDescription="An error occured during the communication" 

         shortDescription="Cannot communicate properly with the derotator" 

         description="Cannot communicate properly with the derotator"/>

         description=" "/>





    <ErrorCode name="ConfigurationError" 

    <ErrorCode name="ConfigurationError" 

         shortDescription="Error configuring the derotator" 

         shortDescription="Cannot perform the derotator configuration" 

         description="Cannot perform the derotator configuration"/>

         description=" "/>





    <ErrorCode name="RemoteControlError" 

    <ErrorCode name="RemoteControlError" 

         shortDescription=" " 

         shortDescription="The derotator is not remotely controllable" 

         description="The derotator is not remotely controllable"/>

         description=" "/>





    <ErrorCode name="ValidationError" 

    <ErrorCode name="ValidationError" 

         shortDescription="Cannot validate the derotator answer" 

         shortDescription="Cannot validate the derotator answer" 

         description="Cannot understand the derotator answer"/>

         description=" "/>





    <ErrorCode name="PositioningError" 

    <ErrorCode name="PositioningError" 

         shortDescription=" "

         shortDescription="Cannot set derotator position"

         description="Cannot set the position"/>

         description=" "/>





    <ErrorCode name="OutOfRangeError" 

    <ErrorCode name="OutOfRangeError" 

         shortDescription=" " 

         shortDescription="Derotator position out of range" 

         description="Position out of range"/>

         description=" "/>





    <ErrorCode name="UnexpectedError" 

    <ErrorCode name="UnexpectedError" 

         shortDescription=" " 

         shortDescription="Unexpected error" 

         description="Unexpected error"/>

         description=" "/>

</Type>

</Type>

Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -36,23 +36,23 @@ 
		<Member name="Details" type="string" description="more details from the board" />   

		<Member name="Details" type="string" description="more details from the board" />   

	</ErrorCode>

	</ErrorCode>

	

	

	<ErrorCode name="SynthetiserError" shortDescription="Error while communicating with sythetiser" description=" ">

	<ErrorCode name="SynthetiserError" shortDescription="Error while communicating with synthesiser" description=" ">

		<Member name="Details" type="string" description="more details about the error" />   

		<Member name="Details" type="string" description="more details about the error" />   

	</ErrorCode>

	</ErrorCode>

	

	

	<ErrorCode name="NoRemoteControlError" shortDescription="The receiver is not remotely controllable" description=" "/>

	<ErrorCode name="NoRemoteControlError" shortDescription="The receiver is not remotely controllable" description=" "/>

	

	

	<ErrorCode name="NoDewarPositioning" shortDescription="Dewar positioning and derotation is not supported by this release" description=" "/>

	<ErrorCode name="NoDewarPositioning" shortDescription="Dewar positioning and derotation is not supported" description=" "/>

    

    

    <ErrorCode name="NoDerotatorAvailable" shortDescription="The current receiver is not equipped with a derotator" description=" "/>

    <ErrorCode name="NoDerotatorAvailable" shortDescription="The current receiver is not equipped with a derotator" description=" "/>

    

    

    <ErrorCode name="DewarPositionerSetupError" shortDescription="Error encountered during the setup of the dewar positioner" description=" ">

    <ErrorCode name="DewarPositionerSetupError" shortDescription="Error during dewar positioner setup" description=" ">

		<Member name="Details" type="string" description="More details on the error" />   

		<Member name="Details" type="string" description="More details on the error" />   

	</ErrorCode>

	</ErrorCode>





	<ErrorCode name="DewarPositionerParkingError" shortDescription="Error detected during derotator parking" description=" "/>

	<ErrorCode name="DewarPositionerParkingError" shortDescription="Error detected during derotator parking" description=" "/>

	

	

	<ErrorCode name="DewarPositionerCommandError" shortDescription="Error detected while issuing a command to the dewar positioner" description=" ">

	<ErrorCode name="DewarPositionerCommandError" shortDescription="Error while issuing a command to the dewar positioner" description=" ">

		<Member name="Command" type="string" description="It specifies which command has failed" />   

		<Member name="Command" type="string" description="It specifies which command has failed" />   

	</ErrorCode>

	</ErrorCode>

Common/Libraries/ParserLibrary/tests/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ USER_LIBS=C++ pthread 




EXECUTABLES_L = unittest

EXECUTABLES_L = unittest

unittest_OBJECTS = unittest

unittest_OBJECTS = unittest

unittest_LIBS = $(GTEST_LIBS) IRALibrary SlaLibrary ParserErrors ComponentErrors

unittest_LIBS = $(GTEST_LIBS) IRALibrary SlaLibrary ParserErrors ComponentErrors DiscosVersion





# END OF CUSTOMIZATION

# END OF CUSTOMIZATION

# do not edit below this line

# do not edit below this line