logging user tags needed for IS queries

diff --git a/org.glite.jp/examples/pch06/align.sh b/org.glite.jp/examples/pch06/align.sh
index 99bc7a6..5486de7 100644 (file)
--- a/org.glite.jp/examples/pch06/align.sh
+++ b/org.glite.jp/examples/pch06/align.sh
@@ -13,6 +13,15 @@ log_event() #1 - attr.name #2 attr.value
   || echo $GLITE_WMS_SEQUENCE_CODE`
 }
 
+init_log_event()
+{
+  lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
+  if [ ! -x "$lb_logevent" ]; then
+    lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
+  fi
+  host=`hostname -f`
+}
+
 
 exec 2>$$.err >&2
 set -x
@@ -24,14 +33,6 @@ echo $0 $*
 
 chmod +x align_warp scanheader
 
-lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
-if [ ! -x "$lb_logevent" ]; then
-  lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
-fi
-host=`hostname -f`
-
-log_event "IPAW_PROGRAM" "align_warp"
-
 globus-url-copy $1.img file://$PWD/anatomy.img
 globus-url-copy $1.hdr file://$PWD/anatomy.hdr
 globus-url-copy $2.img file://$PWD/reference.img
@@ -43,3 +44,17 @@ echo GLOBAL_MAXIMUM=`./scanheader anatomy.img | grep '^global maximum=' | sed 's
 globus-url-copy file://$PWD/warp $1.warp
 
 globus-url-copy file://$PWD/$$.err $1.align-err
+
+# Log LB user_tags
+init_log_event
+log_event "IPAW_STAGE" "1"
+log_event "IPAW_PROGRAM" "align_warp"
+log_event "IPAW_INPUT" "$1.img"
+log_event "IPAW_INPUT" "$1.hdr"
+log_event "IPAW_INPUT" "$2.img"
+log_event "IPAW_INPUT" "$2.hdr"
+log_event "IPAW_OUTPUT" "$1.warp"
+log_event "IPAW_PARAM" "-m 12"
+log_event "IPAW_PARAM" "-q"
+log_event "IPAW_HEADER" "$GLOBAL_MAXIMUM"
+

diff --git a/org.glite.jp/examples/pch06/convert.sh b/org.glite.jp/examples/pch06/convert.sh
index 825f413..70b4511 100644 (file)
--- a/org.glite.jp/examples/pch06/convert.sh
+++ b/org.glite.jp/examples/pch06/convert.sh
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+log_event() #1 - attr.name #2 attr.value
+{
+  GLITE_WMS_SEQUENCE_CODE=`$lb_logevent\
+    --jobid="$GLITE_WMS_JOBID"\
+    --source="Application"\
+    --sequence="$GLITE_WMS_SEQUENCE_CODE"\
+    --event="UserTag"\
+    --node=$host\
+    --name="$1"\
+    --value="$2"\
+  || echo $GLITE_WMS_SEQUENCE_CODE`
+}
+
+init_log_event()
+{
+  lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
+  if [ ! -x "$lb_logevent" ]; then
+    lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
+  fi
+  host=`hostname -f`
+}
+
+
 set -ex
 
 hostname -f
@@ -12,3 +35,12 @@ chmod +x convert
 ./convert atlas.pgm atlas.gif
 
 globus-url-copy file://$PWD/atlas.gif $1-$2.gif
+
+
+# Log LB user_tags
+init_log_event
+log_event "IPAW_STAGE" "5"
+log_event "IPAW_PROGRAM" "convert"
+log_event "IPAW_INPUT" "$1-$2.pgm"
+log_event "IPAW_OUTPUT" "$1-$2.gif"
+

diff --git a/org.glite.jp/examples/pch06/reslice.sh b/org.glite.jp/examples/pch06/reslice.sh
index 6bada59..2d0407b 100644 (file)
--- a/org.glite.jp/examples/pch06/reslice.sh
+++ b/org.glite.jp/examples/pch06/reslice.sh
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+log_event() #1 - attr.name #2 attr.value
+{
+  GLITE_WMS_SEQUENCE_CODE=`$lb_logevent\
+    --jobid="$GLITE_WMS_JOBID"\
+    --source="Application"\
+    --sequence="$GLITE_WMS_SEQUENCE_CODE"\
+    --event="UserTag"\
+    --node=$host\
+    --name="$1"\
+    --value="$2"\
+  || echo $GLITE_WMS_SEQUENCE_CODE`
+}
+
+init_log_event()
+{
+  lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
+  if [ ! -x "$lb_logevent" ]; then
+    lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
+  fi
+  host=`hostname -f`
+}
+
+
 set -ex
 
 hostname -f
