perfsonar-dev - perfsonar: r4073 - trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Subject: perfsonar development work
List archive
perfsonar: r4073 - trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4073 - trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator
- Date: Tue, 1 Jul 2008 09:49:20 -0400
Author: roman
Date: 2008-07-01 09:49:19 -0400 (Tue, 01 Jul 2008)
New Revision: 4073
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
Log:
the attribute 'type' removed from the parameter 'keyword'
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2008-07-01 13:28:51 UTC (rev 4072)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
2008-07-01 13:49:19 UTC (rev 4073)
@@ -76,7 +76,6 @@
String eventType = null;
String keyword = null;
- String keywordType = null;
String ipAddress = null;
String hostName = null;
@@ -113,11 +112,7 @@
if (keywordParameter != null) {
keyword = keywordParameter.getParameterValue();
- keywordType = keywordParameter.getParameterType();
-
- if (!keyword.trim().equals("") && !keywordType.trim().equals(""))
- keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword' and functx:trim(@type)='" + keywordType + "') or
(functx:trim(@value)='" + keyword + "' and functx:trim(@name)='keyword' and
functx:trim(@type)='" + keywordType + "')] ";
- else if (!keyword.trim().equals("") &&
keywordType.trim().equals(""))
+ if (!keyword.trim().equals(""))
keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword') or (functx:trim(@value)='" + keyword + "' and
functx:trim(@name)='keyword')] ";
}
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2008-07-01 13:28:51 UTC (rev 4072)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
2008-07-01 13:49:19 UTC (rev 4073)
@@ -76,7 +76,6 @@
String eventType = null;
String keyword = null;
- String keywordType = null;
String ipAddress = null;
String hostName = null;
@@ -114,11 +113,7 @@
if (keywordParameter != null) {
keyword = keywordParameter.getParameterValue();
- keywordType = keywordParameter.getParameterType();
-
- if (!keyword.trim().equals("") && !keywordType.trim().equals(""))
- keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword' and functx:trim(@type)='" + keywordType + "') or
(functx:trim(@value)='" + keyword + "' and functx:trim(@name)='keyword' and
functx:trim(@type)='" + keywordType + "')] ";
- else if (!keyword.trim().equals("") &&
keywordType.trim().equals(""))
+ if (!keyword.trim().equals(""))
keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword') or (functx:trim(@value)='" + keyword + "' and
functx:trim(@name)='keyword')] ";
}
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2008-07-01 13:28:51 UTC (rev 4072)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGenerator.java
2008-07-01 13:49:19 UTC (rev 4073)
@@ -110,11 +110,7 @@
if (keywordParameter != null) {
String keyword = keywordParameter.getParameterValue();
- String keywordType = keywordParameter.getParameterType();
-
- if (!keyword.trim().equals("") && !keywordType.trim().equals(""))
- keywordQueryPart = " and
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword' and functx:trim(@type)='" + keywordType + "') or
(functx:trim(@value)='" + keyword + "' and functx:trim(@name)='keyword' and
functx:trim(@type)='" + keywordType + "')] \n";
- else if (!keyword.trim().equals("") &&
keywordType.trim().equals(""))
+ if (!keyword.trim().equals(""))
keywordQueryPart = " and
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword') or (functx:trim(@value)='" + keyword + "' and
functx:trim(@name)='keyword')] \n";
}
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2008-07-01 13:28:51 UTC (rev 4072)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/L2PathStatusQueryGeneratorTMP.java
2008-07-01 13:49:19 UTC (rev 4073)
@@ -113,11 +113,7 @@
if (keywordParameter != null) {
String keyword = keywordParameter.getParameterValue();
- String keywordType = keywordParameter.getParameterType();
-
- if (!keyword.trim().equals("") && !keywordType.trim().equals(""))
- keywordQueryPart = " and
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword' and functx:trim(@type)='" + keywordType + "') or
(functx:trim(@value)='" + keyword + "' and functx:trim(@name)='keyword' and
functx:trim(@type)='" + keywordType + "')] \n";
- else if (!keyword.trim().equals("") &&
keywordType.trim().equals(""))
+ if (!keyword.trim().equals(""))
keywordQueryPart = " and
$k/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword') or (functx:trim(@value)='" + keyword + "' and
functx:trim(@name)='keyword')] \n";
}
Modified:
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
---
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2008-07-01 13:28:51 UTC (rev 4072)
+++
trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
2008-07-01 13:49:19 UTC (rev 4073)
@@ -76,7 +76,6 @@
String eventType = null;
String keyword = null;
- String keywordType = null;
String ipAddress = null;
String hostName = null;
@@ -113,11 +112,7 @@
if (keywordParameter != null) {
keyword = keywordParameter.getParameterValue();
- keywordType = keywordParameter.getParameterType();
-
- if (!keyword.trim().equals("") && !keywordType.trim().equals(""))
- keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword' and functx:trim(@type)='" + keywordType + "') or
(functx:trim(@value)='" + keyword + "' and functx:trim(@name)='keyword' and
functx:trim(@type)='" + keywordType + "')] ";
- else if (!keyword.trim().equals("") &&
keywordType.trim().equals(""))
+ if (!keyword.trim().equals(""))
keywordQueryPart = " and
$i/nmwg:parameters/nmwg:parameter[(functx:trim(text())='"+ keyword +"' and
functx:trim(@name)='keyword') or (functx:trim(@value)='" + keyword + "' and
functx:trim(@name)='keyword')] ";
}
- perfsonar: r4073 - trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator, svnlog, 07/01/2008
Archive powered by MHonArc 2.6.16.