perfsonar-dev - r2155 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Subject: perfsonar development work
List archive
r2155 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Chronological Thread
- From:
- To:
- Subject: r2155 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
- Date: Wed, 28 Feb 2007 07:37:04 -0500
Author: roman
Date: 2007-02-28 07:37:03 -0500 (Wed, 28 Feb 2007)
New Revision: 2155
Added:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Modified:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
Log:
updated to support two event type values (old one 'Path.Status' and new one
'http://ggf.org/ns/nmwg/topology/l2/3.0/link/status')
for L2 path status
Modified:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-02-28 12:18:37 UTC (rev 2154)
+++
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2007-02-28 12:37:03 UTC (rev 2155)
@@ -116,8 +116,8 @@
+ "
\n"
+ " let $linkMetadata :=
\n"
+ " for $k in //nmwg:metadata
\n"
- + " where
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " where
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ "
\n"
+ " let $metaids :=
\n"
@@ -166,8 +166,8 @@
+ " if ($globalName != '') then
\n"
+ " for $m in //nmwg:metadata
\n"
+ " where
fn:lower-case($m/nmwg:subject/nmtl2:link/nmtl2:globalName) =
fn:lower-case($globalName) \n"
- + " and
$m/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$m/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $m
\n"
+ " else
\n"
+ " ''
\n"
@@ -295,8 +295,8 @@
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node1_id
\n"
+ " and
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node2_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"
@@ -364,8 +364,8 @@
+ " if ($node_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
+ " where
fn:data($k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef) = $node_id
\n"
- + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
- + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status'
and @name='supportedEventType') \n"
+ + " or
(@value='http://ggf.org/ns/nmwg/topology/l2/3.0/link/status' and
@name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"
Added:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
Property changes on:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
- r2155 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator, svnlog, 02/28/2007
Archive powered by MHonArc 2.6.16.