Changeset 8220

Timestamp:

2004-10-06T05:36:52+13:00 (20 years ago)

Author:

cs025

Message:

Extensions to underpin OAI - e.g. creation of the OAI classifier, adding
modified file dates and ensuring that documents know the parent classifiers
to which they belong.

Location:

trunk/gsdl/perllib

Files:

• classify.pm (modified) (6 diffs)
• doc.pm (modified) (3 diffs)
• mgbuildproc.pm (modified) (2 diffs)
• mgppbuildproc.pm (modified) (2 diffs)

trunk/gsdl/perllib/classify.pm

@@ -29 +29 @@
 
 require util;
+require AllList;
 use gsprintf;
 
@@ -67 +68 @@
     my ($classify_list, $build_dir, $outhandle) = @_;
     my @classify_objects = ();
+    my $classify_number  = 1;
     
     foreach $classifyoption (@$classify_list) {
@@ -113 +115 @@
     die "$@" if $@;
 
+    $classobj->set_number($classify_number);
+    $classify_number ++;
+
         # add this object to the list
     push (@classify_objects, $classobj);
     }
+
+    my ($classobj);
+    eval ("\$classobj = new AllList()");
+    die "$@" if $@;
+    push (@classify_objects, $classobj);
 
     return \@classify_objects;
@@ -135 +145 @@
     
     foreach $classobj (@$classifiers) {
+    my $title = $classobj->{'title'};
     $classobj->classify($doc_obj);
     }
@@ -152 +163 @@
 
     # get each of the classifications
-    foreach $classobj (@$classifiers) {
+    CLASSIFIER: foreach $classobj (@$classifiers) {
     my $tempinfo = $classobj->get_classify_info($gli);
-    $tempinfo->{'classifyOID'} = "CL$next_classify_num";
+    my $classID = $tempinfo->{'classifyOID'};
+
+    if ((defined $classID) && ($classID eq "oai")) {
+        next CLASSIFIER;
+    }
+    $tempinfo->{'classifyOID'} = "CL$next_classify_num" unless defined($tempinfo->{'classifyOID'});
     $next_classify_num++;
     push (@{$classifyinfo->{'contains'}}, $tempinfo);
@@ -188 +204 @@
     $outputtext .= "<parameters>$classifyinfo->{'parameters'}\n" 
         if defined $classifyinfo->{'parameters'};
+    $outputtext .= "<supportsmemberof>$classifyinfo->{'supportsmemberof'}\n"
+        if defined $classifyinfo->{'supportsmemberof'};
     
     my $contains_text = "<contains>";

trunk/gsdl/perllib/doc.pm

@@ -37 +37 @@
 use util;
 use ghtml;
+use File::stat;
 ##use hashdoc;
 
@@ -55 +56 @@
               'text'=>"",
               'OIDtype'=>"hash"}, $class;
+
+    #GRB: Added code to set lastmodified for OAI purposes
+    if ((defined $doc_type) && (defined $source_filename) && (-e $source_filename)) {
+    my $file_stat = stat($source_filename);
+    my $mtime = $file_stat->mtime;
+    $self->add_utf8_metadata($self->get_top_section(), "lastmodified", $file_stat->mtime);
+    }
+    #GRB: end inserted code
 
     if (defined $source_filename) {
@@ -1051 +1060 @@
 
 # add_metadata assumes the text is in (extended) ascii form. For
-# text which hash been already converted to the UTF-8 format use
+# text which has already been converted to the UTF-8 format use
 # add_utf8_metadata.
 sub add_metadata {

trunk/gsdl/perllib/mgbuildproc.pm

@@ -281 +281 @@
     $archivedir =~ s/\/+$//;
 
+    # resolve the final filenames of the files associated with this document
     $self->assoc_files ($doc_obj, $archivedir);
+
+    #GRB: moved 1/06/2004 from GRB01062004
+    #add this document to the browse structure
+    push(@{$self->{'doclist'}},$doc_obj->get_OID()) 
+    unless ($doctype eq "classification");
+
+    # classify this document
+    &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
+    #GRB: end of moved block
 
     # this is another document
@@ -401 +411 @@
     }
 
-    #add this document to the browse structure
-    push(@{$self->{'doclist'}},$doc_obj->get_OID()) 
-    unless ($doctype eq "classification");
-
-    # classify this document
-    &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
-
+    #GRB01062004: see code above moved from here
 }
 

trunk/gsdl/perllib/mgppbuildproc.pm

@@ -324 +324 @@
     $archivedir =~ s/\/+$//;
 
+    # resolve the final filenames of the files associated with this document
     $self->assoc_files ($doc_obj, $archivedir);
+
+    #GRB: moved 1/06/2004 from GRB01062004
+    #add this document to the browse structure
+    push(@{$self->{'doclist'}},$doc_obj->get_OID()) 
+    unless ($doctype eq "classification");
+
+    # classify this document
+    &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
+    #GRB: end of moved block
 
     # this is another document
@@ -451 +461 @@
     }
 
-    #add this document to the browse structure
-    push(@{$self->{'doclist'}},$doc_obj->get_OID()) 
-    unless ($doctype eq "classification");
-
-    # classify this document
-    &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
-
+    #GRB01062004: see code above moved from here
 }