perfsonar development work

Author: zurawski
Date: 2006-11-17 11:55:01 -0500 (Fri, 17 Nov 2006)
New Revision: 1766

Modified:
   branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml
   branches/yi-udel/perfsonar/conf/template/service.properties.ls-template
Log:
XQuery additions.

-jason



Modified: branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml
===================================================================
--- branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml    
2006-11-17 16:13:22 UTC (rev 1765)
+++ branches/yi-udel/perfsonar/ant/xmlls/xmlls-configure-targets.xml    
2006-11-17 16:55:01 UTC (rev 1766)
@@ -58,6 +58,12 @@
                  
value="${base_path}/schema/example-instances/sonar/LS/xslt/summary.xsl" />
        <property name="default_in.ls_global_summary" 
                  
value="${base_path}/schema/example-instances/sonar/LS/xslt/summary2.xsl" />
+                 
+        <property name="default_in.ls_local_summary_xquery" 
+                 
value="${base_path}/schema/example-instances/sonar/LS/xquery/local-summary.xq"
 />
+       <property name="default_in.ls_global_summary_xquery" 
+                 
value="${base_path}/schema/example-instances/sonar/LS/xquery/external-summary.xq"
 />
+                 
        <property name="default_in.ls_summary_interval" 
                  value="30" /><!-- seconds -->
        <property name="default_in.ls_local_interval" 
@@ -183,6 +189,14 @@
                 value="${in.ls_global_summary}"/>
 
         <replace file="${template_file_service}" 
+                token="%LS_LOCAL_SUMMARY_XQUERY%" 
+                value="${in.ls_local_summary_xquery}"/>        
+
+        <replace file="${template_file_service}" 
+                token="%LS_GLOBAL_SUMMARY_XQUERY%" 
+                value="${in.ls_global_summary_xquery}"/>
+
+        <replace file="${template_file_service}" 
                 token="%LS_SUMMARY_INTERVAL%" 
                 value="${in.ls_summary_interval}"/>
 
@@ -364,19 +378,27 @@
               addproperty="in.ls_summary_interval" 
               defaultvalue="${default_in.ls_summary_interval}" />
 
-        <input message="LS Summary -- summary file location: the local 
summary file [${default_in.ls_local_summary}]"
+        <input message="LS Summary XSLT -- summary file location: the local 
summary file [${default_in.ls_local_summary}]"
               addproperty="in.ls_local_summary" 
               defaultvalue="${default_in.ls_local_summary}" />
               
-        <input message="LS Summary -- summary file location: the global 
summary file [${default_in.ls_global_summary}]"
+        <input message="LS Summary XSLT -- summary file location: the global 
summary file [${default_in.ls_global_summary}]"
               addproperty="in.ls_global_summary" 
               defaultvalue="${default_in.ls_global_summary}" />
               
+        <input message="LS Summary XQuery -- summary file location: the 
local summary file [${default_in.ls_local_summary_xquery}]"
+              addproperty="in.ls_local_summary_xquery" 
+              defaultvalue="${default_in.ls_local_summary_xquery}" />
+              
+        <input message="LS Summary XQuery -- summary file location: the 
global summary file [${default_in.ls_global_summary_xquery}]"
+              addproperty="in.ls_global_summary_xquery" 
+              defaultvalue="${default_in.ls_global_summary_xquery}" />       
         
+              
        <input message="LS Local Token -- enable local token passing?"
               addproperty="in.local_token"
               defaultvalue="n"
               validargs="y,n"/>       
-              
+                       
        <condition property="local_token_string" value="">
             <equals arg1="y" arg2="${in.local_token}"/>
         </condition>
@@ -438,8 +460,10 @@
         <echo message="Cleanup TTL [${in.cleanup_ttl}] seconds" />
 
         <echo message="LS Summary Interval [${in.ls_summary_interval}] 
seconds" />
-        <echo message="LS Local Summary File [${in.ls_local_summary}]" />
-        <echo message="LS Global Summary File [${in.ls_global_summary}]" />
+        <echo message="LS Local Summary File (XSLT) 
[${in.ls_local_summary}]" />
+        <echo message="LS Global Summary File (XSLT) 
[${in.ls_global_summary}]" />
+        <echo message="LS Local Summary File (XQuery) 
[${in.ls_local_summary_xquery}]" />
+        <echo message="LS Global Summary File (XQuery) 
[${in.ls_global_summary_xquery}]" />
         <echo message="LS Local Token Interval [${in.ls_local_interval}] 
seconds" />
         <echo message="LS Global Token Interval [${in.ls_global_interval}] 
seconds" />
 

Modified: 
branches/yi-udel/perfsonar/conf/template/service.properties.ls-template
===================================================================
--- branches/yi-udel/perfsonar/conf/template/service.properties.ls-template   
  2006-11-17 16:13:22 UTC (rev 1765)
+++ branches/yi-udel/perfsonar/conf/template/service.properties.ls-template   
  2006-11-17 16:55:01 UTC (rev 1766)
@@ -68,6 +68,10 @@
 component.ls_summary_loader.stylesheet=%LS_LOCAL_SUMMARY%
 component.ls_summary_loader.stylesheet_external=%LS_GLOBAL_SUMMARY%
 
+# XQuery Summarizer
+component.ls_summary_loader.xquery=%LS_LOCAL_SUMMARY_XQUERY%
+component.ls_summary_loader.xquery_external=%LS_GLOBAL_SUMMARY_XQUERY%
+
 #Token Passing - local
 component.ls_local_token_loader.interval=%LS_LOCAL_INTERVAL%
 component.ls_local_token_loader.scheduler_component=ls_scheduler