Merge pull request #9 from robintaylor/master

Add some comments to the Exams Solr client
skylightui · Mar 6, 2014 · a0023fe · a0023fe
2 parents 8bee7d6 + d764619
commit a0023fe
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/application/libraries/solr/solr_client_dspace_exams.php b/application/libraries/solr/solr_client_dspace_exams.php
@@ -205,13 +205,8 @@ function simpleSearch($q = '*:*', $offset = 1, $fq = array(), $operator = 'OR',
                $url .= '&fq=' . $this->solrEscape($value) . '';
         }
 
-        /*
-$ranges = array();
-foreach($this->configured_date_filters as $filter_name => $filter) {
-array_push($ranges,$this->getDateRanges($filter));
-}
 
-*/
+
         if (isset($this->date_field))
         {
             $dates = $this->getDateRanges($this->date_field, $q, $fq);
@@ -223,9 +218,6 @@ function simpleSearch($q = '*:*', $offset = 1, $fq = array(), $operator = 'OR',
             $ranges = array();
         }
 
-        //foreach ($datefqs as $datefq) {
-        //    // $url .= '&fq='.$datefq;
-        //}
 
         // Set up scope
         $url .= '&fq=' . $this->container_field . ':' . $this->container;
@@ -254,6 +246,7 @@ function simpleSearch($q = '*:*', $offset = 1, $fq = array(), $operator = 'OR',
         $url .= '&spellcheck=true&spellcheck.collate=true&spellcheck.onlyMorePopular=false&spellcheck.count=5';
         $url .= '&spellcheck.dictionary=' . $this->dictionary;
 
+        // Call Solr!
         $solr_xml = file_get_contents($url);
         $search_xml = @new SimpleXMLElement($solr_xml);
 
@@ -310,7 +303,7 @@ function simpleSearch($q = '*:*', $offset = 1, $fq = array(), $operator = 'OR',
         $data['rows'] = $search_xml->result['numFound'];
 
 
-        // Hard coded until I do something better
+        // First do the non-date filters
         foreach ($this->configured_filters as $filter_name => $filter) {
             $facet_xml = $search_xml->xpath("//lst[@name='facet_fields']/lst[@name='" . $filter . "']/int");
             $facet['name'] = $filter_name;
@@ -343,6 +336,7 @@ function simpleSearch($q = '*:*', $offset = 1, $fq = array(), $operator = 'OR',
             $facets[] = $facet;
         }
 
+        // Now do the date filters
         foreach ($this->configured_date_filters as $filter_name => $filter) {
             // Date.. needs facet query, not field, since
             // we're on solr 1.4 and can't do nice easy integer ranges