--- loncom/interface/courseclassifier.pm	2010/12/03 04:57:35	1.8.8.1
+++ loncom/interface/courseclassifier.pm	2010/07/09 14:40:20	1.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utilities for classifying courses based on institutional code
 #
-# $Id: courseclassifier.pm,v 1.8.8.1 2010/12/03 04:57:35 raeburn Exp $
+# $Id: courseclassifier.pm,v 1.10 2010/07/09 14:40:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ package Apache::courseclassifier;
 use strict;
 use lib '/home/httpd/lib/perl/';
 use Apache::lonnet;
+use Apache::loncommon;
 use Apache::lonlocal;
 use LONCAPA;
 
@@ -39,10 +40,8 @@ sub retrieve_instcodes {
     my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.',                                                undef,undef,'Course');
     foreach my $course (keys(%courses)) {
         if (ref($courses{$course}) eq 'HASH') {
-            if ($courses{$course}{'inst_code'} ne '') {
-                $$coursecodes{$course} = $courses{$course}{'inst_code'};
-                $totcodes ++;
-            }
+            $$coursecodes{$course} = $courses{$course}{'inst_code'};
+            $totcodes ++;
         }
     }
     return $totcodes;
@@ -260,12 +259,16 @@ sub build_code_selections {
 sub javascript_code_selections {
     my ($formname,@codetitles) = @_;
     my $numtitles = @codetitles;
+    my %lt = &Apache::lonlocal::texthash(
+                      Select => 'Select',
+                      Pick   => 'Pick',
+             );
     my $output = (<<END_OF_BLOCK);
  var display = new Array($numtitles)
  if (caller == "" || caller == "$codetitles[0]") {
      if (caller == "") {
          document.$formname.Year.length = 0
-         document.$formname.Year.options[0] = new Option("Select","-1",true,true)
+         document.$formname.Year.options[0] = new Option("$lt{'Select'}","-1",true,true)
          display[0] = new Array(idyears.length)
          for (var i=0; i<idyears.length; i++) {
              display[0][i] = idyears[i]
@@ -286,13 +289,13 @@ sub javascript_code_selections {
      document.$formname.Semester.length = 0
      document.$formname.Department.length = 0;
      document.$formname.Number.length = 0
-     document.$formname.Department.options[0] = new Option("<-Pick $codetitles[1]","-1",true,true)
-     document.$formname.Number.options[0] = new Option("<-Pick $codetitles[2]","-1",true,true)
+     document.$formname.Department.options[0] = new Option("<-$lt{'Pick'} $codetitles[1]","-1",true,true)
+     document.$formname.Number.options[0] = new Option("<-$lt{'Pick'} $codetitles[2]","-1",true,true)
      if (idyr == 0 || caller == "") {
-         document.$formname.Semester.options[0] = new Option("<-Pick $codetitles[0]","-1",true,true)
+         document.$formname.Semester.options[0] = new Option("<-$lt{'Pick'} $codetitles[0]","-1",true,true)
      }
      else {
-         document.$formname.Semester.options[0] = new Option("Select","-1",true,true)
+         document.$formname.Semester.options[0] = new Option("$lt{'Select'}","-1",true,true)
          display[1] = new Array(idsems[idyr-1].length)
          for (var i=0; i<idsems[idyr-1].length; i++) {
              display[1][i] = idsems[idyr-1][i]
@@ -311,10 +314,10 @@ sub javascript_code_selections {
    document.$formname.Number.length = 0
    document.$formname.Number.options[0] = new Option("<-Pick $codetitles[2]","-1",true,true)
    if (idsem == 0) {
-     document.$formname.Department.options[0] = new Option("<-Pick $codetitles[1]","-1",true,true)
+     document.$formname.Department.options[0] = new Option("<-$lt{'Pick'} $codetitles[1]","-1",true,true)
    }
    else {
-    document.$formname.Department.options[0] = new Option("Select","-1",true,true)
+    document.$formname.Department.options[0] = new Option("$lt{'Select'}","-1",true,true)
     display[2] = new Array(idcodes[idyr-1][idsem-1].length)
     for (var i=0; i<idcodes[idyr-1][idsem-1].length; i++) {
       display[2][i] = idcodes[idyr-1][idsem-1][i]
@@ -331,7 +334,7 @@ sub javascript_code_selections {
  if (caller == "$codetitles[2]") {
    document.$formname.Number.length = 0
    if (iddept == 0) {
-     document.$formname.Number.options[0] = new Option("<-Pick $codetitles[2]","-1",true,true)
+     document.$formname.Number.options[0] = new Option("<-$lt{'Pick'} $codetitles[2]","-1",true,true)
    }
    else {
     document.$formname.Number.options[0] = new Option("Select","-1",true,true)
@@ -547,6 +550,7 @@ function setElements() {
 sub build_instcode_selectors {
     my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order) = @_;
     my $output;
+    my @standardnames = &Apache::loncommon::get_standard_codeitems();
     if ($numtitles > 0) {
         $output .= '<table><tr>';
         for (my $k=0; $k<$lasttitle-1; $k++) {
@@ -564,8 +568,8 @@ sub build_instcode_selectors {
                 @longitems = @items;
             }
             $output .= '<td align="center">'.$codetitles->[$k].'<br />'."\n".
-                       '<select name="'.$codetitles->[$k].'" onChange="courseSet(this)"'.
-                       '>'."\n".'<option value="0" />All'."\n";
+                       '<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 '') {
                     $longitems[$i] = $items[$i];
@@ -575,13 +579,13 @@ sub build_instcode_selectors {
             $output .= '</select></td>';
         }
         $output .= '<td align="center">'.$codetitles->[$lasttitle-1].'<br />'."\n".
-                   '<select name="'.$codetitles->[$lasttitle-1].'">'."\n".
+                   '<select name="'.$standardnames[$lasttitle-1].'">'."\n".
                    '<option value="0">'.&mt('All')."\n".
                    '</option>'."\n".'</select>'."\n".
                    '</td></tr></table>'."\n";
         if ($numtitles > 4) {
             $output .= '<br /><br />'.$codetitles->[$numtitles-1].'<br />'."\n".
-                       '<input type="text" name="'.$codetitles->[$numtitles-1].
+                       '<input type="text" name="'.$standardnames[$numtitles-1].
                        '" /><br />'."\n";
         }
         $output .= '<br />';
@@ -813,7 +817,7 @@ END
 }
 
 sub instcode_search_str {
-    my ($domain,$numtitles) = @_;
+    my ($domain,$numtitles,$codetitles) = @_;
     my $instcode;
     if (defined($numtitles) && $numtitles == 0) {
         $instcode = '.+';
@@ -822,13 +826,25 @@ sub instcode_search_str {
         my $defaults_result =
             &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults,
                                                     \@code_order);
+        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];
+            }
+        }
         if ($defaults_result eq 'ok') {
             $instcode ='^';
-            foreach my $item (@code_order) {
-                if ($env{'form.'.$item} eq '0' ) {
-                    $instcode .= $codedefaults{$item};
+            foreach my $loctitle (@code_order) {
+                my $item = $local_to_standard{$loctitle};
+                if ($item ne '') {
+                    if ($env{'form.'.$item} eq '0' ) {
+                        $instcode .= $codedefaults{$item};
+                    } else {
+                        $instcode .= $env{'form.'.$item};
+                    }
                 } else {
-                    $instcode .= $env{'form.'.$item};
+                    $instcode .= '.+';
                 }
             }
             $instcode .= '$';
@@ -837,6 +853,40 @@ sub instcode_search_str {
         }
     }
     return $instcode;
+}
+
+sub instcode_from_selectors {
+    my ($cdom) = @_;
+    my $instcode;
+    my $caller = 'global';
+    my (%coursecodes,%codes,@codetitles,%cat_titles,%cat_order,
+        %codedefaults,@code_order);
+    my $format_reply =
+        &Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes,
+                            \%codes,\@codetitles,\%cat_titles,\%cat_order);
+    my $defaults_result =
+        &Apache::lonnet::auto_instcode_defaults($cdom,\%codedefaults,
+                                                \@code_order);
+    if (($defaults_result eq 'ok') && ($format_reply eq 'ok')) {
+        my @standardnames = &Apache::loncommon::get_standard_codeitems();
+        my %local_to_standard;
+        for (my $i=0; $i<@codetitles; $i++) {
+            $local_to_standard{$codetitles[$i]} = $standardnames[$i];
+        }
+        foreach my $loctitle (@code_order) {
+            my $category = $local_to_standard{$loctitle};
+            if ($category ne '') {
+                if ($env{'form.'.$category} eq '-1' ) {
+                    $instcode .= $codedefaults{$category};
+                } else {
+                    $instcode .= $env{'form.'.$category};
+                }
+            } else {
+                $instcode .= '.+';
+            }
+        }
+    }
+    return $instcode;
 }
 
 1;
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>