--- capa/capa51/GUITools/capastats.tcl	2000/01/05 21:11:15	1.8
+++ capa/capa51/GUITools/capastats.tcl	2000/02/22 18:10:27	1.13
@@ -88,7 +88,9 @@ proc CTchangePath { num } {
 ###########################################################
 proc CTcapaStat2 { num } {
     global gFile gCT gUniqueNumber
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+   # if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) capastat
     if { [
@@ -128,7 +130,9 @@ proc CTcapaStat2 { num } {
 ###########################################################
 proc CTcapaStat { num } {
     global gFile gCT gUniqueNumber
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+#    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) capastat
     if { [
@@ -162,8 +166,9 @@ proc CTcapaStat { num } {
 ###########################################################
 proc CTlogAnalysis { num } {
     global gFile gUniqueNumber gCT
-    if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
-    
+    #if { [set setId [getOneSet $gCT($num) $gFile($num)]] == "" } { return }
+    if {[set setId [pickSets [CTsetList $gFile($num)] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } { return }
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) loganalysis
     CTdatestamp $cmdnum
@@ -301,13 +306,14 @@ proc CTitemAnalysisStart { num } {
     	unset gCT(cmd.$cmdnum)
 	return
     }
-    if { [set sets [getSetRange $gCT($num) [lindex $select 1]]] == "" } { 
+#    if { [set sets [getSetRange $gCT($num) [lindex $select 1]]] == "" } \{
+    if { [set sets [pickSets [CTsetList [lindex $select 1]] \
+			"extended" "Select Sets" $gCT($num)]] == "Cancel" } {
 	unset gCT(cmd.$cmdnum)
 	return 
     }
     CTdatestamp $cmdnum
-    if { [ catch {CTitemAnalysisRange $cmdnum [lindex $select 1] \
-		      [lindex $sets 0] [lindex $sets 1] } errors ] } { 
+    if { [ catch {CTitemAnalysisRange $cmdnum [lindex $select 1] $sets } errors ] } { 
 	displayError $errors 
     }
     unset gCT(cmd.$cmdnum)
@@ -335,11 +341,13 @@ proc CTitemCorrelationStart { num } {
     foreach path [lsort [array names gCapaConfig "$num.*_path"]] {
 	lappend paths [list [lindex [split $path "."] 1] $gCapaConfig($path) ] 
     }
-    if { [set select [multipleChoice $gCT($num) "Select a class path" $paths ] ] == "" } {
+    if {[set select [multipleChoice $gCT($num) "Select a class path" $paths]] == ""} {
     	unset gCT(cmd.$cmdnum)
 	return
     }
-    if { [set setId [getOneSet $gCT($num) [lindex $select 1]]] == "" } { 
+    #if { [set setId [getOneSet $gCT($num) [lindex $select 1]]] == "" } \{ 
+    if {[set setId [pickSets [CTsetList [lindex $select 1]] single "Pick A Set" \
+			$gCT($num)]] == "Cancel" } {
 	unset gCT(cmd.$cmdnum)
 	return 
     }
@@ -363,12 +371,13 @@ proc CTsubmissions { num } {
 
     set cmdnum [incr gUniqueNumber]
     set gCT(cmd.$cmdnum) submissions
-    if { "" == [set setlist [getSetRange $gCT($num) $gFile($num)]] } { return }
+    if { [set sets [pickSets [CTsetList $gFile($num)] \
+			"extended" "Select Sets" $gCT($num)]] == "Cancel" } { return }
+#    if { "" == [set setlist [getSetRange $gCT($num) $gFile($num)]] } { return }
     CTdatestamp $cmdnum
     CTputs $cmdnum "Submissions for: $s_id, $s_name\n"
     displayStatus "Getting submissions" spinner $cmdnum
-    CTsubmissionsLaunch $num $cmdnum telnet $s_id $s_name \
-	[lindex $setlist 0] [lindex $setlist 1]
+    CTsubmissionsLaunch $num $cmdnum telnet $s_id $s_name 0 $sets
 }
 
 ###########################################################
@@ -588,7 +597,9 @@ proc CTparseSubmissionsLine { aline num
     set gCT($num.response) ""
     set interesting 0
     set current 1
-    foreach {quest response} [lrange $aline 2 end] {
+    foreach element [lrange $aline 2 end] {
+	set quest [lindex $element 0]
+	set response [lindex $element 1]
 	if { $quest == "" } break
 	while { $quest > $current } {
 	    lappend gCT($num.response) {}
@@ -1090,13 +1101,14 @@ proc CTcollectSetScores { num path id on
 			    set char [lindex $ans_char $i]
 			    if { $char == "N" || $char == "n"} { set found 1 }
 			    if { $char == "Y" || $char == "y"} { 
-				incr score [lindex $weights $i];set found 1
+				catch {incr score [lindex $weights $i]}
+				set found 1
 			    }
 			    if { $char >= 0 && $char <= 9 } { 
 				incr score $char;set found 1
 			    }
 			    if { $char == "E" } {
-				incr valid_weights "-[lindex $weights $i]"
+				catch {incr valid_weights "-[lindex $weights $i]"}
 			    }
 			}
 			incr total_scores $score
@@ -1336,8 +1348,8 @@ proc CTrunCommand { num cmdnum fileId {f
 ###########################################################
 ###########################################################
 ###########################################################
-proc CTitemAnalysisRange { num classpath setIdStart setIdEnd } {
-    for { set i $setIdStart } { $i <= $setIdEnd } { incr i } { 
+proc CTitemAnalysisRange { num classpath sets } {
+    foreach i $sets {
 	if { [ catch { CTitemAnalysis $num $classpath $i } errors ] } { 
 	    displayError $errors 
 	}
@@ -1407,23 +1419,25 @@ proc CTitemAnalysis { num classpath setI
 		incr valid_cnt
 		set score 0
 		for { set ii 0 } { $ii < [llength $ans_char] } { incr ii } {
-		    
+		    #Can't use incr because the numbers might be doubles
 		    if { [lindex $ans_char $ii] == "Y" || \
 			     [lindex $ans_char $ii] == "y" } {
-			incr score [lindex $weights $ii]
-			set  Y_cnt($ii) [expr $Y_cnt($ii) + 1]
-			set  Y_total    [expr $Y_total + 1]
+			catch {incr score [lindex $weights $ii]}
+			set Y_cnt($ii) [expr {$Y_cnt($ii) + 1}]
+			set Y_total [expr {$Y_total + 1}]
 		    }
 		    if { [lindex $ans_char $ii] == "N" || \
 			     [lindex $ans_char $ii] == "n" } {
-			set  N_cnt($ii) [expr $N_cnt($ii) + 1]
-			set  N_total    [expr $N_total + 1]
+			set N_cnt($ii) [expr {$N_cnt($ii) + 1}]
+			set N_total  [expr {$N_total + 1}]
 		    }
 		    if { [lindex $ans_char $ii] >= 0 && \
 			     [lindex $ans_char $ii] <= 9 } {
 			incr score [lindex $ans_char $ii]
-			set yes_part [expr [lindex $ans_char $ii] / \
-					  double([lindex $weights $ii]) ]
+			if {[catch {set yes_part [expr [lindex $ans_char $ii] / \
+						      double([lindex $weights $ii])]}]} {
+			    set yes_part 1
+			}
 			set no_part [expr 1.0 - $yes_part]
 			set Y_cnt($ii) [expr $Y_cnt($ii) + $yes_part]
 			set Y_total    [expr $Y_total + $yes_part]
@@ -1561,14 +1575,14 @@ proc CTitemCorrelation { num classpath s
 			## $ans_char($ii) is one of 0 .. 9, Y, y, N, n
 			## $ans_char($jj) is one of 0 .. 9, Y, y, N, n
 			if { $ans_char($ii) == "Y" || $ans_char($ii) == "y" } {
-			    set x_data [lindex $weights $ii]
+			    if {[set x_data [lindex $weights $ii]]==""} {set x_data 0}
 			} elseif { $ans_char($ii) == "N" || $ans_char($ii) == "n" } {
 			    set x_data 0
 			} else { ## must be in 0 .. 9
 			    set x_data $ans_char($ii)
 			}
 			if { $ans_char($jj) == "Y" || $ans_char($jj) == "y" } {
-			    set y_data [lindex $weights $jj]
+			    if {[set y_data [lindex $weights $jj]]==""} {set y_data 0}
 			} elseif { $ans_char($jj) == "N" || $ans_char($jj) == "n" } {
 			    set y_data 0
 			} else { ## must be in 0 .. 9
@@ -1636,27 +1650,28 @@ proc CTitemCorrelation { num classpath s
 ###########################################################
 ###########################################################
 ###########################################################
-proc CTsubmissionsLaunch { num cmdnum type s_id s_nm start end } {
+proc CTsubmissionsLaunch { num cmdnum type s_id s_nm index setlist } {
     global gCT gFile gUniqueNumber gCapaConfig
 
-    CTputs $cmdnum "$type submissions for $s_nm for set $start\n"
+    set curset [lindex $setlist $index]
+    CTputs $cmdnum "$type submissions for $s_nm for set $curset\n"
     if { $type == "telnet" } {
-	set command "grep -i $s_id [file join $gFile($num) records submissions$start.db]"
+	set command "grep -i $s_id [file join $gFile($num) records submissions$curset.db]"
 	set followtype web
     } else {
 	set command "grep -i $s_id [file join $gFile($num) \
-                       records websubmissions$start.db]"
+                       records websubmissions$curset.db]"
 	set followtype telnet
-	incr start
+	incr index
     }
     set done 0
     set followcmd ""
-    while { !$done && ($start <= ($end+1)) } {
-	if { $start <= $end } {
+    while { !$done && ($index <= [llength $setlist]) } {
+	if { [lindex $setlist $index] != "" } {
 	    set followcmd "CTsubmissionsLaunch $num $cmdnum $followtype $s_id {$s_nm} \
-                            $start $end"
+                            $index \"$setlist\""
 	}
-	if { ! [catch {set fileId [open "|$command" "r"]} ] } { set done 1 }
+	if { ![catch {set fileId [open "|$command" "r"]} error ] } { set done 1 } 
     }
     fconfigure $fileId -blocking 0
     fileevent $fileId readable "CTrunCommand $num $cmdnum $fileId {$followcmd}"
@@ -1708,7 +1723,7 @@ proc CTreportDist { num file percentage
 	}
 	set aline [gets $fileId]
     }
-    CTputs $num "Scores #acheived\n"
+    CTputs $num "Scores #achieved\n"
     set scorelist ""
     set templist [array names totals *.score]
     foreach temp $templist {lappend possiblescores [lindex [split $temp .] 0]}
@@ -1785,7 +1800,7 @@ proc CTgradeDistribution { num classpath
     removeStatus $num
     displayStatus "Pondering data . . ." spinner $num
     CTputs $num " There are $valid_cnt entries in file $filename\n"
-    CTputs $num "Score #acheived\n"
+    CTputs $num "Score #achieved\n"
     set scorelist ""
     foreach score [lsort -integer [array names total_score]] {
 	CTputs $num [format "%5d:%6d\n" $score $total_score($score)]
@@ -1872,7 +1887,7 @@ proc CTgradeDistributionRange { num clas
 	set total_score($i) 0
     }
     foreach sNum [array names studentScores] { incr total_score($studentScores($sNum)) }
-    CTputs $num "Scores #acheived\n"
+    CTputs $num "Scores #achieved\n"
     set scorelist ""
     foreach score [lsort -integer [array names total_score]] {
 	CTputs $num [format "%5d:%6d\n" $score $total_score($score)]
@@ -2525,8 +2540,10 @@ proc CTdisplayStudent { num window path
 
     label $infoFrame.label -text $id
     pack $infoFrame.label
-
-    set canvas [canvas $imageFrame.canvas]
+    
+    set height [image height $image]
+    set width [image width $image]
+    set canvas [canvas $imageFrame.canvas -height $height -width $width]
     pack $canvas
     $canvas create image 1 1 -image $image -anchor nw
 }
@@ -2671,7 +2688,7 @@ proc CTdiscussForum { num file dir resul
     while {![eof $fileId]} {
 	incr line_cnt
 	if { ($line_cnt%20) == 0 } { updateStatusBar [expr $line_cnt/double($maxLine)] $num }
-	foreach {stunum capaid name email action set prob date time} [split $aline "|"] {}
+	foreach {stunum capaid name email action set prob date time blank} [split $aline "|"] {}
 	if {$specificSet && ($specificSet == $set)} {set aline [gets $fileId];continue}
 	if { $action == "ViewProblem" } {
 	    if { [catch {incr count($set,$prob)}]} {
@@ -2718,8 +2735,8 @@ proc CTdiscussForum { num file dir resul
     close $fileId
     set result($num.viewers) [llength [array names ever]]
     set result($num.last) $last
-    #IDEAS: stick into capastats
-    #     : howmany viws are repeats
+    #IDEAS:
+    #     : how many views are repeats
     #     : Student Course Profile, add #ViewProblems #Posts
     #     : add some portion of these stats to analyze log files?
 }
@@ -2895,7 +2912,7 @@ proc CTcreateSummaryReport { num cmdnum
 	    set file Sec$gCT(summary.section.$cmdnum)Set$gCT(summary.set.$cmdnum).rpt 
 	}
 	default	{
-	    displayError "An error has occured while creating a summary \
+	    displayError "An error has occurred while creating a summary \
 		    report $gCT(summary.section.$cmdnum)"
 	    return
 	}
@@ -2918,7 +2935,8 @@ proc CTcreateSummaryReport { num cmdnum
 
     removeStatus $cmdnum
 
-    if {!$error && "Yes" == [makeSure "Created summary file $file, would you like to see it?"]} {
+    if {!$error && "Yes" == [makeSure \
+	       "Created summary file $file, would you like to see it?"]} {
 	set fileId [open [file join $gFile($num) $file] r]
 	CTputs $cmdnum [read $fileId]
 	CToutput $num $cmdnum 
@@ -2930,11 +2948,12 @@ proc CTcreateSummaryReport { num cmdnum
 ###########################################################
 ###########################################################
 ###########################################################
-proc CTsetList { num } {
-    global gCT gFile
+proc CTsetList { file } {
     set list ""
-    for { set i 0 } { $i < 1000 } { incr i } {
-	if { [file readable [file join $gFile($num) records set$i.db]] } {
-	    lappend list 
+    for { set i 0 } { $i < 100 } { incr i } {
+	if { [file readable [file join $file records set$i.db]] } {
+	    lappend list $i
+	}
     }
-}
\ No newline at end of file
+    return $list
+}