From: Jiří Filipovič <fila@ics.muni.cz>
Date: Thu, 22 Mar 2007 12:10:30 +0000 (+0000)
Subject: Plugins can set attribute's origin_detail, glite-jp-primary-test shows it.
X-Git-Tag: merge_31_3_head_dst~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b18a0ff3fcbe2768ff1af98df95701a46a15b5ff;p=jra1mw.git

Plugins can set attribute's origin_detail, glite-jp-primary-test shows it.
---

diff --git a/org.glite.jp.primary/examples/jpps-test.c b/org.glite.jp.primary/examples/jpps-test.c
index 0a6b348..6add9c4 100644
--- a/org.glite.jp.primary/examples/jpps-test.c
+++ b/org.glite.jp.primary/examples/jpps-test.c
@@ -285,11 +285,12 @@ int main(int argc,char *argv[])
 
 			puts("Attribute values:");
 			for (i=0; i<out.__sizeattrValues; i++)
-				printf("\t%s\t%s\t%s",
+				printf("\t%s\t%s\t%s\t%s",
 					out.attrValues[i]->value->string ?
 						out.attrValues[i]->value->string :
 						"binary",
 					orig2str(out.attrValues[i]->origin),
+					out.attrValues[i]->originDetail,
 					ctime(&out.attrValues[i]->timestamp));
 
 		}
diff --git a/org.glite.jp.primary/src/attrs.c b/org.glite.jp.primary/src/attrs.c
index 5c1873a..a25eada 100644
--- a/org.glite.jp.primary/src/attrs.c
+++ b/org.glite.jp.primary/src/attrs.c
@@ -88,7 +88,8 @@ void process_files(glite_jp_context_t ctx, const char *job, glite_jp_attrval_t**
                 			int k;
 	                        	for (k=0; myattr[k].name; k++) {
         	                		myattr[k].origin = GLITE_JP_ATTR_ORIG_FILE;
-	                	                trio_asprintf(&myattr[k].origin_detail,"%s %s", uri, names[n] ? names[n] : "");
+	                	                if (!myattr[k].origin_detail) 
+							trio_asprintf(&myattr[k].origin_detail,"%s %s", uri, names[n] ? names[n] : "");
         	                	}
 	        	                *nout = merge_attrvals(out,*nout,myattr);
         	        	        free(myattr);
@@ -161,6 +162,9 @@ glite_jpps_get_attrs(glite_jp_context_t ctx,const char *job,char **attr,int natt
 
 	free(meta); meta = NULL;
 
+	for (i = 0; i < nout; i++)
+                printf("%s\n", out[i].value);
+
 	if (nout) {
 		*attrs_out = out;
 		err = 0;