Changeset 13888 for trunk

Timestamp:

2007-02-10T14:49:25+13:00 (17 years ago)

Author:

qq6

Message:

modify the input date format

File:

• trunk/gsdl/perllib/classify/NewList.pm (modified) (7 diffs)

trunk/gsdl/perllib/classify/NewList.pm

@@ -67 +67 @@
     my $self = new BasClas($classifierslist, $inputargs, $hashArgOptLists);
 
-    # Transfer value from Auto Parsing to the variable name that used in previous GreenStone.
-    my (@meta_list,$meta1);
-    if ($self->{"metadata"}) {
-    @meta_list = split(/,/, $self->{"metadata"});
-    $meta1 = $meta_list[0];
-    $self->{'meta_list'} = \@meta_list;
-    } else {
-    $meta1=undef;
-    @meta_list = undef;
-    }
-
     if (!$self->{"buttonname"}) {
-    if (defined ($self->{'metadata'})) {
-        $self->{"buttonname"} = $self->generate_title_from_metadata($self->{'metadata'});
-    } else {
-        $self->{"buttonname"} = 'NewList';
-    }
+    $self->{"buttonname"} = 'NewList';
     }
 
@@ -91 +76 @@
     $self->{'list'} = [];
 
-    # Clean out the unused keys
-    delete $self->{"metadata"}; # Delete this key
     return bless $self, $class;
 }
@@ -108 +91 @@
     my $doc_OID = $doc_obj->get_OID();
 
-    # are we sorting the list??
-    my $nosort = 0;
-    if (defined $self->{'sort'} && $self->{'sort'} eq "nosort") {
-    $nosort = 1;
-    }
-    
-    if (defined $self->{'after_specified_date'}){
+    if (defined $self->{'after_specified_date'} && !($self->{'after_specified_date'} eq "")){
     my $topsection=$doc_obj->get_top_section();
-    my @values=split('/',$self->{'after_specified_date'});
-
-    my $specified_date=timelocal(0,0,0,$values[0],$values[1]-1,$values[2]);
+    my @values;
+    if ($self->{'after_specified_date'}=~/-/){
+        @values=split('-',$self->{'after_specified_date'});
+      #  print STDERR  "date format yyyy-mm-dd " . "@values" . "\n";
+    }else{
+        $values[0]=substr ($self->{'after_specified_date'},0,4);
+        $values[1]=substr ($self->{'after_specified_date'},4,2);
+        $values[2]=substr ($self->{'after_specified_date'},6,2);
+      #  print STDERR  "date format yyyymmdd" . "@values" . "\n";
+    }
     
+    my $specified_date=timelocal(0,0,0,$values[2],$values[1]-1,$values[0]);
+    print STDERR "scalar specified date : " . scalar localtime($specified_date). "\n";
     my $value_lastmodified=
             $doc_obj->get_metadata_element($topsection, 'lastmodified');
 
-    my @values_lastmodi=(localtime($value_lastmodified))[3,4,5];
-    #print STDERR "$values_lastmodi[0],  $values_lastmodi[1],  $values_lastmodi[2]+1900  \n";
-    my $lastmodified_date=timelocal(0,0,0,$values_lastmodi[0],$values_lastmodi[1],$values_lastmodi[2]+1900);
-
-    #print STDERR "specified_date : " .  localtime($specified_date)  . "\n";
-    if ($lastmodified_date>=$specified_date){
-        print STDERR " lastmodified_value: ", localtime($value_lastmodified), "\n";
+    if ($value_lastmodified>=$specified_date){
         push (@{$self->{'lastmodified_values'}},$value_lastmodified);
         push (@{$self->{'list'}}, $doc_OID);
-    }else{
-        return;
     }
-    
     }else{
-    return;
+    my $topsection=$doc_obj->get_top_section();
+    my $value_lastmodified=
+            $doc_obj->get_metadata_element($topsection, 'lastmodified');
+    print STDERR " lastmodified_value: ", localtime($value_lastmodified), "\n";
+    push (@{$self->{'lastmodified_values'}},$value_lastmodified);
+    push (@{$self->{'list'}}, $doc_OID);
     }
 
@@ -151 +133 @@
     my $memberof = &supports_memberof();
     my $return_doc_size=0;
-    if (defined $self->{'return_doc_size'}){
-    $return_doc_size=$self->{'return_doc_size'};
-    }
-
     my @list = ();
     @list = @{$self->{'list'}};
@@ -171 +149 @@
     #mapping lastmodified with OID in a hashtable
     my %metavaluetoOIDhash=();
-    my $size= @{$self->{'lastmodified_values'}};
-    print STDERR "size of lastmodified_values: ", $size, "\n";
     my @lastmodified_values=();
     @lastmodified_values = @{$self->{'lastmodified_values'}};
@@ -178 +154 @@
     my $i;
     for ($i=0;($i<$size);$i++){
-    #print STDERR "lastmodified_values : " .  $lastmodified_values[$i] .  "list : " .  $list[$i], "\n";
     $metavaluetoOIDhash{$list[$i]}=$lastmodified_values[$i];
     }
@@ -184 +159 @@
     #sort the hashtable by values, then form an array containing keys
     my @sortedOIDbylastmodified = sort { $metavaluetoOIDhash{$b} <=> $metavaluetoOIDhash{$a} } keys %metavaluetoOIDhash;
-
-    my $j=0;
-    for ($i=0;($i<$size);$i++){
+    
+    #get the number of docs returned
+    if (defined $self->{'return_doc_size'} && $self->{'return_doc_size'} ne ""){
+    if  ($self->{'return_doc_size'}<=@list){
+        $return_doc_size=$self->{'return_doc_size'};
+    }else{
+        $return_doc_size=@list;
+    }
+    }else{
+    if (@list>20){
+        $return_doc_size=20;
+    }else{
+        $return_doc_size=@list;
+    }
+    }
+    
+    for ($i=0;($i<$return_doc_size);$i++){
     my $OID= $sortedOIDbylastmodified[$i];
     my $hashref={};
-    # special oid format, if using offsets (from AZCompactList)
-    if ($OID =~ s/\.offset(\d+)$//) {
-        $hashref->{'offset'}=$1;
-    }
     $hashref->{'OID'}=$OID;
-
     push (@{$classifyinfo{'contains'}}, $hashref);
-    $j++;
-    
-    if($return_doc_size>0 && $j>=$return_doc_size){
-        last;
-    }
     }