Facet Pivot, histogram widget, and pyramid widget

.gitignore

@@ -1 +1,2 @@
 ajax-solr.min.js
+*~

core/AbstractFacetWidget.js

@@ -7,6 +7,7 @@
   }
 }(function () {
 
+
 /**
  * Baseclass for all facet widgets.
  *
@@ -82,6 +83,16 @@ AjaxSolr.AbstractFacetWidget = AjaxSolr.AbstractWidget.extend(
         'facet.range.include'
       ]);
     }
+    /***************************
+     * Added new parameter for facet.pivot: according to the documentation
+     * there is only facet.pivot.mincount
+     * ************************/
+    else if (this['facet.pivot'] !== undefined) {
+      this.manager.store.addByValue('facet.pivot', this.field);
+      parameters = parameters.concat([
+        'facet.pivot.mincount',
+      ]);
+    }
 
     for (var i = 0, l = parameters.length; i < l; i++) {
       if (this[parameters[i]] !== undefined) {
@@ -121,6 +132,17 @@ AjaxSolr.AbstractFacetWidget = AjaxSolr.AbstractWidget.extend(
       return this.manager.store.addByValue('fq', this.fq(value));
     });
   },
+
+    /**
+   * Adds a filter query independent of the widget facet field.
+   *
+   * @returns {Boolean} Whether a filter query was added.
+   */
+  addByField: function (field, value) {
+   	return this.changeSelection(function () {
+      return this.manager.store.addByValue('fq', (field+':'+value));
+    });
+  },
 
   /**
    * Removes a filter query.
@@ -183,19 +205,42 @@ AjaxSolr.AbstractFacetWidget = AjaxSolr.AbstractWidget.extend(
     else if (this['facet.range'] !== undefined) {
       property = 'facet_ranges';
     }
+    else if (this['facet.pivot'] !== undefined) {
+      property = 'facet_pivot';
+    }   
     if (property !== undefined) {
-      switch (this.manager.store.get('json.nl').val()) {
-        case 'map':
-          return this.getFacetCountsMap(property);
-        case 'arrarr':
-          return this.getFacetCountsArrarr(property);
-        default:
-          return this.getFacetCountsFlat(property);
-      }
+	 /* -------------------------------------------------------------------------------------------------
+		New If added to control the case of the facet_pivots: we do not know how the
+		* json.nl value would affect pivots, therefore this special case.
+	 -----------------------------------------*/
+		if (property==='facet_pivot'){
+			return this.getPivotCountsMap(property);
+		}else{
+	//---------------------------------------------------------------------------------------------------
+			switch (this.manager.store.get('json.nl').val()) {
+			case 'map':
+			  return this.getFacetCountsMap(property);
+			case 'arrarr':
+			  return this.getFacetCountsArrarr(property);
+			default:
+			  return this.getFacetCountsFlat(property);
+			}	
+		}
     }
     throw 'Cannot get facet counts unless one of the following properties is set to "true" on widget "' + this.id + '": "facet.field", "facet.date", or "facet.range".';
   },
 
+/** ----------------------------------------------------------------------------
+   * Used "if" it is facet.pivot data.
+   *
+   * * @param {JSON} as the solr output for facet.pivots.
+   * @returns {Map} A map associating to each key an array of two elements (total count, and another map),
+   * or the count.
+   */
+  getPivotCountsMap: function (property) {
+    return parse_pivots(this.manager.response.facet_counts[property][this.field]);
+  },
+
   /**
    * Used if the facet counts are represented as a JSON object.
    *
@@ -290,4 +335,26 @@ AjaxSolr.AbstractFacetWidget = AjaxSolr.AbstractWidget.extend(
   }
 });
 
+/*********************************
+ * Method for parsing pivots output: it works recursively such that at each level
+ * which has a new pivot the ouput will indicate the counts and then the map of other results.
+ * It follows the same structure than the solr ourput.
+ *
+ * @param {JSON} as the solr output for facet.pivots.
+ * @returns {Map} A map associating to each key an array of two elements (total count, and another map),
+ * or the count.
+ * 
+ * *********************************/
+function parse_pivots(data_input){
+	var output = {}
+	for (var i = 0, l = data_input.length; i < l; i++) {
+			if ("pivot" in data_input[i]){
+					output[data_input[i]["value"]] = [data_input[i]["count"],parse_pivots(data_input[i]["pivot"])];
+			} else {
+					output[data_input[i]["value"]] = data_input[i]["count"];
+			}
+	}
+	return output
+}
+/********************************************************/
 }));

