umlaut 3.0.0alpha1

data/app/views/resolve/index.html.erb

@@ -0,0 +1,73 @@
+
+<%= render :partial=>'background_updater' %>
+
+ 
+<div class="umlaut_resolve"> <!-- actual wrapper for both columns -->
+  <div class="main_column"> 
+
+  
+    <h1>Find <%=@user_request.referent.type_of_thing.titlecase %></h1>
+    
+    <div class="resource_info">
+      <table width="100%" cellpadding="3" cellspacing="0">
+        <tr>
+          <td>      
+            <%= render :partial=>'citation' %>
+  
+            <div class="resource_info_sections">
+              <% html_sections(:resource_info).each do |section|
+              %>
+                <%= content_tag "div", :id => section[:div_id] do %>
+                  <%= render_section(section) %>
+                <% end %>
+              <% end %>
+            </div>
+            
+          </td>
+          
+          <td align='right'>
+            <div id="cover_image">
+              <%= render_section(html_section_by_div_id("cover_image")) %>
+            </div>
+          </td>
+        </tr>
+      </table>
+    </div>  
+    
+    
+    <div class="main_response_list">
+      <% html_sections(:main).each do |section|
+      %>
+        <%= content_tag "div", :id => section[:div_id] do %>
+          <%= render_section(section) %>
+        <% end %>
+      <% end %>
+    </div>
+  
+  <!--close mainColumn-->
+  </div>
+  
+  <div id="rightColumn" class="sidebar">
+  
+      <% html_sections(:sidebar).each do |section|
+      %>
+        <%= content_tag "div", :id => section[:div_id] do %>
+          <%= render_section(section) %>
+        <% end %>
+      <% end %>
+  
+    <!-- service errors -->
+    <div id="service_errors">
+      <% html_sections(:service_errors).each do |section| %>
+        <%= render_section(section) %>
+      <% end %>
+    </div>
+    
+  </div>
+  
+
+<!-- close bothColumns --> 
+</div> 
+
+
+

data/app/views/resolve/partial_html_sections.xml.erb

@@ -0,0 +1,30 @@
+<partial_html_sections>
+
+<%= render(:partial => "api_in_progress", :layout => false) %>
+
+  
+<% partial_html_sections.each do |section|
+    
+    renderer = SectionRenderer.new(@user_request, section) 
+    
+
+%>
+  <html_section id="<%= section[:div_id] %>">
+    <included_services>
+       <% renderer.service_type_values.each do |svc_type| %>
+         <service name="<%= svc_type.name %>" />
+       <% end %>
+    </included_services>
+    <service_load_complete value="<%= ! renderer.services_in_progress?  %>" />
+    <response_count value="<%= renderer.responses_list.length %>" />
+    <html_content>
+      <%=  with_format("html") do 
+        escape_xml(  render_section(renderer) ).html_safe 
+      end %> 
+    </html_content>    
+  </html_section>
+<% end %>
+    
+</partial_html_sections>
+
+

data/app/views/search/_a_to_z.html.erb

@@ -0,0 +1,6 @@
+  <p class="azNav">
+  <% group_list.each { | letter |%>
+  <%= link_to letter, :action=>"journal_list", :id=>letter%>
+  <%}%>
+  </p>
+

data/app/views/search/_citation.html.erb

