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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-10-21 15:18:40 -0500 (Mon, 21 Oct 2013)
New Revision: 7189

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-18 21:41:35 UTC (rev 7188)
+++ SwiftApps/gocat/log/GlobusCatalog-log.txt	2013-10-21 20:18:40 UTC (rev 7189)
@@ -1,3 +1,63 @@
 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 create_members 48 55 {"data_type":"file", "data_uri":"file:///scratch/local/ketan/gocat/dataset.txt"}
+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 create_annotation_def 48 'parameter1' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text query_datasets 48 name LIKE shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{parameter1:angle49}'
+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 -text query_datasets 48 name LIKE shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{parameter1:angle49}'
+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 create_annotation_def 48 'parameter2' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text query_datasets 48 name LIKE shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{parameter2:angle49}'
+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 create_annotation_def 48 'parameter3' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text query_datasets 48 name LIKE shadow
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{parameter3:angle49}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{name:telegenerate}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{dag:flow}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{dag:flow}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"telegenerate"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{dag:flow}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"telegenerate"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag2' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{dag2:flow}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"telegenerate"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag3' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag3":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"owais"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag3":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"subah"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag4' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag4":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"shaam"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag4":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag6' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag6":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag7' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag7":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 '{"dag7":"flow"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{name:expression}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 '{"name":"expression"}'
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"expression"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"given"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag8' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"taken"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag9' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"taken"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"taken"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 'dag10' text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py get_annotation_defs 48
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py -text get_annotation_defs 48
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"taken"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_annotation_def 48 dag9 text
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py create_dataset 48 {"name":"taken"}
+python /scratch/local/ketan/catalog-client/globusonline/catalog/client/examples/catalog.py add_dataset_annotation 48 80 {"dag9":"flow"}

Modified: SwiftApps/gocat/tagwrap.sh
===================================================================
--- SwiftApps/gocat/tagwrap.sh	2013-10-18 21:41:35 UTC (rev 7188)
+++ SwiftApps/gocat/tagwrap.sh	2013-10-21 20:18:40 UTC (rev 7189)
@@ -1,17 +1,34 @@
-#!/bin/bash
+#!/bin/bash -x
 
-# Usage: $0 <catid> <dataset> <tagname>=<value>
+# Usage: $0 <catid> <dataset_name> <tagname>=<value>
 
-catid=$1 #48
-datasetid=$2 #55 
-tagvalpair=$3
+loc=/scratch/local/ketan/catalog-client/globusonline/catalog/client/examples
+catid=48
+dsetname=$1
+tagvalpair=$2
 
 tagname=`echo $tagvalpair|awk -F= '{print $1}'`
 tagval=`echo $tagvalpair|awk -F= '{print $2}'`
 
-# 1. create dataset member
-python catalog.py create_members $catid $datasetid '{"data_type":"file", "data_uri":"file:///scratch/local/ketan/gocat/dataset.txt"}'
+# 1. Create dataset
+ exprstr="{\"name\":\"$dsetname\"}"
+ echo '==='
+ echo $exprstr
+ echo '==='
+ retstr=$(python $loc/catalog.py create_dataset $catid $exprstr)
 
-# 2. insert tagname, value
-python catalog.py add_member_annotation $catid $datasetid $memberid <Annotations>
+ echo '==='
+ echo $retstr
+ echo '==='
 
+# 2. Annotate it
+  # a. create annotation definition
+  python $loc/catalog.py create_annotation_def $catid "$tagname" 'text'
+
+  dsetid=`echo $retstr |awk -F, '{print $2}'`
+  echo '==='
+  echo $dsetid
+  echo '==='
+  # b. Add dataset annotation
+  python $loc/catalog.py add_dataset_annotation $catid $dsetid "{\"$tagname\":\"$tagval\"}"
+