Changeset 251

Timestamp:

03/30/06 15:40:23 (6 years ago)

Author:

knok

Message:

Changed value check.

Location:

Search-Namazu/trunk/Search-Namazu

Files:

• ChangeLog (modified) (1 diff)
• Namazu.pm (modified) (5 diffs)

Search-Namazu/trunk/Search-Namazu/ChangeLog

@@ -2 +2 @@
 
         * Namazu.pm (Search): Added "sortField" method.
-          Fixed constants.
+          //Fixed constants. - reverted
+          Changed value check.
 
         * Namazu.xs (call_search_main): Fixed half of results bug.

Search-Namazu/trunk/Search-Namazu/Namazu.pm

@@ -245 +245 @@
 use Carp;
 
-sub NMZ_SORTBYSCORE { return 0; }
 sub NMZ_SORTBYDATE { return 1; }
-sub NMZ_SORTBYFIELD { return 2; }
-sub NMZ_ASCENDSORT { return 0; }
-sub NMZ_DESCENDSORT { return 1; }
+sub NMZ_SORTBYSCORE { return 2; }
+sub NMZ_SORTBYFIELD { return 3; }
+sub NMZ_ASCENDSORT { return 16; }
+sub NMZ_DESCENDSORT { return 32; }
 
 sub NMZ_NOT_SPECIFIED_INDEX { return -1; }
@@ -263 +263 @@
     my %args = @_;
     my $index = $args{'index'};
-    my $sortmeth = $args{'sortMethod'};
-    my $sortord = $args{'sortOrder'};
-    my $sortfield = $args{'sortField'};
+    my $sortmeth = $args{'sortMethod'} || -1;
+    my $sortord = $args{'sortOrder'} || -1;
+    my $sortfield = $args{'sortField'} || -1;
     my $lang = $args{'lang'};
     my $query = $args{'query'};
@@ -294 +294 @@
 # set paramater
 
-    if (!defined $sortmeth) {
-        nmz_sortbydate();
-    } elsif ( $sortmeth == NMZ_SORTBYDATE) {
+    if ( $sortmeth == NMZ_SORTBYDATE) {
         nmz_sortbydate();
     } elsif ($sortmeth == NMZ_SORTBYSCORE) {
@@ -307 +305 @@
     }
 
-    if (!defined $sortord) {
-        nmz_descendingsort();
-    } elsif ($sortord == NMZ_DESCENDSORT) {
+    if ($sortord == NMZ_DESCENDSORT) {
         nmz_descendingsort();
     } elsif ($sortord == NMZ_ASCENDSORT) {
@@ -324 +320 @@
 # query and get hlist
 
-    if (! defined $query) {
+    if (!defined $query) {
         return NMZ_ERR_RESULT_EXCEEDED;
     }