@@ -15,3 +38,15 @@ chmod +x reslice
 
 globus-url-copy file://$PWD/resliced.img $1-resliced.img
 globus-url-copy file://$PWD/resliced.hdr $1-resliced.hdr
+
+
+# Log LB user_tags
+init_log_event
+log_event "IPAW_STAGE" "2"
+log_event "IPAW_PROGRAM" "reslice"
+log_event "IPAW_INPUT" "$1.warp"
+log_event "IPAW_INPUT" "$1.img"
+log_event "IPAW_INPUT" "$1.hdr"
+log_event "IPAW_OUTPUT" "$1-resliced.img"
+log_event "IPAW_OUTPUT" "$1-resliced.img"
+

diff --git a/org.glite.jp/examples/pch06/slicer.sh b/org.glite.jp/examples/pch06/slicer.sh
index 55eed1e..db6b3a0 100644 (file)
--- a/org.glite.jp/examples/pch06/slicer.sh
+++ b/org.glite.jp/examples/pch06/slicer.sh
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+log_event() #1 - attr.name #2 attr.value
+{
+  GLITE_WMS_SEQUENCE_CODE=`$lb_logevent\
+    --jobid="$GLITE_WMS_JOBID"\
+    --source="Application"\
+    --sequence="$GLITE_WMS_SEQUENCE_CODE"\
+    --event="UserTag"\
+    --node=$host\
+    --name="$1"\
+    --value="$2"\
+  || echo $GLITE_WMS_SEQUENCE_CODE`
+}
+
+init_log_event()
+{
+  lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
+  if [ ! -x "$lb_logevent" ]; then
+    lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
+  fi
+  host=`hostname -f`
+}
+
+
 set -ex
 
 hostname -f
@@ -15,3 +38,13 @@ export FSLOUTPUTTYPE
 ./slicer atlas.hdr -$2 .5 atlas-$2.pgm
 
 globus-url-copy file://$PWD/atlas-$2.pgm $1-$2.pgm
+
+
+# Log LB user_tags
+init_log_event
+log_event "IPAW_STAGE" "4"
+log_event "IPAW_PROGRAM" "slicer"
+log_event "IPAW_INPUT" "$1.hdr"
+log_event "IPAW_INPUT" "$1.img"
+log_event "IPAW_OUTPUT" "$1-$2.pgm"
+

diff --git a/org.glite.jp/examples/pch06/softmean.sh b/org.glite.jp/examples/pch06/softmean.sh
index 5657f1f..3136010 100644 (file)
--- a/org.glite.jp/examples/pch06/softmean.sh
+++ b/org.glite.jp/examples/pch06/softmean.sh
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+log_event() #1 - attr.name #2 attr.value
+{
+  GLITE_WMS_SEQUENCE_CODE=`$lb_logevent\
+    --jobid="$GLITE_WMS_JOBID"\
+    --source="Application"\
+    --sequence="$GLITE_WMS_SEQUENCE_CODE"\
+    --event="UserTag"\
+    --node=$host\
+    --name="$1"\
+    --value="$2"\
+  || echo $GLITE_WMS_SEQUENCE_CODE`
+}
+
+init_log_event()
+{
+  lb_logevent=${GLITE_WMS_LOCATION}/bin/glite-lb-logevent
+  if [ ! -x "$lb_logevent" ]; then
+    lb_logevent="${EDG_WL_LOCATION}/bin/edg-wl-logev"
+  fi
+  host=`hostname -f`
+}
+
+
 set -ex
 
 hostname -f
@@ -20,3 +43,20 @@ chmod +x softmean
 
 globus-url-copy file://$PWD/atlas.img $5.img
 globus-url-copy file://$PWD/atlas.hdr $5.hdr
+
+
+# Log LB user_tags
+init_log_event
+log_event "IPAW_STAGE" "3"
+log_event "IPAW_PROGRAM" "softmean"
+log_event "IPAW_INPUT" "$1-resliced.img"
+log_event "IPAW_INPUT" "$1-resliced.hdr"
+log_event "IPAW_INPUT" "$2-resliced.img"
+log_event "IPAW_INPUT" "$2-resliced.hdr"
+log_event "IPAW_INPUT" "$3-resliced.img"
+log_event "IPAW_INPUT" "$3-resliced.hdr"
+log_event "IPAW_INPUT" "$4-resliced.img"
+log_event "IPAW_INPUT" "$4-resliced.hdr"
+log_event "IPAW_OUTPUT" "$5.img"
+log_event "IPAW_OUTPUT" "$5.hdr"
+