OFBiz › OFBiz - Commits

svn commit: r1794771 - in /ofbiz/ofbiz-plugins/trunk/solr: ./ home/solrdefault/conf/ webapp/solr/ webapp/solr/css/angular/ webapp/solr/css/styles/ webapp/solr/js/angular/ webapp/solr/js/angular/controllers/ webapp/solr/js/scripts/ webapp/solr/partials/...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

shijh

svn commit: r1794771 - in /ofbiz/ofbiz-plugins/trunk/solr: ./ home/solrdefault/conf/ webapp/solr/ webapp/solr/css/angular/ webapp/solr/css/styles/ webapp/solr/js/angular/ webapp/solr/js/angular/controllers/ webapp/solr/js/scripts/ webapp/solr/partials/...

Author: shijh
Date: Thu May 11 00:10:12 2017
New Revision: 1794771

URL: http://svn.apache.org/viewvc?rev=1794771&view=rev
Log:
Fixed: Update Apache Solr/Lucene to release 6.2.1
OFBIZ-8316

Updated Solr from 6.2.1 to 6.5.1 and the point fields generated by Lucene are ok now for Solr component.
The 'original UI' link is commented in admin.html and the relative files under solr/webapp/solr/tpl are all removed.

Thanks: Cao Pengan for the patch and Jacques, Michael for the comments and reviews.

Removed:
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/analysis.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/cloud.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/cores.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/dashboard.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/dataimport.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/documents.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/files.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/index.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/logging.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/plugins.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/query.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/replication.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/schema-browser.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/segments.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/tpl/threads.html
Modified:
ofbiz/ofbiz-plugins/trunk/solr/build.gradle
ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/schema.xml
ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/admin.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/collections.css
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/dashboard.css
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/plugins.css
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/schema.css
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/styles/plugins.css
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/app.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/analysis.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/collections.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/core-overview.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/dataimport.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/files.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/plugins.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/query.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/schema.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/services.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/scripts/dataimport.js
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/analysis.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/collections.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/core_overview.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/files.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/query.html
ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/schema.html

Modified: ofbiz/ofbiz-plugins/trunk/solr/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/build.gradle?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/build.gradle (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/build.gradle Thu May 11 00:10:12 2017
@@ -17,5 +17,5 @@
* under the License.
*/
dependencies {
- pluginLibsCompile 'org.apache.solr:solr-core:6.2.1'
-}
\ No newline at end of file
+ pluginLibsCompile 'org.apache.solr:solr-core:6.5.1'
+}

Modified: ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/schema.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/schema.xml?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/schema.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/schema.xml Thu May 11 00:10:12 2017
@@ -469,7 +469,7 @@
<analyzer type="query">
<tokenizer class="solr.StandardTokenizerFactory"/>
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>
</fieldType>
@@ -501,7 +501,7 @@
</analyzer>
<analyzer type="query">
<tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
<filter class="solr.StopFilterFactory"
ignoreCase="true"
words="lang/stopwords_en.txt"
@@ -537,19 +537,19 @@
ignoreCase="true"
words="lang/stopwords_en.txt"
/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.PorterStemFilterFactory"/>
</analyzer>
<analyzer type="query">
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
<filter class="solr.StopFilterFactory"
ignoreCase="true"
words="lang/stopwords_en.txt"
/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.PorterStemFilterFactory"/>
@@ -561,9 +561,9 @@
<fieldType name="text_en_splitting_tight" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
<filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_en.txt"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
+ <filter class="solr.WordDelimiterGraphFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.KeywordMarkerFilterFactory" protected="protwords.txt"/>
<filter class="solr.EnglishMinimalStemFilterFactory"/>
@@ -585,7 +585,7 @@
</analyzer>
<analyzer type="query">
<tokenizer class="solr.StandardTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+ <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
<filter class="solr.LowerCaseFilterFactory"/>
</analyzer>

Modified: ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/home/solrdefault/conf/solrconfig.xml Thu May 11 00:10:12 2017
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>6.2.1</luceneMatchVersion>
+ <luceneMatchVersion>6.5.1</luceneMatchVersion>


- <dataDir>${solr.data.dir:runtime/indexes/solr}</dataDir>
+ <dataDir>${ofbiz.home}/runtime/indexes/products/</dataDir>



<div id="content-wrapper">
<div ng-view id="content">

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/collections.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/collections.css?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/collections.css (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/collections.css Thu May 11 00:10:12 2017
@@ -311,6 +311,14 @@ limitations under the License.
right:10px;
}

