perfsonar-dev - r1596 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Subject: perfsonar development work
List archive
r1596 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Chronological Thread
- From:
- To:
- Subject: r1596 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
- Date: Tue, 5 Sep 2006 06:10:41 -0400
Author: roman
Date: 2006-09-05 06:10:41 -0400 (Tue, 05 Sep 2006)
New Revision: 1596
Modified:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
Log:
xquery statements updated to take into account both xml structures:
Examples:
1)
<nmwg:parameters>
<nmwg:parameter name="supportedEventType" value="utilization"/>
</nmwg:parameters>
2)
<nmwg:parameters>
<nmwg:parameter
name="supportedEventType">utilization</nmwg:parameter>
</nmwg:parameters>
Modified:
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2006-09-05 10:05:59 UTC (rev 1595)
+++
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2006-09-05 10:10:41 UTC (rev 1596)
@@ -109,30 +109,30 @@
if (subject == null) {
xQuery =
- " let $nodeMetadata :=
\n"
- + " for $i in //nmwg:metadata
\n"
- + " where $i/nmwg:subject/nmwgtopo3:node
\n"
- + " return $i
\n"
- + "
\n"
- + " let $linkMetadata :=
\n"
- + " for $k in //nmwg:metadata
\n"
- + " where
fn:lower-case($k/nmwg:parameters/nmwg:parameter) =
fn:lower-case('Path.Status') \n"
- + " and
$k/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
\n"
- + " return $k
\n"
- + "
\n"
- + " let $metaids :=
\n"
- + " for $j in $linkMetadata
\n"
- + " return fn:data($j/@id)
\n"
- + "
\n"
- + " let $datas :=
\n"
- + " for $k in $metaids
\n"
- + " let $d :=
\n"
- + " for $l in //nmwg:data
\n"
- + " where $l/@metadataIdRef = $k
\n"
- + " return $l
\n"
- + " return $d
\n"
- + "
\n"
- + " return ($nodeMetadata, $linkMetadata, $datas)
\n";
+ " let $nodeMetadata :=
\n"
+ + " for $i in //nmwg:metadata
\n"
+ + " where $i/nmwg:subject/nmwgtopo3:node
\n"
+ + " return $i
\n"
+ + "
\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"
+ + " return $k
\n"
+ + "
\n"
+ + " let $metaids :=
\n"
+ + " for $j in $linkMetadata
\n"
+ + " return fn:data($j/@id)
\n"
+ + "
\n"
+ + " let $datas :=
\n"
+ + " for $k in $metaids
\n"
+ + " let $d :=
\n"
+ + " for $l in //nmwg:data
\n"
+ + " where $l/@metadataIdRef = $k
\n"
+ + " return $l
\n"
+ + " return $d
\n"
+ + "
\n"
+ + " return ($nodeMetadata, $linkMetadata, $datas)
\n";
xQuery = ns + xQuery;
@@ -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
fn:lower-case($m/nmwg:parameters/nmwg:parameter) =
fn:lower-case('Path.Status') \n"
- + " and
$m/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
\n"
+ + " and
$m/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $m
\n"
+ " else
\n"
+ " ''
\n"
@@ -280,20 +280,20 @@
+ " for $k in //nmwg:metadata
\n"
+ " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node1_id
\n"
+ " and
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node2_id
\n"
- + " and
fn:lower-case($k/nmwg:parameters/nmwg:parameter) =
fn:lower-case('Path.Status') \n"
- + " and
$k/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
\n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
+ " else if ($node1_id != '' and $node2_id = '') then
\n"
+ " for $k in //nmwg:metadata
\n"
+ " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node1_id
\n"
- + " and
fn:lower-case($k/nmwg:parameters/nmwg:parameter) =
fn:lower-case('Path.Status') \n"
- + " and
$k/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
\n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
+ " else if ($node1_id = '' and $node2_id != '') then
\n"
+ " for $k in //nmwg:metadata
\n"
+ " where
$k/nmwg:subject/nmtl2:link/nmwgtopo3:node/@nodeIdRef = $node2_id
\n"
- + " and
fn:lower-case($k/nmwg:parameters/nmwg:parameter) =
fn:lower-case('Path.Status') \n"
- + " and
$k/nmwg:parameters/nmwg:parameter[@name='supportedEventType']
\n"
+ + " and
$k/nmwg:parameters/nmwg:parameter[(text()='Path.Status' and
@name='supportedEventType') \n"
+ + " or
(@value='Path.Status' and @name='supportedEventType')] \n"
+ " return $k
\n"
+ " else
\n"
+ " ''
\n"
- r1596 - trunk/perfsonar/src/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator, svnlog, 09/05/2006
Archive powered by MHonArc 2.6.16.