--- loncom/interface/coursecatalog.pm	2006/10/17 18:11:46	1.8
+++ loncom/interface/coursecatalog.pm	2006/12/05 02:55:51	1.11
@@ -47,8 +47,7 @@ sub handler {
     my $lonidsdir=$r->dir_config('lonIDsDir');
     my $handle;
     if ($lonid) {
-        $handle=$lonid->value;
-        $handle=~s/\W//g;
+	my $handle=&LONCAPA::clean_handle($lonid->value);
     }
     if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
         &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
@@ -456,6 +455,7 @@ sub build_courseinfo_hash {
         }
         my $cleandesc=&HTML::Entities::encode($descr,'<>&"');
         $cleandesc=~s/'/\\'/g;
+        $cleandesc =~ s/^\s+//;
         my ($cdom,$cnum)=split(/\_/,$course);
 
         my ($desc,$instcode,$owner,$ttype) = split(/:/,$courses{$course});
@@ -758,39 +758,44 @@ function courseSet() {
             }
         }
         else {
-            for (var k=0; k<idyears.length; k++) {
-                if (idyears[k] == valyr) {
-                    idyr = k;
+            if (selDepartment > -1) {
+                for (var k=0; k<idyears.length; k++) {
+                    if (idyears[k] == valyr) {
+                        idyr = k;
+                    }
                 }
-            }
-            if (idyr != -1) {
-                for (var k=0; k<idsems[idyr].length; k++) {
-                    if (idsems[idyr][k] == valsem) {
-                        idsem = k;
+                if (idyr != -1) {
+                    for (var k=0; k<idsems[idyr].length; k++) {
+                        if (idsems[idyr][k] == valsem) {
+                            idsem = k;
+                        }
                     }
                 }
-            }
-            if (idsem != -1) {
-                for (var k=0; k<idcodes[idyr][idsem].length; k++) {
-                    if (idcodes[idyr][idsem][k] == valdept) {
-                        iddept = k;
+                if (idsem != -1) {
+                    for (var k=0; k<idcodes[idyr][idsem].length; k++) {
+                        if (idcodes[idyr][idsem][k] == valdept) {
+                            iddept = k;
+                        }
                     }
                 }
-            }
-            if (iddept != -1) {
-                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) {
-                        if (idcourseslongs[idyr][idsem][iddept][i] != "") {
-                            display = idcourseslongs[idyr][idsem][iddept][i]
+                if (iddept != -1) {
+                    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) {
+                            if (idcourseslongs[idyr][idsem][iddept][i] != "") {
+                                display = idcourseslongs[idyr][idsem][iddept][i]
+                            }
                         }
+                        document.$formname.Number.options[i+1] = new Option(display,idcourses[idyr][idsem][iddept][i],false,false)
                     }
-                    document.$formname.Number.options[i+1] = new Option(display,idcourses[idyr][idsem][iddept][i],false,false)
+                } 
+                else {
+                    document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
                 }
-            }
+            } 
             else {
-                document.$formname.Number.options[0] =  new Option('No courses','0',true,true);
+                document.$formname.Number.options[0] =  new Option('All','0',true,true);
             }
         }
         document.$formname.Number.selectedIndex = 0