PROG Modified XML Schema to include the OSIRIS-REx mission. References #4300 (e34c9e45) · Commits · aflab / astrogeology / ISIS3

isis/src/docsys/Object/build/isisDoxyDefs.doxydef

+18 −11

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@
		* @history 2008-05-19 steven lambright - Fixed Mission End Group Tag
		* @history 2008-05-19 steven lambright - Fixed Bad Namespace Documentation
		* @history 2013-03-27 Jeannie Backer - Added NEAR Shoemaker mission. References #1248.
		* @history 2016-08-25 Marjorie Hahn - Added OSIRIS-REx mission. References #4300.
		*
		* @todo Develop two different pages for API vs. Programmer
		* documentation. 2004-11-03
		@@ -390,7 +391,6 @@
		*
		*/


		// MRO
		/**
		* \defgroup MarsReconnaissanceOrbiter Mars Reconnaissance Orbiter
		@@ -439,7 +439,6 @@
		*
		*/


		// New Horizons
		/**
		* \defgroup NewHorizons New Horizons
		@@ -447,14 +446,27 @@
		* These objects provide functionality for manipulating data from the
		* New Horizons mission. New Horizons is part of NASA's New Frontiers
		* Program.
		* New Horizons launced January 19, 2006 and is expected to spend five months studying
		* New Horizons launched January 19, 2006 and is expected to spend five months studying
		* Pluto durring the summer of 2015.
		*
		* Mission site: http://www.nasa.gov/mission_pages/newhorizons/main/#.VA4QY8NuH4I
		*
		*
		*/

		// OSIRIS-REx
		/**
		* \defgroup OSIRIS-REx OSIRIS-REx
		*
		* These objects provide functionality for manipulating data from the
		* OSIRIS-REx asteroid sample return mission. The 2016 OSIRIS-REx mission's
		* key objectives include mapping out the asteroid Bennu's surface, analyzing
		* a sample of Bennu's regolith, documenting the sample site, calculating Bennu's
		* orbit deviation, and comparing observations made at the asteroid to observations
		* made on Earth.
		*
		* Mission site: http://www.asteroidmission.org/
		*
		*/

		// VIKING
		/**
		@@ -491,8 +503,6 @@
		*
		*/



		// LUNAR ORBITER
		/**
		* \defgroup LunarOrbiter Lunar Orbiter
		@@ -517,9 +527,6 @@
		*
		*/




		/* @} end of Missions group */

isis/src/docsys/Schemas/Application/application.xsd

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@
		<xs:annotation>
		<xs:documentation>2016-03-29 Kristin Berry - Added missionItem_type enummeration for Rosetta.</xs:documentation>
		</xs:annotation>
		<xs:annotation>
		<xs:documentation>2016-08-25 Marjorie Hahn - Added missionItem_type enummeration for OSIRIS-REx.</xs:documentation>
		</xs:annotation>
		<xs:element name="application">
		<xs:annotation>
		<xs:documentation>XML file describing an Isis application</xs:documentation>
		@@ -449,6 +452,7 @@
		<xs:enumeration value="Messenger"/>
		<xs:enumeration value="New Horizons"/>
		<xs:enumeration value="Near Earth Asteroid Rendezvous"/>
		<xs:enumeration value="OSIRIS-REx"/>
		<xs:enumeration value="Robotic Lunar Observatory"/>
		<xs:enumeration value="Rosetta"/>
		<xs:enumeration value="Small Missions for Advanced Research and Technology 1"/>

isis/src/docsys/Schemas/Application/documentation/index.html

+35 −2

Original line number	Diff line number	Diff line
		@@ -431,7 +431,23 @@
		</tr>
		<tr valign="top">
		<td width="10%" align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">facets</span></td>
		<td width="90%" align="left" bgcolor="#F0F0F0"><table cellspacing="0" cellpadding="0"><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Cassini</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Clementine</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mariner</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Galileo</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Reconnaissance Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Reconnaissance Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Global Surveyor</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Odyssey</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Exploration Rover</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Messenger</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Small Missions for Advanced Research and Technology 1</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Voyager</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Viking</span></td></tr></table></td>
		<td width="90%" align="left" bgcolor="#F0F0F0"><table cellspacing="0" cellpadding="0">
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Cassini</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Clementine</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mariner</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Galileo</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Reconnaissance Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Reconnaissance Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Global Surveyor</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Odyssey</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Exploration Rover</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Messenger</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">OSIRIS-REx</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Small Missions for Advanced Research and Technology 1</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Voyager</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Viking</span></td></tr>
		</table></td>
		</tr>
		<tr valign="top">
		<td width="10%" align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">annotation</span></td>
		@@ -3337,7 +3353,23 @@
		</tr>
		<tr valign="top">
		<td width="10%" align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">facets</span></td>
		<td width="90%" align="left" bgcolor="#F0F0F0"><table cellspacing="0" cellpadding="0"><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Cassini</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Clementine</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mariner</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Galileo</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Reconnaissance Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Reconnaissance Orbiter</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Global Surveyor</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Odyssey</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Exploration Rover</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Messenger</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Small Missions for Advanced Research and Technology 1</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Voyager</span></td></tr><tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Viking</span></td></tr></table></td>
		<td width="90%" align="left" bgcolor="#F0F0F0"><table cellspacing="0" cellpadding="0">
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Cassini</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Clementine</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mariner</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Galileo</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Lunar Reconnaissance Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Reconnaissance Orbiter</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Global Surveyor</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Odyssey</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Mars Exploration Rover</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Messenger</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">OSIRIS-REx</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Small Missions for Advanced Research and Technology 1</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Voyager</span></td></tr>
		<tr valign="top"><td align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">enumeration </span></td><td align="left" bgcolor="#F0F0F0"><span class="schemaSubData">Viking</span></td></tr>
		</table></td>
		</tr>
		<tr valign="top">
		<td width="10%" align="right" bgcolor="#F0F0F0"><span class="schemaSubTitle">annotation</span></td>
		@@ -3361,6 +3393,7 @@
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Mars Odyssey</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Mars Exploration Rover</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Messenger</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"OSIRIS-REx</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Small Missions for Advanced Research and Technology 1</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Voyager</span><span class="textOperator">"/></span><span class="textContents"><BR>
		</span><span class="textOperator"><</span><span class="textElement">xs:enumeration</span><span class="textAttr"> value</span><span class="textOperator">=</span><span class="textContents">"Viking</span><span class="textOperator">"/></span><span class="textContents"><BR>