--- loncom/interface/lonsearchcat.pm 2007/03/12 17:09:23 1.282 +++ loncom/interface/lonsearchcat.pm 2007/05/01 02:13:40 1.285 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.282 2007/03/12 17:09:23 albertel Exp $ +# $Id: lonsearchcat.pm,v 1.285 2007/05/01 02:13:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -764,6 +764,9 @@ sub setup_basic_search { '&launch='.$env{'form.launch'}. '&mode='.$env{'form.mode'}. '&area='.$area. + '&form='.$env{'form.form'}. + '&titleelement='.$env{'form.titleelement'}. + '&element='.$env{'form.element'}. '">'.&mt('Advanced Search').''; # $scrout.='
'Network-wide number of accesses (hits)',}, { name=>'stdno', description=> - 'Total number of students who have worked on this problem',}, + 'Statistics calculated for number of students',}, { name => 'avetries', description=>'Average number of tries till solved',}, { name => 'difficulty', @@ -1392,7 +1395,7 @@ sub parse_advanced_search { 'lastrevisiondatestart_month','lastrevisiondatestart_day', 'lastrevisiondatestart_year','lastrevisiondateend_month', 'lastrevisiondateend_day','lastrevisiondateend_year') { - $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; + $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g; } foreach ('mode','form','element') { # is this required? Hmmm. @@ -1855,7 +1858,7 @@ sub process_phrase_input { $item[1]; } term: - /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ { + /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ { $item[1]; } ENDGRAMMAR