[Saga-devel] saga SVN commit 3382: /trunk/examples/misc/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/24 01:27 PM

Modified:
 /trunk/examples/misc/
  aws.cpp

Log:
 cleanup

File Changes:

Directory: /trunk/examples/misc/
================================

File [modified]: aws.cpp
Delta lines: +12 -11
===================================================================
--- trunk/examples/misc/aws.cpp	2009-01-24 19:26:16 UTC (rev 3381)
+++ trunk/examples/misc/aws.cpp	2009-01-24 19:27:41 UTC (rev 3382)
@@ -12,7 +12,7 @@
 
   std::string line;
 
-  while ( ! out.fail () ) 
+  while ( out.good () ) 
   {
     char c;
 
@@ -33,7 +33,6 @@
                  std::string            type, 
                  std::string            instance = "")
 {
-
   saga::url js_url (type + "://" + instance);
 
   std::cout << " ----------------------- (" << type << " - " << js_url << ") \n";
@@ -66,18 +65,20 @@
     // job description is shared by all sessions
     saga::job::description jd;
 
-    jd.set_attribute (saga::job::attributes::description_executable,  "hostname");
-    jd.set_attribute (saga::job::attributes::description_executable, "/usr/local/packages/saga-1.1/bin/saga-file");
-    jd.set_attribute (saga::job::attributes::description_executable, "saga-file");
-    jd.set_attribute (saga::job::attributes::description_interactive, "True");
-
     std::vector <std::string> args;
+    std::vector <std::string> env;
 
+    std::string exe ("saga-file");
+
     args.push_back ("list_dir");
-    args.push_back ("ssh://merzky@qb.loni.org/");
+    args.push_back ("ssh://amerzky@gg101.cct.lsu.edu/");
 
-    jd.set_vector_attribute (saga::job::attributes::description_arguments, args);
+    env.push_back  ("SAGA_VERBOSE=0");
 
+    jd.set_attribute (saga::job::attributes::description_executable,         exe);
+    jd.set_vector_attribute (saga::job::attributes::description_arguments,   args);
+    jd.set_vector_attribute (saga::job::attributes::description_environment, env );
+    jd.set_attribute (saga::job::attributes::description_interactive,        saga::attributes::common_true);
 
     //  FIXME: the job service contact should point to the ec2 service instance.
     //  Problem: what protocol to use?  We need to denotify the context type (do
@@ -91,7 +92,7 @@
 
     // create a new instance on ec2, and run a test job
     test_cloud (jd, "ec2");
- // test_cloud (jd, "ec2",        "i-a7f87bce");
+ // test_cloud (jd, "ec2",        "i-6e9c1e07");
 
     // same for eucalyptus
  // test_cloud (jd, "eucalyptus");
@@ -103,7 +104,7 @@
   
     // same for gumbocloud
  // test_cloud (jd, "gumbocloud");
- // test_cloud (jd, "gumbocloud",        "i-d642c7bf");
+ // test_cloud (jd, "gumbocloud", "i-d642c7bf");
 
   }
   catch ( saga::exception const & e )