MDL-53579 search: Improve solr engine field name

andelacruz · Apr 7, 2016 · f6b4ec7 · f6b4ec7
1 parent 546c0af
commit f6b4ec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/search/engine/solr/classes/document.php b/search/engine/solr/classes/document.php
@@ -71,7 +71,7 @@ class document extends \core_search\document {
             'indexed' => true
         ),
         // Stores the status of file indexing.
-        'solr_fileindexedcontent' => array(
+        'solr_fileindexstatus' => array(
             'type' => 'int',
             'stored' => true,
             'indexed' => true
@@ -194,7 +194,7 @@ public function export_file_for_engine($file) {
         $data['type'] = \core_search\manager::TYPE_FILE;
         $data['solr_fileid'] = $file->get_id();
         $data['solr_filecontenthash'] = $file->get_contenthash();
-        $data['solr_fileindexedcontent'] = self::INDEXED_FILE_TRUE;
+        $data['solr_fileindexstatus'] = self::INDEXED_FILE_TRUE;
         $data['title'] = $file->get_filename();
 
         return $data;

diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
@@ -618,7 +618,7 @@ protected function process_document_files($document) {
                         if ($indexedfile->solr_filecontenthash != $files[$fileid]->get_contenthash()) {
                             continue;
                         }
-                        if ($indexedfile->solr_fileindexedcontent == document::INDEXED_FILE_FALSE &&
+                        if ($indexedfile->solr_fileindexstatus == document::INDEXED_FILE_FALSE &&
                                 $this->file_is_indexable($files[$fileid])) {
                             // This means that the last time we indexed this file, filtering blocked it.
                             // Current settings say it is indexable, so we will allow it to be indexed.
@@ -682,7 +682,7 @@ protected function get_indexed_files($document, $start = 0, $rows = 500) {
         $query->addField('title');
         $query->addField('solr_fileid');
         $query->addField('solr_filecontenthash');
-        $query->addField('solr_fileindexedcontent');
+        $query->addField('solr_fileindexstatus');
 
         $query->addFilterQuery('{!cache=false}solr_filegroupingid:(' . $document->get('id') . ')');
         $query->addFilterQuery('type:' . \core_search\manager::TYPE_FILE);
@@ -729,7 +729,7 @@ protected function convert_file_results($responsedoc) {
             $result->title = $doc->title;
             $result->solr_fileid = $doc->solr_fileid;
             $result->solr_filecontenthash = $doc->solr_filecontenthash;
-            $result->solr_fileindexedcontent = $doc->solr_fileindexedcontent;
+            $result->solr_fileindexstatus = $doc->solr_fileindexstatus;
             $out[] = $result;
         }
 
@@ -752,7 +752,7 @@ protected function add_stored_file($document, $storedfile) {
 
         if (!$this->file_is_indexable($storedfile)) {
             // For files that we don't consider indexable, we will still place a reference in the search engine.
-            $filedoc['solr_fileindexedcontent'] = document::INDEXED_FILE_FALSE;
+            $filedoc['solr_fileindexstatus'] = document::INDEXED_FILE_FALSE;
             $this->add_solr_document($filedoc);
             return;
         }
@@ -838,7 +838,7 @@ protected function add_stored_file($document, $storedfile) {
         }
 
         // If we get here, the document was not indexed due to an error. So we will index just the base info without the file.
-        $filedoc['solr_fileindexedcontent'] = document::INDEXED_FILE_ERROR;
+        $filedoc['solr_fileindexstatus'] = document::INDEXED_FILE_ERROR;
         $this->add_solr_document($filedoc);
     }