[Swift-commit] r7218 - in SwiftApps/gocat: . log

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-10-23 16:47:41 -0500 (Wed, 23 Oct 2013)
New Revision: 7218

Modified:
   SwiftApps/gocat/log/GlobusCatalog-log.txt
   SwiftApps/gocat/tagwrap.sh
Log:
 

Modified: SwiftApps/gocat/log/GlobusCatalog-log.txt
===================================================================
--- SwiftApps/gocat/log/GlobusCatalog-log.txt	2013-10-23 16:21:25 UTC (rev 7217)
+++ SwiftApps/gocat/log/GlobusCatalog-log.txt	2013-10-23 21:47:41 UTC (rev 7218)
@@ -75,3 +75,13 @@
 python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py get_datasets 48
 python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text get_datasets 48
 python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text get_dataset_annotations 48 83
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"shadow"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 85 {"parameter1":"angle49"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py query_datasets 48 name EQUAL shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"shadow"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 86 {"parameter1":"angle49"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text query_datasets 48 name EQUAL shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"shadow"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 87 {"parameter1":"angle49"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py get_datasets 48
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text get_datasets 48

Modified: SwiftApps/gocat/tagwrap.sh
===================================================================
--- SwiftApps/gocat/tagwrap.sh	2013-10-23 16:21:25 UTC (rev 7217)
+++ SwiftApps/gocat/tagwrap.sh	2013-10-23 21:47:41 UTC (rev 7218)
@@ -1,7 +1,13 @@
 #!/bin/bash -x
 
-# Usage: $0 <catid> <dataset_name> <tagname>=<value>
+# Usage: $0 <dataset_name> <tagname>=<value>
 
+if [ $# -ne 2 ]
+then
+ echo "Usage: $0 <dataset_name> <tagname>=<value>"
+ exit 1
+fi
+
 loc=/scratch/local/ketan/catalog-client/globusonline/catalog/client/examples
 catid=48
 dsetname=$1
@@ -11,6 +17,9 @@
 tagval=`echo $tagvalpair|awk -F= '{print $2}'`
 
 # 1. Create dataset
+ # a. Check if it already exists
+ python $loc/catalog.py -text query_datasets $catid name EQUAL $dsetname
+
  exprstr="{\"name\":\"$dsetname\"}"
  echo '==='
  echo $exprstr