Skip to Content.
Sympa Menu

perfsonar-dev - r1767 - branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType

Subject: perfsonar development work

List archive

r1767 - branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType


Chronological Thread 
  • From:
  • To:
  • Subject: r1767 - branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType
  • Date: Fri, 17 Nov 2006 14:54:52 -0500
Author: yi
Date: 2006-11-17 14:54:50 -0500 (Fri, 17 Nov 2006)
New Revision: 1767

Modified:

branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java

branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java

branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java

branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
Log:
BDB passed the test of Summary, Local Token and Global Token test

Modified:
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
===================================================================
---
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
2006-11-17 16:55:01 UTC (rev 1766)
+++
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
2006-11-17 19:54:50 UTC (rev 1767)
@@ -143,8 +143,8 @@
logger.debug("LSGlobalTokenAction: Query: " + query);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ lsUtil.getLsAccessPoint() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ lsUtil.getLsAccessPoint() + "\"]";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();

@@ -212,7 +212,7 @@
results = (String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager)
{
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE + "<nmwg:store>{collection(\""
+ LS_GLOBAL_PEER_CONTAINER + "\")}</nmwg:store>";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
}
@@ -248,9 +248,9 @@
logger.debug("LSGlobalTokenAction: Staring Query: " + query);
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager)
{
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
-
"\")//nmwg:parameter[@name='familiar']
return $p/text())";
- edbres = (XmlDbResult)xmlStorageManager.fetch(query);
+ query = XQUERY_UPDATE_DECLARE + "for $p in collection(\"" +
LS_GLOBAL_PEER_CONTAINER + "\")" +
+
"//nmwg:parameter[@name=\"familiar\"]
return $p/text()";
+ edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();

logger.debug("LSGlobalTokenAction: Staring Query: " + query);
@@ -283,7 +283,7 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath, "0");
}
@@ -359,8 +359,8 @@

xmlStorageManager.fetch(update);
}
else if(xmlStorageManager
instanceof BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE,
xPath, Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}

@@ -394,8 +394,8 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] + "']/nmwg:parameter" +
-
"[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] + "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))-1));
}
@@ -477,8 +477,8 @@
logger.debug("LSGlobalTokenAction: Staring Query: " +
query);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\""
+ LS_GLOBAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ tokenMD.getId() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ tokenMD.getId() + "\"]";
edbres =
(XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();


Modified:
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
===================================================================
---
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
2006-11-17 16:55:01 UTC (rev 1766)
+++
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
2006-11-17 19:54:50 UTC (rev 1767)
@@ -143,8 +143,8 @@
logger.debug("LSLocalTokenAction: Query: " + query);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_LOCAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ lsUtil.getLsAccessPoint() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_LOCAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ lsUtil.getLsAccessPoint() + "\"]";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();

@@ -212,7 +212,7 @@
results = (String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager)
{
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_LOCAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE + "<nmwg:store>{collection(\""
+ LS_LOCAL_PEER_CONTAINER + "\")}</nmwg:store>";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
}
@@ -248,8 +248,8 @@
logger.debug("LSLocalTokenAction: Staring Query: " + query);
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager)
{
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_LOCAL_PEER_CONTAINER +
-
"\")//nmwg:parameter[@name='familiar']
return $p/text())";
+ query = XQUERY_UPDATE_DECLARE + "for $p in collection(\"" +
LS_LOCAL_PEER_CONTAINER + "\")" +
+
"//nmwg:parameter[@name=\"familiar\"]
return $p/text()";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();

@@ -283,7 +283,7 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath, "0");
}
@@ -359,8 +359,8 @@

xmlStorageManager.fetch(update);
}
else if(xmlStorageManager
instanceof BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE,
xPath, Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}

@@ -394,8 +394,8 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] + "']/nmwg:parameter" +
-
"[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] + "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))-1));
}
@@ -477,8 +477,8 @@
logger.debug("LSLocalTokenAction: Staring Query: " +
query);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\""
+ LS_LOCAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ tokenMD.getId() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_LOCAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ tokenMD.getId() + "\"]";
edbres =
(XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();


Modified:
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
===================================================================
---
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
2006-11-17 16:55:01 UTC (rev 1766)
+++
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSRegisterAction.java
2006-11-17 19:54:50 UTC (rev 1767)
@@ -215,7 +215,7 @@
results =
(String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE +
"data(collection(\"" + LS_LOCAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE +
"<nmwg:store>{collection(\"" + LS_LOCAL_PEER_CONTAINER + "\")}</nmwg:store>";
edbres =
(XmlDbResult)xmlStorageManager.fetch(query);
results =
(String[])edbres.getResultAsStringArray();
}
@@ -285,8 +285,8 @@

xmlStorageManager.fetch(update);
}
else if(xmlStorageManager
instanceof BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,


XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}

@@ -317,8 +317,8 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] + "']/nmwg:parameter" +
-
"[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] + "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString(Integer.parseInt(sortedList[b][1])-1));
}

