--- loncom/interface/lonsearchcat.pm 2001/08/26 21:49:49 1.99
+++ loncom/interface/lonsearchcat.pm 2001/08/28 12:12:38 1.100
@@ -335,7 +335,7 @@ LASTREVISIONDATEEND
LIMIT BY SPECIAL METADATA FIELDS:
For resource-specific metadata, enter in an expression in the form of
-key=value separated by operators such as AND or OR.
+key=value separated by operators such as AND, OR or NOT. Example: grandmother=75 OR grandfather=85
CUSTOMMETADATA
@@ -358,6 +358,13 @@ $scrout.=' initial users of this syst
The LearningOnline Network with CAPA
+
@@ -368,7 +375,7 @@ $hidden
Basic Search
Enter terms or phrases separated by search operators
-such as AND or OR then press SEARCH below. Terms should be specific
+such as AND, OR, or NOT then press SEARCH below. Terms should be specific
to the title, author, subject, notes, or abstract information associated
with a resource.
@@ -385,6 +392,7 @@ ENDDOCUMENT
$closebutton
$basicviewselect
+
Advanced Search
@@ -394,6 +402,7 @@ $scrout
$closebutton
$advancedviewselect
+
@@ -451,7 +460,7 @@ sub searchphrasefield {
my ($title,$name,$value)=@_;
my $instruction=<$uctitle:".
@@ -904,7 +913,7 @@ BEGINNING
# conditional output of script functions dependent on the mode in
# which the search was invoked
$r->print(<
+
SCRIPT
$r->print(<
+
SCRIPT
- $r->print(<
+ $r->print(<
function displayinfo(val) {
popwin.document.forms.popremain.sdetails.value=val;
}
+ function openhelp(val) {
+ openhelpwin=open('/adm/help/searchcat.html','helpscreen',
+ 'scrollbars=1,width=400,height=300');
+ openhelpwin.focus();
+ }
SCRIPT
$r->rflush();
@@ -1019,7 +1033,7 @@ RESULTS
$sn++;
}
$r->print(<
+'.
"\n");
$r->rflush();
@@ -1093,11 +1107,13 @@ ENDPOP
my $temp=0;
WLOOP: while (1) {
if (-e $replyfile && $tflag) {
- $r->print(''.
"\n");
$r->rflush();
- $r->print(''.
"\n");
$r->rflush();
@@ -1106,9 +1122,10 @@ ENDPOP
last WLOOP if $temp>5;
if (-e "$replyfile.end") {
if (-s $replyfile) {
- $r->print(''.
- "\n");
+ $r->print(''."\n");
$r->rflush();
my $fh=Apache::File->new($replyfile) or
($r->print('ERROR: file '.
@@ -1116,23 +1133,28 @@ ENDPOP
return OK);
@results=<$fh> if $fh;
$hitcount{$rkey}=@results+0;
- $r->print(''.
"\n");
$r->rflush();
$hitcountsum+=$hitcount{$rkey};
- $r->print(''.
"\n");
$r->rflush();
}
else {
- $r->print(''.
- "\n");
+ $r->print(''.
+ "\n");
$r->rflush();
- $r->print(''.
"\n");
$r->rflush();
@@ -1143,12 +1165,18 @@ ENDPOP
sleep 1;
$timeremain--;
$elapsetime++;
- $r->print(''."\n");
$r->rflush();
$temp++;
}
}
+ $r->print(''."\n");
+ $r->rflush();
}
my $customshow='';
my $extrashow='';
@@ -1260,7 +1288,7 @@ RESULTS
unless ($resultflag) {
$r->print("\nThere were no results that matched your query\n");
}
-# $r->print(''."\n"); $r->rflush();
+# $r->print(''."\n"); $r->rflush();
$r->print(<
@@ -368,7 +375,7 @@ $hidden