@@ -0,0 +1,94 @@
+<% 
+  # save the conversion to hash on every call!
+  ref_meta = @current_context_object.referent.metadata  
+  labels = referent_labels
+%>
+<div class="search_citation">
+  <ul class="citation">
+
+          <% if ! ref_meta["atitle"].blank? %>
+            <li class="atitle">
+                <span class="label"><%= labels.atitle %>:</span>
+                <span class="value"><%= ref_meta["atitle"] %></span>               
+            </li>              
+         <% end %>
+         
+         <% unless ref_meta["au"].nil? and ref_meta['aulast'].nil? %>
+           <li class="au">
+            <span class="label">Author:</span>
+            <span class="value">
+              <%= ref_meta["au"] || ref_meta["aulast"] %>         
+              <% if ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"]%>
+              ,	<%= ref_meta["aufirst"] || ref_meta["auinit"] || ref_meta["auinit1"] %>
+              <% end %>
+            </span>
+          </li>
+        <% end %>
+        
+        <% if ref_meta.has_key?("jtitle")  or ref_meta.has_key?("title") or ref_meta.has_key?("btitle") %>
+          <li class="title">
+            <span class="label">            
+              <%= labels.title %>:
+            </span>
+            <span class="value">                 
+              <%= link_to(ref_meta["title"] || ref_meta["btitle"] || ref_meta["jtitle"], 
+                url_for_with_co({:controller => 'resolve'}, @current_context_object), 
+                {:target => search_result_target_window}) 
+               %>
+            </span>
+           </li>
+         <% end %>
+     
+        <% if ref_meta.has_key?("issn") %>
+          <li class="issn">
+            <span class="label">ISSN:</span>
+            <span class="value"><%=ref_meta["issn"] %></span>
+          </li>      
+        <% end %>
+    
+        <% if ref_meta.has_key?("isbn") %>
+          <ul class="isbn">
+            <span class="label">ISBN:</span>
+            <span class="value"><%=ref_meta["isbn"] %></span>
+          </ul>      
+        <% end %>
+    
+    
+        <% if ( ref_meta.has_key?("date") || ref_meta.has_key?("volume") || ref_meta.has_key?("issue") || ref_meta.has_key?("spage")) %>
+          <li class="cite">
+            <%=  date_format(ref_meta["date"].to_s) %>    
+            <% if ref_meta.has_key?("volume") %> 
+              Volume:&nbsp;&nbsp; <%= ref_meta["volume"] %>&nbsp;&nbsp;
+            <% end %>    
+            <% if ref_meta.has_key?("issue") %>
+              Issue:&nbsp;&nbsp; <%= ref_meta["issue"]  %>&nbsp;&nbsp;
+            <% end %>    
+            <% if ref_meta.has_key?("spage") %> 
+              Page:&nbsp;&nbsp; <%= ref_meta["spage"] %>&nbsp;&nbsp;
+            <% end %>    
+            <% if ref_meta.has_key?("epage") %>
+              -  <%= ref_meta["epage"] %>
+            <% end %>
+          </li>
+        <% end %>
+
+        <% unless ref_meta['pub'].blank? && ref_meta['place'].blank? %>
+          <li class="pub">
+            <span class="label" >Publisher:</span>
+            <span class="value">
+              <% unless ref_meta['place'].blank?  %>
+                <%= ref_meta['place'] %> :
+              <% end %>
+              <%= ref_meta['pub'] %>
+            </span>
+          </li>
+         <% end %>
+   </ul>
+
+  <div class="citation_link">
+    <%= resolver_link(@current_context_object, {:target => search_result_target_window}) %>
+  </div>
+</div>
+
+
+

data/app/views/search/_pager.html.erb

@@ -0,0 +1,60 @@
+<% # much of this paging code adopted from will_paginate plugin for view
+
+
+  total_pages = (@hits / @batch_size)
+  total_pages += 1 unless (@hits % @batch_size == 0)
+
+  if total_pages > 1
+    
+    # Arguments for paging actions, just add 'page'
+    args= params.clone
+    # Need to take out that annoying legacy journal key, sorry.
+    args.delete('journal')
+    
+    inner_window ||= 2 #how many links are shown on each side of current page
+    outer_window ||= 2 #how many links are around the first and the last page
+    
+    min = @page - inner_window
+    max = @page + inner_window
+    
+    # adjust lower or upper limit if other is out of bounds
+    if max > total_pages
+      min -= max - total_pages
+    elsif min < 1 
+      max += 1 - min
+    end
+    
+    current   = min..max
+    beginning = 1..(1 + outer_window)
+    tail      = (total_pages - outer_window)..total_pages
+    visible   = [beginning, current, tail].map(&:to_a).flatten.sort.uniq
+    links, prev = [], 0
+    
+    visible.each do |n|
+      next if n < 1
+      break if n > total_pages
+    
+      unless n - prev > 1
+        prev = n
+        if ( n != @page )
+           links << ( link_to n, args.merge({'page' => n }) )
+        else
+           links << ( content_tag :span, n )
+        end
+      else
+        # ellipsis represents the gap between windows
+        prev = n - 1
+        links << '...'
+        redo
+      end
+    end
+    
+    # Next and previous buttons
+    links.unshift(link_to('Previous', args.merge({'page' => @page -1 }))) if @page > 1
+    links.push(link_to('Next', args.merge({'page' => @page + 1}))) if @page < total_pages
+%>
+<%= content_tag :div, links.join(' ').html_safe %>
+<%
+  end
+%>
+

data/app/views/search/books.html.erb

