[Swift-commit] r7083 - SwiftApps/gocat

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-09-18 14:52:18 -0500 (Wed, 18 Sep 2013)
New Revision: 7083

Modified:
   SwiftApps/gocat/catalog.swift
Log:
 

Modified: SwiftApps/gocat/catalog.swift
===================================================================
--- SwiftApps/gocat/catalog.swift	2013-09-18 18:32:47 UTC (rev 7082)
+++ SwiftApps/gocat/catalog.swift	2013-09-18 19:52:18 UTC (rev 7083)
@@ -1,26 +1,21 @@
 type file;
 
-app (file out, file err) tag_go (string datasetname, string tag_args){
-    tag_go datasetname tag_args stdout=@out stderr=@err;
+app (file _out, file _err) tag (string _datasetname, string[] _tagargs){
+    tag_dataset _datasetname _tagargs stdout=@_out stderr=@_err;
 }
 
-app (file tags, file err) locate_go (string catalog_id, string dataset_id, string tag_args){
-    get_tags catalog_id dataset_id tag_args stdout=@tags stderr=@err;
+app (file _ds) locate (string _tagargs){
+    locate_dataset _tagargs stdout=@_ds;
 }
 
-app (file out, file err) tag_cmd (string datasetname, string tagargs){
-    tag_dataset datasetname tagargs stdout=@out stderr=@err;
-}
-
-app (file tags) locate_cmd (string tag_args){
-    locate_dataset tag_args stdout=@tags;
-}
-
 file tagout[]<simple_mapper; location="outdir", prefix="tag.",suffix=".out">;
 file tagerr[]<simple_mapper; location="outdir", prefix="tag.",suffix=".err">;
 
 foreach i in [1:3]{
-#iterate i {
-  (tagout[i], tagerr[i]) = tag_cmd(@strcat("/data/maheshwari/d", i), @strcat("atagname=tagvalue", i));
+  (tagout[i], tagerr[i]) = tag(@strcat(@arg("dsname","/data/maheshwari/z"), i), @strsplit(@arg("tagarg"), "\\s"));
 }
-#until (i==3);
+
+file ds<"ds.txt">;
+
+ds=locate(@arg("locatearg","atagname=tagvalue1"));
+