--- loncom/interface/courseclassifier.pm	2010/07/09 14:40:20	1.10
+++ loncom/interface/courseclassifier.pm	2013/07/15 14:32:45	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utilities for classifying courses based on institutional code
 #
-# $Id: courseclassifier.pm,v 1.10 2010/07/09 14:40:20 raeburn Exp $
+# $Id: courseclassifier.pm,v 1.15 2013/07/15 14:32:45 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,8 +40,10 @@ sub retrieve_instcodes {
     my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.',                                                undef,undef,'Course');
     foreach my $course (keys(%courses)) {
         if (ref($courses{$course}) eq 'HASH') {
-            $$coursecodes{$course} = $courses{$course}{'inst_code'};
-            $totcodes ++;
+            if ($courses{$course}{'inst_code'} ne '') {
+                $$coursecodes{$course} = $courses{$course}{'inst_code'};
+                $totcodes ++;
+            }
         }
     }
     return $totcodes;
@@ -53,7 +55,7 @@ sub sort_cats {
     if (defined($$cat_order{$$codetitles[$num]})) {
         foreach my $item (@{$$cat_order{$$codetitles[$num]}}) {
             if (grep/^\Q$item\E$/,@unsorted) {
-                push @{$sorted}, $item;
+                push(@{$sorted},$item);
             }
         }
     } else {
@@ -515,26 +517,35 @@ function setOfficial(caller) {
                 }
                 $jscript .= &javascript_select_filler($formname,$scripttext,$codetitles,$longtitles_str,$allidlist,$officialjs);
                 if ($env{'form.state'} eq 'listing') {
+                    my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                    my %local_to_standard;
+                    if (ref($codetitles) eq 'ARRAY') {
+                        for (my $i=0; $i<@{$codetitles}; $i++) {
+                            $local_to_standard{$codetitles->[$i]} = $standardnames[$i];
+                        }
+                    }
                     $jscript .= '
 function setElements() {
 ';
                     for (my $i=0; $i<@{$codetitles}-1; $i++) {
-                        if ($env{'form.'.$codetitles->[$i]} != -1) {
+                        my $item = $local_to_standard{$codetitles->[$i]};
+                        if ($env{'form.'.$item} != -1) {
                             $jscript .= '
-    for (var j=0; j<document.'.$formname.'.'.$codetitles->[$i].'.length; j++) {
-        if (document.'.$formname.'.'.$codetitles->[$i].'[j].value == "'.$env{'form.'.$codetitles->[$i]}.'") {
-            document.'.$formname.'.'.$codetitles->[$i].'.selectedIndex = j;
+    for (var j=0; j<document.'.$formname.'.'.$item.'.length; j++) {
+        if (document.'.$formname.'.'.$item.'[j].value == "'.$env{'form.'.$item}.'") {
+            document.'.$formname.'.'.$item.'.selectedIndex = j;
         }
     }
 ';
                         }
                     }
                     $jscript .= '   courseSet()'."\n";
-                    if ($env{'form.'.$codetitles->[-1]} != -1) {
+                    my $lastcodetitle =  $local_to_standard{$codetitles->[-1]};
+                    if ($env{'form.'.$lastcodetitle} != -1) {
                         $jscript .= '
-    for (var j=0; j<document.'.$formname.'.'.$codetitles->[-1].'.length; j++) {
-        if (document.'.$formname.'.'.$codetitles->[-1].'[j].value == "'.$env{'form.'.$codetitles->[-1]}.'") {
-            document.'.$formname.'.'.$codetitles->[-1].'.selectedIndex = j;
+    for (var j=0; j<document.'.$formname.'.'.$lastcodetitle.'.length; j++) {
+        if (document.'.$formname.'.'.$lastcodetitle.'[j].value == "'.$env{'form.'.$lastcodetitle}.'") {
+            document.'.$formname.'.'.$lastcodetitle.'.selectedIndex = j;
         }
     }
 ';
@@ -568,7 +579,7 @@ sub build_instcode_selectors {
                 @longitems = @items;
             }
             $output .= '<td align="center">'.$codetitles->[$k].'<br />'."\n".
-                       '<select name="'.$standardnames[$k].'" onChange="courseSet(this)"'.
+                       '<select name="'.$standardnames[$k].'" onchange="courseSet(this)"'.
                        '>'."\n".'<option value="0">'.&mt('All').'</option>'."\n";
             for (my $i=0; $i<@items; $i++) {
                 if ($longitems[$i] eq '') {
@@ -677,6 +688,8 @@ sub build_javascript {
 
 sub javascript_select_filler {
     my ($formname,$scripttext,$codetitles,$longtitles_str,$allidlist,$officialjs) = @_;
+    my $all = &mt('All');
+    my $nocrs = &mt('No courses');
     my $output = <<END;
 
 function courseSet(caller) {
@@ -699,14 +712,14 @@ function courseSet(caller) {
     if (selYear == -1) {
         if (selSemester == -1) {
             if (selDepartment > -1) {
-                document.$formname.Number.options[0] =  new Option('All','0',false,false);
+                document.$formname.Number.options[0] =  new Option('$all','0',false,false);
                 for (var k=0; k<idcse_by_dep[selDepartment].length; k++) {
                     document.$formname.Number.options[k+1] = new Option(idcse_by_dep[selDepartment][k],idcse_by_dep[selDepartment][k],false,false);
 
                 }
             }
             else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
+                document.$formname.Number.options[0] = new Option('$all','0',true,true);
             }
         }
         else {
@@ -724,17 +737,17 @@ function courseSet(caller) {
                     }
                 }
                 if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
+                    document.$formname.Number.options[0] =  new Option('$all','0',false,false);
                     for (var k=0; k<idcse_by_sem_num[idsem][iddept].length; k++) {
                         document.$formname.Number.options[k+1] = new Option(idcse_by_sem_num[idsem][iddept][k],idcse_by_sem_num[idsem][iddept][k],false,false);
                     }
                 }
                 else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
+                    document.$formname.Number.options[0] =  new Option('$nocrs','0',true,true);
                 }
             }
             else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
+                document.$formname.Number.options[0] = new Option('$all','0',true,true);
             }
         }
     }
@@ -754,17 +767,17 @@ function courseSet(caller) {
                     }
                 }
                 if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
+                    document.$formname.Number.options[0] =  new Option('$all','0',false,false);
                     for (var k=0; k<idcse_by_yr_num[idyr][iddept].length; k++) {
                         document.$formname.Number.options[k+1] = new Option(idcse_by_yr_num[idyr][iddept][k],idcse_by_yr_num[idyr][iddept][k],false,false);
                     }
                 }
                 else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
+                    document.$formname.Number.options[0] =  new Option('$nocrs','0',true,true);
                 }
             }
             else {
-                document.$formname.Number.options[0] = new Option("All","0",true,true);
+                document.$formname.Number.options[0] = new Option('$all','0',true,true);
             }
         }
         else {
@@ -789,7 +802,7 @@ function courseSet(caller) {
                     }
                 }
                 if (iddept != -1) {
-                    document.$formname.Number.options[0] =  new Option('All','0',false,false);
+                    document.$formname.Number.options[0] =  new Option('$all','0',false,false);
                     for (var i=0; i<idcourses[idyr][idsem][iddept].length; i++) {
                         var display = idcourses[idyr][idsem][iddept][i];
                         if (longtitles[3] == 1) {
@@ -801,11 +814,11 @@ function courseSet(caller) {
                     }
                 }
                 else {
-                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
+                    document.$formname.Number.options[0] =  new Option('$nocrs','0',true,true);
                 }
             }
             else {
-                document.$formname.Number.options[0] =  new Option('All','0',true,true);
+                document.$formname.Number.options[0] =  new Option('$all','0',true,true);
             }
         }
         document.$formname.Number.selectedIndex = 0
@@ -839,7 +852,7 @@ sub instcode_search_str {
                 my $item = $local_to_standard{$loctitle};
                 if ($item ne '') {
                     if ($env{'form.'.$item} eq '0' ) {
-                        $instcode .= $codedefaults{$item};
+                        $instcode .= $codedefaults{$loctitle};
                     } else {
                         $instcode .= $env{'form.'.$item};
                     }
@@ -856,7 +869,7 @@ sub instcode_search_str {
 }
 
 sub instcode_from_selectors {
-    my ($cdom) = @_;
+    my ($cdom,$noregexps) = @_;
     my $instcode;
     my $caller = 'global';
     my (%coursecodes,%codes,@codetitles,%cat_titles,%cat_order,
@@ -877,7 +890,11 @@ sub instcode_from_selectors {
             my $category = $local_to_standard{$loctitle};
             if ($category ne '') {
                 if ($env{'form.'.$category} eq '-1' ) {
-                    $instcode .= $codedefaults{$category};
+                    if ($noregexps) {
+                        $instcode .= ' ';
+                    } else {
+                        $instcode .= $codedefaults{$category};
+                    }
                 } else {
                     $instcode .= $env{'form.'.$category};
                 }