@@ -0,0 +1,103 @@
+  <div class="oneColumn">
+  <h1>Books</h1>
+
+<%= form_tag({:controller=>'resolve', :action=>@submit_action}, {:method=>'get'}) %>
+  <div class="citationLinker">                                      
+
+<input type=hidden name="url_ver" value="Z39.88-2004">
+<input type=hidden name="url_ctx_fmt" value="info:ofi/fmt:kev:mtx:ctx">
+<input type=hidden name="ctx_ver" value="Z39.88-2004">
+<input type=hidden name="rfr_id" value="info:sid/umlaut.code4lib.org:citation">
+<input type=hidden name="rft_val_fmt" value="info:ofi/fmt:kev:mtx:book">
+<input type=hidden name="rft.genre" value="book">
+
+<table>
+                                </tr>
+                                    <td align="right" >book title</td>
+
+                                    <td><input
+                                            type=text
+                                            name="rft.btitle"
+                                            size="33"
+                                            value=""></td>
+                                </tr>
+                                <tr>
+                                    <td align="right" >year</td>
+                                    <td>
+                                        <input type=text name="rft.date" size="10" value="">
+                                                                            </td>
+                                </tr>
+
+                                <tr>
+                                    <td align="right" >volume</td>
+                                    <td>
+                                        <input
+                                            type=text
+                                            name="rft.volume"
+                                            size="5"
+                                            maxlength="5"
+                                            value="">
+                                        part <input
+                                                type=text
+                                                name="rft.part"
+                                                size="5"
+                                                value="">
+
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td align="right" >isbn</td>
+                                    <td>
+                                        <input
+                                            type=text
+                                            name="rft.isbn"
+                                            size="17"
+                                            maxlength="17"
+                                            value="">
+                                    </td>
+                                </tr>
+
+                                <tr>
+                                    <td align="right" >author</td>
+                                    <td>
+                                        <table border="0" cellspacing="0" cellpadding="0">
+                                            <tr>
+                                                <td >last name</td>
+                                                <td >first name</td>
+
+                                                <td >initials</td>
+                                            </tr>
+                                            <tr>
+                                                <td><input
+                                                        type=text
+                                                        name="rft.aulast"
+                                                        size="12"
+                                                        value=""></td>
+                                                <td><input
+                                                        type=text
+                                                        name="rft.aufirst"
+                                                        size="10"
+                                                        value=""></td>
+                                                <td><input
+                                                        type=text
+                                                        name="rft.auinit"
+                                                        size="4"
+                                                        value=""></td>
+                                            </tr>
+                                        </table>
+
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td colspan="80%" align="right">
+                                      &nbsp;               
+                                    </td>
+                                    <td colspan="20%" align="right">
+                                        <input type="submit"  value="search"></td>
+                                    </td>
+
+                                </tr>
+                            </table>
+</div>                        
+</form>
+</div>

data/app/views/search/journal_search.html.erb

@@ -0,0 +1,90 @@
+<% 
+if (params["action"] == "journal_list")
+  @page_title = "Browse by Journal Title: #{params['id']}"
+else
+  @page_title = 'Journal titles that '
+
+  @page_title +=
+  (params["umlaut.title_search_type"] == "begins") ?
+  'begin with ' : 'contain '
+
+  @page_title += "'" + params['rft.jtitle'] + "'"
+end
+
+%>
+
+<div class="oneColumn">
+<h1><%= @page_title %>
+</h1>
+
+<div class="citationLinker" style="margin-bottom: 8px">                                                                        
+  <%= form_tag({:controller=>'search', :action=>'journal_search'}, {:method=>'get', :name=>'OpenURL', :id=>'OpenURL'})  %>
+      <input type=hidden name="rfr_id" value="info:sid/sfxit.com:citation"> 
+      <!-- <input type=hidden name="rfr_id" value="info:sid/umlaut.code4lib.org:citation"> -->
+
+      <input type="hidden" class="rft_title" name="rft.title">
+      <input type="hidden" class="rft_object_id" name="rft.object_id">
+
+      <%-
+      # specific article fields from prior form may be present, if the user is now choosing from
+      # amongst serveral possible title matches. Preserve them on refinement of search terms.  
+      -%>
+      <% params.slice("rft.date", "__year", "__month", "__day", "rft.volume", "rft.issue", "rft.spage").each_pair do |key, value| %>
+        <%= hidden_field_tag key, value %>
+      <% end %>
+      
+          
+      Journal Title:
+      <%= text_field :journal, :title, {:name=>'rft.jtitle', :autocomplete=>'off', :size=>'40', :value=>params['rft.jtitle'], :class=>"title_search"}
+      %>
+                                                                             
+      <select name="umlaut.title_search_type" class="sfx_title_search">
+          <option value="contains" <%= "SELECTED" if params["umlaut.title_search_type"] == "contains" %>>contains</option>
+          <option value="begins" <%= "SELECTED" if params["umlaut.title_search_type"] == "begins" %> >begins
+          with</option>
+          <option value="exact">exact match</option>
+      </select>
+      
+      <input type=hidden name="rft.issn">
+      <input type="submit" name="Generate_OpenURL2" value="Search">
+      <%= link_to('More search options', :controller=>'search') %>
+  </form>
+</div>
+                                      
+<% if params["action"] == "journal_list" %> 
+  <%= render :partial=>"a_to_z" %>
+  <div class="line2"></div>
+<% end %>
+
+
+<% unless @hits == 0%>
+<h3>Showing results <%= @start_result_num %> through <%= @end_result_num %> of <%= @hits %></h3>
+<% end %>
+<% if params["rft.jtitle"] %>
+  <div class="note"><em><strong>Note:</strong> Alternate titles might have matched your search terms</em></div>
+<% end %>
+
+<div class='pagination'>
+  <%= render :partial=>'pager' %>
+</div>
+
+<div class="list">
+<% @display_results.each do | co | 
+@current_context_object = co
+%>
+  <% partial_name = @citation_partial || 'citation' %>
+  <%= render :partial=>partial_name %>
+ 
+<% end %>
+</div>
+
+<div class='pagination'>
+  <%= render :partial=>'pager' %>
+</div>
+
+<% if params["action"] == "journal_list" %> 
+  <div class="line2"></div>
+  <%= render :partial=>"a_to_z" %>
+<% end %>
+ <!--close oneColumn-->
+</div>