examples/reuters/css/reuters.css

@@ -106,6 +106,7 @@ a:hover {
 }
 #calendar {
   width: 160px;
+  margin-top: 10px;
 }
 #search_help {
   font-size: 80%;
@@ -158,3 +159,46 @@ font-size: 170%;
 a.tagcloud_size_10 {
 font-size: 180%;
 }
+
+/*histogram*/
+
+div.bar {
+		display: inline-block;
+		width: 20px;
+		height: 75px;
+		background-color: teal;
+		margin-right: 2px;		
+	}
+
+bar2 {
+	background-color: blue;
+}
+
+.shared, .bar, .label {
+  font-size: 8pt;
+  font-weight: bold;
+  font-family: Arial, sans-serif;
+}
+.femalebar, .malebar {
+  fill: #a7b6c1;
+}
+.highlight rect.malebar, .highlight rect.femalebar {
+  fill: #a14538;
+}
+text.malebar, text.femalebar {
+  display: none;
+}
+.highlight text {
+  display: block;
+  fill: #000;
+}
+
+rect.highlight2{
+	fill: #a14538;
+}
+
+#histogram
+{
+margin-top: 10px;
+}
+

examples/reuters/index.html

@@ -23,12 +23,37 @@
   <script src="widgets/AutocompleteWidget.js"></script>
   <script src="widgets/CountryCodeWidget.js"></script>
   <script src="widgets/CalendarWidget.js"></script>
+  <script src="widgets/HistogramWidget.js"></script>
+  <script src="widgets/PyramidAges.js"></script>  <!--*********************************************************************** -->
+  <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+  <script> 
+
+  $('CalendarWidget').datepicker({
+      changeMonth: true,
+      changeYear: true,
+      maxDate:0,
+      onChangeMonthYear: function(year, month, inst){
+        // set date to 1st on year or month change
+
+        // this seems  bit janky, but works
+        //$('#' + inst.id).datepicker( "setDate", month + '/1/' + year );
+		alert("hohoho");
+        // Can't I use the instatnce to set the date?
+
+        // $(inst).datepicker( "setDate", month + '/1/' + year ); // fails
+        // inst.datepicker( "setDate", month + '/1/' + year ); // fails
+        // inst.selectedDay = 1; // fails
+        // inst.currentDay = 1; // fails 
+      }
+  });
+
+   </script>
 </head>
 <body>
   <div id="wrap"> 
     <div id="header">
-      <h1>AJAX Solr Demonstration</h1>
-      <h2>Browse Reuters business news from 1987</h2>
+      <h1>Meneame database</h1>
+      <h2>Comments</h2>
     </div>
 
     <div class="right">
@@ -51,21 +76,22 @@ <h2>Search</h2>
         <input type="text" id="query" name="query" autocomplete="off">
       </ul>
 
-      <h2>Top Topics</h2>
-      <div class="tagcloud" id="topics"></div>
-
-      <h2>Top Organisations</h2>
-      <div class="tagcloud" id="organisations"></div>
-
-      <h2>Top Exchanges</h2>
-      <div class="tagcloud" id="exchanges"></div>
-
-      <h2>By Country</h2>
-      <div id="countries"></div>
-      <div id="preview"></div>
+      <h2>Most commun Words</h2>
+      <div class="tagcloud" id="comment_content"></div>
+
+      <h2>Most commun Users</h2>
+      <div class="tagcloud" id="comment_user_id"></div>
 
       <h2>By Date</h2>
       <div id="calendar"></div>
