<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[608] trunk/rails:
Set constant in application controller for defining which fields to select from when showing a document
, removed the huge text fields (text_text, word)
which greatly improved the load time.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>608</dd>
<dt>Author</dt> <dd>mwmitchell</dd>
<dt>Date</dt> <dd>2008-06-18 16:57:49 -0400 (Wed, 18 Jun 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set constant in application controller for defining which fields to select from when showing a document, removed the huge text fields (text_text, word) which greatly improved the load time. Added "Loading..." message to preview popup panels, midified Flare.find_by_id to accept more than just the id. find_by_id now allows any standard Solr::Request param to be passed in</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkrailsappcontrollersapplicationrb">trunk/rails/app/controllers/application.rb</a></li>
<li><a href="#trunkrailsappcontrollerscatalog_controllerrb">trunk/rails/app/controllers/catalog_controller.rb</a></li>
<li><a href="#trunkrailsappcontrollersmusic_controllerrb">trunk/rails/app/controllers/music_controller.rb</a></li>
<li><a href="#trunkrailsappcontrollerssemester_at_sea_controllerrb">trunk/rails/app/controllers/semester_at_sea_controller.rb</a></li>
<li><a href="#trunkrailspublicjavascriptscatalogindexjs">trunk/rails/public/javascripts/catalog/index.js</a></li>
<li><a href="#trunkrailsvendorgemsflare020libflarecontextrb">trunk/rails/vendor/gems/flare-0.2.0/lib/flare/context.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkrailsappcontrollersapplicationrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/app/controllers/application.rb (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/app/controllers/application.rb 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/app/controllers/application.rb 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -10,6 +10,35 @@
</span><span class="cx">
</span><span class="cx"> helper :all # include all helpers, all the time
</span><span class="cx">
</span><ins>+ #
+ # fields used for displaying a single record ("show" action)
+ # TODO: This needs to be moved to a config somewhere
+ #
+ COMMON_FIELDS_FOR_SHOW_RECORD=%W(
+ media_resource_id_display
+ marc_display
+ format_facet
+ location_facet
+ call_number_display
+ isbn_display
+ edition_display
+ call_number_facet
+ score
+ datafile_name_display
+ collection_facet
+ timestamp
+ subject_genre_facet
+ content_model_facet
+ id
+ composition_era_facet
+ content_type_facet
+ author_display
+ source_facet
+ language_facet
+ title_display
+ year_facet
+ )
+
</ins><span class="cx"> # See ActionController::RequestForgeryProtection for details
</span><span class="cx"> # Uncomment the :secret if you're not using the cookie session store
</span><span class="cx"> protect_from_forgery # :secret => '200c1e5f25e610288439b479ef176bbd'
</span></span></pre></div>
<a id="trunkrailsappcontrollerscatalog_controllerrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/app/controllers/catalog_controller.rb (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/app/controllers/catalog_controller.rb 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/app/controllers/catalog_controller.rb 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -8,6 +8,11 @@
</span><span class="cx">
</span><span class="cx"> protected
</span><span class="cx">
</span><ins>+ def document_for_show
+ # removed huge content fields (word, text_text etc.) for faster page loading
+ @flare.find_by_id(params[:id], :field_list=>COMMON_FIELDS_FOR_SHOW_RECORD)
+ end
+
</ins><span class="cx"> #
</span><span class="cx"> # This is overrides the Flare "documents_for_index" method
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkrailsappcontrollersmusic_controllerrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/app/controllers/music_controller.rb (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/app/controllers/music_controller.rb 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/app/controllers/music_controller.rb 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -7,6 +7,10 @@
</span><span class="cx">
</span><span class="cx"> protected
</span><span class="cx">
</span><ins>+ def document_for_show
+ @flare.find_by_id(params[:id], :field_list=>COMMON_FIELDS_FOR_SHOW_RECORD)
+ end
+
</ins><span class="cx"> def documents_for_index
</span><span class="cx"> @flare.search(flare_page_param) do |req|
</span><span class="cx"> req[:sort] = [{:score=>:descending}, {:id=>:descending}]
</span></span></pre></div>
<a id="trunkrailsappcontrollerssemester_at_sea_controllerrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/app/controllers/semester_at_sea_controller.rb (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/app/controllers/semester_at_sea_controller.rb 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/app/controllers/semester_at_sea_controller.rb 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -6,6 +6,10 @@
</span><span class="cx"> include UVA::Controller::Refworks
</span><span class="cx">
</span><span class="cx"> protected
</span><ins>+
+ def document_for_show
+ @flare.find_by_id(params[:id], :field_list=>COMMON_FIELDS_FOR_SHOW_RECORD)
+ end
</ins><span class="cx">
</span><span class="cx"> def documents_for_index
</span><span class="cx"> @flare.search(flare_page_param) do |req|
</span></span></pre></div>
<a id="trunkrailspublicjavascriptscatalogindexjs"></a>
<div class="modfile"><h4>Modified: trunk/rails/public/javascripts/catalog/index.js (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/public/javascripts/catalog/index.js 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/public/javascripts/catalog/index.js 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -13,27 +13,33 @@
</span><span class="cx"> $('.previewPanelOpener').click(function(e){
</span><span class="cx"> var el=$(this);
</span><span class="cx"> e.preventDefault();
</span><ins>+
+ var p = $('#PanelContainer');
+
+ $.blockUI({
+ allowBodyStretch: true,
+ message:p,
+ css: {
+ cursor:'arrow',
+ width:'60%',
+ top:'10%',
+ left:'20%',
+ 'border':'none'/* this is key to getting the panel to display properly with variable heights */
+ }
+ });
+
+ $('.panelBody', p).html('Loading...');
+
</ins><span class="cx"> $.get(el.attr('href'), {no_layout:true}, function(data){
</span><del>- var p = $('#PanelContainer');
- $('.panelBody', p).append(data);
</del><ins>+ $('.panelBody', p).html(data);
</ins><span class="cx"> $('.panelCloseButton', p).click(function(e){
</span><span class="cx"> e.preventDefault();
</span><span class="cx"> $.unblockUI();
</span><span class="cx"> $('.panelBody', p).html('');
</span><span class="cx"> p.hide();
</span><span class="cx"> });
</span><del>- $.blockUI({
- allowBodyStretch: true,
- message:p,
- css: {
- cursor:'arrow',
- width:'60%',
- top:'10%',
- left:'20%',
- 'border':'none'/* this is key to getting the panel to display properly with variable heights */
- }
- });
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> });
</span><span class="cx"> })
</span><span class="cx"> })();
</span></span></pre></div>
<a id="trunkrailsvendorgemsflare020libflarecontextrb"></a>
<div class="modfile"><h4>Modified: trunk/rails/vendor/gems/flare-0.2.0/lib/flare/context.rb (607 => 608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/rails/vendor/gems/flare-0.2.0/lib/flare/context.rb 2008-06-18 15:50:41 UTC (rev 607)
+++ trunk/rails/vendor/gems/flare-0.2.0/lib/flare/context.rb 2008-06-18 20:57:49 UTC (rev 608)
</span><span class="lines">@@ -108,11 +108,18 @@
</span><span class="cx"> #
</span><span class="cx"> # Find Solr document by id
</span><span class="cx"> #
</span><del>- def find_by_id(id)
- @connection.send(Solr::Request::Standard.new(:query => "id:\"#{id}\"")).hits[0]
</del><ins>+ def find_by_id(id, params={})
+ self.query({:query=>"id:\"#{id}\""}.merge(params)).hits[0]
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> #
</span><ins>+ # Send a query to Solr
+ #
+ def query(params={}, handler=Solr::Request::Standard)
+ @connection.send(handler.new(params))
+ end
+
+ #
</ins><span class="cx"> # Returns list of suggestions
</span><span class="cx"> # The term by default is the "q" entire param string.
</span><span class="cx"> # An optional block can be used to finalize the request params passed to Solr
</span></span></pre>
</div>
</div>
</body>
</html>