[Exist-commits] eXist-1.0/webapp/xse sprocess-foc.xsp,1.5,1.6

[<jm...@us...>]

Update of /cvsroot/exist/eXist-1.0/webapp/xse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12615

Modified Files:
	sprocess-foc.xsp 
Log Message:
adapt to new XQuery queries, with summary of criteria


Index: sprocess-foc.xsp
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/webapp/xse/sprocess-foc.xsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sprocess-foc.xsp	16 Feb 2004 10:28:49 -0000	1.5
--- sprocess-foc.xsp	8 Mar 2004 18:12:02 -0000	1.6
***************
*** 81,96 ****
              // ]]>
  
-             // add document(*) to query if missing
-             if(!(query.startsWith("document(") || query.startsWith("collection(")) ||
-                  query.startsWith("xcollection(")) {
-                 if(cname == null || cname.equals("all documents"))
-                     query = "document()" + query;
-                 else
-                     query = "collection('" + cname + "')" + query;
-             }
-             
              <!-- print current query -->
!             <span>XPath Query:
!               <tt><xsp:expr>query</xsp:expr></tt>
              </span>
              <br />
--- 81,87 ----
              // ]]>
  
              <!-- print current query -->
!             <span>XQuery:
!               <pre><xsp:expr>query</xsp:expr></pre>
              </span>
              <br />
***************
*** 115,123 ****
              <xdb:execute encoding="ISO-8859-1">
                  <xdb:xpath>query</xdb:xpath>
!                 
                      <xsp:logic>
                          hits = <xdb:get-hit-count/>;
!                         <!-- print a summary of hits per document -->                     
!                         <p>Found <xdb:get-hit-count/> hits in
                          <xdb:get-query-time/> ms.</p>
                                  
--- 106,119 ----
              <xdb:execute encoding="ISO-8859-1">
                  <xdb:xpath>query</xdb:xpath>
! 
                      <xsp:logic>
                          hits = <xdb:get-hit-count/>;
!                         <!-- print a summary of hits per document -->
!                         <p>Found 
!                              <xsp:expr>
! 								<xdb:get-hit-count/>
! 								-1
! 							</xsp:expr>
! 						 hits in
                          <xdb:get-query-time/> ms.</p>