- Timestamp:
- 2012-09-20T09:34:45+12:00 (12 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/doc.pm
r25557 r26221 204 204 my ($type, $metadata) = @_; 205 205 206 if (defined $type && $type =~ /^(hash|hash_on_file|hash_on_ga_xml|incremental| dirname|assigned)$/) {206 if (defined $type && $type =~ /^(hash|hash_on_file|hash_on_ga_xml|incremental|filename|dirname|assigned)$/) { 207 207 $self->{'OIDtype'} = $type; 208 208 } else { … … 401 401 $OID = "D" . $OIDcount; 402 402 $OIDcount ++; 403 403 } elsif ($self->{'OIDtype'} eq "filename") { 404 my $filename = $self->get_source_filename(); 405 $OID = &File::Basename::fileparse($filename, qr/\.[^.]*/); 406 $OID = &util::tidy_up_oid($OID); 404 407 } elsif ($self->{'OIDtype'} eq "dirname") { 405 408 $OID = 'J'; -
main/trunk/greenstone2/perllib/plugins/BasePlugin.pm
r25743 r26221 101 101 { 'name' => "incremental", 102 102 'desc' => "{import.OIDtype.incremental}" }, 103 { 'name' => "filename", 104 'desc' => "{import.OIDtype.filename}" }, 103 105 { 'name' => "dirname", 104 106 'desc' => "{import.OIDtype.dirname}" } ]; … … 1016 1018 my ($doc_obj) = @_; 1017 1019 1020 # don't add one if there is one already set 1021 return unless $doc_obj->get_OID() =~ /^NULL$/; 1018 1022 $doc_obj->set_OIDtype($self->{'OIDtype'}, $self->{'OIDmetadata'}); 1019 1023
Note:
See TracChangeset
for help on using the changeset viewer.