+
+      <h2>Histogram</h2>
+      <div id="histogram"></div>
+
+      <!-- ********************************************************************************* -->
+      <h2>Pyramid age-gender</h2>
+      <div id="pyramidAges"></div>
+      <!-- *********************************************************************************-->
 
       <div class="clear"></div>
     </div>

examples/reuters/js/reuters.js

@@ -1,15 +1,19 @@
+//var ip = location.hostname;
+var ip = "localhost";
 var Manager;
 
 (function ($) {
 
   $(function () {
     Manager = new AjaxSolr.Manager({
-      solrUrl: 'http://evolvingweb.ca/solr/reuters/'
+      solrUrl: 'http://' + ip + ':8983/solr/collection1/'
     });
     Manager.addWidget(new AjaxSolr.ResultWidget({
       id: 'result',
       target: '#docs'
     }));
+
+
     Manager.addWidget(new AjaxSolr.PagerWidget({
       id: 'pager',
       target: '#pager',
@@ -20,7 +24,8 @@ var Manager;
         $('#pager-header').html($('<span></span>').text('displaying ' + Math.min(total, offset + 1) + ' to ' + Math.min(total, offset + perPage) + ' of ' + total));
       }
     }));
-    var fields = [ 'topics', 'organisations', 'exchanges' ];
+    /*var fields = ['comment_id', 'comment_order', 'comment_karma', 'comment_randkey', 'comment_date', 'comment_user_id', 'comment_link_id', 'comment_content', 'comment_votes', 'comment_parent' ];*/
+    var fields = ['comment_content', 'comment_user_id' ];
     for (var i = 0, l = fields.length; i < l; i++) {
       Manager.addWidget(new AjaxSolr.TagcloudWidget({
         id: fields[i],
@@ -32,34 +37,49 @@ var Manager;
       id: 'currentsearch',
       target: '#selection'
     }));
+
     Manager.addWidget(new AjaxSolr.AutocompleteWidget({
       id: 'text',
       target: '#search',
-      fields: [ 'topics', 'organisations', 'exchanges' ]
+      fields: [ 'comment_id', 'comment_content']
     }));
-    Manager.addWidget(new AjaxSolr.CountryCodeWidget({
-      id: 'countries',
-      target: '#countries',
-      field: 'countryCodes'
+
+        Manager.addWidget(new AjaxSolr.HistogramWidget({
+      id: 'histogram',
+      target: '#histogram',
+      fields: ['comment_date', 'comment_hour']
     }));
+
+   //************** new widget pyramid pivots ********************
+
+     Manager.addWidget(new AjaxSolr.PyramidAges({
+      id: 'pyramidAges',
+      target: '#pyramidAges',
+      field: 'user_sex,user_age',
+      'facet.pivot': true
+    }));
+   // **********************************************************
+
     Manager.addWidget(new AjaxSolr.CalendarWidget({
       id: 'calendar',
       target: '#calendar',
-      field: 'date'
+      field: 'comment_date'
     }));
+
     Manager.init();
     Manager.store.addByValue('q', '*:*');
     var params = {
       facet: true,
-      'facet.field': [ 'topics', 'organisations', 'exchanges', 'countryCodes' ],
+      'facet.field': ['comment_id', 'comment_order', 'comment_karma', 'comment_randkey', 'comment_date', 'comment_user_id', 'comment_link_id', 'comment_content', 'comment_votes', 'comment_parent', 'comment_hour' ],
       'facet.limit': 20,
       'facet.mincount': 1,
       'f.topics.facet.limit': 50,
-      'f.countryCodes.facet.limit': -1,
-      'facet.date': 'date',
-      'facet.date.start': '1987-02-26T00:00:00.000Z/DAY',
-      'facet.date.end': '1987-10-20T00:00:00.000Z/DAY+1DAY',
+      'facet.date': 'comment_date',
+      'facet.date.start': '2005-12-01T00:00:00.000Z/DAY',
+      'facet.date.end': '2006-12-31T00:00:00.000Z/DAY+1DAY',
       'facet.date.gap': '+1DAY',
+      //************** new line for pyramid pivot *******************************
+      'facet.pivot':'user_sex,user_age',   	
       'json.nl': 'map'
     };
     for (var name in params) {