--- loncom/interface/courseclassifier.pm	2010/07/08 23:19:19	1.9
+++ 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.9 2010/07/08 23:19:19 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;
 
@@ -258,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]
@@ -284,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]
@@ -309,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]
@@ -329,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)
@@ -545,7 +550,7 @@ function setElements() {
 sub build_instcode_selectors {
     my ($numtitles,$lasttitle,$cat_items,$codetitles,$cat_titles,$cat_order) = @_;
     my $output;
-    my @standardnames = &get_standard_codeitems();
+    my @standardnames = &Apache::loncommon::get_standard_codeitems();
     if ($numtitles > 0) {
         $output .= '<table><tr>';
         for (my $k=0; $k<$lasttitle-1; $k++) {
@@ -821,7 +826,7 @@ sub instcode_search_str {
         my $defaults_result =
             &Apache::lonnet::auto_instcode_defaults($domain,\%codedefaults,
                                                     \@code_order);
-        my @standardnames = &get_standard_codeitems();
+        my @standardnames = &Apache::loncommon::get_standard_codeitems();
         my %local_to_standard;
         if (ref($codetitles) eq 'ARRAY') {
             for (my $i=0; $i<@{$codetitles}; $i++) {
@@ -850,8 +855,38 @@ sub instcode_search_str {
     return $instcode;
 }
 
-sub get_standard_codeitems {
-    return ('Year','Semester','Department','Number');
+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;