[Swift-commit] r7082 - SwiftApps/gocat

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-09-18 13:32:47 -0500 (Wed, 18 Sep 2013)
New Revision: 7082

Modified:
   SwiftApps/gocat/apps
   SwiftApps/gocat/catalog.swift
   SwiftApps/gocat/cleanup
   SwiftApps/gocat/psql.txt
Log:
tag app

Modified: SwiftApps/gocat/apps
===================================================================
--- SwiftApps/gocat/apps	2013-09-18 11:48:37 UTC (rev 7081)
+++ SwiftApps/gocat/apps	2013-09-18 18:32:47 UTC (rev 7082)
@@ -3,3 +3,4 @@
 
 localhost tag_dataset tag
 localhost locate_dataset locate
+localhost findit find

Modified: SwiftApps/gocat/catalog.swift
===================================================================
--- SwiftApps/gocat/catalog.swift	2013-09-18 11:48:37 UTC (rev 7081)
+++ SwiftApps/gocat/catalog.swift	2013-09-18 18:32:47 UTC (rev 7082)
@@ -1,15 +1,15 @@
 type file;
 
-app (file out, file err) tag_go (string tag_args){
-    tag_go tag_args stdout=@out stderr=@err;
+app (file out, file err) tag_go (string datasetname, string tag_args){
+    tag_go datasetname tag_args 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 out, file err) tag_cmd (string tagargs){
-    tag_dataset tagargs stdout=@out stderr=@err;
+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){
@@ -20,5 +20,7 @@
 file tagerr[]<simple_mapper; location="outdir", prefix="tag.",suffix=".err">;
 
 foreach i in [1:3]{
-  (tagout[i], tagerr[i]) = tag_cmd(strcat("/data/maheshwari/d", i, " atagname=tagvalue", i));
+#iterate i {
+  (tagout[i], tagerr[i]) = tag_cmd(@strcat("/data/maheshwari/d", i), @strcat("atagname=tagvalue", i));
 }
+#until (i==3);

Modified: SwiftApps/gocat/cleanup
===================================================================
--- SwiftApps/gocat/cleanup	2013-09-18 11:48:37 UTC (rev 7081)
+++ SwiftApps/gocat/cleanup	2013-09-18 18:32:47 UTC (rev 7082)
@@ -1,2 +1,2 @@
-rm -rf *.log *.rlog *.d p?-*-*-* *.kml *.swiftx *.out output outdir logs hi.* _concurrent .swift/tmp
+rm -rf *.log *.rlog *.d p?-*-*-* *.kml *.swiftx *.out output outdir logs hi.* _concurrent .swift/tmp t.hdr t.body
 

Modified: SwiftApps/gocat/psql.txt
===================================================================
--- SwiftApps/gocat/psql.txt	2013-09-18 11:48:37 UTC (rev 7081)
+++ SwiftApps/gocat/psql.txt	2013-09-18 18:32:47 UTC (rev 7082)
@@ -1,2 +1,3 @@
 psql -U provdb -h swift.rcc.uchicago.edu provdb -c "\d+ annot_dataset_text"
 psql -U provdb -h swift.rcc.uchicago.edu provdb -c "select dataset_id from annot_dataset_text"
+psql -U provdb -h swift.rcc.uchicago.edu provdb -c "delete from annot_dataset_text where dataset_id = '/data/maheshwari/d3'"