Commit 56d26466 authored by hrchilds's avatar hrchilds
Browse files

Update from March 15, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@832 18c085ea-50e0-402c-830e-de6fd14e8384
parent f36a3a91
...@@ -25,6 +25,17 @@ ...@@ -25,6 +25,17 @@
# Moved all instructions to single place. Made it send a single email # Moved all instructions to single place. Made it send a single email
# for all recipients so all could see who received it. # for all recipients so all could see who received it.
# #
# Mark C. Miller, Thu Mar 15 21:45:31 PDT 2007
# Fixed problems with mutt being unreliable. Added contrib and keep files
# to be cleaned from the TEMPORARY copy of the plugin dir we make.
#
# Mark C. Miller, Thu Mar 15 21:26:08 PST 2007
# Modified instructions to include information on building when VisIt
# installation wasn't built to include the plugin
#
# Mark C. Miller, Thu Mar 15 22:53:04 PST 2007
# Added support for testing on the user's end (during install)
#
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# #
...@@ -37,6 +48,7 @@ ...@@ -37,6 +48,7 @@
cleanPluginDir () { cleanPluginDir () {
pushd $1 pushd $1
rm -f .depend .cmake.depend .cmake.state Makefile *.o rm -f .depend .cmake.depend .cmake.state Makefile *.o
rm -f *.contrib* *.keep*
rm -f *PluginInfo*.[Ch] rm -f *PluginInfo*.[Ch]
chmod -f 664 * chmod -f 664 *
popd popd
...@@ -46,25 +58,29 @@ cleanPluginDir () { ...@@ -46,25 +58,29 @@ cleanPluginDir () {
# Buil the README file to be included in the tarball # Buil the README file to be included in the tarball
# #
makeInstructionsFile () { makeInstructionsFile () {
typeset upperPluginName=`echo $pluginName | tr \[a-z\] \[A-Z\]`
cat > $1 <<- EOF cat > $1 <<- EOF
The associated tarball is a VisIt plugin. This update is being The associated tarball is a VisIt plugin. This update is being
furnished to you to address the following problem(s)... furnished to you to address the following problem(s)...
$commentString $commentString
Commands for installing and UNinstalling (VisIt 1.6 and newer) Simple commands for installing/UNinstalling a plugin
(Works in most cases)
-------------------------------------------------------------- --------------------------------------------------------------
(Note: no '.tar.gz' after the plugin's name) (Note: no '.tar.gz' after the plugin's name)
% visit_plugin -install $pluginName % visit_plugin -install $pluginName
% visit_plugin -uninstall $pluginName % visit_plugin -uninstall $pluginName
Commands for installing and UNinstalling (VisIt 1.5.5 and older) Manual commands for installing and UNinstalling
(If the above commands fail, you can try this appraoch)
---------------------------------------------------------------- ----------------------------------------------------------------
% gunzip < $pluginName.tar.gz | tar xvf - % gunzip < $pluginName.tar.gz | tar xvf -
% cd $pluginName % cd $pluginName
To install... To install...
% xml2info -clobber <pluginname>.xml % xml2info -clobber $pluginName.xml
% xml2makefile -clobber <pluginname>.xml % xml2makefile -clobber $pluginName.xml
% make % make
To UNinstall... To UNinstall...
% make clean % make clean
...@@ -82,19 +98,18 @@ cat > $1 <<- EOF ...@@ -82,19 +98,18 @@ cat > $1 <<- EOF
not install or, once installed, not run correctly. You may be not install or, once installed, not run correctly. You may be
required to update either VisIt and/or the third party I/O library(s) required to update either VisIt and/or the third party I/O library(s)
this plugin may require. this plugin may require.
EOF EOF
if test $testBuild -ne 0; then if test $testBuild -ne 0; then
if test -n "$testRun"; then if test -n "$testRun"; then
cat >> $1 <<- EOF cat >> $1 <<- EOF
Prior to sending you this tarball, it was confirmed to build and Prior to sending you this tarball, it was confirmed to build and
run correctly with version $versionBuiltWith of VisIt. run correctly with version $versionBuiltWith of VisIt.
EOF EOF
else else
cat >> $1 <<- EOF cat >> $1 <<- EOF
Prior to sending you this tarball, it was confirmed to build with Prior to sending you this tarball, it was confirmed to build with
version $versionBuiltWith of VisIt. version $versionBuiltWith of VisIt.
...@@ -119,6 +134,23 @@ cat >> $1 <<- EOF ...@@ -119,6 +134,23 @@ cat >> $1 <<- EOF
To correct this situation, simply uninstall your private plugin To correct this situation, simply uninstall your private plugin
following the instructions here. following the instructions here.
If VisIt was installed on your system without this database plugin,
then you will most likely have to use the Manual approach for installing
and UNinstalling the plugin. Also, you will most likely have to modify
the Makefile that gets created by xml2makefile to specify the location(s)
of any applicable third party include and library files. Typically,
you would do this by editing Makefile and defining something like...
${upperPluginName}_INCLUDE="-I/usr/local/foo/include -I/usr/local/bar/include"
${upperPluginName}_LIB="-L/usr/local/foo/lib -lfoo -L/usr/local/bar/lib -lbar"
You would place these lines AFTER the include directive that includes
'make-variables' near the top of the Makefile. Alternatively, you may
need to statically link to third party libraries by specifing the complete
path to the .a files in ${upperPluginName}_LIB like so...
${upperPluginName}_LIB="/usr/local/foo/lib/libfoo.a /usr/local/bar/lib/libbar.a"
If you would like VisIt to test the plugin and automatically uninstall If you would like VisIt to test the plugin and automatically uninstall
it if the test fails, give the command it if the test fails, give the command
% visit_plugin -install . -testrun <Filename>:<PlotType>:<Varname> % visit_plugin -install . -testrun <Filename>:<PlotType>:<Varname>
...@@ -139,6 +171,14 @@ packagePluginDir () { ...@@ -139,6 +171,14 @@ packagePluginDir () {
cleanPluginDir $TMPDIR/${theDir}_tmp.$$/$theDir 1>/dev/null 2>&1 cleanPluginDir $TMPDIR/${theDir}_tmp.$$/$theDir 1>/dev/null 2>&1
pushd $TMPDIR/${theDir}_tmp.$$ 1>/dev/null 2>&1 pushd $TMPDIR/${theDir}_tmp.$$ 1>/dev/null 2>&1
makeInstructionsFile $theDir/README 1>/dev/null 2>&1 makeInstructionsFile $theDir/README 1>/dev/null 2>&1
if test -n "$requiredVersions"; then
echo $requiredVersions | cut -d' ' -f1 > $theDir/.REQUIRED_VISIT_VERSION
fi
if test -n "$testRun"; then
inputFileName=`echo $testRun | cut -d':' -f1`
cp $inputFileName $theDir/.
echo $testRun > $theDir/.TEST_RUN_COMMAND
fi
tar cf - $theDir | gzip > $theDir.tar.gz tar cf - $theDir | gzip > $theDir.tar.gz
popd 1>/dev/null 2>&1 popd 1>/dev/null 2>&1
cp $TMPDIR/${theDir}_tmp.$$/$theDir.tar.gz . cp $TMPDIR/${theDir}_tmp.$$/$theDir.tar.gz .
...@@ -151,16 +191,18 @@ packagePluginDir () { ...@@ -151,16 +191,18 @@ packagePluginDir () {
testBuildPluginTarball () { testBuildPluginTarball () {
typeset theTarball=$1 typeset theTarball=$1
typeset deleteIt=$2 typeset deleteIt=$2
vers=
if test -n "$requiredVersions"; then
vers="-v `echo $requiredVersions | cut -d' ' -f1`"
fi
thePluginName=`basename $theTarball .tar.gz` thePluginName=`basename $theTarball .tar.gz`
mkdir $TMPDIR/${theTarball}_tmp.$$ mkdir $TMPDIR/${theTarball}_tmp.$$
cp $theTarball $TMPDIR/${theTarball}_tmp.$$/. cp $theTarball $TMPDIR/${theTarball}_tmp.$$/.
pushd $TMPDIR/${theTarball}_tmp.$$ 1>/dev/null 2>&1 pushd $TMPDIR/${theTarball}_tmp.$$ 1>/dev/null 2>&1
gunzip < $theTarball | tar xf - gunzip < $theTarball | tar xf -
cd $thePluginName cd $thePluginName
vers=
if test -n "$requiredVersions"; then
vers="-v `echo $requiredVersions | cut -d' ' -f1`"
elif test -e .REQUIRED_VISIT_VERSION; then
vers="-v `cat .REQUIRED_VISIT_VERSION`"
fi
xml2info $vers -clobber $thePluginName.xml 1>/dev/null 2>&1 xml2info $vers -clobber $thePluginName.xml 1>/dev/null 2>&1
xml2makefile $vers -clobber $thePluginName.xml 1>/dev/null 2>&1 xml2makefile $vers -clobber $thePluginName.xml 1>/dev/null 2>&1
make -j 2 1>/dev/null 2>&1 make -j 2 1>/dev/null 2>&1
...@@ -184,10 +226,19 @@ testRunPluginTarball () { ...@@ -184,10 +226,19 @@ testRunPluginTarball () {
vers= vers=
if test -n "$requiredVersions"; then if test -n "$requiredVersions"; then
vers="-v `echo $requiredVersions | cut -d' ' -f1`" vers="-v `echo $requiredVersions | cut -d' ' -f1`"
elif test -e $tarballDir/.REQUIRED_VISIT_VERSION; then
vers="-v `cat $tarballDir/.REQUIRED_VISIT_VERSION`"
fi fi
fileName=`echo $testRun | cut -d':' -f1` fileName=`echo $testRun | cut -d':' -f1`
plotType=`echo $testRun | cut -d':' -f2` plotType=`echo $testRun | cut -d':' -f2`
varName=`echo $testRun | cut -d':' -f3` varName=`echo $testRun | cut -d':' -f3`
if test $action = install && test -e $tarballDir/.TEST_RUN_COMMAND; then
fileName=`cat $tarballDir/.TEST_RUN_COMMAND | cut -d':' -f1`
fileName=`basename $fileName`
fileName=$tarballDir/$fileName
plotType=`cat $tarballDir/.TEST_RUN_COMMAND | cut -d':' -f2`
varName=`cat $tarballDir/.TEST_RUN_COMMAND | cut -d':' -f3`
fi
mkdir $TMPDIR/visit_plugin_test.$$ mkdir $TMPDIR/visit_plugin_test.$$
pushd $TMPDIR/visit_plugin_test.$$ 1>/dev/null 2>&1 pushd $TMPDIR/visit_plugin_test.$$ 1>/dev/null 2>&1
cat > visit_plugin_test.py <<- EOF cat > visit_plugin_test.py <<- EOF
...@@ -214,13 +265,15 @@ EOF ...@@ -214,13 +265,15 @@ EOF
passedIt=`visit $vers -debug 5 -cli -nowin -s visit_plugin_test.py 2>&1 | grep '###PASSED###'` passedIt=`visit $vers -debug 5 -cli -nowin -s visit_plugin_test.py 2>&1 | grep '###PASSED###'`
if test -z "$passedIt"; then if test -z "$passedIt"; then
origDir=`pushd 1>/dev/null 2>&1; pwd ; pushd 1>/dev/null` origDir=`pushd 1>/dev/null 2>&1; pwd ; pushd 1>/dev/null`
cp *.log $origDir/. cp *.5.log $origDir/.
fi fi
popd 1>/dev/null 2>&1 popd 1>/dev/null 2>&1
rm -rf $TMPDIR/visit_plugin_test.$$ rm -rf $TMPDIR/visit_plugin_test.$$
pushd $tarballDir 1>/dev/null 2>&1 if test $action = pack; then
make clean 1>/dev/null 2>&1 pushd $tarballDir 1>/dev/null 2>&1
popd 1>/dev/null 2>&1 make clean 1>/dev/null 2>&1
popd 1>/dev/null 2>&1
fi
rm -rf $tarballDir rm -rf $tarballDir
if test -n "$passedIt"; then if test -n "$passedIt"; then
echo 0 echo 0
...@@ -293,7 +346,7 @@ do ...@@ -293,7 +346,7 @@ do
echo "Expected colon separated list of <Filename:PlotType:VarName> for $1" echo "Expected colon separated list of <Filename:PlotType:VarName> for $1"
optError=1 optError=1
else else
testBuild=1 testBuild=1
testRun=$2 testRun=$2
shift 2 shift 2
fi fi
...@@ -463,14 +516,28 @@ if test $action = pack; then ...@@ -463,14 +516,28 @@ if test $action = pack; then
# Email tarball to recipients if specified # Email tarball to recipients if specified
# #
if test -n "$emailRecipients"; then if test -n "$emailRecipients"; then
oldTmpDir=$TMPDIR
TMPDIR=$TMPDIR/mutt$$
export TMPDIR
mkdir $TMPDIR
chmod 700 $TMPDIR
makeInstructionsFile mutt.msg 1>/dev/null 2>&1 makeInstructionsFile mutt.msg 1>/dev/null 2>&1
if test "$execEmail" = "unknown"; then while true; do
mutt -s "Updated $pluginName plugin" -a $pluginName.tar.gz $emailRecipients < mutt.msg if test "$execEmail" = "unknown"; then
else mutt -s "Updated $pluginName plugin" -a $pluginName.tar.gz $emailRecipients < mutt.msg >& $TMPDIR/mutt.errors
mutt -c $execEmail -s "Updated $pluginName plugin" -a $pluginName.tar.gz $emailRecipients < mutt.msg else
fi mutt -c $execEmail -s "Updated $pluginName plugin" -a $pluginName.tar.gz $emailRecipients < mutt.msg
fi
if test -z "`cat $TMPDIR/mutt.errors`"; then
break;
else
sleep 1
fi
done
rm -rf $TMPDIR
TMPDIR=$oldTmpDir
export TMPDIR
tarballsToRemove="$tarballsToRemove $pluginName.tar.gz" tarballsToRemove="$tarballsToRemove $pluginName.tar.gz"
sleep 3
rm -f mutt.msg rm -f mutt.msg
fi fi
...@@ -486,17 +553,33 @@ elif test $action = install; then ...@@ -486,17 +553,33 @@ elif test $action = install; then
# #
# Try to install the plugin # Try to install the plugin
# #
if test -f $pluginName.tar.gz; then if test -e $pluginName.tar.gz; then
echo -n "Compiling the plugin..."
buildResult=`testBuildPluginTarball $pluginName.tar.gz 0` buildResult=`testBuildPluginTarball $pluginName.tar.gz 0`
buildError=`echo $buildResult | cut -d' ' -f1` buildError=`echo $buildResult | cut -d' ' -f1`
buildDir=`echo $buildResult | cut -d' ' -f2` buildDir=`echo $buildResult | cut -d' ' -f2`
if test $buildError -ne 0; then if test $buildError -ne 0; then
echo "Install failed" echo "Failed. UNinstalling it"
pushd $buildDir 1>/dev/null 2>&1 pushd $buildDir 1>/dev/null 2>&1
make clean 1>/dev/null 2>&1 make clean 1>/dev/null 2>&1
popd 1>/dev/null 2>&1 popd 1>/dev/null 2>&1
exit 1 exit 1
else else
echo "Succeeded."
if test -n "$testRun" || test -e $buildDir/$pluginName/.TEST_RUN_COMMAND; then
echo -n "Testing it..."
if test `testRunPluginTarball $buildDir/$pluginName` -ne 0; then
echo "Failed."
echo "Check debug logs copied to `pwd`."
echo "Uninstalling it"
pushd $buildDir/$pluginName 1>/dev/null 2>&1
make clean 1>/dev/null 2>&1
popd 1>/dev/null 2>&1
rm -rf $buildDir
exit 1
fi
echo "Succeeded."
fi
echo "Installed successfully." echo "Installed successfully."
echo "To UNinstall it, use $0 -uninstall $pluginName" echo "To UNinstall it, use $0 -uninstall $pluginName"
rm -rf $buildDir rm -rf $buildDir
......
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
#include <DataNode.h> #include <DataNode.h>
#include <AnnotationObject.h> #include <AnnotationObject.h>
// Type map format string
const char *AnnotationObjectList::TypeMapFormatString = "a*";
// **************************************************************************** // ****************************************************************************
// Method: AnnotationObjectList::AnnotationObjectList // Method: AnnotationObjectList::AnnotationObjectList
// //
...@@ -48,13 +51,14 @@ ...@@ -48,13 +51,14 @@
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
// **************************************************************************** // ****************************************************************************
AnnotationObjectList::AnnotationObjectList() : AttributeSubject("a*") AnnotationObjectList::AnnotationObjectList() :
AttributeSubject(AnnotationObjectList::TypeMapFormatString)
{ {
} }
...@@ -67,13 +71,14 @@ AnnotationObjectList::AnnotationObjectList() : AttributeSubject("a*") ...@@ -67,13 +71,14 @@ AnnotationObjectList::AnnotationObjectList() : AttributeSubject("a*")
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
// **************************************************************************** // ****************************************************************************
AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) : AttributeSubject("a*") AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) :
AttributeSubject(AnnotationObjectList::TypeMapFormatString)
{ {
AttributeGroupVector::const_iterator pos; AttributeGroupVector::const_iterator pos;
...@@ -105,7 +110,7 @@ AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) : At ...@@ -105,7 +110,7 @@ AnnotationObjectList::AnnotationObjectList(const AnnotationObjectList &obj) : At
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -129,15 +134,16 @@ AnnotationObjectList::~AnnotationObjectList() ...@@ -129,15 +134,16 @@ AnnotationObjectList::~AnnotationObjectList()
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
// **************************************************************************** // ****************************************************************************
void AnnotationObjectList&
AnnotationObjectList::operator = (const AnnotationObjectList &obj) AnnotationObjectList::operator = (const AnnotationObjectList &obj)
{ {
if (this == &obj) return *this;
AttributeGroupVector::const_iterator pos; AttributeGroupVector::const_iterator pos;
// *** Copy the annotation field *** // *** Copy the annotation field ***
...@@ -157,6 +163,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj) ...@@ -157,6 +163,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj)
SelectAll(); SelectAll();
return *this;
} }
// **************************************************************************** // ****************************************************************************
...@@ -168,7 +175,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj) ...@@ -168,7 +175,7 @@ AnnotationObjectList::operator = (const AnnotationObjectList &obj)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -201,7 +208,7 @@ AnnotationObjectList::operator == (const AnnotationObjectList &obj) const ...@@ -201,7 +208,7 @@ AnnotationObjectList::operator == (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -222,7 +229,7 @@ AnnotationObjectList::operator != (const AnnotationObjectList &obj) const ...@@ -222,7 +229,7 @@ AnnotationObjectList::operator != (const AnnotationObjectList &obj) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -243,7 +250,7 @@ AnnotationObjectList::TypeName() const ...@@ -243,7 +250,7 @@ AnnotationObjectList::TypeName() const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -271,7 +278,7 @@ AnnotationObjectList::CopyAttributes(const AttributeGroup *atts) ...@@ -271,7 +278,7 @@ AnnotationObjectList::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -297,7 +304,7 @@ AnnotationObjectList::CreateCompatible(const std::string &tname) const ...@@ -297,7 +304,7 @@ AnnotationObjectList::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -324,7 +331,7 @@ AnnotationObjectList::NewInstance(bool copy) const ...@@ -324,7 +331,7 @@ AnnotationObjectList::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -345,7 +352,7 @@ AnnotationObjectList::SelectAll() ...@@ -345,7 +352,7 @@ AnnotationObjectList::SelectAll()
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -370,7 +377,7 @@ AnnotationObjectList::CreateSubAttributeGroup(int) ...@@ -370,7 +377,7 @@ AnnotationObjectList::CreateSubAttributeGroup(int)
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -413,7 +420,7 @@ AnnotationObjectList::CreateNode(DataNode *parentNode, bool completeSave, bool f ...@@ -413,7 +420,7 @@ AnnotationObjectList::CreateNode(DataNode *parentNode, bool completeSave, bool f
// Note: Autogenerated by xml2atts. // Note: Autogenerated by xml2atts.
// //
// Programmer: xml2atts // Programmer: xml2atts
// Creation: Thu Dec 18 11:23:56 PDT 2003 // Creation: Tue Mar 13 10:49:51 PDT 2007
// //
// Modifications: // Modifications:
// //
...@@ -433,7 +440,7 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode) ...@@ -433,7 +440,7 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode)
DataNode *node; DataNode *node;
DataNode **children; DataNode **children;
// Clear all the AnnotationObjects. // Clear all the AnnotationObjects.
ClearAnnotationObjects(); ClearAnnotations();
// Go through all of the children and construct a new // Go through all of the children and construct a new
// AnnotationObject for each one of them. // AnnotationObject for each one of them.
...@@ -444,7 +451,7 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode) ...@@ -444,7 +451,7 @@ AnnotationObjectList::SetFromNode(DataNode *parentNode)
{ {
AnnotationObject temp; AnnotationObject temp;
temp.SetFromNode(children[i]); temp.SetFromNode(children[i]);
AddAnnotationObject(temp); AddAnnotation(temp);
} }
} }
...@@ -475,7 +482,7 @@ AnnotationObjectList::GetAnnotation() ...@@ -475,7 +482,7 @@ AnnotationObjectList::GetAnnotation()
///////////////////////////////////////////////////////////////////////////////