rjack-solr 4.0.0.0-java → 4.1.0.0-java

data/webapp/js/scripts/file.js

@@ -18,7 +18,7 @@
 // #/:core/schema, #/:core/config
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(schema|config)$/,
+  new RegExp( app.core_regex_base + '\\/(schema|config)$' ),
   function( context )
   {
     var core_basepath = this.active_core.attr( 'data-basepath' );

data/webapp/js/scripts/index.js

@@ -36,15 +36,13 @@ var generate_bar = function( bar_container, bar_data, convert_label_values )
   $( '.bar-max.val', bar_holder ).text( bar_data['max'] );
     
   bar_level++;
-  var total_width = Math.round( ( bar_data['total'] * max_width ) / bar_data['max'] );
-  $( '.bar-total.bar', bar_holder ).width( Math.max( total_width, 1 ) );
+  $( '.bar-total.bar', bar_holder ).width( new String( (bar_data['total']/bar_data['max'])*100 ) + '%' );
   $( '.bar-total.val', bar_holder ).text( bar_data['total'] );
 
   if( bar_data['used'] )
   {
     bar_level++;
-    var used_width = Math.round( ( bar_data['used'] * max_width ) / bar_data['max'] );
-    $( '.bar-used.bar', bar_holder ).width( Math.min( used_width, total_width - 1 ) );
+    $( '.bar-used.bar', bar_holder ).width( new String( (bar_data['used']/bar_data['total'])*100 ) + '%' );
     $( '.bar-used.val', bar_holder ).text( bar_data['used'] );
   }
 
@@ -233,7 +231,7 @@ sammy.get
     
           var data = {
             'start_time' : app.dashboard_values['jvm']['jmx']['startTime'],
-            'host' : app.dashboard_values['core']['host'],
+            'host' : app.dashboard_values['core']['host'] || '-',
             'dir_instance' : app.dashboard_values['core']['directory']['instance'],
             'dir_data' : app.dashboard_values['core']['directory']['data'],
             'dir_index' : app.dashboard_values['core']['directory']['index'],

data/webapp/js/scripts/logging.js

@@ -318,6 +318,14 @@ var load_logging_viewer = function()
         {
           var doc = docs[i];
 
+          if( 1 === doc.time.length )
+          {
+            for( var key in doc )
+            {
+              doc[key] = doc[key][0];
+            }
+          }
+
           if( !doc.trace )
           {
             var lines = doc.message.split( "\n" );

data/webapp/js/scripts/plugins.js

@@ -206,7 +206,7 @@ var render_plugin_data = function( plugin_data, plugin_sort, types )
       }
 
       content += '<li class="' + classes.join( ' ' ) + '">' + "\n";
-      content += '<a href="' + context_path + '?entry=' + bean.esc() + '">';
+      content += '<a href="' + context_path + '?entry=' + bean.esc() + '" data-bean="' + bean.esc() + '">';
       content += '<span>' + bean.esc() + '</span>';
       content += '</a>' + "\n";
       content += '<ul class="detail">' + "\n";
@@ -279,15 +279,55 @@ var render_plugin_data = function( plugin_data, plugin_sort, types )
   frame_element
     .html( content );
 
-  $( 'a[href="' + decodeURIComponent( active_context.path ) + '"]', frame_element )
-    .parent().addClass( 'expanded' );
+  
+  var path = active_context.path.split( '?entry=' );
+  var entries = ( path[1] || '' ).split( ',' );
+  
+  var entry_count = entries.length;
+  for( var i = 0; i < entry_count; i++ )
+  {
+    $( 'a[data-bean="' + entries[i] + '"]', frame_element )
+      .parent().addClass( 'expanded' );
+  }
+
+  $( 'a', frame_element )
+    .off( 'click' )
+    .on
+    (
+      'click',
+      function( event )
+      { 
+        var self = $( this );
+        var bean = self.data( 'bean' );
+
+        var split = '?entry=';
+        var path = active_context.path.split( split );
+        var entry = ( path[1] || '' );
+
+        var regex = new RegExp( bean.replace( /\//g, '\\/' ) + '(,|$)' );
+        var match = regex.test( entry );
+
+        var url = path[0] + split;
+
+        url += match
+             ? entry.replace( regex, '' )
+             : entry + ',' + bean;
+
+        url = url.replace( /=,/, '=' );
+        url = url.replace( /,$/, '' );
+        url = url.replace( /\?entry=$/, '' );
+
+        active_context.redirect( url );
+        return false;
+      }
+    );
   
   // Try to make links for anything with http (but leave the rest alone)
   $( '.detail dd' ).each(function(index) {
     var txt = $(this).html();
     if(txt.indexOf("http") >= 0) {
       $(this).linker({
-         className : 'linker',
+         className : 'linker'
       });
     }
   });
@@ -382,7 +422,7 @@ sammy.bind
 // #/:core/plugins/$type
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(plugins)\/(\w+)$/,
+  new RegExp( app.core_regex_base + '\\/(plugins)\\/(\\w+)$' ),
   function( context )
   {
     core_basepath = this.active_core.attr( 'data-basepath' );
@@ -405,7 +445,7 @@ sammy.get
 // #/:core/plugins
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(plugins)$/,
+  new RegExp( app.core_regex_base + '\\/(plugins)$' ),
   function( context )
   {
     core_basepath = this.active_core.attr( 'data-basepath' );
@@ -423,4 +463,4 @@ sammy.get
       }
     );
   }
-);
+);

data/webapp/js/scripts/query.js

@@ -18,7 +18,7 @@
 // #/:core/query
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(query)$/,
+  new RegExp( app.core_regex_base + '\\/(query)$' ),
   function( context )
   {
     var core_basepath = this.active_core.attr( 'data-basepath' );
@@ -36,7 +36,7 @@ sammy.get
         var query_form = $( '#form form', query_element );
         var url_element = $( '#url', query_element );
         var result_element = $( '#result', query_element );
-        var response_element = $( '#response iframe', result_element );
+        var response_element = $( '#response', result_element );
 
         url_element
           .die( 'change' )
@@ -45,40 +45,49 @@ sammy.get
             'change',
             function( event )
             {
-              var check_iframe_ready_state = function()
-              {
-                var iframe_element = response_element.get(0).contentWindow.document || response_element.get(0).document;
+              var wt = $( '[name="wt"]', query_form ).val();
 
-                if( !iframe_element )
-                {
-                  console.debug( 'no iframe_element found', response_element );
-                  return false;
-                }
+              var content_generator = {
 
-                url_element
-                  .addClass( 'loader' );
+                _default : function( xhr )
+                {
+                  return xhr.responseText.esc();
+                },
 
-                if( 'complete' === iframe_element.readyState )
+                json : function( xhr )
                 {
-                  url_element
-                    .removeClass( 'loader' );
+                  return app.format_json( xhr.responseText );
                 }
-                else
+
+              };
+
+              $.ajax
+              (
                 {
-                  window.setTimeout( check_iframe_ready_state, 100 );
+                  url : this.href,
+                  dataType : wt,
+                  context : response_element,
+                  beforeSend : function( xhr, settings )
+                  {
+                    this
+                     .html( '<div class="loader">Loading ...</div>' );
+                  },
+                  complete : function( xhr, text_status )
+                  {
+                    var code = $(
+                      '<pre class="syntax language-' + wt + '"><code>' +
+                      ( content_generator[wt] || content_generator['_default'] )( xhr ) +
+                      '</code></pre>'
+                    );
+                    this.html( code );
+
+                    if( 'success' === text_status )
+                    {
+                      hljs.highlightBlock( code.get(0) );
+                    }
+                  }
                 }
-              }
-              check_iframe_ready_state();
-
-              response_element
-                .attr( 'src', this.href );
-                            
-              if( !response_element.hasClass( 'resized' ) )
-              {
-                response_element
-                  .addClass( 'resized' )
-                  .css( 'height', $( '#main' ).height() - 60 );
-              }
+              );
             }
           )
 
@@ -104,27 +113,38 @@ sammy.get
             'submit',
             function( event )
             {
-              var form_map = {};
               var form_values = [];
-              var all_form_values = query_form.formToArray();
-
-              for( var i = 0; i < all_form_values.length; i++ )
+ 
+              var add_to_form_values = function add_to_form_values( fields )
               {
-                if( !all_form_values[i].value || 0 === all_form_values[i].value.length )
-                {
-                  continue;
-                }
-
-                var name_parts = all_form_values[i].name.split( '.' );
-                if( 1 < name_parts.length && !form_map[name_parts[0]] )
-                {
-                  console.debug( 'skip "' + all_form_values[i].name + '", parent missing' );
-                  continue;
-                }
-
-                form_map[all_form_values[i].name] = all_form_values[i].value;
-                form_values.push( all_form_values[i] );
-              }
+                 for( var i in fields )
+                 {
+                  if( !fields[i].value || 0 === fields[i].value.length )
+                  {
+                    continue;
+                  }
+ 
+                  form_values.push( fields[i] );
+                 }
+              };
+ 
+              var fieldsets = $( '> fieldset', query_form );
+ 
+              var fields = fieldsets.first().formToArray();
+              add_to_form_values( fields );
+
+              fieldsets.not( '.common' )
+                .each
+                (
+                  function( i, set )
+                  {
+                    if( $( 'legend input', set ).is( ':checked' ) )
+                    {
+                      var fields = $( set ).formToArray();
+                      add_to_form_values( fields );
+                    }
+                  }
+                );
 
               var handler_path = $( '#qt', query_form ).val();
               if( '/' !== handler_path[0] )
@@ -135,7 +155,13 @@ sammy.get
 
               var query_url = window.location.protocol + '//' + window.location.host
                             + core_basepath + handler_path + '?' + $.param( form_values );
-                            
+
+              var custom_parameters = $( '#custom_parameters', query_form ).val();
+              if( custom_parameters && 0 !== custom_parameters.length )
+              {
+                query_url += '&' + custom_parameters.replace( /^&/, '' ); 
+              }
+
               url_element
                 .attr( 'href', query_url )
                 .text( query_url )

data/webapp/js/scripts/replication.js

@@ -22,49 +22,6 @@ var core_basepath = null;
 var navigation_element = null;
 var replication_element = null;
 
-var convert_duration_to_seconds = function( str )
-{
-  var ret = 0;
-  var parts = new String( str ).split( ':' ).reverse();
-  var parts_count = parts.length;
-    
-  for( var i = 0; i < parts_count; i++ )
-  {
-    ret += parseInt( parts[i], 10 ) * Math.pow( 60, i );
-  }
-
-  return ret;
-}
-
-var convert_seconds_to_readable_time = function( value )
-{
-  var text = [];
-  value = parseInt( value );
-
-  var minutes = Math.floor( value / 60 );
-  var hours = Math.floor( minutes / 60 );
-
-  if( 0 !== hours )
-  {
-    text.push( hours + 'h' );
-    value -= hours * 60 * 60;
-    minutes -= hours * 60;
-  }
-
-  if( 0 !== minutes )
-  {
-    text.push( minutes + 'm' );
-    value -= minutes * 60;
-  }
-
-  if( 0 !== value )
-  {
-    text.push( value + 's' );
-  }
-
-  return text.join( ' ' );
-}
-
 var init_timer = function( next_tick )
 {
   if( timer_timeout )
@@ -83,7 +40,7 @@ var update_timer = function( next_tick )
   }
 
   $( 'p .tick', timer_element )
-    .text( convert_seconds_to_readable_time( next_tick ) );
+    .text( app.convert_seconds_to_readable_time( next_tick ) );
 
   timer_timeout = window.setTimeout
   (
@@ -151,7 +108,7 @@ var replication_fetch_status = function()
 
           var eta_element = $( '#eta', progress_element );
           $( 'span', eta_element )
-            .text( convert_seconds_to_readable_time( data.slave.timeRemaining ) );
+            .text( app.convert_seconds_to_readable_time( data.slave.timeRemaining ) );
 
           var bar_element = $( '#bar', progress_element );
           $( '.files span', bar_element )
@@ -394,7 +351,7 @@ var replication_fetch_status = function()
               timer_element = $( '.timer', navigation_element );
               approx_element = $( '.approx', timer_element );
 
-              var next_tick = convert_duration_to_seconds( data.slave.pollInterval );
+              var next_tick = app.convert_duration_to_seconds( data.slave.pollInterval );
               approx_element.show();
 
               if( data.slave.nextExecutionAt )
@@ -490,7 +447,7 @@ var replication_fetch_status = function()
 // #/:core/replication
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(replication)$/,
+  new RegExp( app.core_regex_base + '\\/(replication)$' ),
   function( context )
   {
     core_basepath = this.active_core.attr( 'data-basepath' );

data/webapp/js/scripts/schema-browser.js

@@ -115,7 +115,7 @@ var load_terminfo = function( trigger_element, core_basepath, field, data_elemen
                                +  '<ul>' + "\n";
             }
 
-            var target = '#/' + current_core + '/query?q=' + field.esc() + ':' + encodeURIComponent( topterms[i] );
+            var target = '#/' + current_core + '/query?q=' + field.esc() + ':' + encodeURIComponent( '"' + topterms[i] + '"' );
             topterms_content += '<li><a href="' + target + '">' + topterms[i].esc() + '</a></li>' + "\n";
           }
 
@@ -267,19 +267,23 @@ sammy.bind
       if( 'field' === type )
       {
         navigation_data.fields.push( value );
-        navigation_data.types.push( app.schema_browser_data.relations.f_t[value] );
+
+        if( app.schema_browser_data.relations.f_t[value] )
+        {
+          navigation_data.types.push( app.schema_browser_data.relations.f_t[value] );
+        }
 
         if( app.schema_browser_data.relations.f_df[value] )
         {
           navigation_data.dynamic_fields.push( app.schema_browser_data.relations.f_df[value] );
         }
 
-        if( 0 !== app.schema_browser_data.fields[value].copySources.length )
+        if( app.schema_browser_data.fields[value].copySources && 0 !== app.schema_browser_data.fields[value].copySources.length )
         {
           navigation_data.copyfield_source = app.schema_browser_data.fields[value].copySources;
         }
 
-        if( 0 !== app.schema_browser_data.fields[value].copyDests.length )
+        if( app.schema_browser_data.fields[value].copyDests && 0 !== app.schema_browser_data.fields[value].copyDests.length )
         {
           navigation_data.copyfield_dest = app.schema_browser_data.fields[value].copyDests;
         }
@@ -490,30 +494,39 @@ sammy.bind
 
                 for( var field in app.schema_browser_data.fields )
                 {
-                  app.schema_browser_data.fields[field].copySourcesRaw = null;
-
-                  if( app.schema_browser_data.fields[field].copySources &&
-                    0 !== app.schema_browser_data.fields[field].copySources.length )
+                  var copy_dests = app.schema_browser_data.fields[field].copyDests;
+                  for( var i in copy_dests )
                   {
-                    app.schema_browser_data.fields[field].copySourcesRaw =
-                      app.schema_browser_data.fields[field].copySources;
+                    var copy_dest = copy_dests[i];
+                    if( !app.schema_browser_data.fields[copy_dest] )
+                    {
+                      app.schema_browser_data.fields[copy_dest] = {
+                        partial : true,
+                        copySources : []
+                      };
+                    }
+
+                    if( app.schema_browser_data.fields[copy_dest].partial )
+                    {
+                      app.schema_browser_data.fields[copy_dest].copySources.push( field );
+                    }
                   }
-                                        
-                  app.schema_browser_data.fields[field].copyDests = [];
-                  app.schema_browser_data.fields[field].copySources = [];
-                }
 
-                for( var field in app.schema_browser_data.fields )
-                {
-                  if( app.schema_browser_data.fields[field].copySourcesRaw )
+                  var copy_sources = app.schema_browser_data.fields[field].copySources;
+                  for( var i in copy_sources )
                   {
-                    var copy_sources = app.schema_browser_data.fields[field].copySourcesRaw;
-                    for( var i in copy_sources )
+                    var copy_source = copy_sources[i];
+                    if( !app.schema_browser_data.fields[copy_source] )
                     {
-                      var target = copy_sources[i].replace( /^.+:(.+)\{.+$/, '$1' );
+                      app.schema_browser_data.fields[copy_source] = {
+                        partial : true,
+                        copyDests : []
+                      };
+                    }
 
-                      app.schema_browser_data.fields[field].copySources.push( target );
-                      app.schema_browser_data.fields[target].copyDests.push( field );
+                    if( app.schema_browser_data.fields[copy_source].partial )
+                    {
+                      app.schema_browser_data.fields[copy_source].copyDests.push( field );
                     }
                   }
 
@@ -665,7 +678,7 @@ sammy.bind
 // #/:core/schema-browser
 sammy.get
 (
-  /^#\/([\w\d-]+)\/(schema-browser)$/,
+  new RegExp( app.core_regex_base + '\\/(schema-browser)$' ),
   function( context )
   {
     var core_basepath = this.active_core.attr( 'data-basepath' );
@@ -763,6 +776,16 @@ sammy.get
         }
         $( '.name', head_element ).html( field.esc() );
 
+
+        var partial_state = false;
+        if( is_f )
+        {
+          partial_state = !!schema_browser_data.fields[field].partial;
+        }
+
+        $( '.partial', data_element )
+          .toggle( partial_state );
+
         // -- properties
         var properties_element = $( 'dt.properties', options_element );
         if( flags )