Modified:
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
===================================================================
---
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
2006-11-17 16:55:01 UTC (rev 1766)
+++
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
2006-11-17 19:54:50 UTC (rev 1767)
@@ -380,10 +380,10 @@
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
if(kind.equals("local")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_LOCAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE + "<nmwg:store>{collection(\""
+ LS_LOCAL_PEER_CONTAINER + "\")}</nmwg:store>";
}
else if(kind.equals("global")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE + "<nmwg:store>{collection(\""
+ LS_GLOBAL_PEER_CONTAINER + "\")}>/nmwg:store>";
}
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
@@ -420,8 +420,8 @@
results = (String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_CACHE_COLLECTION_TYPE +
-
"\")/nmwg:metadata[@id='"
+ lsUtil.getLsAccessPoint() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_CACHE_COLLECTION_TYPE +
+
"\")/nmwg:metadata[@id=\""
+ lsUtil.getLsAccessPoint() + "\"]";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
}
@@ -448,8 +448,8 @@
results = (String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_CACHE_COLLECTION_TYPE +
-
"\")/nmwg:data[@metadataIdRef='"
+ lsUtil.getLsAccessPoint() + "'])";
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_CACHE_COLLECTION_TYPE +
+
"\")/nmwg:data[@metadataIdRef=\""
+ lsUtil.getLsAccessPoint() + "\"]";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
}
@@ -517,14 +517,14 @@
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
if(kind.equals("local")) {

- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}
else if(kind.equals("global")) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}

@@ -566,14 +566,14 @@
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
if(kind.equals("local")) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))-1));
}
else if(kind.equals("global")) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] +
-
"']/nmwg:parameter[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] +
+
"\"]/nmwg:parameter[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))-1));
}

@@ -623,16 +623,16 @@
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {

if(kind.equals("local")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_LOCAL_PEER_CONTAINER +
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_LOCAL_PEER_CONTAINER +

"\")/nmwg:metadata[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
requestMetadata.getSubject()).getService().
- getAccessPoint().getAccessPoint() + "\"])";
+ getAccessPoint().getAccessPoint() + "\"]";
}
else if(kind.equals("global")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_GLOBAL_PEER_CONTAINER +

"\")/nmwg:metadata[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
requestMetadata.getSubject()).getService().
- getAccessPoint().getAccessPoint() + "\"])";
+ getAccessPoint().getAccessPoint() + "\"]";
}
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
@@ -737,16 +737,16 @@
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
if(kind.equals("local")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\""
+ LS_LOCAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_LOCAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)

requestMetadata.getSubject()).getService().getAccessPoint().getAccessPoint()
+
-
"']/nmwg:key/nmwg:parameters/nmwg:parameter[@name='familiar']/text())";
+
"\"]/nmwg:key/nmwg:parameters/nmwg:parameter[@name=\"familiar\"]/text()";
}
else if(kind.equals("global")) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\""
+ LS_GLOBAL_PEER_CONTAINER +
-
"\")/nmwg:metadata[@id='"
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+ query = XQUERY_UPDATE_DECLARE + "collection(\"" +
LS_GLOBAL_PEER_CONTAINER +
+
"\")/nmwg:metadata[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)

requestMetadata.getSubject()).getService().getAccessPoint().getAccessPoint()
+
-
"']/nmwg:key/nmwg:parameters/nmwg:parameter[@name='familiar']/text())";
+
"\"]/nmwg:key/nmwg:parameters/nmwg:parameter[@name=\"familiar\"]/text()";
}
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
@@ -782,18 +782,18 @@
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
if(kind.equals("local")) {
- String xPath =
"//nmwg:parameters[@id='"
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+ String xPath =
"//nmwg:parameters[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)

requestMetadata.getSubject()).getService().
- getAccessPoint().getAccessPoint()
+ "']/nmwg:parameter" +
-
"[@name='familiar']";
+ getAccessPoint().getAccessPoint()
+ "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_LOCAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(String.valueOf(results2[0].charAt(0))))+1));

}
else if(kind.equals("global")) {
- String xPath =
"//nmwg:parameters[@id='"
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)
+ String xPath =
"//nmwg:parameters[@id=\""
+ ((org.ggf.ns.nmwg.tools.org.perfsonar.v1_0.Subject)

requestMetadata.getSubject()).getService().
- getAccessPoint().getAccessPoint()
+ "']/nmwg:parameter" +
-
"[@name='familiar']";
+ getAccessPoint().getAccessPoint()
+ "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(String.valueOf(results2[0].charAt(0))))+1));

}
@@ -825,7 +825,7 @@
results = (String[])edbres.getResultAsStringArray();
}
else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
- query = XQUERY_UPDATE_DECLARE + "data(collection(\"" +
LS_GLOBAL_PEER_CONTAINER + "\"))";
+ query = XQUERY_UPDATE_DECLARE + "<nmwg:store>{collection(\"" +
LS_GLOBAL_PEER_CONTAINER + "\")}</nmwg:store>";
edbres = (XmlDbResult)xmlStorageManager.fetch(query);
results = (String[])edbres.getResultAsStringArray();
}
@@ -1002,8 +1002,8 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] + "']/nmwg:parameter" +
-
"[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] + "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))+1));
}
@@ -1036,8 +1036,8 @@
xmlStorageManager.fetch(update);
}
else if(xmlStorageManager instanceof
BerkeleyDbXmlStorageManager) {
- String xPath =
"//nmwg:parameters[@id='"
+ sortedList[b][0] + "']/nmwg:parameter" +
-
"[@name='familiar']";
+ String xPath =
"//nmwg:parameters[@id=\""
+ sortedList[b][0] + "\"]/nmwg:parameter" +
+
"[@name=\"familiar\"]";

((BerkeleyDbXmlStorageManager)xmlStorageManager).update(LS_GLOBAL_PEER_CONTAINER,

XQUERY_UPDATE_DECLARE, xPath,
Integer.toString((Integer.parseInt(sortedList[b][1]))-1));
}


  • r1767 - branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType, svnlog, 11/17/2006

Archive powered by MHonArc 2.6.16.

Top of Page