SlicDiagWeb/src/main/webapp

diff -u -r1.4 -r1.5
--- plotFrame.jsp	20 Nov 2007 20:03:52 -0000	1.4
+++ plotFrame.jsp	29 Nov 2007 22:38:41 -0000	1.5
@@ -71,7 +71,7 @@

             </aida:objects>
         </c:catch>
         <c:if test="${! empty firstException}">

-            <c:out value="<p><b>*** Problem getting histograms for path: ${aidaPath}, file: ${plotData[0]}</b><br>${firstException.message}" />

+            <p><b>*** Problem getting histograms for path: ${aidaPath}, file: ${plotData[0]}</b><br>${firstException.message}

         </c:if>
         <c:if test="${empty firstException}">
             

SlicDiagWeb/src/main/webapp

diff -u -r1.4 -r1.5
--- treeFrame.jsp	20 Nov 2007 20:03:53 -0000	1.4
+++ treeFrame.jsp	29 Nov 2007 22:38:41 -0000	1.5
@@ -24,9 +24,13 @@

             <c:forEach var="i" begin="1" end="${fn:length(plotData)-1}" step="1">
                 <c:catch var="treeException">
                     <c:set var="aidaDataFile" value="${initParam.slic_file_base}/${plotData[i]}" scope="page"/>

+                    <c:set var="stType" value="xml"/>
+                    <c:if test="${fn:contains(fn:toLowerCase(aidaDataFile), \".root\")}">
+                        <c:set var="stType" value="root"/>
+                    </c:if>

                     <aida:tree 
                         storeName="${aidaDataFile}" 

-                        storeType="xml" options="useProxies=true">

+                        storeType="${stType}" options="useProxies=true">

                     </aida:tree>
                 </c:catch>
                 <c:if test="${! empty treeException}">

@@ -38,9 +42,13 @@

             <!-- Create and display AIDA Tree for the very first file on the list -->
             <c:catch var="treeException0">
                 <c:set var="aidaDataFile" value="${initParam.slic_file_base}/${plotData[0]}" scope="page"/>

+                <c:set var="stType" value="xml"/>
+                <c:if test="${fn:contains(fn:toLowerCase(aidaDataFile), \".root\")}">
+                    <c:set var="stType" value="root"/>
+                </c:if>

                 <aida:tree 
                     storeName="${aidaDataFile}" 

-                    storeType="xml" options="useProxies=true">

+                    storeType="${stType}" options="useProxies=true">

                 </aida:tree>
                 
                 <aida:displaytree 

SlicDiagWeb/src/main/webapp/WEB-INF

diff -u -r1.5 -r1.6
--- web.xml	20 Nov 2007 20:03:53 -0000	1.5
+++ web.xml	29 Nov 2007 22:38:41 -0000	1.6
@@ -21,10 +21,10 @@

     
     <context-param>
         <param-name>slic_file_base</param-name>       

-       <param-value>/nfs/slac/g/lcd/public_data/SlicDiagWebData</param-value>
-       <!-- 

+        <param-value>/nfs/slac/g/lcd/public_data/SlicDiagWebData</param-value>
+        <!-- 

             <param-value>C:/work/Data/slicdiag_test</param-value> 

-       <param-value>/afs/slac.stanford.edu/u/ey/jeremym/public_html/download/slicdiag_test</param-value> 

+            <param-value>/afs/slac.stanford.edu/u/ey/jeremym/public_html/download/slicdiag_test</param-value> 

          -->
         <description>Directory where to look for the files with plots</description>
     </context-param>