[cig-commits] r11369 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-03-07 08:40:53 -0800 (Fri, 07 Mar 2008)
New Revision: 11369

Modified:
   cs/benchmark/cigma/trunk/src/ListCmd.cpp
Log:
Reuse h5ls command, and disabled traces in ListCmd


Modified: cs/benchmark/cigma/trunk/src/ListCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/ListCmd.cpp	2008-03-07 16:40:52 UTC (rev 11368)
+++ cs/benchmark/cigma/trunk/src/ListCmd.cpp	2008-03-07 16:40:53 UTC (rev 11369)
@@ -1,7 +1,10 @@
 #include <iostream>
+#include <cstdlib>
 #include <cassert>
+#include <string>
 #include "ListCmd.h"
 #include "VtkList.h"
+#include "StringUtils.h"
 
 using namespace std;
 
@@ -21,7 +24,7 @@
 
 void cigma::ListCmd::setupOptions(AnyOption *opt)
 {
-    cout << "Calling cigma::ListCmd::setupOptions()" << endl;
+    //cout << "Calling cigma::ListCmd::setupOptions()" << endl;
 
     assert(opt != 0);
 
@@ -38,7 +41,7 @@
 
 void cigma::ListCmd::configure(AnyOption *opt)
 {
-    cout << "Calling cigma::ListCmd::configure()" << endl;
+    //cout << "Calling cigma::ListCmd::configure()" << endl;
 
     assert(opt != 0);
     char *in = 0;
@@ -56,15 +59,36 @@
 
 int cigma::ListCmd::run()
 {
-    cout << "Calling cigma::ListCmd::run()" << endl;
+    //cout << "Calling cigma::ListCmd::run()" << endl;
 
     if (filename == "")
     {
         return 1;
     }
 
-    vtkls(filename.c_str());
+    string fileroot;
+    string extension;
 
+    path_splitext(filename, fileroot, extension);
+    
+    if (extension == ".vtk")
+    {
+        vtkls(filename.c_str());
+    }
+    else if (extension == ".h5")
+    {
+        int ret;
+        string cmd = "h5ls -r ";
+        cmd += filename;
+        ret = system(cmd.c_str());
+        return ret;
+    }
+    else
+    {
+        cerr << "list: File extension must be .h5 or .vtk" << endl;
+        return 2;
+    }
+
     return 0;
 }