[Strandmapservic-developers] nsdl-client-project/web/bubble resourcesStrict.jsp, 1.2, 1.3 resources.jsp, 1.7, 1.8

[S C. <sl...@us...>]

Update of /cvsroot/strandmapservic/nsdl-client-project/web/bubble
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7837/web/bubble

Modified Files:
	resourcesStrict.jsp resources.jsp 
Log Message:
debug=1 parameter in url provides link to results xml and tab with bm info

Index: resources.jsp
===================================================================
RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/resources.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** resources.jsp	29 Feb 2008 23:29:06 -0000	1.7
--- resources.jsp	23 Jun 2008 19:16:46 -0000	1.8
***************
*** 1,5 ****
  <%@ include file="../../TagLibIncludes.jsp" %>
! <h2>NSDL Resources</h2>
! 
  <%-- Grab the required service URLs (defined in web.xml or server.xml): --%>
  <c:set var="smsCsipBaseUrl" value="${initParam.smsCsipBaseUrl}" />
--- 1,4 ----
  <%@ include file="../../TagLibIncludes.jsp" %>
! <p>These resources were selected by performing a keyword search over items in the NSDL library.</p>
  <%-- Grab the required service URLs (defined in web.xml or server.xml): --%>
  <c:set var="smsCsipBaseUrl" value="${initParam.smsCsipBaseUrl}" />
***************
*** 9,12 ****
--- 8,12 ----
  String startingOffset = request.getParameter("startingOffset");
  String map = request.getParameter("mapId");
+ String bm = request.getParameter("bmId");
  String stdKeywords = request.getParameter("stdKeywords");
  String subjects = request.getParameter("subjects");
***************
*** 14,17 ****
--- 14,18 ----
  String keywords = request.getParameter("keywords");
  String displaytype = request.getParameter("displaytype");
+ String debug = request.getParameter("debug");
  %>
  
***************
*** 20,27 ****
--- 21,30 ----
  <c:set var="stdKeywords" value="<%=stdKeywords%>"/>
  <c:set var="map" value="<%=map%>"/>
+ <c:set var="bm" value="<%=bm%>"/>
  <c:set var="subj" value="<%=subjects%>"/>
  <c:set var="grades" value="<%=grades%>"/>
  <c:set var="kw" value="<%=keywords%>"/>
  <c:set var="displaytype" value="<%=displaytype%>"/>
+ <c:set var="debug" value="<%=debug%>"/>
  <c:set var="strandkeywords" value=""/>
  
***************
*** 124,128 ****
  		<c:param name="q" value="${query}"/> 
  	</c:url> 
! 
  	<%-- Issue the request to the Web service server and store the response in variable 'xmlResponse' --%>
  	<c:import url="${webServiceRequest}" var="xmlResponse" charEncoding="UTF-8" /> 
--- 127,133 ----
  		<c:param name="q" value="${query}"/> 
  	</c:url> 
! <c:if test="${debug == '1'}">
! <p><a href="${webServiceRequest}" target="_blank">View Results XML</a></p>
! </c:if>
  	<%-- Issue the request to the Web service server and store the response in variable 'xmlResponse' --%>
  	<c:import url="${webServiceRequest}" var="xmlResponse" charEncoding="UTF-8" /> 
***************
*** 249,252 ****
--- 254,262 ----
  							<x:out select="fields/compoundDescription"/> 
  						</c:set>
+ 						
+ 						<c:set var="audience">
+ 							<x:out select="fields/compoundAudience"/>
+ 						</c:set>
+ 						
  						<p class="resource, stdlink" id="resourceItem">
  							<div class="resourceTitle">
***************
*** 294,297 ****
--- 304,314 ----
  									</c:if>	
  									${description}
+ 									<a href="http://localhost:8080/search/?q=&verb=Search&s=0&n=10&item_num=0&identifier=${resourceURL}&bm=${bm}&id=${map}&debug=${debug}">View More</a>
+ 									
+ 									<c:if test="${debug == '1'}">
+ 										<c:set var="audienceLists" value="${fn:replace( audience, ' ~^',', ')}"/>
+ 										<br/><strong>Audiences:</strong>
+ 										<c:out value="${audienceLists}" />
+ 									</c:if>
  								</div>
  							</p>

Index: resourcesStrict.jsp
===================================================================
RCS file: /cvsroot/strandmapservic/nsdl-client-project/web/bubble/resourcesStrict.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** resourcesStrict.jsp	16 May 2008 21:57:13 -0000	1.2
--- resourcesStrict.jsp	23 Jun 2008 19:16:46 -0000	1.3
***************
*** 58,62 ****
  				<%-- If the total number of results is greater than zero, display them --%>
  				<x:when select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults > 0"> 
! 				<h2>NSDL Resources</h2>
  					<%-- ------ Begin paging logic ------ --%>
  					<%-- Save the number of results in variable 'numResults' --%>
--- 58,62 ----
  				<%-- If the total number of results is greater than zero, display them --%>
  				<x:when select="$xmlDom/NSDLSearchService/SearchResults/resultsInfo/totalNumResults > 0"> 
! 				<p>These resources were hand-aligned to this benchmark.</p>
  					<%-- ------ Begin paging logic ------ --%>
  					<%-- Save the number of results in variable 'numResults' --%>