From 96bed7ce0335b52ea8810b4531d9857d801238c4 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Tue, 14 May 2013 14:40:17 -0600 Subject: [PATCH 1/6] first pass at creating a csv download option. TODO icons on page, debug failing load --- .../controller/PagedSearchController.java | 44 ++++++++++++++++-- webapp/web/images/share-uri-icon.png | Bin 0 -> 1160 bytes .../body/search/search-csvResults.ftl | 5 ++ .../body/search/search-pagedResults.ftl | 6 +++ 4 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 webapp/web/images/share-uri-icon.png create mode 100644 webapp/web/templates/freemarker/body/search/search-csvResults.ftl diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 7889a825a..510cb2532 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -70,6 +70,7 @@ public class PagedSearchController extends FreemarkerHttpServlet { protected static final int DEFAULT_MAX_HIT_COUNT = 1000; private static final String PARAM_XML_REQUEST = "xml"; + private static final String PARAM_CSV_REQUEST = "csv"; private static final String PARAM_START_INDEX = "startIndex"; private static final String PARAM_HITS_PER_PAGE = "hitsPerPage"; private static final String PARAM_CLASSGROUP = "classgroup"; @@ -79,7 +80,7 @@ public class PagedSearchController extends FreemarkerHttpServlet { protected static final Map> templateTable; protected enum Format { - HTML, XML; + HTML, XML, CSV; } protected enum Result { @@ -101,9 +102,10 @@ public class PagedSearchController extends FreemarkerHttpServlet { throws IOException, ServletException { VitroRequest vreq = new VitroRequest(request); boolean wasXmlRequested = isRequestedFormatXml(vreq); - if( ! wasXmlRequested ){ + boolean wasCSVRequested = isRequestedFormatCSV(vreq); + if( !wasXmlRequested && !wasCSVRequested){ super.doGet(vreq,response); - }else{ + }else if (wasXMLRequested){ try { ResponseValues rvalues = processRequest(vreq); @@ -113,6 +115,16 @@ public class PagedSearchController extends FreemarkerHttpServlet { } catch (Exception e) { log.error(e, e); } + }else if (wasCSVRequested){ + try { + ResponseValues rvalues = processRequest(vreq); + + response.setCharacterEncoding("UTF-8"); + response.setContentType("text/csv;charset=UTF-8"); + writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); + } catch (Exception e) { + log.error(e, e); + } } } @@ -672,10 +684,25 @@ public class PagedSearchController extends FreemarkerHttpServlet { return false; } } + + protected boolean isRequestedFormatCSV(VitroRequest req){ + if( req != null ){ + String param = req.getParameter(PARAM_CSV_REQUEST); + if( param != null && "1".equals(param)){ + return true; + }else{ + return false; + } + }else{ + return false; + } + } protected Format getFormat(VitroRequest req){ if( req != null && req.getParameter("xml") != null && "1".equals(req.getParameter("xml"))) return Format.XML; + else if ( req != null && req.getParameter("csv") != null && "1".equals(req.getParameter("csv"))) + return Format.CSV; else return Format.HTML; } @@ -705,9 +732,20 @@ public class PagedSearchController extends FreemarkerHttpServlet { resultsToTemplates = new HashMap(); resultsToTemplates.put(Result.PAGED, "search-xmlResults.ftl"); resultsToTemplates.put(Result.ERROR, "search-xmlError.ftl"); + // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl"); templateTable.put(Format.XML, Collections.unmodifiableMap(resultsToTemplates)); + + // set up CSV format + resultsToTemplates = new HashMap(); + resultsToTemplates.put(Result.PAGED, "search-csvResults.ftl"); + resultsToTemplates.put(Result.ERROR, "search-csvError.ftl"); + + // resultsToTemplates.put(Result.BAD_QUERY, "search-xmlBadQuery.ftl"); + templateTable.put(Format.CSV, Collections.unmodifiableMap(resultsToTemplates)); + + return Collections.unmodifiableMap(templateTable); } } diff --git a/webapp/web/images/share-uri-icon.png b/webapp/web/images/share-uri-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a79edd97b30a571115154c5bd3ef17799e0f7a07 GIT binary patch literal 1160 zcmV;31b6$1P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3Ih)xD(sL!&Hw-e8c9S!R7l6Y zR#|TwRTMrmo{VR_)^-v*&N7Y?#|}{&L*hO}iqkAqh^0|QLZ6VJ6nJ3~zW~HvK!_J) zgak;?1c4d|pwnjz^H*;y&fi&v$H!oA z*W~C~6hSIb=Xu_KZQi{?!+(XvNL_wmu*m-K5vJ#sPQnWS?iG5zy9T~ zSzL#SUU_z~qoqOE-u4H-xpAvB!RhvQv}pTGRN>TYnwxSg*5pM1u3Q-EHMYt~LRdCS z*W}3Ava~73BAez4)DD+7!KAA5Vj|I%3+H;;n*rdqpZ?&}?>?Hkp5ih?PnyQ8J*Alm zCgpH>0RYYB^7HN*l0XsU_3@!zV=DmMUE8qFI3L6kemeBYw~hppddftV<?D&p5li$)-R5@wZ3I zclYCHisLF$Uw+=!)83roGJ?0&VIl-U?r-k+=n#S+$YIO<@VmQWd5YsITjCqz=T3LD z003Sm+KtB9G&gX%v)iBt0N?=tP!vHBkFBp#4uQ~HP4*(xeI}!|Auav*@(wLMG^8nGr zL3LdU&>AX@(0>IbTZ!P@2TGMdMlpZrvO;S>Pz@|$Bch@$o-R&2L`eYI!alnpQ zd!(co0KWL?<{$UgYVyiRqT8UyFcE6Am}VC|rLoxsPn%ZVs8&9GXgzU;oxSNf4zJL_ zmLk1tBQ-H%{eOpr(h+BBZmH&%R)kza zOblCVj5uY3nbYkr(|Z}Dq}cXYgIW1F8Q2PJM +URI,Name + <#list individuals as individual> + ${individual.uri?xml},${individual.name?xml} + diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl index 5203b4fb3..e5e14dc95 100644 --- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl @@ -8,8 +8,14 @@ <#if classGroupName?has_content>limited to type '${classGroupName}' <#if typeName?has_content>limited to type '${typeName}' + + XML/RDF Results + + + Not the results you expected? +
<#-- Refinement links --> From 32395cbac293b985c09625ca88e4b1001f57f046 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Wed, 15 May 2013 14:53:31 -0600 Subject: [PATCH 2/6] Fixed controller for CSV output, added button and coorsponding js and png --- .../controller/PagedSearchController.java | 7 ++- webapp/web/css/search.css | 17 ++++++- webapp/web/images/download-icon.png | Bin 0 -> 1404 bytes webapp/web/js/searchDownload.js | 44 ++++++++++++++++++ .../body/search/search-csvResults.ftl | 8 ++-- .../body/search/search-pagedResults.ftl | 23 ++++++--- 6 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 webapp/web/images/download-icon.png create mode 100644 webapp/web/js/searchDownload.js diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java index 510cb2532..b74979164 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java @@ -105,12 +105,13 @@ public class PagedSearchController extends FreemarkerHttpServlet { boolean wasCSVRequested = isRequestedFormatCSV(vreq); if( !wasXmlRequested && !wasCSVRequested){ super.doGet(vreq,response); - }else if (wasXMLRequested){ + }else if (wasXmlRequested){ try { ResponseValues rvalues = processRequest(vreq); response.setCharacterEncoding("UTF-8"); response.setContentType("text/xml;charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=search.xml"); writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); } catch (Exception e) { log.error(e, e); @@ -121,6 +122,7 @@ public class PagedSearchController extends FreemarkerHttpServlet { response.setCharacterEncoding("UTF-8"); response.setContentType("text/csv;charset=UTF-8"); + response.setHeader("Content-Disposition", "attachment; filename=search.csv"); writeTemplate(rvalues.getTemplateName(), rvalues.getMap(), request, response); } catch (Exception e) { log.error(e, e); @@ -134,8 +136,9 @@ public class PagedSearchController extends FreemarkerHttpServlet { //There may be other non-html formats in the future Format format = getFormat(vreq); boolean wasXmlRequested = Format.XML == format; + boolean wasCSVRequested = Format.CSV == format; log.debug("Requested format was " + (wasXmlRequested ? "xml" : "html")); - boolean wasHtmlRequested = ! wasXmlRequested; + boolean wasHtmlRequested = ! (wasXmlRequested || wasCSVRequested); try { diff --git a/webapp/web/css/search.css b/webapp/web/css/search.css index 35b6857eb..b3717888a 100644 --- a/webapp/web/css/search.css +++ b/webapp/web/css/search.css @@ -79,7 +79,22 @@ ul.searchTips li { } span#searchHelp { float:right; - margin-top:-45px; + margin-top:10px; font-size:.825em; padding-right:32px +} + +span#downloadResults { + float:left; + margin-top:10px; + font-size:.825em; + padding-left:10px +} + +img#downloadIcon { + cursor: pointer; +} + +.download-url { + padding: 5px 25px 5px; } \ No newline at end of file diff --git a/webapp/web/images/download-icon.png b/webapp/web/images/download-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd32132040b2d306b8b81ead5ef6f1ac2e68f0d7 GIT binary patch literal 1404 zcmV-?1%vvDP)WFU8GbZ8()Nlj27Z*CxAAWdOomE>Pr000EnNkl7$GgiSSYRkZ;nEBVrlx~ZHsLtb2y&S{SQskpU_1& zWmk@q<1|xRlRrSE6huNG+C|abl~{iH0}TRp_dTbJT^3egcP)Ev-g(b?-sgLs=X{?Z zudvoya)@gTf$#{yNR&`?g2?FIjQ!`2fcRBfGb4q^Z7+)vJ7HC6Q9*58M?DbL3Q8`rYej=HdxHey52St1Fp{#R2d* zn*Pu*Uw+q`)|r=sO${_`s>Y)=N@arUM*)qs96xu3ww~+Dhuw9F#bU(caS#H5C6REK z)ji&Fg-~>ycbgjUd7KPz{V3?yKeTb}Mr6e>3ItkfEXlib9F5j$Mg6P6Fw-+J4()Hm zD>Nz<_6+||w033%1rUNXX|j=Lu>>MfPPBC5x(1WF*)(w1K!gk319_2WF)i{)3IIC( zxW(0AIIS<|*?Z*VMgEQCgOQP}C!C8V^Kw2v;|Uib1lHOlptZzO zdy`W$d4)U>89@ib(X2}EHSOfV^bA4>V(|o(YfBMAq*F);!L!el&{SVXfycpE%hSb$ z96QsoqRn6=ijIuk%?e!Lad>r04aT@ArBF&?txe~nv6iyZ)x6cX9b*ha2(AqdWwkjp zb{|!md3xzsm^*Q4`dw)C$r%c+!b z4Nn#MIDO@Jej5m3j7ipAW58POJ)9ymJeG`5+|6mPx?(M|YF%kwCww?P3qWW8O@=4# zqf!&boyosAcD93#Kp2ms(@h|oRIMvP*7+;)ZVXyUf~J%myuByg0v`>zl9F4)<6P{yPG>Mgd;cu}re|YIm=5sKf!Fx_ z!vh(6b^Z#ZR+7E1Y)LQryagynqNTvv1p|u*KY-3ah@)pZ7`^v!+4ea9UR+d|kzV_D zZAB}YoIu{#v5BAC`_g59m9K#E($$PlPNgc8O{Gq9-&(M#HGxP)CixVpP)Q+hl%m*I zfNK^G)l^@%F#7ns9zJMpkT~HMp)#=dY3i zB?VGQloBYR5K>^QrD9D9KCk9dU-CK*H8kTmas{@=)<=EjWh{_npq`*v-m zslF~vq{jwc^3xWM5+1!vcw{1D-@m>LfB70}{T0-1SdUh@d(S^^z(cxK9hXu70000< KMNUMnLSTZ7){oZ! literal 0 HcmV?d00001 diff --git a/webapp/web/js/searchDownload.js b/webapp/web/js/searchDownload.js new file mode 100644 index 000000000..7d9da55a8 --- /dev/null +++ b/webapp/web/js/searchDownload.js @@ -0,0 +1,44 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +$(document).ready(function(){ + // This function creates and styles the "qTip" tooltip that displays the resource uri and the rdf link when the user clicks the uri/rdf icon. + $('span#downloadResults').children('img#downloadIcon').each(function() + { + $(this).qtip( + { + content: { + prerender: true, // We need this for the .click() event listener on 'a.close' + text: '
Download the results from this search
download results in XML format
download results in CSV format

close' + }, + position: { + corner: { + target: 'bottomLeft', + tooltip: 'topLeft' + } + }, + show: { + when: {event: 'click'} + }, + hide: { + fixed: true, // Make it fixed so it can be hovered over and interacted with + when: { + target: $('a.close'), + event: 'click' + } + }, + style: { + padding: '1em', + width: 350, + backgroundColor: '#f1f2ee' + } + }); + }); + + + + // Prevent close link for URI qTip from requesting bogus '#' href + $('a.close').click(function() { + $('#downloadIcon').qtip("hide"); + return false; + }); +}); \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl index 8cd910e05..0656e8e6a 100644 --- a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl @@ -1,5 +1,5 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -URI,Name - <#list individuals as individual> - ${individual.uri?xml},${individual.name?xml} - +URI, Name +<#list individuals as individual> +"${individual.uri}","${individual.name}" + diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl index e5e14dc95..5d96408bd 100644 --- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl @@ -2,21 +2,27 @@ <#-- Template for displaying paged search results --> -

+ + +

<#escape x as x?html> Search results for '${querytext}' <#if classGroupName?has_content>limited to type '${classGroupName}' <#if typeName?has_content>limited to type '${typeName}' - - XML/RDF Results - - +

+ + Download Results + + Not the results you expected? -
+
<#-- Refinement links --> <#if classGroupLinks?has_content> @@ -100,3 +106,8 @@
${stylesheets.add('')} + +${headScripts.add('', + '')} + +${scripts.add('')} From b5e148975a8fe5138652d90cfc8b0c95fd3155ae Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Fri, 31 May 2013 09:23:05 -0600 Subject: [PATCH 3/6] fixed a bug in the download that didn't allow it include limits such as Class when drilling down, added a slider that allows you to modify the maximum number of results returned and modified the csv template to include the sitename, query text, and date in its header --- webapp/web/js/searchDownload.js | 34 ++++++++++++++++--- .../body/search/search-csvResults.ftl | 8 +++-- .../body/search/search-pagedResults.ftl | 23 +++++++++---- .../body/search/search-xmlResults.ftl | 7 ++++ 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/webapp/web/js/searchDownload.js b/webapp/web/js/searchDownload.js index 7d9da55a8..1bcec1607 100644 --- a/webapp/web/js/searchDownload.js +++ b/webapp/web/js/searchDownload.js @@ -2,13 +2,23 @@ $(document).ready(function(){ // This function creates and styles the "qTip" tooltip that displays the resource uri and the rdf link when the user clicks the uri/rdf icon. - $('span#downloadResults').children('img#downloadIcon').each(function() + + $('span#downloadResults').children('img#downloadIcon').each(function() { $(this).qtip( { content: { prerender: true, // We need this for the .click() event listener on 'a.close' - text: '
Download the results from this search
download results in XML format
download results in CSV format

close' + text: '
' + +'

' + +'

' + +'
' + +'
' + +'
Download the results from this search
' + +'
download results in XML format
' + +'
download results in CSV format
' + +'
close
' + }, position: { corner: { @@ -28,17 +38,33 @@ $(document).ready(function(){ }, style: { padding: '1em', - width: 350, + width: 500, backgroundColor: '#f1f2ee' } }); + }); - + $( "#slider-vertical" ).slider({ + orientation: "vertical", + range: "min", + min: 10, + max: 1000, + value: 500, + slide: function( event, ui ) { + $( "#amount" ).val( ui.value ); + $('#csvDownload').attr("href", urlsBase + '/search?' + queryText +'&csv=1&hitsPerPage=' + ui.value); + $('#xmlDownload').attr("href", urlsBase + '/search?' + queryText +'&xml=1&hitsPerPage=' + ui.value); + } + }); + $( "#amount" ).val( $( "#slider-vertical" ).slider( "value" ) ); + // Prevent close link for URI qTip from requesting bogus '#' href $('a.close').click(function() { $('#downloadIcon').qtip("hide"); return false; }); + + }); \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl index 0656e8e6a..4b028ab01 100644 --- a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl @@ -1,5 +1,9 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -URI, Name +<#assign today = .now > +<#assign todayDate = today?date> +Results from ${siteName} for ${querytext} on ${todayDate} + +URI, Name, URL <#list individuals as individual> -"${individual.uri}","${individual.name}" +"${individual.uri}","${individual.name}","${individual.profileUrl}" diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl index 5d96408bd..1fe395ec3 100644 --- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl @@ -4,15 +4,23 @@ +

<#escape x as x?html> Search results for '${querytext}' <#if classGroupName?has_content>limited to type '${classGroupName}' <#if typeName?has_content>limited to type '${typeName}' -

@@ -105,9 +113,12 @@
-${stylesheets.add('')} +${stylesheets.add('', + '')} -${headScripts.add('', - '')} +${headScripts.add('', + '', + '' + )} ${scripts.add('')} diff --git a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl index b96094453..5a47d3697 100644 --- a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl @@ -14,6 +14,13 @@ ${individual.uri?xml} ${individual.name?xml} + <#if individual.preferredTitle?has_content> + ${individual.preferredTitle?xml} + + <#if individual.email?has_content> + "${individual.email}" + + ${individual.profileUrl?xml}" From 8880d87484c3cf6ecc691aab8ff42ac0ba054a01 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Fri, 31 May 2013 12:20:27 -0600 Subject: [PATCH 4/6] changed order so name is first, removed vivo items (added to the VIVO branch of this feature) from xmlResults. --- .../templates/freemarker/body/search/search-csvResults.ftl | 4 ++-- .../templates/freemarker/body/search/search-xmlResults.ftl | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl index 4b028ab01..575af9584 100644 --- a/webapp/web/templates/freemarker/body/search/search-csvResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-csvResults.ftl @@ -3,7 +3,7 @@ <#assign todayDate = today?date> Results from ${siteName} for ${querytext} on ${todayDate} -URI, Name, URL +Name, URI, URL <#list individuals as individual> -"${individual.uri}","${individual.name}","${individual.profileUrl}" +"${individual.name}","${individual.uri}","${individual.profileUrl}" diff --git a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl index 5a47d3697..66821302b 100644 --- a/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-xmlResults.ftl @@ -14,12 +14,6 @@ ${individual.uri?xml} ${individual.name?xml} - <#if individual.preferredTitle?has_content> - ${individual.preferredTitle?xml} - - <#if individual.email?has_content> - "${individual.email}" - ${individual.profileUrl?xml}" From fb70b50108eaec8cc20b85feb004b82b98c5ed17 Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Fri, 31 May 2013 14:38:52 -0600 Subject: [PATCH 5/6] Added search counts to the searchTOC - see listserv email for request --- webapp/web/css/vitro.css | 9 ++++++++- .../freemarker/body/search/search-pagedResults.ftl | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css index 54e42a6c3..c2001d95b 100644 --- a/webapp/web/css/vitro.css +++ b/webapp/web/css/vitro.css @@ -133,10 +133,17 @@ border-bottom: none } .searchTOC ul a { - display: block; + display: inline; padding-left: 25px; } +.searchTOC ul span { + float:right; + padding-right: 10px; + color:grey; + font-size:smaller; +} + /* -------------------------------------------------> */ /* DROP DOWN USER MENU ----------------------------> */ /* -------------------------------------------------> */ diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl index 1fe395ec3..4cd221ac6 100644 --- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl @@ -38,7 +38,7 @@

Display only

@@ -53,7 +53,7 @@ From 315894cc3022d7bb6b5f817046fe4bf3a3c7ddef Mon Sep 17 00:00:00 2001 From: "Stephen V. Williams" Date: Mon, 17 Jun 2013 10:44:49 -0500 Subject: [PATCH 6/6] Update pagedResults - cleaned up bad merge results --- .../templates/freemarker/body/search/search-pagedResults.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl index c7d84eebe..a0946ed23 100644 --- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl +++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl @@ -23,16 +23,11 @@ var urlsBase = '${urls.base}'; -<<<<<<< HEAD Download Results -Not the results you expected? - -
- ${i18n().not_expected_results}