Update of /cvsroot/stack/diag
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25063
Modified Files:
SkillsResources.php
Log Message:
Index: SkillsResources.php
===================================================================
RCS file: /cvsroot/stack/diag/SkillsResources.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SkillsResources.php 1 Sep 2010 13:19:32 -0000 1.6
--- SkillsResources.php 1 Sep 2010 15:05:50 -0000 1.7
***************
*** 79,86 ****
$skills['EST-RND'] = 'Rounding';
- $skills['GRP'] = 'Interpreting Graphs';
- $skills['DIG'] = 'Analysis of Diagrams';
- $skills['WRP'] = 'Analysis of Word Problems';
-
$skills['EQN'] = 'Equations';
$skills['EQN-LIN'] = 'Solve Linear Equations';
--- 79,82 ----
***************
*** 89,92 ****
--- 85,90 ----
$skills['EQN-INQ'] = 'Solve Inequations';
+ $skills['WRP'] = 'Analysis of Word Problems';
+
$skills['FNC'] = 'Functions';
$skills['FNC-EVL'] = 'Evaluate a function';
***************
*** 107,110 ****
--- 105,111 ----
$skills['GEO-TID'] = 'Trigonometric Identities';
+ $skills['GRP'] = 'Interpreting Graphs';
+ $skills['DIG'] = 'Analysis of Diagrams';
+
$skills['SEQ'] = 'Sequences and Series';
$skills['SEQ-TER'] = 'Terms in Series';
***************
*** 138,151 ****
$skills['DIF-PRM'] = 'Parametric Differentiation';
- $skills['VEC'] = 'Vectors';
- $skills['VEC-ADD'] = 'Vector Addition';
- $skills['VEC-SUB'] = 'Vector Subtraction';
- $skills['VEC-VXS'] = 'Vector Multiplied by Scalar';
- $skills['VEC-PNT'] = 'Vector from point to point';
- $skills['VEC-MAG'] = 'Magnitude of Vector';
- $skills['VEC-UNT'] = 'Unit Vector';
- $skills['VEC-EQL'] = 'Vector Equation of Line';
- $skills['VEC-SCP'] = 'Scalar Product';
-
$skills['INT'] = 'Integration';
$skills['INT-CON'] = 'Concept and constant of integration';
--- 139,142 ----
***************
*** 162,165 ****
--- 153,167 ----
$skills['INT-VSR'] = 'Volume of Solid of Revolution';
+ $skills['VEC'] = 'Vectors';
+ $skills['VEC-ADD'] = 'Vector Addition';
+ $skills['VEC-SUB'] = 'Vector Subtraction';
+ $skills['VEC-VXS'] = 'Vector Multiplied by Scalar';
+ $skills['VEC-PNT'] = 'Vector from point to point';
+ $skills['VEC-MAG'] = 'Magnitude of Vector';
+ $skills['VEC-UNT'] = 'Unit Vector';
+ $skills['VEC-EQL'] = 'Vector Equation of Line';
+ $skills['VEC-SCP'] = 'Scalar Product';
+
+
$skillTags = array_keys($skills);
***************
*** 351,354 ****
--- 353,379 ----
+ private function getQuestionStem($qname) {
+
+ $db = new StackDBADOdb();
+ $db -> connect();
+
+ $sql = "SELECT stackquestion.questionID,stackquestion.questionName, display_cache.xhtml FROM question_keyword, keywords, display_cache, display_cache_sequence, question_lines, stackquestion WHERE
+ (stackquestion.questionName = $qname) AND
+ (stackquestion.line = question_lines.id) AND
+ (stackquestion.questionID = question_lines.latestVersion) AND
+ (stackquestion.questionID = display_cache.qID) AND
+ (display_cache_sequence.nextNode = display_cache.id) AND
+ (display_cache_sequence.event = 0)";
+
+ $query = $db->query($sql);
+
+ $result=array();
+ foreach($query as $row)
+ {
+ $result = array($row[0],$row[1],$row[2]);
+ }
+ return $result;
+ }
+
private function getSkillsResources($qid){
|
