[svn r17598] Fixes to latest commits

main/newscorm/learnpathItem.class.php

@@ -104,14 +104,16 @@ class learnpathItem{
 		$this->db_id = $id;
 
         // get search_did
-        $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
-        $sql = sprintf($sql, $tbl_se_ref, api_get_course_id(), TOOL_LEARNPATH, $this->lp_id, $id);
-        $res = api_sql_query($sql, __FILE__, __LINE__);
-        if (Database::num_rows($res) >  0) {
-	        $se_ref = Database::fetch_array($res);
-	        $this->search_did = (int)$se_ref['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
+            $sql = sprintf($sql, $tbl_se_ref, api_get_course_id(), TOOL_LEARNPATH, $this->lp_id, $id);
+            $res = api_sql_query($sql, __FILE__, __LINE__);
+            if (Database::num_rows($res) >  0) {
+    	        $se_ref = Database::fetch_array($res);
+    	        $this->search_did = (int)$se_ref['search_did'];
+            }
         }
         $this->audio = $row['audio'];
 		

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,21 +18,22 @@ if($error=='not_a_learning_path')
 {
         $msg = urlencode(get_lang('UnknownPackageFormat'));
 }else{
-	require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
-	$specific_fields = get_specific_field_list();
-
-	foreach ($specific_fields as $specific_field) {
-		$values = explode(',', trim($_POST[$specific_field['code']]));
-		if ( !empty($values) ) {
-			foreach ($values as $value) {
-				$value = trim($value);
-				if ( !empty($value) ) {
-					add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $oScorm->lp_id, $value);
-				}
-			}
-		}
-	}
-
+	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();
+    
+    	foreach ($specific_fields as $specific_field) {
+    		$values = explode(',', trim($_POST[$specific_field['code']]));
+    		if ( !empty($values) ) {
+    			foreach ($values as $value) {
+    				$value = trim($value);
+    				if ( !empty($value) ) {
+    					add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $oScorm->lp_id, $value);
+    				}
+    			}
+    		}
+    	}
+    }
 	$msg = urlencode(get_lang('UplUploadSucceeded'));
 }
 header('location: ../newscorm/lp_controller.php?action=list&dialog_box='.$msg);