perfsonar development work

Author: mac
Date: 2008-07-25 04:51:48 -0400 (Fri, 25 Jul 2008)
New Revision: 4294

Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
Log:
Changes to satsfy bug #518.
No explicit namespace will be used in querying for ipAddress and hostName.


Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2008-07-24 12:36:52 UTC (rev 4293)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2008-07-25 08:51:48 UTC (rev 4294)
@@ -473,10 +473,9 @@
 
         String xq = 
         " declare namespace nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; \n"+
-        " declare namespace nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";; 
\n"+
         " for $d in 
/nmwg:store[@type='LSStore']/nmwg:data
 \n"+
-        " let $val := $d/nmwg:metadata/*:subject//nmwgt:ifAddress/text() \n"+
-        " let $metaIdRef := data($d/@metadataIdRef) \n"+
+        "   let $metaIdRef := data($d/@metadataIdRef) \n"+
+        "   for $val in $d/nmwg:metadata/*:subject//*:ifAddress/text() \n"+
         " return if (empty($val)) then $val else concat($metaIdRef,',',$val) 
\n";
         return xquery(xq);
         
@@ -490,11 +489,11 @@
 
         String xq = 
             " declare namespace nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; 
\n"+
-            " declare namespace 
nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";; \n"+
             " for $d in 
/nmwg:store[@type='LSStore']/nmwg:data
 \n"+
-            " let $val := $d/nmwg:metadata/*:subject//nmwgt:hostName/text() 
\n"+
-            " let $metaIdRef := data($d/@metadataIdRef) \n"+
-            " return if (empty($val)) then $val else 
concat($metaIdRef,',',$val) \n";
+            "   let $metaIdRef := data($d/@metadataIdRef) \n"+
+            "   for $val in $d/nmwg:metadata/*:subject//*:hostName/text() 
\n"+
+            "     return if (empty($val)) then $val else 
concat($metaIdRef,',',$val) \n";
+        
         return xquery(xq);
     }    
 
@@ -597,11 +596,8 @@
     } //ServiceSummary
     
     
-    public static void main(String[] s) {
-        
-        
-        
-
-    }
+//    public static void main(String[] s) {
+//
+//    }
     
 }//LSSummaryServiceContent