[Swift-commit] r7046 - SwiftApps/gocat

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-09-09 13:37:35 -0500 (Mon, 09 Sep 2013)
New Revision: 7046

Modified:
   SwiftApps/gocat/apps
   SwiftApps/gocat/catalog.swift
Log:
simplified swift

Modified: SwiftApps/gocat/apps
===================================================================
--- SwiftApps/gocat/apps	2013-09-09 03:14:35 UTC (rev 7045)
+++ SwiftApps/gocat/apps	2013-09-09 18:37:35 UTC (rev 7046)
@@ -1,4 +1,5 @@
-get_all_catalogs /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
-get_all_datasets /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
-get_dataset_members /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
-get_tags /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
+localhost tag_go /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
+localhost locate_go /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py
+
+localhost tag_cmd tag
+localhost locate_cmd locate

Modified: SwiftApps/gocat/catalog.swift
===================================================================
--- SwiftApps/gocat/catalog.swift	2013-09-09 03:14:35 UTC (rev 7045)
+++ SwiftApps/gocat/catalog.swift	2013-09-09 18:37:35 UTC (rev 7046)
@@ -1,19 +1,17 @@
 type file;
 
-app (file catalogs, file err) get_all_catalogs (){
-    get_catalogs stdout=@catalogs stderr=@err;
+app (file out, file err) tag_go (string tag_args){
+    tag_go tag_args stdout=@out stderr=@err;
 }
 
-app (file datasets, file err) get_all_datasets (string catalogid){
-    get_datasets catalogid stdout=@datasets 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 dataset_members, file err) get_dataset_members (string catalog_id, string dataset_id){
-    get_dataset_members catalog_id dataset_id stdout=@dataset_members stderr=@err;
+app (file datasets, file err) tag_cmd (string catalogid){
+    get_datasets catalogid stdout=@datasets stderr=@err;
 }
 
-app (file tags, file err) get_tags (string catalog_id, string dataset_id){
-    get_tags catalog_id dataset_id stdout=@tags stderr=@err;
+app (file tags, file err) locate_cmd (string tag_args){
+    get_tags tag_args stdout=@tags stderr=@err;
 }
-
-