-
+ #foreach ($facet in $field)
+ #if ($facet.value > 0)
+ #set($facetURL = "#url_for_nested_facet_query($facet.key)")
+ #if ($facetURL != '')
+
- $facet.key ($facet.value) + #end + #end + #end +
-
+ #if($before && $before != "")
+ #set($value = "[* TO " + "#format_value($start)" + "}")
+ #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)")
+
- Less than #format_value($start) ($before) + #end + #foreach ($facet in $field) + #set($rangeEnd = "#range_get_to_value($facet.key, $gap)") + #set($value = "[" + $facet.key + " TO " + $rangeEnd + "}") + #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") + #if ($facetURL != '') +
- $facet.key - #format_value($rangeEnd) ($facet.value) + #end + #end + #if($end && $end != "" && $after > 0) + #set($value = "[" + "#format_value($end)" + " TO *}") + #set($facetURL = "#url_for_facet_range_filter($fieldName, $value)") +
- More than #format_value($end) ($after) + #end +
-
+ #foreach ($pivot in $pivots)
+ #foreach ($entry in $pivot.value)
+ $entry.field::$entry.value ($entry.count)
+
-
+ #foreach($nest in $entry.pivot)
+ $nest.field::$nest.value ($nest.count)
+ #end
+
+ #parse("pagination_top.vm")
+
+
+## Show Error Message, if any
+
+ #parse("error.vm")
+
+
+## Render Results, actual matching docs
+
+ #parse("results_list.vm")
+
+
+
+ #parse("pagination_bottom.vm")
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/cluster.vm b/solr/homeDirectoryTemplate/conf/velocity/cluster.vm
new file mode 100644
index 000000000..bfe2f3b8d
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/cluster.vm
@@ -0,0 +1,19 @@
+#**
+ * Check if Clustering is Enabled and then
+ * call cluster_results.vm
+ *#
+
++ Clusters +
+ +## Div tag has placeholder text by default +
+ Run Solr with java -Dsolr.clustering.enabled=true -jar start.jar to see clustered search results.
+
+
+## Replace the div content *if* Carrot^2 is available
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/cluster_results.vm b/solr/homeDirectoryTemplate/conf/velocity/cluster_results.vm
new file mode 100644
index 000000000..204480d5d
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/cluster_results.vm
@@ -0,0 +1,31 @@
+#**
+ * Actual rendering of Clusters
+ *#
+
+## For each cluster
+#foreach ($clusters in $response.response.clusters)
+
+ #set($labels = $clusters.get('labels'))
+ #set($docs = $clusters.get('docs'))
+
+ ## This Cluster's Heading
+ + #foreach ($label in $labels) + ## Keep the following line together to prevent + ## a space appearing before each comma + $label#if( $foreach.hasNext ),#end + #end +
+ + ## This Cluster's Documents +-
+ ## For each doc in this cluster
+ #foreach ($cluDoc in $docs)
+
- + + $cluDoc + + #end +
ERROR $response.response.error.code
+ $response.response.error.msg +#end diff --git a/solr/homeDirectoryTemplate/conf/velocity/facet_fields.vm b/solr/homeDirectoryTemplate/conf/velocity/facet_fields.vm new file mode 100644 index 000000000..d9db659b8 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/facet_fields.vm @@ -0,0 +1,23 @@ +#** + * Display facets based on field values + * e.g.: fields specified by &facet.field= + *# + +#if($response.facetFields) ++ Field Facets +
+ #foreach($field in $response.facetFields) + ## Hide facets without value + #if($field.values.size() > 0) + $field.name +-
+ #foreach($facet in $field.values)
+
- + $facet.name ($facet.count) + + #end +
+ Pivot Facets +
+ +#set($pivot = $response.response.facet_counts.facet_pivot) + +#display_facet_pivot($pivot, "") diff --git a/solr/homeDirectoryTemplate/conf/velocity/facet_queries.vm b/solr/homeDirectoryTemplate/conf/velocity/facet_queries.vm new file mode 100644 index 000000000..37489c7e0 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/facet_queries.vm @@ -0,0 +1,12 @@ +#** + * Display facets based on specific facet queries + * e.g.: facets specified by &facet.query= + *# + +#set($field = $response.response.facet_counts.facet_queries) + ++ Query Facets +
+ +#display_facet_query($field, "", "") diff --git a/solr/homeDirectoryTemplate/conf/velocity/facet_ranges.vm b/solr/homeDirectoryTemplate/conf/velocity/facet_ranges.vm new file mode 100644 index 000000000..a61084b22 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/facet_ranges.vm @@ -0,0 +1,23 @@ +#** + * Display facets based on ranges of values, AKA "Bukets" + * e.g.: ranges specified by &facet.range= + *# + ++ Range Facets +
+ +#foreach ($field in $response.response.facet_counts.facet_ranges) + ## Hide facets without value + #if($field.value.counts.size() > 0) + #set($name = $field.key) + #set($display = $name) + #set($f = $field.value.counts) + #set($start = $field.value.start) + #set($end = $field.value.end) + #set($gap = $field.value.gap) + #set($before = $field.value.before) + #set($after = $field.value.after) + #display_facet_range($f, $display, $name, $start, $end, $gap, $before, $after) + #end ## end if has any values +#end ## end for each facet range diff --git a/solr/homeDirectoryTemplate/conf/velocity/facets.vm b/solr/homeDirectoryTemplate/conf/velocity/facets.vm new file mode 100644 index 000000000..55d40c9ab --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/facets.vm @@ -0,0 +1,10 @@ +#** + * Overall Facet display block + * Invokes the 4 facet and 1 cluster template + *# + +#parse('facet_fields.vm') +#parse('facet_queries.vm') +#parse('facet_ranges.vm') +#parse('facet_pivot.vm') +#parse('cluster.vm') diff --git a/solr/homeDirectoryTemplate/conf/velocity/footer.vm b/solr/homeDirectoryTemplate/conf/velocity/footer.vm new file mode 100644 index 000000000..0604c34cc --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/footer.vm @@ -0,0 +1,43 @@ +#** + * Render the bottom section of the page visible to users + *# + ++
+ Options:
+
+ #if($request.params.get('debugQuery'))
+
+ disable debug
+ #else
+
+ enable debug
+ #end
+ -
+ #if($annotate)
+
+ disable annotation
+ #else
+
+ enable annotation
+ #end
+ -
+
+ XML results
+
+
+
+
+ Generated by VelocityResponseWriter
+
+
+
+ Disclaimer:
+ The locations displayed in this demonstration are purely fictional.
+ It is more than likely that no store with the items listed actually
+ exists at that location!
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/head.vm b/solr/homeDirectoryTemplate/conf/velocity/head.vm
new file mode 100644
index 000000000..d1f6ee6eb
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/head.vm
@@ -0,0 +1,35 @@
+#**
+ * Provide elements for the section of the HTML document
+ *#
+
+ ## An example of using an arbitrary request parameter
+
+ 
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/hit.vm b/solr/homeDirectoryTemplate/conf/velocity/hit.vm
new file mode 100644
index 000000000..a9c11f411
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/hit.vm
@@ -0,0 +1,25 @@
+#**
+ * Called for each matching document but then
+ * calls one of product_doc, join_doc or richtext_doc
+ * depending on which fields the doc has
+ *#
+
+#set($docId = $doc.getFieldValue('id'))
+
+
+
+
+ ## Has a "name" field ?
+ #if($doc.getFieldValue('name'))
+ #parse("product_doc.vm")
+
+ ## Has a "compName_s" field ?
+ #elseif($doc.getFieldValue('compName_s'))
+ #parse("join_doc.vm")
+
+ ## Fallback to richtext_doc
+ #else
+ #parse("richtext_doc.vm")
+
+ #end
+
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/hit_grouped.vm b/solr/homeDirectoryTemplate/conf/velocity/hit_grouped.vm
new file mode 100644
index 000000000..5297f1e9a
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/hit_grouped.vm
@@ -0,0 +1,43 @@
+#**
+ * Display grouped results
+ *#
+
+
+
+
## end of div class=result-document
diff --git a/solr/homeDirectoryTemplate/conf/velocity/hit_plain.vm b/solr/homeDirectoryTemplate/conf/velocity/hit_plain.vm
new file mode 100644
index 000000000..193439b59
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/hit_plain.vm
@@ -0,0 +1,25 @@
+#**
+ * An extremely plain / debug version of hit.vm
+ *#
+
+
+ $grouping.key
+
+
+
+ Total Matches in Group: $grouping.value.matches
+
+
+ ## list of groups
+
+ #foreach ($group in $grouping.value.groups)
+
## div tag for entire list of groups
+
+
+ #if($group.groupValue)$group.groupValue#{else}No group#end
+
+ ($group.doclist.numFound)
+
+
+
+
+ #foreach ($doc in $group.doclist)
+ #set($docId = $doc.getFieldValue('id'))
+ #if($doc.getFieldValue('name'))
+ #parse("product_doc.vm")
+ #elseif($doc.getFieldValue('compName_s'))
+ #parse("join_doc.vm")
+ #else
+ #parse("richtext_doc.vm")
+ #end
+ #end
+
+
+ #end ## end of foreach group in grouping.value.groups
+ | + #if( $foreach.count == 1 ) + $fieldName: + #end + | + ## Field Value(s) +
+ $esc.html($value) + |
+
|---|
diff --git a/solr/homeDirectoryTemplate/conf/velocity/join_doc.vm b/solr/homeDirectoryTemplate/conf/velocity/join_doc.vm new file mode 100644 index 000000000..9956012b4 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/join_doc.vm @@ -0,0 +1,20 @@ +#** + * Display documents that are joined to other documents + *# + +
+ #field('compName_s')
+
+
+
+ Id: #field('id')
+ (company-details document for
+ join
+ )
+
+
+
+ Address: #field('address_s')
+
+
+#parse('debug.vm')
diff --git a/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.css b/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.css
new file mode 100644
index 000000000..91b622833
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.css
@@ -0,0 +1,48 @@
+.ac_results {
+ padding: 0px;
+ border: 1px solid black;
+ background-color: white;
+ overflow: hidden;
+ z-index: 99999;
+}
+
+.ac_results ul {
+ width: 100%;
+ list-style-position: outside;
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
+.ac_results li {
+ margin: 0px;
+ padding: 2px 5px;
+ cursor: default;
+ display: block;
+ /*
+ if width will be 100% horizontal scrollbar will apear
+ when scroll mode will be used
+ */
+ /*width: 100%;*/
+ font: menu;
+ font-size: 12px;
+ /*
+ it is very important, if line-height not setted or setted
+ in relative units scroll will be broken in firefox
+ */
+ line-height: 16px;
+ overflow: hidden;
+}
+
+.ac_loading {
+ background: white url('indicator.gif') right center no-repeat;
+}
+
+.ac_odd {
+ background-color: #eee;
+}
+
+.ac_over {
+ background-color: #0A246A;
+ color: white;
+}
diff --git a/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.js b/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.js
new file mode 100644
index 000000000..a377b4057
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/jquery.autocomplete.js
@@ -0,0 +1,763 @@
+/*
+ * Autocomplete - jQuery plugin 1.1pre
+ *
+ * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.autocomplete.js 5785 2008-07-12 10:37:33Z joern.zaefferer $
+ *
+ */
+
+;(function($) {
+
+$.fn.extend({
+ autocomplete: function(urlOrData, options) {
+ var isUrl = typeof urlOrData == "string";
+ options = $.extend({}, $.Autocompleter.defaults, {
+ url: isUrl ? urlOrData : null,
+ data: isUrl ? null : urlOrData,
+ delay: isUrl ? $.Autocompleter.defaults.delay : 10,
+ max: options && !options.scroll ? 10 : 150
+ }, options);
+
+ // if highlight is set to false, replace it with a do-nothing function
+ options.highlight = options.highlight || function(value) { return value; };
+
+ // if the formatMatch option is not specified, then use formatItem for backwards compatibility
+ options.formatMatch = options.formatMatch || options.formatItem;
+
+ return this.each(function() {
+ new $.Autocompleter(this, options);
+ });
+ },
+ result: function(handler) {
+ return this.bind("result", handler);
+ },
+ search: function(handler) {
+ return this.trigger("search", [handler]);
+ },
+ flushCache: function() {
+ return this.trigger("flushCache");
+ },
+ setOptions: function(options){
+ return this.trigger("setOptions", [options]);
+ },
+ unautocomplete: function() {
+ return this.trigger("unautocomplete");
+ }
+});
+
+$.Autocompleter = function(input, options) {
+
+ var KEY = {
+ UP: 38,
+ DOWN: 40,
+ DEL: 46,
+ TAB: 9,
+ RETURN: 13,
+ ESC: 27,
+ COMMA: 188,
+ PAGEUP: 33,
+ PAGEDOWN: 34,
+ BACKSPACE: 8
+ };
+
+ // Create $ object for input element
+ var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass);
+
+ var timeout;
+ var previousValue = "";
+ var cache = $.Autocompleter.Cache(options);
+ var hasFocus = 0;
+ var lastKeyPressCode;
+ var config = {
+ mouseDownOnSelect: false
+ };
+ var select = $.Autocompleter.Select(options, input, selectCurrent, config);
+
+ var blockSubmit;
+
+ // prevent form submit in opera when selecting with return key
+ $.browser.opera && $(input.form).bind("submit.autocomplete", function() {
+ if (blockSubmit) {
+ blockSubmit = false;
+ return false;
+ }
+ });
+
+ // only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all
+ $input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) {
+ // track last key pressed
+ lastKeyPressCode = event.keyCode;
+ switch(event.keyCode) {
+
+ case KEY.UP:
+ event.preventDefault();
+ if ( select.visible() ) {
+ select.prev();
+ } else {
+ onChange(0, true);
+ }
+ break;
+
+ case KEY.DOWN:
+ event.preventDefault();
+ if ( select.visible() ) {
+ select.next();
+ } else {
+ onChange(0, true);
+ }
+ break;
+
+ case KEY.PAGEUP:
+ event.preventDefault();
+ if ( select.visible() ) {
+ select.pageUp();
+ } else {
+ onChange(0, true);
+ }
+ break;
+
+ case KEY.PAGEDOWN:
+ event.preventDefault();
+ if ( select.visible() ) {
+ select.pageDown();
+ } else {
+ onChange(0, true);
+ }
+ break;
+
+ // matches also semicolon
+ case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA:
+ case KEY.TAB:
+ case KEY.RETURN:
+ if( selectCurrent() ) {
+ // stop default to prevent a form submit, Opera needs special handling
+ event.preventDefault();
+ blockSubmit = true;
+ return false;
+ }
+ break;
+
+ case KEY.ESC:
+ select.hide();
+ break;
+
+ default:
+ clearTimeout(timeout);
+ timeout = setTimeout(onChange, options.delay);
+ break;
+ }
+ }).focus(function(){
+ // track whether the field has focus, we shouldn't process any
+ // results if the field no longer has focus
+ hasFocus++;
+ }).blur(function() {
+ hasFocus = 0;
+ if (!config.mouseDownOnSelect) {
+ hideResults();
+ }
+ }).click(function() {
+ // show select when clicking in a focused field
+ if ( hasFocus++ > 1 && !select.visible() ) {
+ onChange(0, true);
+ }
+ }).bind("search", function() {
+ // TODO why not just specifying both arguments?
+ var fn = (arguments.length > 1) ? arguments[1] : null;
+ function findValueCallback(q, data) {
+ var result;
+ if( data && data.length ) {
+ for (var i=0; i < data.length; i++) {
+ if( data[i].result.toLowerCase() == q.toLowerCase() ) {
+ result = data[i];
+ break;
+ }
+ }
+ }
+ if( typeof fn == "function" ) fn(result);
+ else $input.trigger("result", result && [result.data, result.value]);
+ }
+ $.each(trimWords($input.val()), function(i, value) {
+ request(value, findValueCallback, findValueCallback);
+ });
+ }).bind("flushCache", function() {
+ cache.flush();
+ }).bind("setOptions", function() {
+ $.extend(options, arguments[1]);
+ // if we've updated the data, repopulate
+ if ( "data" in arguments[1] )
+ cache.populate();
+ }).bind("unautocomplete", function() {
+ select.unbind();
+ $input.unbind();
+ $(input.form).unbind(".autocomplete");
+ });
+
+
+ function selectCurrent() {
+ var selected = select.selected();
+ if( !selected )
+ return false;
+
+ var v = selected.result;
+ previousValue = v;
+
+ if ( options.multiple ) {
+ var words = trimWords($input.val());
+ if ( words.length > 1 ) {
+ v = words.slice(0, words.length - 1).join( options.multipleSeparator ) + options.multipleSeparator + v;
+ }
+ v += options.multipleSeparator;
+ }
+
+ $input.val(v);
+ hideResultsNow();
+ $input.trigger("result", [selected.data, selected.value]);
+ return true;
+ }
+
+ function onChange(crap, skipPrevCheck) {
+ if( lastKeyPressCode == KEY.DEL ) {
+ select.hide();
+ return;
+ }
+
+ var currentValue = $input.val();
+
+ if ( !skipPrevCheck && currentValue == previousValue )
+ return;
+
+ previousValue = currentValue;
+
+ currentValue = lastWord(currentValue);
+ if ( currentValue.length >= options.minChars) {
+ $input.addClass(options.loadingClass);
+ if (!options.matchCase)
+ currentValue = currentValue.toLowerCase();
+ request(currentValue, receiveData, hideResultsNow);
+ } else {
+ stopLoading();
+ select.hide();
+ }
+ };
+
+ function trimWords(value) {
+ if ( !value ) {
+ return [""];
+ }
+ var words = value.split( options.multipleSeparator );
+ var result = [];
+ $.each(words, function(i, value) {
+ if ( $.trim(value) )
+ result[i] = $.trim(value);
+ });
+ return result;
+ }
+
+ function lastWord(value) {
+ if ( !options.multiple )
+ return value;
+ var words = trimWords(value);
+ return words[words.length - 1];
+ }
+
+ // fills in the input box w/the first match (assumed to be the best match)
+ // q: the term entered
+ // sValue: the first matching result
+ function autoFill(q, sValue){
+ // autofill in the complete box w/the first match as long as the user hasn't entered in more data
+ // if the last user key pressed was backspace, don't autofill
+ if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) {
+ // fill in the value (keep the case the user has typed)
+ $input.val($input.val() + sValue.substring(lastWord(previousValue).length));
+ // select the portion of the value not typed by the user (so the next character will erase)
+ $.Autocompleter.Selection(input, previousValue.length, previousValue.length + sValue.length);
+ }
+ };
+
+ function hideResults() {
+ clearTimeout(timeout);
+ timeout = setTimeout(hideResultsNow, 200);
+ };
+
+ function hideResultsNow() {
+ var wasVisible = select.visible();
+ select.hide();
+ clearTimeout(timeout);
+ stopLoading();
+ if (options.mustMatch) {
+ // call search and run callback
+ $input.search(
+ function (result){
+ // if no value found, clear the input box
+ if( !result ) {
+ if (options.multiple) {
+ var words = trimWords($input.val()).slice(0, -1);
+ $input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") );
+ }
+ else
+ $input.val( "" );
+ }
+ }
+ );
+ }
+ if (wasVisible)
+ // position cursor at end of input field
+ $.Autocompleter.Selection(input, input.value.length, input.value.length);
+ };
+
+ function receiveData(q, data) {
+ if ( data && data.length && hasFocus ) {
+ stopLoading();
+ select.display(data, q);
+ autoFill(q, data[0].value);
+ select.show();
+ } else {
+ hideResultsNow();
+ }
+ };
+
+ function request(term, success, failure) {
+ if (!options.matchCase)
+ term = term.toLowerCase();
+ var data = cache.load(term);
+ data = null; // Avoid buggy cache and go to Solr every time
+ // recieve the cached data
+ if (data && data.length) {
+ success(term, data);
+ // if an AJAX url has been supplied, try loading the data now
+ } else if( (typeof options.url == "string") && (options.url.length > 0) ){
+
+ var extraParams = {
+ timestamp: +new Date()
+ };
+ $.each(options.extraParams, function(key, param) {
+ extraParams[key] = typeof param == "function" ? param() : param;
+ });
+
+ $.ajax({
+ // try to leverage ajaxQueue plugin to abort previous requests
+ mode: "abort",
+ // limit abortion to this input
+ port: "autocomplete" + input.name,
+ dataType: options.dataType,
+ url: options.url,
+ data: $.extend({
+ q: lastWord(term),
+ limit: options.max
+ }, extraParams),
+ success: function(data) {
+ var parsed = options.parse && options.parse(data) || parse(data);
+ cache.add(term, parsed);
+ success(term, parsed);
+ }
+ });
+ } else {
+ // if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match
+ select.emptyList();
+ failure(term);
+ }
+ };
+
+ function parse(data) {
+ var parsed = [];
+ var rows = data.split("\n");
+ for (var i=0; i < rows.length; i++) {
+ var row = $.trim(rows[i]);
+ if (row) {
+ row = row.split("|");
+ parsed[parsed.length] = {
+ data: row,
+ value: row[0],
+ result: options.formatResult && options.formatResult(row, row[0]) || row[0]
+ };
+ }
+ }
+ return parsed;
+ };
+
+ function stopLoading() {
+ $input.removeClass(options.loadingClass);
+ };
+
+};
+
+$.Autocompleter.defaults = {
+ inputClass: "ac_input",
+ resultsClass: "ac_results",
+ loadingClass: "ac_loading",
+ minChars: 1,
+ delay: 400,
+ matchCase: false,
+ matchSubset: true,
+ matchContains: false,
+ cacheLength: 10,
+ max: 100,
+ mustMatch: false,
+ extraParams: {},
+ selectFirst: false,
+ formatItem: function(row) { return row[0]; },
+ formatMatch: null,
+ autoFill: false,
+ width: 0,
+ multiple: false,
+ multipleSeparator: ", ",
+ highlight: function(value, term) {
+ return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1");
+ },
+ scroll: true,
+ scrollHeight: 180
+};
+
+$.Autocompleter.Cache = function(options) {
+
+ var data = {};
+ var length = 0;
+
+ function matchSubset(s, sub) {
+ if (!options.matchCase)
+ s = s.toLowerCase();
+ var i = s.indexOf(sub);
+ if (options.matchContains == "word"){
+ i = s.toLowerCase().search("\\b" + sub.toLowerCase());
+ }
+ if (i == -1) return false;
+ return i == 0 || options.matchContains;
+ };
+
+ function add(q, value) {
+ if (length > options.cacheLength){
+ flush();
+ }
+ if (!data[q]){
+ length++;
+ }
+ data[q] = value;
+ }
+
+ function populate(){
+ if( !options.data ) return false;
+ // track the matches
+ var stMatchSets = {},
+ nullData = 0;
+
+ // no url was specified, we need to adjust the cache length to make sure it fits the local data store
+ if( !options.url ) options.cacheLength = 1;
+
+ // track all options for minChars = 0
+ stMatchSets[""] = [];
+
+ // loop through the array and create a lookup structure
+ for ( var i = 0, ol = options.data.length; i < ol; i++ ) {
+ var rawValue = options.data[i];
+ // if rawValue is a string, make an array otherwise just reference the array
+ rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue;
+
+ var value = options.formatMatch(rawValue, i+1, options.data.length);
+ if ( value === false )
+ continue;
+
+ var firstChar = value.charAt(0).toLowerCase();
+ // if no lookup array for this character exists, look it up now
+ if( !stMatchSets[firstChar] )
+ stMatchSets[firstChar] = [];
+
+ // if the match is a string
+ var row = {
+ value: value,
+ data: rawValue,
+ result: options.formatResult && options.formatResult(rawValue) || value
+ };
+
+ // push the current match into the set list
+ stMatchSets[firstChar].push(row);
+
+ // keep track of minChars zero items
+ if ( nullData++ < options.max ) {
+ stMatchSets[""].push(row);
+ }
+ };
+
+ // add the data items to the cache
+ $.each(stMatchSets, function(i, value) {
+ // increase the cache size
+ options.cacheLength++;
+ // add to the cache
+ add(i, value);
+ });
+ }
+
+ // populate any existing data
+ setTimeout(populate, 25);
+
+ function flush(){
+ data = {};
+ length = 0;
+ }
+
+ return {
+ flush: flush,
+ add: add,
+ populate: populate,
+ load: function(q) {
+ if (!options.cacheLength || !length)
+ return null;
+ /*
+ * if dealing w/local data and matchContains than we must make sure
+ * to loop through all the data collections looking for matches
+ */
+ if( !options.url && options.matchContains ){
+ // track all matches
+ var csub = [];
+ // loop through all the data grids for matches
+ for( var k in data ){
+ // don't search through the stMatchSets[""] (minChars: 0) cache
+ // this prevents duplicates
+ if( k.length > 0 ){
+ var c = data[k];
+ $.each(c, function(i, x) {
+ // if we've got a match, add it to the array
+ if (matchSubset(x.value, q)) {
+ csub.push(x);
+ }
+ });
+ }
+ }
+ return csub;
+ } else
+ // if the exact item exists, use it
+ if (data[q]){
+ return data[q];
+ } else
+ if (options.matchSubset) {
+ for (var i = q.length - 1; i >= options.minChars; i--) {
+ var c = data[q.substr(0, i)];
+ if (c) {
+ var csub = [];
+ $.each(c, function(i, x) {
+ if (matchSubset(x.value, q)) {
+ csub[csub.length] = x;
+ }
+ });
+ return csub;
+ }
+ }
+ }
+ return null;
+ }
+ };
+};
+
+$.Autocompleter.Select = function (options, input, select, config) {
+ var CLASSES = {
+ ACTIVE: "ac_over"
+ };
+
+ var listItems,
+ active = -1,
+ data,
+ term = "",
+ needsInit = true,
+ element,
+ list;
+
+ // Create results
+ function init() {
+ if (!needsInit)
+ return;
+ element = $("")
+ .hide()
+ .addClass(options.resultsClass)
+ .css("position", "absolute")
+ .appendTo(document.body);
+
+ list = $("
+ #parse("header.vm")
+
+
+ #parse("tabs.vm")
+
+
+ $content
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/main.css b/solr/homeDirectoryTemplate/conf/velocity/main.css
new file mode 100644
index 000000000..0aed533e3
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/main.css
@@ -0,0 +1,230 @@
+#admin{
+ text-align: right;
+ vertical-align: top;
+}
+
+#head{
+ width: 100%;
+}
+.array-field {
+ border: 2px solid #474747;
+ background: #FFE9D8;
+ padding: 5px;
+ margin: 5px;
+}
+
+.array-field-list li {
+ list-style: circle;
+ margin-left: 20px;
+}
+
+.parsed_query_header {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 10pt;
+ font-weight: bold;
+}
+
+.parsed_query {
+ font-family: Courier, Courier New, monospaced;
+ font-size: 10pt;
+ font-weight: normal;
+}
+
+body {
+ font-family: Helvetica, Arial, sans-serif;
+ font-size: 10pt;
+}
+
+a {
+ color: #43a4b1;
+}
+
+.navigators {
+ float: left;
+ margin: 5px;
+ margin-top: 0px;
+ width: 185px;
+ padding: 5px;
+ top: -20px;
+ position: relative;
+}
+
+.tabs-bar {
+ padding: 5px;
+ width: 100%;
+ border: 1px solid;
+ border-width: 0px 0px 1px 0px;
+}
+.tab {
+ font-weight: bold;
+ padding: 5px;
+ margin: 0px 5px;
+ border: 1px solid;
+ background-color: #dddddd;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+}
+.tab:hover {
+ background: #FEC293;
+}
+.tab.selected {
+ background-color: #ffffff;
+ border-bottom: 1px solid #ffffff;
+}
+
+.navigators h2 {
+ background: #FEC293;
+ padding: 2px 5px;
+}
+
+.navigators ul {
+ list-style: none;
+ margin: 0;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding-left: 10px;
+}
+
+.navigators ul li {
+ color: #999;
+ padding: 2px;
+}
+
+
+
+.facet-field {
+ font-weight: bold;
+}
+
+.highlight {
+ color: white;
+ background-color: gray;
+ border: 1px black solid;
+}
+
+.highlight-box {
+ margin-left: 15px;
+}
+
+.field-name {
+ font-weight: bold;
+}
+
+.highlighted-facet-field {
+ background: white;
+}
+
+.constraints {
+ margin-top: 10px;
+}
+
+#query-form{
+ width: 80%;
+}
+
+
+
+.query-box, .constraints {
+ padding: 5px;
+ margin: 5px;
+ font-weight: normal;
+ font-size: 24px;
+ letter-spacing: 0.08em;
+}
+
+.query-box #q {
+ margin-left: 8px;
+ width: 60%;
+ height: 50px;
+ border: 1px solid #999;
+ font-size: 1em;
+ padding: 0.4em;
+}
+
+.query-box {
+
+}
+
+.query-boost {
+
+ top: 10px;
+ left: 50px;
+ position: relative;
+ font-size: 0.8em;
+}
+
+.query-box .inputs{
+ left: 180px;
+ position: relative;
+
+}
+
+#logo {
+ margin: 10px;
+ border-style: none;
+}
+
+.pagination {
+ padding-left: 33%;
+ background: #eee;
+ margin: 5px;
+ margin-left: 210px;
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+.result-document {
+ border: 1px solid #999;
+ padding: 5px;
+ margin: 5px;
+ margin-left: 210px;
+ margin-bottom: 15px;
+}
+
+.result-document div{
+ padding: 5px;
+}
+
+.result-title{
+ width:60%;
+}
+
+.result-body{
+ background: #ddd;
+}
+
+.mlt{
+
+}
+
+.map{
+ float: right;
+ position: relative;
+ top: -25px;
+}
+
+.result-document:nth-child(2n+1) {
+ background-color: #eee;
+}
+
+
+.selected-facet-field {
+ font-weight: bold;
+}
+
+li.show {
+ list-style: disc;
+}
+
+.group-value{
+ font-weight: bold;
+}
+
+.error {
+ color: white;
+ background-color: red;
+ left: 210px;
+ width:80%;
+ position: relative;
+
+}
diff --git a/solr/homeDirectoryTemplate/conf/velocity/mime_type_lists.vm b/solr/homeDirectoryTemplate/conf/velocity/mime_type_lists.vm
new file mode 100644
index 000000000..1468bbdbf
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/mime_type_lists.vm
@@ -0,0 +1,68 @@
+#**
+ * Define some Mime-Types, short and long form
+ *#
+
+## MimeType to extension map for detecting file type
+## and showing proper icon
+## List of types match the icons in /solr/img/filetypes
+
+## Short MimeType Names
+## Was called $supportedtypes
+#set($supportedMimeTypes = "7z;ai;aiff;asc;audio;bin;bz2;c;cfc;cfm;chm;class;conf;cpp;cs;css;csv;deb;divx;doc;dot;eml;enc;file;gif;gz;hlp;htm;html;image;iso;jar;java;jpeg;jpg;js;lua;m;mm;mov;mp3;mpg;odc;odf;odg;odi;odp;ods;odt;ogg;pdf;pgp;php;pl;png;ppt;ps;py;ram;rar;rb;rm;rpm;rtf;sig;sql;swf;sxc;sxd;sxi;sxw;tar;tex;tgz;txt;vcf;video;vsd;wav;wma;wmv;xls;xml;xpi;xvid;zip")
+
+## Long Form: map MimeType headers to our Short names
+## Was called $extMap
+#set( $mimeExtensionsMap = {
+ "application/x-7z-compressed": "7z",
+ "application/postscript": "ai",
+ "application/pgp-signature": "asc",
+ "application/octet-stream": "bin",
+ "application/x-bzip2": "bz2",
+ "text/x-c": "c",
+ "application/vnd.ms-htmlhelp": "chm",
+ "application/java-vm": "class",
+ "text/css": "css",
+ "text/csv": "csv",
+ "application/x-debian-package": "deb",
+ "application/msword": "doc",
+ "message/rfc822": "eml",
+ "image/gif": "gif",
+ "application/winhlp": "hlp",
+ "text/html": "html",
+ "application/java-archive": "jar",
+ "text/x-java-source": "java",
+ "image/jpeg": "jpeg",
+ "application/javascript": "js",
+ "application/vnd.oasis.opendocument.chart": "odc",
+ "application/vnd.oasis.opendocument.formula": "odf",
+ "application/vnd.oasis.opendocument.graphics": "odg",
+ "application/vnd.oasis.opendocument.image": "odi",
+ "application/vnd.oasis.opendocument.presentation": "odp",
+ "application/vnd.oasis.opendocument.spreadsheet": "ods",
+ "application/vnd.oasis.opendocument.text": "odt",
+ "application/pdf": "pdf",
+ "application/pgp-encrypted": "pgp",
+ "image/png": "png",
+ "application/vnd.ms-powerpoint": "ppt",
+ "audio/x-pn-realaudio": "ram",
+ "application/x-rar-compressed": "rar",
+ "application/vnd.rn-realmedia": "rm",
+ "application/rtf": "rtf",
+ "application/x-shockwave-flash": "swf",
+ "application/vnd.sun.xml.calc": "sxc",
+ "application/vnd.sun.xml.draw": "sxd",
+ "application/vnd.sun.xml.impress": "sxi",
+ "application/vnd.sun.xml.writer": "sxw",
+ "application/x-tar": "tar",
+ "application/x-tex": "tex",
+ "text/plain": "txt",
+ "text/x-vcard": "vcf",
+ "application/vnd.visio": "vsd",
+ "audio/x-wav": "wav",
+ "audio/x-ms-wma": "wma",
+ "video/x-ms-wmv": "wmv",
+ "application/vnd.ms-excel": "xls",
+ "application/xml": "xml",
+ "application/x-xpinstall": "xpi",
+ "application/zip": "zip"
+})
diff --git a/solr/homeDirectoryTemplate/conf/velocity/pagination_bottom.vm b/solr/homeDirectoryTemplate/conf/velocity/pagination_bottom.vm
new file mode 100644
index 000000000..71b8bdf21
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/pagination_bottom.vm
@@ -0,0 +1,22 @@
+#**
+ * Paging and Statistics at bottom of results
+ *#
+
+## Usually rendered in pagination div tag
+
+#if($response.response.get('grouped'))
+ ## pass
+#else
+
+ #link_to_previous_page("previous")
+
+ $page.results_found
+ results found.
+
+ Page $page.current_page_number
+ of $page.page_count
+
+ #link_to_next_page("next")
+
+#end
+diff --git a/solr/homeDirectoryTemplate/conf/velocity/pagination_top.vm b/solr/homeDirectoryTemplate/conf/velocity/pagination_top.vm new file mode 100644 index 000000000..e0ac8ac89 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/pagination_top.vm @@ -0,0 +1,29 @@ +#** + * Paging and Statistics at top of results + *# + +## Usually rendered in pagination div tag + +## Grouped Results / Not Paginated +#if($response.response.get('grouped')) + + + + $response.response.get('grouped').size() group(s) + + found in ${response.responseHeader.QTime} ms + + +## Regular Results / Use Paging Links if needed +#else + + + $page.results_found + results found in + ${response.responseHeader.QTime} ms + + + Page $page.current_page_number + of $page.page_count + +#end ## end else non-grouped results, normal pagination diff --git a/solr/homeDirectoryTemplate/conf/velocity/product_doc.vm b/solr/homeDirectoryTemplate/conf/velocity/product_doc.vm new file mode 100644 index 000000000..c878d8c13 --- /dev/null +++ b/solr/homeDirectoryTemplate/conf/velocity/product_doc.vm @@ -0,0 +1,32 @@ +#** + * Render a hit representing a Product + * assumed to have a field called "name" + *# + +
#field('name') #if($params.getBool('mlt', false) == false)More Like This#end
+##do we have a physical store for this product
+#set($store = $doc.getFieldValue('store'))
+#if($store)#end
+Id: #field('id')
+Price: #field('price_c')
+Features: #field('features')
+In Stock: #field('inStock')
+
+ #set($mlt = $mltResults.get($docId))
+ #set($mltOn = $params.getBool('mlt'))
+ #if($mltOn == true)
+#parse('debug.vm')
diff --git a/solr/homeDirectoryTemplate/conf/velocity/query.vm b/solr/homeDirectoryTemplate/conf/velocity/query.vm
new file mode 100644
index 000000000..ddbab3fcf
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/query.vm
@@ -0,0 +1,42 @@
+Similar Items
#end
+ #if ($mltOn && $mlt && $mlt.size() > 0)
+ -
+ #foreach($mltHit in $mlt)
+ #set($mltId = $mltHit.getFieldValue('id'))
+
- Name: $mltHit.getFieldValue('name')+Price: $!number.currency($mltHit.getFieldValue('price')) In Stock: $mltHit.getFieldValue('inStock')+ +
+ #end
+
No Similar Items Found
+ #end
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/query_form.vm b/solr/homeDirectoryTemplate/conf/velocity/query_form.vm
new file mode 100644
index 000000000..70a0af20f
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/query_form.vm
@@ -0,0 +1,64 @@
+#**
+ * Renders the main query form
+ *#
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/velocity/query_group.vm b/solr/homeDirectoryTemplate/conf/velocity/query_group.vm
new file mode 100644
index 000000000..42e54573e
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/query_group.vm
@@ -0,0 +1,43 @@
+#**
+ * Query settings for grouping by fields,
+ * e.g.: Manufacturer or Popularity
+ *#
+
+#set($queryOpts = $params.get("queryOpts"))
+
+#if($queryOpts == "group")
+
+ #set($groupF = $request.params.get('group.field'))
+
+
+
+
+
+
+
+#end
diff --git a/solr/homeDirectoryTemplate/conf/velocity/query_spatial.vm b/solr/homeDirectoryTemplate/conf/velocity/query_spatial.vm
new file mode 100644
index 000000000..2bc204493
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/query_spatial.vm
@@ -0,0 +1,75 @@
+#**
+ * Query logic for selecting location / Geospatial search
+ *#
+
+#set($queryOpts = $params.get("queryOpts"))
+
+#if($queryOpts == "spatial")
+
+
+
+ #set($loc = $request.params.get('pt'))
+ ## Normalize first trip through to "none" because
+ ## an empty string generates an error message later on
+ #if( ! $loc )
+ #set( $loc = "none" )
+ #end
+
+ #set($dist = $request.params.get('d', "10"))
+
+ ## Cities for The Select List
+ #set( $cities = {
+ "none": "No Filter",
+ "45.17614,-93.87341": "Buffalo, MN",
+ "37.7752,-100.0232": "Dodge City, KS",
+ "35.0752,-97.032": "Oklahoma City, OK",
+ "37.7752,-122.4232": "San Francisco CA"
+ })
+
+
+
+
+ Distance (KM):
+
+
+
+
+
+
+
+
+
+
+
+#end
diff --git a/solr/homeDirectoryTemplate/conf/velocity/results_list.vm b/solr/homeDirectoryTemplate/conf/velocity/results_list.vm
new file mode 100644
index 000000000..f73532b2d
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/results_list.vm
@@ -0,0 +1,22 @@
+#**
+ * Render the main Results List
+ *#
+
+## Usually displayed inside
+
+#if($response.response.get('grouped'))
+
+ #foreach($grouping in $response.response.get('grouped'))
+ #parse("hit_grouped.vm")
+ #end
+
+#else
+
+ #foreach($doc in $response.results)
+ #parse("hit.vm")
+ ## Can get an extremely simple view of the doc
+ ## which might be nicer for debugging
+ ##parse("hit_plain.vm")
+ #end
+
+#end
diff --git a/solr/homeDirectoryTemplate/conf/velocity/richtext_doc.vm b/solr/homeDirectoryTemplate/conf/velocity/richtext_doc.vm
new file mode 100644
index 000000000..9e8d6cb71
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/richtext_doc.vm
@@ -0,0 +1,153 @@
+#**
+ * Render a complex document in the results list
+ *#
+
+## Load Mime-Type List and Mapping
+#parse('mime_type_lists.vm')
+## Sets:
+## * supportedMimeTypes, AKA supportedtypes
+## * mimeExtensionsMap, AKA extMap
+
+## Title
+#if($doc.getFieldValue('title'))
+ #set($title = $esc.html($doc.getFirstValue('title')))
+#else
+ #set($title = "["+$doc.getFieldValue('id')+"]")
+#end
+
+## URL
+#if($doc.getFieldValue('url'))
+ #set($url = $doc.getFieldValue('url'))
+#elseif($doc.getFieldValue('resourcename'))
+ #set($url = "file:///$doc.getFieldValue('resourcename')")
+#else
+ #set($url = "$doc.getFieldValue('id')")
+#end
+
+## Sort out Mime-Type
+#set($ct = $list.get($doc.getFirstValue('content_type').split(";"),0))
+#set($filename = $doc.getFieldValue('resourcename'))
+#set($filetype = false)
+#set($filetype = $mimeExtensionsMap.get($ct))
+
+## TODO: falling back to file extension is convenient,
+## except when you don't have an icon for that extension
+## example "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+## document with a .docx extension.
+## It'd be nice to fall back to an "unknown" or the existing "file" type
+## We sort of do this below, but only if the filename has no extension
+## (anything after the last dot).
+
+#if(!$filetype)
+ #set($filetype = $filename.substring($filename.lastIndexOf(".")).substring(1))
+#end
+
+## #if(!$filetype)
+## #set($filetype = "file")
+## #end
+## #if(!$supportedMimeTypes.contains($filetype))
+## #set($filetype = "file")
+## #end
+
+## Row 1: Icon and Title and mlt link
+
-
-
-
-
- <xsl:value-of select="$title"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- javascript:toggle(" ?
-
-
- exp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ <xsl:value-of select="$title"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ javascript:toggle(" ?
+
+
+ exp
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl b/solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl
index da4d0822b..b6c23151d 100644
--- a/solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl
+++ b/solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl
@@ -1,67 +1,67 @@
-
-
-
-
-
-
-
-
-
-
- Example Solr Atom 1.0 Feed
-
- This has been formatted by the sample "example_atom.xsl" transform -
- use your own XSLT to get a nicer Atom feed.
-
-
- Apache Solr
- solr-user@lucene.apache.org
-
-
-
-
- tag:localhost,2007:example
-
-
-
-
-
-
- <xsl:value-of select="str[@name='name']"/>
-
- tag:localhost,2007:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Example Solr Atom 1.0 Feed
+
+ This has been formatted by the sample "example_atom.xsl" transform -
+ use your own XSLT to get a nicer Atom feed.
+
+
+ Apache Solr
+ solr-user@lucene.apache.org
+
+
+
+
+ tag:localhost,2007:example
+
+
+
+
+
+
+ <xsl:value-of select="str[@name='name']"/>
+
+ tag:localhost,2007:
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl b/solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl
index 26c814bc3..2857f1174 100644
--- a/solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl
+++ b/solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl
@@ -1,66 +1,66 @@
-
-
-
-
-
-
-
-
-
-
-
- Example Solr RSS 2.0 Feed
- http://localhost:8983/solr
-
- This has been formatted by the sample "example_rss.xsl" transform -
- use your own XSLT to get a nicer RSS feed.
-
- en-us
- http://localhost:8983/solr
-
-
-
-
-
-
- -
-
<xsl:value-of select="str[@name='name']"/>
-
- http://localhost:8983/solr/select?q=id:
-
-
- http://localhost:8983/solr/select?q=id:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Example Solr RSS 2.0 Feed
+ http://localhost:8983/solr
+
+ This has been formatted by the sample "example_rss.xsl" transform -
+ use your own XSLT to get a nicer RSS feed.
+
+ en-us
+ http://localhost:8983/solr
+
+
+
+
+
+
+ -
+
<xsl:value-of select="str[@name='name']"/>
+
+ http://localhost:8983/solr/select?q=id:
+
+
+ http://localhost:8983/solr/select?q=id:
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/xslt/luke.xsl b/solr/homeDirectoryTemplate/conf/xslt/luke.xsl
index 04d341d5f..8553f3c63 100644
--- a/solr/homeDirectoryTemplate/conf/xslt/luke.xsl
+++ b/solr/homeDirectoryTemplate/conf/xslt/luke.xsl
@@ -1,337 +1,337 @@
-
-
-
-
-
-
- Solr Luke Request Handler Response
-
-
-
-
-
-
-
-
- <xsl:value-of select="$title"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Solr Luke Request Handler Response
+
+
+
+
+
+
+
+
+ <xsl:value-of select="$title"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/conf/xslt/updateXml.xsl b/solr/homeDirectoryTemplate/conf/xslt/updateXml.xsl
new file mode 100644
index 000000000..daf1344b0
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/xslt/updateXml.xsl
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/solr.xml b/solr/homeDirectoryTemplate/solr.xml
index 6f0d0fd3c..4d1a84e75 100644
--- a/solr/homeDirectoryTemplate/solr.xml
+++ b/solr/homeDirectoryTemplate/solr.xml
@@ -1,34 +1,34 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/homeDirectoryTemplate/solr_newversion.xml b/solr/homeDirectoryTemplate/solr_newversion.xml
new file mode 100644
index 000000000..94d60b6a2
--- /dev/null
+++ b/solr/homeDirectoryTemplate/solr_newversion.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+ ${host:}
+ ${jetty.port:8983}
+ ${hostContext:solr}
+ ${zkClientTimeout:30000}
+ ${genericCoreNodeNames:true}
+
+
+
+ ${socketTimeout:0}
+ ${connTimeout:0}
+
+
+
diff --git a/solr/solr-4.7.2.war b/solr/solr-4.7.2.war
new file mode 100644
index 000000000..cd8f30876
Binary files /dev/null and b/solr/solr-4.7.2.war differ
diff --git a/solr/solrj-lib/commons-io-2.1.jar b/solr/solrj-lib/commons-io-2.1.jar
new file mode 100644
index 000000000..b5c7d692f
Binary files /dev/null and b/solr/solrj-lib/commons-io-2.1.jar differ
diff --git a/solr/solrj-lib/httpclient-4.3.1.jar b/solr/solrj-lib/httpclient-4.3.1.jar
new file mode 100644
index 000000000..cdd1e3874
Binary files /dev/null and b/solr/solrj-lib/httpclient-4.3.1.jar differ
diff --git a/solr/solrj-lib/httpcore-4.3.jar b/solr/solrj-lib/httpcore-4.3.jar
new file mode 100644
index 000000000..ddfe6dacb
Binary files /dev/null and b/solr/solrj-lib/httpcore-4.3.jar differ
diff --git a/solr/solrj-lib/httpmime-4.3.1.jar b/solr/solrj-lib/httpmime-4.3.1.jar
new file mode 100644
index 000000000..2b26d7a79
Binary files /dev/null and b/solr/solrj-lib/httpmime-4.3.1.jar differ
diff --git a/solr/solrj-lib/jcl-over-slf4j-1.6.6.jar b/solr/solrj-lib/jcl-over-slf4j-1.6.6.jar
new file mode 100644
index 000000000..ab898c041
Binary files /dev/null and b/solr/solrj-lib/jcl-over-slf4j-1.6.6.jar differ
diff --git a/solr/solrj-lib/jul-to-slf4j-1.6.6.jar b/solr/solrj-lib/jul-to-slf4j-1.6.6.jar
new file mode 100644
index 000000000..fa8640f16
Binary files /dev/null and b/solr/solrj-lib/jul-to-slf4j-1.6.6.jar differ
diff --git a/solr/solrj-lib/log4j-1.2.16.jar b/solr/solrj-lib/log4j-1.2.16.jar
new file mode 100644
index 000000000..5429a903e
Binary files /dev/null and b/solr/solrj-lib/log4j-1.2.16.jar differ
diff --git a/solr/solrj-lib/noggit-0.5.jar b/solr/solrj-lib/noggit-0.5.jar
new file mode 100644
index 000000000..163ced7cc
Binary files /dev/null and b/solr/solrj-lib/noggit-0.5.jar differ
diff --git a/solr/solrj-lib/slf4j-api-1.6.6.jar b/solr/solrj-lib/slf4j-api-1.6.6.jar
new file mode 100644
index 000000000..4c03fa6bb
Binary files /dev/null and b/solr/solrj-lib/slf4j-api-1.6.6.jar differ
diff --git a/solr/solrj-lib/slf4j-log4j12-1.6.6.jar b/solr/solrj-lib/slf4j-log4j12-1.6.6.jar
new file mode 100644
index 000000000..e72c2d66e
Binary files /dev/null and b/solr/solrj-lib/slf4j-log4j12-1.6.6.jar differ
diff --git a/solr/solrjClientLibs/wstx-asl-3.2.7.jar b/solr/solrj-lib/wstx-asl-3.2.7.jar
similarity index 100%
rename from solr/solrjClientLibs/wstx-asl-3.2.7.jar
rename to solr/solrj-lib/wstx-asl-3.2.7.jar
diff --git a/solr/solrj-lib/zookeeper-3.4.5.jar b/solr/solrj-lib/zookeeper-3.4.5.jar
new file mode 100644
index 000000000..a7966bbbc
Binary files /dev/null and b/solr/solrj-lib/zookeeper-3.4.5.jar differ
diff --git a/solr/solrjClientLibs/apache-solr-core-3.1.0.jar b/solr/solrjClientLibs/apache-solr-core-3.1.0.jar
deleted file mode 100644
index 00a842e4b..000000000
Binary files a/solr/solrjClientLibs/apache-solr-core-3.1.0.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar b/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar
deleted file mode 100644
index 058d27350..000000000
Binary files a/solr/solrjClientLibs/apache-solr-solrj-3.1.0.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/commons-codec-1.4.jar b/solr/solrjClientLibs/commons-codec-1.4.jar
deleted file mode 100644
index 458d432da..000000000
Binary files a/solr/solrjClientLibs/commons-codec-1.4.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/commons-httpclient-3.1.jar b/solr/solrjClientLibs/commons-httpclient-3.1.jar
deleted file mode 100644
index 7c59774ae..000000000
Binary files a/solr/solrjClientLibs/commons-httpclient-3.1.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/commons-io-1.4.jar b/solr/solrjClientLibs/commons-io-1.4.jar
deleted file mode 100644
index 133dc6cb3..000000000
Binary files a/solr/solrjClientLibs/commons-io-1.4.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar b/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar
deleted file mode 100644
index ab1ee3ba6..000000000
Binary files a/solr/solrjClientLibs/geronimo-stax-api_1.0_spec-1.0.1.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar b/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar
deleted file mode 100644
index 6b8ddd633..000000000
Binary files a/solr/solrjClientLibs/jcl-over-slf4j-1.5.5.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/slf4j-api-1.5.5.jar b/solr/solrjClientLibs/slf4j-api-1.5.5.jar
deleted file mode 100644
index 4bb4abbb0..000000000
Binary files a/solr/solrjClientLibs/slf4j-api-1.5.5.jar and /dev/null differ
diff --git a/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar b/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar
deleted file mode 100644
index 0c40e9c8b..000000000
Binary files a/solr/solrjClientLibs/slf4j-log4j12-1.5.6.jar and /dev/null differ
diff --git a/webapp/build.xml b/webapp/build.xml
index e8bc13669..1adf47338 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -420,7 +420,7 @@
-
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
index 34e2dbd10..153eb337a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/modules/searchEngine/SearchInputDocument.java
@@ -22,33 +22,41 @@ public interface SearchInputDocument {
void addField(SearchInputField field);
/**
- * Create a field with this name and values, and put it into the document. If
- * a field with this name already exists in the document, it will be
- * replaced.
+ * Create a field with this name and values, and put it into the document.
+ *
+ * If a field with this name already exists in the document, these values
+ * will be added to the existing values on the field.
*/
void addField(String name, Object... values);
/**
- * Create a field with this name and values, and put it into the document. If
- * a field with this name already exists in the document, it will be
- * replaced.
+ * Create a field with this name and values, and put it into the document.
+ *
+ * If a field with this name already exists in the document, these values
+ * will be added to the existing values on the field.
*/
void addField(String name, Collection
+ ## Icon
+ ## Small file type icons from http://www.splitbrain.org/projects/file_icons (public domain)
+ 
+
+ ## Title, hyperlinked
+
+ $title
+
+ ## Link for MLT / More Like This / Find Similar
+
+ #if($params.getBool('mlt', false) == false)
+
+ More Like This
+ #end
+
+
+
+
+## Row 2?: ID / URL
+
+
+ ## Title, hyperlinked
+
+ $title
+
+ ## Link for MLT / More Like This / Find Similar
+
+ #if($params.getBool('mlt', false) == false)
+
+ More Like This
+ #end
+
+
+
+ Id: #field('id')
+
+
+## Resource Name
+
+ #if($doc.getFieldValue('resourcename'))
+ Resource name: $filename
+ #elseif($url)
+ URL: $url
+ #end
+ #if($ct)
+ ($ct)
+ #end
+
+
+## Author
+#if($doc.getFieldValue('author'))
+
+ Author: #field('author')
+
+#end
+
+## Last_Modified Date
+#if($doc.getFieldValue('last_modified'))
+
+ last-modified:
+ #field('last_modified')
+
+#end
+
+## Main content of doc
+
+ #field('content')
+
+
+## Display Similar Documents / MLT = More Like This
+
+ #set($mlt = $mltResults.get($docId))
+ #set($mltOn = $params.getBool('mlt'))
+ #if($mltOn == true)
+
## div class=mlt
+
+#parse('debug.vm')
diff --git a/solr/homeDirectoryTemplate/conf/velocity/suggest.vm b/solr/homeDirectoryTemplate/conf/velocity/suggest.vm
new file mode 100644
index 000000000..dae6b830d
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/suggest.vm
@@ -0,0 +1,8 @@
+#**
+ * Provides cynamic spelling suggestions
+ * as you type in the search form
+ *#
+
+#foreach($t in $response.response.terms.name)
+ $t.key
+#end
diff --git a/solr/homeDirectoryTemplate/conf/velocity/tabs.vm b/solr/homeDirectoryTemplate/conf/velocity/tabs.vm
new file mode 100644
index 000000000..da19cbc0b
--- /dev/null
+++ b/solr/homeDirectoryTemplate/conf/velocity/tabs.vm
@@ -0,0 +1,50 @@
+#**
+ * Provides navigation/access to Advanced search options
+ * Usually displayed near the top of the page
+ *#
+
+##TODO: Make some nice tabs here
+
+#set($queryOpts = $params.get("queryOpts"))
+
+
diff --git a/solr/homeDirectoryTemplate/conf/xslt/example.xsl b/solr/homeDirectoryTemplate/conf/xslt/example.xsl
index c17f9ea78..b89927008 100644
--- a/solr/homeDirectoryTemplate/conf/xslt/example.xsl
+++ b/solr/homeDirectoryTemplate/conf/xslt/example.xsl
@@ -1,132 +1,132 @@
-
-
-
-
-
-
+ Similar Items
+
+ #end
+ ## If has MLT enabled An Entries to show
+ #if ($mltOn && $mlt && $mlt.size() > 0)
+ -
+ #foreach($mltHit in $mlt)
+ #set($mltId = $mltHit.getFieldValue('id'))
+
-
+ + + $mltId +++ + Title: + + $mltHit.getFieldValue('title') +++ + Author: + + $mltHit.getFieldValue('author') + + Description: + + $mltHit.getFieldValue('description') ++
+ #end ## end for each mltHit in $mlt
+
No Similar Items Found
+ #end
+
- This has been formatted by the sample "example.xsl" transform -
- use your own XSLT to get a nicer page
-
-
-
-
-
- -
-
-
+ This has been formatted by the sample "example.xsl" transform -
+ use your own XSLT to get a nicer page
+
+
+
+
+
+ +
-
+
-
-
-
- -
-
- - Index Statistics - -
-
- Field Statistics
-
-
-
-
-
-
- -
-
-
- - Document statistics - -
Index Statistics
-Field Statistics
-Document statistics
-
-
-
-
- |
-
- |
- |
|---|---|
|
- |
-
-
- 50
- 800
- 160
- blue
-
-
- |
-
-
- |
-
|
- |
-
-
-
-
-
+
+
+
+ -
+
- + Index Statistics + +
-
+ Field Statistics
+
-
+
-
+
+
+ -
+
+
- + Document statistics + +
Index Statistics
+Field Statistics
+Document statistics
+
+
+
+
+ |
+
+ |
+ |
|---|---|
|
+ |
+
+
+ 50
+ 800
+ 160
+ blue
+
+
+ |
+
+
+ |
+
|
+ |
+
-
+
-
+