[svn r10198] replaced

* Database::get_scorm_main_table() with Database::get_scorm_table(TABLE_SCORM_MAIN)
* Database::get_scorm_sco_data_table() with Database::get_scorm_table(TABLE_SCORM_SCO_DATA)

and removed the obsolete functions

main/inc/lib/database.lib.php

@@ -73,7 +73,7 @@ define('TABLE_STATISTIC_TRACK_E_COURSE_ACCESS', 'track_e_course_access');
 
 //scorm database tables
 define('TABLE_SCORM_MAIN', 'scorm_main');
-define('SCORM_SCO_DATA_TABLE', 'scorm_sco_data');
+define('TABLE_SCORM_SCO_DATA', 'scorm_sco_data');
 
 //course tables
 define('TABLE_AGENDA', 'calendar_event');
@@ -344,23 +344,6 @@ class Database
 		return $result;
 	}
 
-	/**
-	* Returns the name of the main table of the SCORM database.
-	* @deprecated use Database::get_scorm_table(TABLE_SCORM_MAIN);
-	*/
-	function get_scorm_main_table()
-	{
-		return Database::get_scorm_table(TABLE_SCORM_MAIN);
-	}
-	/**
-	* Returns the name of the data table of the SCORM database.
-	* @deprecated use Database::get_scorm_table(SCORM_SCO_DATA_TABLE);
-	*/
-	function get_scorm_sco_data_table()
-	{
-		return Database::get_scorm_table(SCORM_SCO_DATA_TABLE);
-	}
-	
 	/*
 	-----------------------------------------------------------------------------
 		Query Functions

main/newscorm/scorm.lib.php

@@ -59,15 +59,15 @@ function removescormDir($dir)
           if ($pos==0) {
             $scormdir=substr($dir,strlen($path),strlen($dir)-strlen($path));
             $courseid=$_course['official_code'];
-            $sql="SELECT * FROM ".Database::get_scorm_main_table()." where (contentTitle='$scormdir' and dokeosCourse='$courseid')";
+            $sql="SELECT * FROM ".Database::get_scorm_table(TABLE_SCORM_MAIN)." where (contentTitle='$scormdir' and dokeosCourse='$courseid')";
             $result=api_sql_query($sql,__FILE__,__LINE__);
             while ($row=mysql_fetch_array($result))
             {
 	      $c=$row['contentId'];
-	      $sql2="DELETE FROM ".Database::get_scorm_sco_data_table()." where contentId=$c"; 
+	      $sql2="DELETE FROM ".Database::get_scorm_table(TABLE_SCORM_SCO_DATA)." where contentId=$c"; 
 	      $result2=api_sql_query($sql2,__FILE__,__LINE__);
 	    }
-	    $sql="DELETE FROM ".Database::get_scorm_main_table()." where (contentTitle='$scormdir' and dokeosCourse='$courseid')";
+	    $sql="DELETE FROM ".Database::get_scorm_table(TABLE_SCORM_MAIN)." where (contentTitle='$scormdir' and dokeosCourse='$courseid')";
 	    $result=api_sql_query($sql,__FILE__,__LINE__);
 	  }
 	} 

main/tracking/courseLog.php

@@ -86,7 +86,7 @@ $TABLECOURSE	        = Database::get_main_table(TABLE_MAIN_COURSE);
 $TABLECOURSE_LINKS      = Database::get_course_table(TABLE_LINK);
 $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-//$table_scormdata = Database::get_scorm_table(SCORM_SCO_DATA_TABLE);
+//$table_scormdata = Database::get_scorm_table(TABLE_SCORM_SCO_DATA);
 //$table_scormmain = Database::get_scorm_table(TABLE_SCORM_MAIN);
 //$tbl_learnpath_main = Database::get_course_table(TABLE_LEARNPATH_MAIN);
 //$tbl_learnpath_item = Database::get_course_table(TABLE_LEARNPATH_ITEM);