[svn r17598] Fixes to latest commits

main/newscorm/learnpathItem.class.php

@@ -104,6 +104,7 @@ class learnpathItem{
 		$this->db_id = $id;
 
         // get search_did
+        if (api_get_setting('search_enabled')=='true') {
             $tbl_se_ref = Database::get_main_table(TABLE_MAIN_SEARCH_ENGINE_REF);
             $sql = 'SELECT * FROM %s WHERE course_code=\'%s\' AND tool_id=\'%s\' AND ref_id_high_level=%s AND ref_id_second_level=%d LIMIT 1';
             // TODO: verify if it's possible to assume the actual course instead of getting it from db
@@ -113,6 +114,7 @@ class learnpathItem{
     	        $se_ref = Database::fetch_array($res);
     	        $this->search_did = (int)$se_ref['search_did'];
             }
+        }
         $this->audio = $row['audio'];
 		
 		//error_log('New LP - End of learnpathItem constructor for item '.$id,0);

main/newscorm/scorm.class.php

@@ -475,7 +475,7 @@ class scorm extends learnpath {
 				$previous = $item_id;
 
 				// code for indexing, now only index specific fields like terms and the title
-				if (isset($_POST['index_document']) && $_POST['index_document']) {
+				if (!empty($_POST['index_document'])) {
 					require_once(api_get_path(LIBRARY_PATH).'search/DokeosIndexer.class.php');
 					require_once(api_get_path(LIBRARY_PATH).'search/IndexableChunk.class.php');
 					require_once(api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php');

main/upload/upload.scorm.php

@@ -18,6 +18,7 @@ if($error=='not_a_learning_path')
 {
         $msg = urlencode(get_lang('UnknownPackageFormat'));
 }else{
+	if (api_get_setting('search_enabled')=='true') {
         require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
     	$specific_fields = get_specific_field_list();
     
@@ -32,7 +33,7 @@ if($error=='not_a_learning_path')
     			}
     		}
     	}
-
+    }
 	$msg = urlencode(get_lang('UplUploadSucceeded'));
 }
 header('location: ../newscorm/lp_controller.php?action=list&dialog_box='.$msg);