+#content #collections .shard h2 span.rem {
+ background-image: url( ../../img/ico/cross.png );
+ background-position: 100% 50%;
+ cursor: pointer;
+ padding-right: 21px;
+ right:10px;
+}
+
#content #collections .replica h2 span .open {
background-image: url( ../../img/ico/chevron-small.png );
}
@@ -336,6 +344,15 @@ limitations under the License.
{
background-image: url( ../../img/ico/tick.png );
}
+
+#content #collections .delete-shard span
+{
+ background-image: url( ../../img/ico/cross.png );
+}
+#content #collections .delete-shard button.submit span
+{
+ background-image: url( ../../img/ico/tick.png );
+}

#content #collections #node-name .chosen-container
{

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/dashboard.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/dashboard.css?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/dashboard.css (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/dashboard.css Thu May 11 00:10:12 2017
@@ -123,11 +123,6 @@ limitations under the License.
margin-top: 10px;
}

-#content #dashboard #admin-extra
-{
- float: left;
-}
-
#content #dashboard #healthcheck
{
float: right;
@@ -152,7 +147,6 @@ limitations under the License.
#content #dashboard #replication.master h2 { background-image: url( ../../img/ico/node-master.png ); }
#content #dashboard #replication.slave h2 { background-image: url( ../../img/ico/node-slave.png ); }
#content #dashboard #instance h2 { background-image: url( ../../img/ico/server.png ); }
-#content #dashboard #admin-extra h2 { background-image: url( ../../img/ico/plus-button.png ); }
#content #dashboard #collection h2 { background-image: url( ../../img/ico/book-open-text.png ); }
#content #dashboard #shards h2 { background-image: url( ../../img/ico/documents-stack.png ); }

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/plugins.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/plugins.css?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/plugins.css (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/plugins.css Thu May 11 00:10:12 2017
@@ -25,9 +25,12 @@ limitations under the License.
#content #plugins #navigation .cache a { background-image: url( ../../img/ico/disk-black.png ); }
#content #plugins #navigation .core a { background-image: url( ../../img/ico/wooden-box.png ); }
#content #plugins #navigation .other a { background-image: url( ../../img/ico/zone.png ); }
-#content #plugins #navigation .highlighting a { background-image: url( ../../img/ico/highlighter-text.png ); }
-#content #plugins #navigation .updatehandler a{ background-image: url( ../../img/ico/arrow-circle.png ); }
-#content #plugins #navigation .queryhandler a { background-image: url( ../../img/ico/magnifier.png ); }
+#content #plugins #navigation .highlighting a { text-decoration: line-through; background-image: url( ../../img/ico/highlighter-text.png ); }
+#content #plugins #navigation .highlighter a { background-image: url( ../../img/ico/highlighter-text.png ); }
+#content #plugins #navigation .updatehandler a{ text-decoration: line-through; background-image: url( ../../img/ico/arrow-circle.png ); }
+#content #plugins #navigation .update a{ background-image: url( ../../img/ico/arrow-circle.png ); }
+#content #plugins #navigation .queryhandler a { text-decoration: line-through; background-image: url( ../../img/ico/magnifier.png ); }
+#content #plugins #navigation .query a { background-image: url( ../../img/ico/magnifier.png ); }
#content #plugins #navigation .queryparser a { background-image: url( ../../img/ico/asterisk.png ); }

#content #plugins #navigation .PLUGINCHANGES { margin-top: 20px; }

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/schema.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/schema.css?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/schema.css (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/angular/schema.css Thu May 11 00:10:12 2017
@@ -702,3 +702,26 @@ limitations under the License.
float:left;
width:80%;
}
+
+#content #schema dd.similarity.ng-binding::after {
+ content: attr(data-tip) ;
+
+ font-size: 12px;
+ position: relative;
+ white-space: nowrap;
+ bottom: 9999px;
+ left: 0;
+ background: lightyellow;
+ color: black;
+ padding: 4px 7px;
+ line-height: 24px;
+ height: 24px;
+ border: 1px solid darkgray;
+ opacity: 0;
+ transition:opacity 0.4s ease-out;
+}
+
+#content #schema dd.similarity.ng-binding:hover::after {
+ opacity: 90;
+ bottom: -20px;
+}

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/styles/plugins.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/styles/plugins.css?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/styles/plugins.css (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/css/styles/plugins.css Thu May 11 00:10:12 2017
@@ -25,9 +25,12 @@ limitations under the License.
#content #plugins #navigation .cache a { background-image: url( ../../img/ico/disk-black.png ); }
#content #plugins #navigation .core a { background-image: url( ../../img/ico/wooden-box.png ); }
#content #plugins #navigation .other a { background-image: url( ../../img/ico/zone.png ); }
-#content #plugins #navigation .highlighting a { background-image: url( ../../img/ico/highlighter-text.png ); }
-#content #plugins #navigation .updatehandler a{ background-image: url( ../../img/ico/arrow-circle.png ); }
-#content #plugins #navigation .queryhandler a { background-image: url( ../../img/ico/magnifier.png ); }
+#content #plugins #navigation .highlighting a { text-decoration: line-through; background-image: url( ../../img/ico/highlighter-text.png ); }
+#content #plugins #navigation .highlighter a { background-image: url( ../../img/ico/highlighter-text.png ); }
+#content #plugins #navigation .updatehandler a{ text-decoration: line-through; background-image: url( ../../img/ico/arrow-circle.png ); }
+#content #plugins #navigation .update a{ background-image: url( ../../img/ico/arrow-circle.png ); }
+#content #plugins #navigation .queryhandler a { text-decoration: line-through; background-image: url( ../../img/ico/magnifier.png ); }
+#content #plugins #navigation .query a { background-image: url( ../../img/ico/magnifier.png ); }
#content #plugins #navigation .queryparser a { background-image: url( ../../img/ico/asterisk.png ); }

#content #plugins #navigation .PLUGINCHANGES { margin-top: 20px; }

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/app.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/app.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/app.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/app.js Thu May 11 00:10:12 2017
@@ -148,7 +148,7 @@ solrAdminApp.config([
})
.filter('highlight', function($sce) {
return function(input, lang) {
- if (lang && input && lang!="txt") return hljs.highlight(lang, input).value;
+ if (lang && input && lang!="txt" && lang!="csv") return hljs.highlight(lang, input).value;
return input;
}
})

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/analysis.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/analysis.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/analysis.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/analysis.js Thu May 11 00:10:12 2017
@@ -76,9 +76,17 @@ solrAdminApp.controller('AnalysisControl

for (key in tokenhash) {
if (key == "match" || key=="positionHistory") {
- //@ todo do something
+ //skip, to not display these keys in the UI
} else {
- token.keys.push({name:key, value:tokenhash[key]});
+ var tokenInfo = new Object();
+ tokenInfo.name = key;
+ tokenInfo.value = tokenhash[key];
+ if ('text' === key || 'raw_bytes' === key ) {
+ if (tokenhash.match) {
+ tokenInfo.extraclass = 'match'; //to highlight matching text strings
+ }
+ }
+ token.keys.push(tokenInfo);
}
}
tokens.push(token);

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/collections.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/collections.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/collections.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/collections.js Thu May 11 00:10:12 2017
@@ -210,6 +210,20 @@ solrAdminApp.controller('CollectionsCont
$scope.hideAll();
replica.showRemove = !replica.showRemove;
};
+
+ $scope.toggleRemoveShard = function(shard) {
+ $scope.hideAll();
+ shard.showRemove = !shard.showRemove;
+ };
+
+ $scope.deleteShard = function(shard) {
+ Collections.deleteShard({collection: shard.collection, shard:shard.name}, function(data) {
+ shard.deleted = true;
+ $timeout(function() {
+ $scope.refresh();
+ }, 2000);
+ });
+ }

$scope.deleteReplica = function(replica) {
Collections.deleteReplica({collection: replica.collection, shard:replica.shard, replica:replica.name}, function(data) {

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/core-overview.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/core-overview.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/core-overview.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/core-overview.js Thu May 11 00:10:12 2017
@@ -139,86 +139,3 @@ function($scope, $rootScope, $routeParam
$scope.refresh();
});

-/*******
-
-// @todo admin-extra
- var core_basepath = this.active_core.attr( 'data-basepath' );
- var content_element = $( '#content' );
-
- content_element
- .removeClass( 'single' );
-
- if( !app.core_menu.data( 'admin-extra-loaded' ) )
- {
- app.core_menu.data( 'admin-extra-loaded', new Date() );
-
- $.get
- (
- core_basepath + '/admin/file/?file=admin-extra.menu-top.html&contentType=text/html;charset=utf-8',
- function( menu_extra )
- {
- app.core_menu
- .prepend( menu_extra );
- }
- );
-
- $.get
- (
- core_basepath + '/admin/file/?file=admin-extra.menu-bottom.html&contentType=text/html;charset=utf-8',
- function( menu_extra )
- {
- app.core_menu
- .append( menu_extra );
- }
- );
- }
-
-
-
-////////////////////////////////// ADMIN EXTRA
- $.ajax
- (
- {
- url : core_basepath + '/admin/file/?file=admin-extra.html',
- dataType : 'html',
- context : $( '#admin-extra', dashboard_element ),
- beforeSend : function( xhr, settings )
- {
- $( 'h2', this )
- .addClass( 'loader' );
-
- $( '.message', this )
- .show()
- .html( 'Loading' );
-
- $( '.content', this )
- .hide();
- },
- success : function( response, text_status, xhr )
- {
- $( '.message', this )
- .hide()
- .empty();
-
- $( '.content', this )
- .show()
- .html( response );
- },
- error : function( xhr, text_status, error_thrown)
- {
- this
- .addClass( 'disabled' );
-
- $( '.message', this )
- .show()
- .html( 'We found no "admin-extra.html" file.' );
- },
- complete : function( xhr, text_status )
- {
- $( 'h2', this )
- .removeClass( 'loader' );
- }
- }
- );
-
-***/

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/dataimport.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/dataimport.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/dataimport.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/dataimport.js Thu May 11 00:10:12 2017
@@ -22,7 +22,7 @@ solrAdminApp.controller('DataImportContr
$scope.resetMenu("dataimport", Constants.IS_COLLECTION_PAGE);

$scope.refresh = function () {
- Mbeans.info({core: $routeParams.core, cat: 'QUERYHANDLER'}, function (data) {
+ Mbeans.info({core: $routeParams.core, cat: 'QUERY'}, function (data) {
var mbeans = data['solr-mbeans'][1];
$scope.handlers = [];
for (var key in mbeans) {

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/files.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/files.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/files.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/files.js Thu May 11 00:10:12 2017
@@ -25,7 +25,7 @@ solrAdminApp.controller('FilesController
$scope.file = $location.search().file;
$scope.content = null;

- $scope.baseurl = $location.protocol()+ "://" + $location.host() + ":" + $location.port();
+ $scope.baseurl = $location.absUrl().substr(0,$location.absUrl().indexOf("#")); // Including /solr/ context

$scope.refresh = function () {

@@ -81,7 +81,7 @@ solrAdminApp.controller('FilesController

Files.get({core: $routeParams.core, file: $scope.file, contentType: contentType}, function(data) {
$scope.content = data.data;
- $scope.url = $scope.baseurl + data.config.url + "?" + $.param(data.config.params);
+ $scope.url = data.config.url + "?" + $.param(data.config.params); // relative URL
if (contentType.indexOf("text/plain") && (data.data.indexOf("<?xml")>=0) || data.data.indexOf("<!--")>=0) {
$scope.lang = "xml";
} else {

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/plugins.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/plugins.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/plugins.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/plugins.js Thu May 11 00:10:12 2017
@@ -88,6 +88,7 @@ var getPluginTypes = function(data, sele
var key = mbeans[i];
var lower = key.toLowerCase();
var plugins = getPlugins(mbeans[i+1]);
+ if (plugins.length == 0) continue;
keys.push({name: key,
selected: lower == selected,
changes: 0,

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/query.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/query.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/query.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/query.js Thu May 11 00:10:12 2017
@@ -88,9 +88,9 @@ solrAdminApp.controller('QueryController
Query.query(params, function(data) {
$scope.lang = $scope.query.wt;
$scope.response = data;
- $scope.url = $location.protocol() + "://" +
- $location.host() + ":" +
- $location.port() + url;
+ // Use relative URL to make it also work through proxies that may have a different host/port/context
+ $scope.url = url;
+ $scope.hostPortContext = $location.absUrl().substr(0,$location.absUrl().indexOf("#")); // For display only
});
};

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/schema.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/schema.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/schema.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/controllers/schema.js Thu May 11 00:10:12 2017
@@ -70,6 +70,10 @@ solrAdminApp.controller('SchemaControlle
$scope.core = $routeParams.core;
$scope.defaultSearchField = data.default_search_field;
$scope.uniqueKeyField = data.unique_key_field;
+ $scope.similarity = data.similarity;
+ if ($scope.similarity && $scope.similarity.className) {
+ $scope.similarity.className = shortenPackages($scope.similarity.className);
+ }
$scope.isDefaultSearchField = ($scope.selectedType == "Field" && $scope.name == $scope.defaultSearchField);
$scope.isUniqueKeyField = ($scope.selectedType == "Field" && $scope.name == $scope.uniqueKeyField);

@@ -334,6 +338,7 @@ var mergeIndexAndSchemaData = function(i
var data = {
default_search_field: null,
unique_key_field: null,
+ similarity: null,
key: {},
fields: {},
dynamic_fields: {},
@@ -354,6 +359,7 @@ var mergeIndexAndSchemaData = function(i

data.default_search_field = schema.defaultSearchField;
data.unique_key_field = schema.uniqueKeyField;
+ data.similarity = schema.similarity;

data.dynamic_fields = schema.dynamicFields;
data.types = schema.types;
@@ -422,11 +428,11 @@ var mergeIndexAndSchemaData = function(i
return data;
};

-var getFieldProperties = function(data, core, is, field) {
+var getFieldProperties = function(data, core, is, name) {

var display = {};

- display.partialState = is.field && !!data.fields[field].partial;
+ display.partialState = is.field && !!data.fields[name].partial;

display.columns = [];
display.rows = [];
@@ -446,23 +452,33 @@ var getFieldProperties = function(data,
}

// Identify the rows for our field property table
- if (is.field && data.fields[field]) {
- if (data.fields[field].flags) {
- addRow('Properties', data.fields[field].flags);
- }
- if (data.fields[field].schema) {
- addRow('Schema', data.fields[field].schema);
- }
- if (data.fields[field].index) {
- addRow('Index', data.fields[field].index);
- }
- display.docs = data.fields[field].docs;
- display.docsUrl = "#/" + core + "/query?q=" + field + ":[* TO *]";
- display.distinct = data.fields[field].distinct;
- display.positionIncrementGap = data.fields[field].positionIncrementGap;
- display.similarity = data.fields[field].similarity;
- } else if (is.dynamicField && data.dynamic_fields[field] && data.dynamic_fields[field].flags) {
- addRow('Properties', data.dynamic_fields[field].flags);
+ if (is.field && data.fields[name]) {
+ if (data.fields[name].flags) {
+ addRow('Properties', data.fields[name].flags);
+ }
+ if (data.fields[name].schema) {
+ addRow('Schema', data.fields[name].schema);
+ }
+ if (data.fields[name].index) {
+ addRow('Index', data.fields[name].index);
+ }
+ display.docs = data.fields[name].docs;
+ display.docsUrl = "#/" + core + "/query?q=" + name + ":[* TO *]";
+ display.distinct = data.fields[name].distinct;
+ display.positionIncrementGap = data.fields[name].positionIncrementGap;
+ if (data.types[data.fields[name].type]) {
+ display.similarity = data.types[data.fields[name].type].similarity;
+ } else {
+ display.similarity = null;
+ }
+ } else if (is.dynamicField && data.dynamic_fields[name] && data.dynamic_fields[name].flags) {
+ addRow('Properties', data.dynamic_fields[name].flags);
+ display.similarity = data.types[data.dynamic_fields[name].type].similarity;
+ } else if (is.type && data.types[name]) {
+ display.similarity = data.types[name].similarity;
+ }
+ if (display.similarity && display.similarity.className) {
+ display.similarity.className = shortenPackages(display.similarity.className);
}

// identify columns in field property table:
@@ -591,7 +607,11 @@ var sortedObjectArray = function(list) {
objarr.push({"name": list[i]});
}
return objarr;
-}
+};
+
+var shortenPackages = function(className) {
+ return className.replace("org.apache.solr", "o.a.s").replace("org.apache.lucene", "o.a.l");
+};

/*
var get_width = function get_width()

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/services.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/services.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/services.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/angular/services.js Thu May 11 00:10:12 2017
@@ -19,11 +19,11 @@ var solrAdminServices = angular.module('

solrAdminServices.factory('System',
['$resource', function($resource) {
- return $resource('/solr/admin/info/system', {"wt":"json", "_":Date.now()});
+ return $resource('admin/info/system', {"wt":"json", "_":Date.now()});
}])
.factory('Collections',
['$resource', function($resource) {
- return $resource('/solr/admin/collections',
+ return $resource('admin/collections',
{'wt':'json', '_':Date.now()}, {
"list": {params:{action: "LIST"}},
"status": {params:{action: "CLUSTERSTATUS"}},
@@ -34,13 +34,14 @@ solrAdminServices.factory('System',
"deleteAlias": {params:{action: "DELETEALIAS"}},
"deleteReplica": {params:{action: "DELETEREPLICA"}},
"addReplica": {params:{action: "ADDREPLICA"}},
+ "deleteShard": {params:{action: "DELETESHARD"}},
"reload": {method: "GET", params:{action:"RELOAD", core: "@core"}},
"optimize": {params:{}}
});
}])
.factory('Cores',
['$resource', function($resource) {
- return $resource('/solr/admin/cores',
+ return $resource('admin/cores',
{'wt':'json', '_':Date.now()}, {
"query": {},
"list": {params:{indexInfo: false}},
@@ -54,7 +55,7 @@ solrAdminServices.factory('System',
}])
.factory('Logging',
['$resource', function($resource) {
- return $resource('/solr/admin/info/logging', {'wt':'json', '_':Date.now()}, {
+ return $resource('admin/info/logging', {'wt':'json', '_':Date.now()}, {
"events": {params: {since:'0'}},
"levels": {},
"setLevel": {}
@@ -62,7 +63,7 @@ solrAdminServices.factory('System',
}])
.factory('Zookeeper',
['$resource', function($resource) {
- return $resource('/solr/admin/zookeeper', {wt:'json', _:Date.now()}, {
+ return $resource('admin/zookeeper', {wt:'json', _:Date.now()}, {
"simple": {},
"dump": {params: {dump: "true"}},
"liveNodes": {params: {path: '/live_nodes'}},
@@ -81,30 +82,30 @@ solrAdminServices.factory('System',
}])
.factory('Properties',
['$resource', function($resource) {
- return $resource('/solr/admin/info/properties', {'wt':'json', '_':Date.now()});
+ return $resource('admin/info/properties', {'wt':'json', '_':Date.now()});
}])
.factory('Threads',
['$resource', function($resource) {
- return $resource('/solr/admin/info/threads', {'wt':'json', '_':Date.now()});
+ return $resource('admin/info/threads', {'wt':'json', '_':Date.now()});
}])
.factory('Properties',
['$resource', function($resource) {
- return $resource('/solr/admin/info/properties', {'wt':'json', '_':Date.now()});
+ return $resource('admin/info/properties', {'wt':'json', '_':Date.now()});
}])
.factory('Replication',
['$resource', function($resource) {
- return $resource('/solr/:core/replication', {'wt':'json', core: "@core", '_':Date.now()}, {
+ return $resource(':core/replication', {'wt':'json', core: "@core", '_':Date.now()}, {
"details": {params: {command: "details"}},
"command": {params: {}}
});
}])
.factory('CoreSystem',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/system', {wt:'json', core: "@core", _:Date.now()});
+ return $resource(':core/admin/system', {wt:'json', core: "@core", _:Date.now()});
}])
.factory('Update',
['$resource', function($resource) {
- return $resource('/solr/:core/:handler', {core: '@core', wt:'json', _:Date.now(), handler:'update'}, {
+ return $resource(':core/:handler', {core: '@core', wt:'json', _:Date.now(), handler:'update'}, {
"optimize": {params: { optimize: "true"}},
"commit": {params: {commit: "true"}},
"post": {headers: {'Content-type': 'application/json'}, method: "POST", params: {handler: '@handler'}},
@@ -115,7 +116,7 @@ solrAdminServices.factory('System',
}])
.service('FileUpload', function ($http) {
this.upload = function(params, file, success, error){
- var url = "/solr/" + params.core + "/" + params.handler + "?";
+ var url = "" + params.core + "/" + params.handler + "?";
raw = params.raw;
delete params.core;
delete params.handler;
@@ -135,7 +136,7 @@ solrAdminServices.factory('System',
})
.factory('Luke',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/luke', {core: '@core', wt:'json', _:Date.now()}, {
+ return $resource(':core/admin/luke', {core: '@core', wt:'json', _:Date.now()}, {
"index": {params: {numTerms: 0, show: 'index'}},
"raw": {params: {numTerms: 0}},
"schema": {params: {show:'schema'}},
@@ -156,13 +157,13 @@ solrAdminServices.factory('System',
}])
.factory('Analysis',
['$resource', function($resource) {
- return $resource('/solr/:core/analysis/field', {core: '@core', wt:'json', _:Date.now()}, {
+ return $resource(':core/analysis/field', {core: '@core', wt:'json', _:Date.now()}, {
"field": {params: {"analysis.showmatch": true}}
});
}])
.factory('DataImport',
['$resource', function($resource) {
- return $resource('/solr/:core/:name', {core: '@core', name: '@name', indent:'on', wt:'json', _:Date.now()}, {
+ return $resource(':core/:name', {core: '@core', name: '@name', indent:'on', wt:'json', _:Date.now()}, {
"config": {params: {command: "show-config"}, headers: {doNotIntercept: "true"},
transformResponse: function(data) {
return {config: data};
@@ -177,14 +178,14 @@ solrAdminServices.factory('System',
}])
.factory('Ping',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/ping', {wt:'json', core: '@core', ts:Date.now(), _:Date.now()}, {
+ return $resource(':core/admin/ping', {wt:'json', core: '@core', ts:Date.now(), _:Date.now()}, {
"ping": {},
"status": {params:{action:"status"}, headers: {doNotIntercept: "true"}
}});
}])
.factory('Mbeans',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/mbeans', {'wt':'json', core: '@core', '_':Date.now()}, {
+ return $resource(':core/admin/mbeans', {'wt':'json', core: '@core', '_':Date.now()}, {
stats: {params: {stats: true}},
info: {},
reference: {
@@ -203,7 +204,7 @@ solrAdminServices.factory('System',
}])
.factory('Files',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/file', {'wt':'json', core: '@core', '_':Date.now()}, {
+ return $resource(':core/admin/file', {'wt':'json', core: '@core', '_':Date.now()}, {
"list": {},
"get": {method: "GET", interceptor: {
response: function(config) {return config;}
@@ -214,7 +215,7 @@ solrAdminServices.factory('System',
}])
.factory('Query',
['$resource', function($resource) {
- var resource = $resource('/solr/:core/:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
+ var resource = $resource(':core/:handler', {core: '@core', handler: '@handler', '_':Date.now()}, {
"query": {
method: "GET",
transformResponse: function (data) {
@@ -232,19 +233,19 @@ solrAdminServices.factory('System',
}
}
}
- return "/solr/" + params.core + "/" + params.handler + "?" + qs.sort().join("&");
+ return "" + params.core + "/" + params.handler + "?" + qs.sort().join("&");
}
return resource;
}])
.factory('Segments',
['$resource', function($resource) {
- return $resource('/solr/:core/admin/segments', {'wt':'json', core: '@core', _:Date.now()}, {
+ return $resource(':core/admin/segments', {'wt':'json', core: '@core', _:Date.now()}, {
get: {}
});
}])
.factory('Schema',
['$resource', function($resource) {
- return $resource('/solr/:core/schema', {wt: 'json', core: '@core', _:Date.now()}, {
+ return $resource(':core/schema', {wt: 'json', core: '@core', _:Date.now()}, {
get: {method: "GET"},
check: {method: "GET", headers: {doNotIntercept: "true"}},
post: {method: "POST"}
@@ -252,7 +253,7 @@ solrAdminServices.factory('System',
}])
.factory('Config',
['$resource', function($resource) {
- return $resource('/solr/:core/config', {wt: 'json', core: '@core', _:Date.now()}, {
+ return $resource(':core/config', {wt: 'json', core: '@core', _:Date.now()}, {
get: {method: "GET"}
})
}]);

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/scripts/dataimport.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/scripts/dataimport.js?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/scripts/dataimport.js (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/js/scripts/dataimport.js Thu May 11 00:10:12 2017
@@ -28,7 +28,7 @@ sammy.bind
$.ajax
(
{
- url : core_basepath + '/admin/mbeans?cat=QUERYHANDLER&wt=json',
+ url : core_basepath + '/admin/mbeans?cat=QUERY&wt=json',
dataType : 'json',
beforeSend : function( xhr, settings )
{

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/analysis.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/analysis.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/analysis.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/analysis.html Thu May 11 00:10:12 2017
@@ -106,7 +106,7 @@ limitations under the License.
<td class="details">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
- <tr class="{{value.name}}" ng-repeat="value in token.keys" ng-show="verbose || value.name=='text'">
+ <tr class="{{value.name}} {{value.extraclass}}" ng-repeat="value in token.keys" ng-show="verbose || value.name=='text'">
<td>{{value.value}}</td>
</tr>
</tbody>

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/collections.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/collections.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/collections.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/collections.html Thu May 11 00:10:12 2017
@@ -215,7 +215,23 @@ limitations under the License.

<div class="block" id="shard-data">
<div class="content shard" ng-repeat="shard in collection.shards">
- <a ng-click="toggleShard(shard)"><h2><span ng-class="{open:shard.show}">Shard: {{shard.name}}</span></h2></a>
+ <a ng-click="toggleShard(shard)">
+ <h2>
+ <span ng-class="{open:shard.show}"><b>Shard: {{shard.name}}</b></span>
+ <div style="float:right" ng-show="!shard.range || shard.state == 'inactive'"><a ng-click="toggleRemoveShard(shard)"><span class="rem"></span></a></div>
+ </h2>
+ </a>
+ <ul ng-show="shard.showRemove">
+ <li>
+ <form class="delete-shard">
+ <p class="clearfix"><em>Are you sure you want to delete this shard?</em></p>
+ <p class="clearfix buttons">
+ <button class="submit" ng-class="{success: shard.deleted}" ng-click="deleteShard(shard)"><span>Delete Shard</span></button>
+ <button type="reset" class="reset" ng-click="toggleRemoveShard(shard)"><span>Cancel</span></button>
+ </p>
+ </form>
+ </li>
+ </ul>
<ul ng-show="shard.show">
<li>
<ul>

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/core_overview.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/core_overview.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/core_overview.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/core_overview.html Thu May 11 00:10:12 2017
@@ -205,23 +205,6 @@ limitations under the License.
</div>

</div>
- <div class="clearfix">
-
- <div class="block" id="admin-extra">
-
- <h2><span>Admin Extra</span></h2>
-
- <div class="message-container">
- <div class="message"></div>
- </div>
-
- <div class="content">
-
- </div>
-
- </div>
-
- </div>

</div>

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/files.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/files.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/files.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/files.html Thu May 11 00:10:12 2017
@@ -27,7 +27,7 @@ limitations under the License.

<div class="top clearfix">

- <a id="url" class="address-bar" href="{{url}}" ng-show="url">{{url}}</a>
+ <a id="url" class="address-bar" href="{{url}}" ng-show="url">{{baseurl}}{{url}}</a>

</div>

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/query.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/query.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/query.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/query.html Thu May 11 00:10:12 2017
@@ -345,7 +345,7 @@ limitations under the License.

<div id="result">

- <a ng-show="response.data" id="url" class="address-bar" ng-href="{{url}}">{{url}}</a>
+ <a ng-show="response.data" id="url" class="address-bar" ng-href="{{url}}">{{hostPortContext}}{{url}}</a>

<div id="response">
<pre class="syntax language-{{lang}}"><code ng-bind-html="response.data | highlight:lang | unsafe"></code></pre>

Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/schema.html
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/schema.html?rev=1794771&r1=1794770&r2=1794771&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/schema.html (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/partials/schema.html Thu May 11 00:10:12 2017
@@ -212,7 +212,7 @@ limitations under the License.
</h2>
</div>

- <div class="partial" ng-show="partialState">
+ <div class="partial" ng-show="display.partialState">

<p>Because your Index is empty, we do not have enough Information about this Field</p>

@@ -220,11 +220,11 @@ limitations under the License.

<dl class="options clearfix">

- <dt class="field-type">Field-Type:</dt>
- <dd class="field-type">{{analysis.data.className}}</dd>
+ <dt class="field-type" ng-show="analysis.data.className">Field-Type:</dt>
+ <dd class="field-type" ng-show="analysis.data.className">{{analysis.data.className}}</dd>

- <dt class="similarity" ng-show="display.similarity">Similarity:</dt>
- <dd class="similarity" ng-show="display.similarity">{{ display.similarity.details }} ({{ similarity.className }}) </dd>
+ <dt class="similarity" ng-show="display.similarity.className">Similarity:</dt>
+ <dd class="similarity" ng-show="display.similarity.className" data-tip="{{ display.similarity.className }}">{{ display.similarity.details }}</dd>

<dt class="position-increment-gap" ng-show="display.positionIncrementGap"><abbr title="Position Increment Gap">PI Gap</abbr>:</dt>
<dd class="position-increment-gap" ng-show="display.positionIncrementGap">{{ display.positionIncrementGap }}</dd>
@@ -287,7 +287,7 @@ limitations under the License.

</div>

- <div class="terminfo-holder loaded clearfix" ng-class="{disabled: noTermData}" ng-show="is.field">
+ <div class="terminfo-holder loaded clearfix" ng-class="{disabled: noTermData}" ng-show="is.field && !display.partialState">

<div class="trigger">

@@ -438,6 +438,9 @@ limitations under the License.
<dt class="default-search-field" ng-class="{active: isDefaultSearchField}" ng-show="defaultSearchField">Default Search Field</dt>
<dd class="default-search-field" ng-class="{active: isDefaultSearchField}"><a ng-href="#/{{core}}/schema?field={{defaultSearchField}}">{{defaultSearchField}}</a></dd>

+ <dt class="similarity" ng-class="{active: similarity.className}">Global Similarity:</dt>
+ <dd class="similarity" ng-class="{active: similarity.className}" data-tip="{{ similarity.className }}">{{ similarity.details }}</dd>
+
</dl>

</div>