mostly cosmetic changes to TestStorageClient & fiddling with doxytag

livesupport/modules/storage/src/TestStorageClient.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.13 $
+    Version  : $Revision: 1.14 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClient.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -249,25 +249,13 @@ TestStorageClient :: acquirePlaylist(Ptr<const UniqueId>::Ref id) const
         ++it;
     }
 
-    char fileName[] = "/tmp/tempPlaylistXXXXXX";
+    std::stringstream fileName;
-    if (!mkstemp(fileName)) {
+    fileName << "file:///tmp/tempPlaylist" << newPlaylist->getId()->getId()
-        throw std::logic_error("could not create temp file");
+             << "#" << std::rand() << ".smil";
-    }
-    std::string     sysCommand = "mv ";
-    sysCommand += fileName;
-    sysCommand += " ";
-    sysCommand += fileName;
-    sysCommand += ".smil > /dev/null 2>&1";
-    if (system(sysCommand.c_str()) != 0) {
-        throw std::logic_error("could not rename temp file");
-    }
 
-    std::string     smilFileName("file://");
+    smilDocument->write_to_file(fileName.str(), "UTF-8");
-    smilFileName += fileName;
-    smilFileName += ".smil";
-    smilDocument->write_to_file(smilFileName, "UTF-8");
    
-    Ptr<std::string>::Ref   playlistUri(new std::string(smilFileName));
+    Ptr<std::string>::Ref   playlistUri(new std::string(fileName.str()));
     newPlaylist->setUri(playlistUri);
     return newPlaylist;
 }
@@ -285,12 +273,11 @@ TestStorageClient :: releasePlaylist(Ptr<Playlist>::Ref playlist) const
     }
 
     std::ifstream ifs(playlist->getUri()->substr(7).c_str());
-    if (ifs) {
+    if (!ifs) {
         ifs.close();
-    }
-    else {
         throw std::logic_error("playlist temp file not found");
     }
+    ifs.close();
 
     std::remove(playlist->getUri()->substr(7).c_str());
    
@@ -425,12 +412,11 @@ TestStorageClient :: acquireAudioClip(Ptr<const UniqueId>::Ref id) const
     std::string     audioClipFileName = storedAudioClip->getUri()->substr(5);
     
     std::ifstream ifs(audioClipFileName.c_str());
-    if (ifs) {
+    if (!ifs) {
         ifs.close();
-    }
-    else {
         throw std::logic_error("could not read audio clip");
     }
+    ifs.close();
 
     Ptr<AudioClip>::Ref audioClip(new AudioClip(*storedAudioClip));
 

livesupport/modules/storage/src/TestStorageClientTest.cxx

@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.12 $
+    Version  : $Revision: 1.13 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -272,12 +272,11 @@ TestStorageClientTest :: acquirePlaylistTest(void)
     CPPUNIT_ASSERT(playlist->getUri()->substr(0,7) == "file://");
     
     std::ifstream ifs1(playlist->getUri()->substr(7).c_str());
-    if (ifs1) {
+    if (!ifs1) {
         ifs1.close();
-    }
-    else {
         CPPUNIT_FAIL("temp file not created correctly");
     }
+    ifs1.close();
 
     string  savedTempFilePath = playlist->getUri()->substr(7);
     try {
@@ -294,6 +293,7 @@ TestStorageClientTest :: acquirePlaylistTest(void)
         ifs2.close();
         CPPUNIT_FAIL("temp file not destroyed correctly");
     }
+    ifs2.close();
 
     try {
         playlist = tsc->acquirePlaylist(id77);

livesupport/products/scheduler/etc/doxygen.config

@@ -21,7 +21,7 @@
 #
 #
 #   Author   : $Author: fgerlits $
-#   Version  : $Revision: 1.3 $
+#   Version  : $Revision: 1.4 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/doxygen.config,v $
 #-------------------------------------------------------------------------------
 
@@ -977,7 +977,8 @@ SKIP_FUNCTION_MACROS   = YES
 # If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = ../../usr/share/doc/xmlrpc++/xmlrpc++.tag=../../../../../usr/share/doc/xmlrpc++
+TAGFILES               = \
+../../usr/share/doc/xmlrpc++/xmlrpc++.tag=../../../../../usr/share/doc/xmlrpc++
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.

livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh

@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: fgerlits $
-#   Version  : $Revision: 1.2 $
+#   Version  : $Revision: 1.3 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/Attic/install.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -37,7 +37,12 @@ installdir=`cd $basedir/../../../usr; pwd; cd -`
 tmpdir=$basedir/tmp
 etcdir=$basedir/etc
 tar=$basedir/src/$product.tar.gz
+
 docdir=$installdir/share/doc/xmlrpc++
+tagfile="xmlrpc++.tag"
+external_doc_pages="XmlRpcServerMethod_8h-source.html \
+                    classXmlRpc_1_1XmlRpcServerMethod.html \
+                    classXmlRpc_1_1XmlRpcServerMethod-members.html"
 
 echo "installing $product from $basedir to $installdir"
 
@@ -52,9 +57,7 @@ sh autogen.sh --prefix=$installdir
 make install
 
 cd $docdir
-doxytag -t xmlrpc++.tag XmlRpcServerMethod_8h-source.html \
+doxytag -t $tagfile $external_doc_pages
-                        classXmlRpc_1_1XmlRpcServerMethod.html \
-                        classXmlRpc_1_1XmlRpcServerMethod-members.html
                         
 cd $basedir
 rm -rf tmp